考勤0不填报

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

@@ -5643,8 +5643,16 @@
                             totalTime += parseFloat(this.workForm.domains[t].workingTime);
                         }
                         
-                        if(this.workForm.time){
-                            if (this.workForm.time.workHours == 0 && this.user.timeType.notAllowedNoAttendance == 1){
+                        if(this.user.timeType.notAllowedNoAttendance == 1){
+                            if (this.workForm.time){
+                                if (this.workForm.time.workHours == 0){
+                                    this.$message({
+                                        message: '无考勤记录不可填报',
+                                        type: 'error'
+                                    })
+                                    return
+                                }
+                            }else{
                                 this.$message({
                                     message: '无考勤记录不可填报',
                                     type: 'error'

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

@@ -1519,8 +1519,13 @@ import timetoolVue from '../timetool/timetool.vue';
                             return;
                         }
                     }
-                    if(this.report.time){
-                            if (this.report.time.workHours == 0 && this.user.timeType.notAllowedNoAttendance == 1){
+                        if(this.user.timeType.notAllowedNoAttendance == 1){
+                            if (this.report.time){
+                                if (this.report.time.workHours == 0){
+                                    this.$toast.fail('无考勤记录不可填报')
+                                    return
+                                }
+                            }else{
                                 this.$toast.fail('无考勤记录不可填报')
                                 return
                             }