Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,10 +1,8 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.39'
 // var ip = '192.168.2.15'
 var ip = '192.168.2.39'
-// var ip = '192.168.2.12'// var ip = '47.100.37.243' 
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -862,7 +862,7 @@ export default {
       this.http.post('/project/getCustomerProjectInAndOut', {
                     pageIndex: this.page,
                     pageSize: this.size,
-                    projectId: this.proJuctId,
+                    projectId: this.cusProJuctId,
                     customerId: this.customerId
                     },
         res => {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -384,8 +384,8 @@
                         <el-input-number :id="'numberData_'+index" :disabled="!canEdit" v-model="domain.customData" style="width:200px;" @keyup.native="restrictNumber('numberData_'+index)"></el-input-number>
                     </el-form-item>
                     <!-- 自定义文本 -->
-                    <el-form-item :label="yonghuUser.customTextName" v-if="yonghuUser.customTextActive == 1">
-                        <el-input :disabled="!canEdit" v-model="domain.customText" style="width:500px;" maxlength="25" show-word-limit></el-input>
+                    <el-form-item :label="yonghuUser.customTextName + '123'" v-if="yonghuUser.customTextActive == 1">
+                        <el-input :disabled="!canEdit" v-model="domain.customText" style="width:75%;margin-right:7%" maxlength="25" show-word-limit></el-input>
                     </el-form-item>
                     <el-form-item v-if="reportTimeType.type == 3" label="用时占比" :prop="'domains.' + index + '.'+timeFields[reportTimeType.type]"
                         :rules="{ required: true, message: '请设置用时占比', trigger: 'blur' }">
@@ -504,7 +504,7 @@
                         </el-form-item>
                         <!-- 自定义文本 -->
                         <el-form-item :label="yonghuUser.customTextName" v-if="yonghuUser.customTextActive == 1">
-                            <el-input :disabled="!canEdit" v-model="domain.customText" style="width:500px;" maxlength="25" show-word-limit></el-input>
+                            <el-input :disabled="!canEdit" v-model="domain.customText" style="width:75%;margin-right:7%" maxlength="25" show-word-limit></el-input>
                         </el-form-item>
                         <!--项目管理专业版模式下，项目下的近期执行的任务 -->
                         <el-form-item label="任务/里程碑" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -17,7 +17,7 @@
             </van-popup>
             <van-cell title="总时长(h)" v-if="reportTimeType.type == 3">
                 <template>
-                    <van-stepper :disabled="!canEdit" v-model="reportTimeType.allday" @change="changeAllTime" min="0.5" max="12" step="0.5" :decimal-length="1" />
+                    <van-stepper :disabled="!canEdit || user.timeType.lockWorktime == 1" v-model="reportTimeType.allday" @change="changeAllTime" min="0.5" max="12" step="0.5" :decimal-length="1" />
                 </template>
             </van-cell>
             
@@ -165,7 +165,7 @@
                         <template >
                             <div>
                         <span>用时占比</span>
-                        <van-slider :disabled="!canEdit" :min="10" :step="10" style="width:120px;display:inline-block;margin-left:50px;" v-model="item.progress" :value="100" @change="item.workingTime = (reportTimeType.allday*item.progress/100).toFixed(1)" >
+                        <van-slider :disabled="!canEdit" :min="5" :step="5" style="width:120px;display:inline-block;margin-left:50px;" v-model="item.progress" :value="100" @change="item.workingTime = (reportTimeType.allday*item.progress/100).toFixed(1)" >
                         <template #button>
                             <div class="custom-button">{{ item.progress }}%</div>
                         </template>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -26,6 +26,11 @@
                         <van-button type="default" size="small" @click="submitClear">清空</van-button>
                     </div>
             </van-grid>
+            <van-cell title="总时长(h)" v-if="reportTimeType.type == 3">
+                        <template>
+                            <van-stepper style="float:left;" :disabled="user.timeType.lockWorktime == 1" v-model="reportTimeType.allday" @change="changeAllTime" min="0.5" max="12" step="0.5" button-size="24px" :decimal-length="1" />
+                        </template>
+                    </van-cell>
 
 
             <div class="form_domains" v-for="(item,index) in currentForm.domains" :key="item.id">
@@ -150,7 +155,7 @@
                         <template >
                             <div>
                         <span>用时占比</span>
-                        <van-slider :min="10" :step="10" style="width:120px;display:inline-block;margin-left:50px;" v-model="item.progress" :value="100" @change="item.workingTime = (reportTimeType.allday*item.progress/100).toFixed(1)" >
+                        <van-slider :min="5" :step="5" style="width:120px;display:inline-block;margin-left:50px;" v-model="item.progress" :value="100" @change="item.workingTime = (reportTimeType.allday*item.progress/100).toFixed(1)" >
                         <template #button>
                             <div class="custom-button">{{ item.progress }}%</div>
                         </template>
@@ -365,7 +370,7 @@
                 inbtn: 0,
                 weekIndex: 5,
                 weekSwitchIndex: 1,
-                kaoqinText: false
+                kaoqinText: false,
             };
         },
         methods: {
@@ -448,6 +453,7 @@
                                 projectName: "",
                                 workingTime: this.user.timeType.allday,
                                 content: "",
+                                progress: 100,
                                 state: 2,
                                 multiWorktime:0,
                                 worktimeList:{},
@@ -859,7 +865,7 @@
                         case 'h': return _this.padding(date.getHours(), $0.length);
                         case 'm': return _this.padding(date.getMinutes(), $0.length);
                         case 's': return _this.padding(date.getSeconds(), $0.length);
-                    }
+                    }getReport
                 });
             },
 

fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -3,7 +3,7 @@ const pxtorem = require("postcss-pxtorem");
 const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
-var ip = '192.168.2.2'
+var ip = '192.168.2.39'
 // var ip = '127.0.0.1'
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {