2022.5.17 18.48

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -706,8 +706,17 @@
                         } else {
                             param.customTextActive = 0
                         }
+                        
                         param.fillOvertime = param.fillOvertime ? 1 : 0
                         param.lockWorktime = param.lockWorktime ? 1 : 0
+                        if(param.lockWorktime){
+                            param.fillOvertime = 0
+                            param.payOvertime = 0
+                        }else {
+                            if(!param.fillOvertime){
+                                param.payOvertime = 0
+                            }
+                        }
                         if(param.payOvertime) {
                             if(param.overtimeRatio == 0 || param.overtimeRatio == '') {
                                 this.$message({