2022.10.17 考勤0不填报

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

@@ -207,7 +207,7 @@
                 <el-form-item><el-checkbox v-model="dialogData.projectWithDept">项目是否有所属部门</el-checkbox></el-form-item>
                 <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.noWorkToReport">是否开启考勤为0不可填报</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>
                     日报审核模式：
@@ -367,7 +367,7 @@
                             this.$set(this.dialogData,'projectWithDept',res.data.projectWithDept ? true : false)
                             this.$set(this.dialogData,'financeJobnumEnabled',res.data.financeJobnumEnabled ? true : false)
                             this.$set(this.dialogData,'reportAutoApprove',res.data.reportAutoApprove ? true : false)
-                            this.$set(this.dialogData,'noWorkToReport',res.data.noWorkToReport ? true : false)
+                            this.$set(this.dialogData,'notAllowedNoAttendance',res.data.notAllowedNoAttendance ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                         }else{
                             this.$message({
@@ -641,7 +641,7 @@
                     projectWithDept: this.dialogData.projectWithDept ? 1 : 0,
                     financeJobnumEnabled: this.dialogData.financeJobnumEnabled ? 1 : 0,
                     reportAutoApprove: this.dialogData.reportAutoApprove ? 1 : 0,
-                    noWorkToReport: this.dialogData.noWorkToReport ? 1 : 0,
+                    notAllowedNoAttendance: this.dialogData.notAllowedNoAttendance ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType
                 },res => {
                     if(res.code == 'ok'){

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

@@ -5642,14 +5642,18 @@
                         for (var t=0;t<this.workForm.domains.length; t++) {
                             totalTime += parseFloat(this.workForm.domains[t].workingTime);
                         }
-                        if (this.reportTimeType.type == 1 && this.workForm.time) {
-                            if (this.workForm.time.workHours && this.user.timeType.noWorkToReport == 1){
+                        
+                        if(this.workForm.time){
+                            if (this.workForm.time.workHours == 0 && this.user.timeType.notAllowedNoAttendance == 1){
                                 this.$message({
                                     message: '无考勤记录不可填报',
                                     type: 'error'
                                 })
                                 return
                             }
+                        }
+
+                        if (this.reportTimeType.type == 1 && this.workForm.time) {
                             if (this.workForm.time.workHours && totalTime > parseFloat(this.workForm.time.workHours)) {
                                 this.$message({
                                         message: this.$t('message.Fillinthesumofworkinghours')+(totalTime)+"h"+this.$t('message.Cannotexceedthetotalworkinghoursofattendance')+"("+this.workForm.time.workHours.toFixed(1)+"h)",

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

@@ -1519,6 +1519,12 @@ import timetoolVue from '../timetool/timetool.vue';
                             return;
                         }
                     }
+                    if(this.report.time){
+                            if (this.report.time.workHours == 0 && this.user.timeType.notAllowedNoAttendance == 1){
+                                this.$toast.fail('无考勤记录不可填报')
+                                return
+                            }
+                        }
                     if (this.reportTimeType.type == 1 && this.report.time) {
                                 var totalTime = 0;
                                 for (var t=0;t<this.form.domains.length; t++) {