2022.10.17 预估工时

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -208,7 +208,7 @@
                 <el-form-item><el-checkbox v-model="dialogData.financeJobnumEnabled">财务导入薪资是否支持工号</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item>
                 <el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
-                <!-- <el-form-item><el-checkbox v-model="dialogData.noWorkToReport">是否开启填报不超过考勤工时</el-checkbox></el-form-item> -->
+                <el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
                 <el-form-item>
                     日报审核模式：
                     <el-select v-model="dialogData.reportAuditType" size="small">
@@ -368,6 +368,7 @@
                             this.$set(this.dialogData,'financeJobnumEnabled',res.data.financeJobnumEnabled ? true : false)
                             this.$set(this.dialogData,'reportAutoApprove',res.data.reportAutoApprove ? true : false)
                             this.$set(this.dialogData,'notAllowedNoAttendance',res.data.notAllowedNoAttendance ? true : false)
+                            this.$set(this.dialogData,'stageHasEvtime',res.data.stageHasEvtime ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -642,6 +643,7 @@
                     financeJobnumEnabled: this.dialogData.financeJobnumEnabled ? 1 : 0,
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
                     notAllowedNoAttendance: this.dialogData.notAllowedNoAttendance ? 1 : 0,
+                    stageHasEvtime: this.dialogData.stageHasEvtime ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

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

@@ -1923,7 +1923,7 @@
         },
         methods: {
             test(){
-                console.log('test',this.depData,this.data[0].membCount,this.reportList.length);
+                // console.log('test',this.depData,this.data[0].membCount,this.reportList.length);
             },
             weeklyFilledTimeClick(parameterDate){ //按周填报-已填工时-点击
                 this.weeklyFilledTimeDialog = true
@@ -3501,7 +3501,7 @@
                 }
             },
             stateChange() {
-                console.log(this.allData,'alldate');
+                // console.log(this.allData,'alldate');
                 this.membCount = 0;
                 if (this.selectState == -1) {
                     //全部状态
@@ -3991,7 +3991,7 @@
                         let monthdate = new Date(sessionStorage.msg)
                         this.choseDay = monthdate.getDate() - 1
                         this.curDate = (monthdate.getMonth() + 1) + this.$t('weekDay.month') + monthdate.getDate() + this.$t('weekDay.day')
-                        console.log('choseday',sessionStorage.msg,this.choseDay,monthdate.getDate());
+                        // console.log('choseday',sessionStorage.msg,this.choseDay,monthdate.getDate());
                     }
                 }else{
                     this.choseDay = parseInt(sessionStorage.msg.split('-')[2]) - 1
@@ -4704,14 +4704,14 @@
             },
             // 减去时间
             dateChange(num = 1,date = false) {
-            　　if (!date) {
-            　　　　date = new Date();//没有传入值时,默认是当前日期
-            　　　　date = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
-            　　}
-            　　date += " 00:00:00";//设置为当天凌晨12点
-            　　date = Date.parse(new Date(date))/1000;//转换为时间戳
-            　　date += (86400) * num;//修改后的时间戳
-            　　var newDate = new Date(parseInt(date) * 1000);//转换为时间
+                if (!date) {
+                    date = new Date();//没有传入值时,默认是当前日期
+                    date = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+                }
+                date += " 00:00:00";//设置为当天凌晨12点
+                date = Date.parse(new Date(date))/1000;//转换为时间戳
+                date += (86400) * num;//修改后的时间戳
+                var newDate = new Date(parseInt(date) * 1000);//转换为时间
                 var nian = newDate.getFullYear()
                 var yue = ''
                 var ri = ''
@@ -5870,12 +5870,12 @@
                             } else {
                                 formData.append("stage", "-");
                             }
-                            console.log(this.workForm.domains[i].projectAuditorId, '审核人的id')
+                            // console.log(this.workForm.domains[i].projectAuditorId, '审核人的id')
                             if (this.workForm.domains[i].projectAuditorId) {
                                 formData.append("projectAuditorId", this.workForm.domains[i].projectAuditorId);
                             } else {
-                                console.log('执行到了这里')
-                                console.log(this.user.timeType.reportAuditType)
+                                // console.log('执行到了这里')
+                                // console.log(this.user.timeType.reportAuditType)
                                 if (this.user.timeType.reportAuditType == 0) {
                                     this.$message({
                                         message: this.$t('message.Pleasespecifyaprojectreviewer'),
@@ -6003,7 +6003,7 @@
 
             //撤回日报
             cancel(item,e) {
-                console.log('can can need',item);
+                // console.log('can can need',item);
                 this.logining = true;
                 
                 var ids = '';
@@ -6104,12 +6104,12 @@
             },
             // 触发 selectCat 组件更改他的值
             selectCatCli(obj) {
-                console.log(obj, '看看')
+                // console.log(obj, '看看')
                 // obj.id 是 选中人员的id， obj.idx 是 当前的索引
                 this.workForm.domains[obj.idx].projectAuditorId = obj.id
             },
             vueCasader(obj) {
-                console.log(obj, '看看值')
+                // console.log(obj, '看看值')
                 if(obj.distinction == 1) {
                     let arr = []
                     arr.push(obj.item.id)