소스 검색

提交特殊节假日设置bug

Min 1 년 전
부모
커밋
be83d109ec

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/HolidaySettingController.java

@@ -61,6 +61,10 @@ public class HolidaySettingController {
             return msg;
         }
         holidaySetting.setCompanyId(companyId);
+        if(holidaySetting.getRangeType()==0){
+            holidaySetting.setTargetUsers("");
+            holidaySetting.setTargetDepts("");
+        }
         if(!holidaySettingService.saveOrUpdate(holidaySetting)){
             msg.setError("验证失败");
         }

+ 14 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -1004,6 +1004,20 @@
                     }
                     this.specialHolidaysDept = newDeptForm
                     this.specialHolidaysUser = newUserForm
+                }else{
+                    this.holidaySeetingForm.holidayDate = ""
+                    this.holidaySeetingForm.id = null
+                    this.holidaySeetingForm.rangeType = "0"
+                    let newDeptForm = {
+                        values: [],
+                        labels: []
+                    }
+                    let newUserForm = {
+                        values: [],
+                        labels: []
+                    }
+                    this.specialHolidaysDept = newDeptForm
+                    this.specialHolidaysUser = newUserForm
                 }
                 this.addHolidaySeeting = true;
             },