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">是否开启填报不超过考勤工时</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.noWorkToReport">是否开启填报不超过考勤工时</el-checkbox></el-form-item> -->
                 <el-form-item>
                     日报审核模式：

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

@@ -5576,7 +5576,14 @@
                         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 && this.user.timeType.noWorkToReport == 1) {
+                        if (this.reportTimeType.type == 1 && this.workForm.time) {
+                            if (this.workForm.time.workHours && this.user.timeType.noWorkToReport == 1){
+                                this.$message({
+                                    message: '无考勤记录不可填报',
+                                    type: 'error'
+                                })
+                                return
+                            }
                             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)",