1

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

@@ -390,6 +390,7 @@
                 }
                 else if(i == 'H'){
                     this.editDialogH = true
+                    this.roleIdArr = []
                     this.getReoprtFormList(obj)
                     this.getRoleList(obj)
                 }

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

@@ -1646,8 +1646,8 @@ import timetoolVue from '../timetool/timetool.vue';
                             formData.append("taskFinish", 0);
                         }
                         formData.append("createDate", this.form.createDate);
-                        formData.append("isOvertime", this.form.domains[i].isOvertime?1:0);
-                        if (this.form.domains[i].overtimeHours && this.form.domains[i].isOvertime == 1) {
+                        formData.append("isOvertime", this.form.domains[i].isOvertime && this.user.timeType.fillOvertime?1:0);
+                        if (this.form.domains[i].overtimeHours && this.form.domains[i].isOvertime == 1 && this.user.timeType.fillOvertime) {
                             formData.append("overtimeHours", this.form.domains[i].overtimeHours);
                         } else {
                             formData.append("overtimeHours", 0);