Merge pull request '修改不固定设置' (#16) from calender-1105 into master

Reviewed-on: #16

src/views/HosInformation.vue

@@ -965,7 +965,7 @@ export default {
             calendarList1: [],
             calendarList: {}, // 用于存储格式化后的排班数据
             rawScheduleData: null, // 存储原始排班数据
-            is_allow_coincide: 0,//是否允许时段重合
+            is_allow_coincide: 0,//是否允许时段重合 0不允许 1允许
             conflictDates: [], // 存储有冲突的日期
             conflictCount: 0, // 冲突天数统计
             tempAdjustments: {}, // 存储临时调诊数据 {日期: {医院ID: {原班次, 新班次, 状态}}}
@@ -2324,6 +2324,7 @@ export default {
             this.countMonthlyConflicts(); // 添加统计
         },
         async setDepartWorkTime() {
+            console.log('=====执行了');
             this.$refs.conflictDialog.setDepartWorkTime()
         },
         formatMonth(date, dayFlag) {
@@ -2681,7 +2682,7 @@ export default {
                 }
                 this.houseCallSettingForm.worktimes = JSON.parse(JSON.stringify(this.form.worktimes));
                 // ---------还没有数据
-                const {display_work_days,worktime_no_fixed} = response.data;
+                const {display_work_days,worktime_no_fixed,is_allow_coincide} = response.data;
                 if(display_work_days > 0){
                     this.houseCallSettingForm.planDays = display_work_days;
                 }else{
@@ -2690,7 +2691,7 @@ export default {
                 this.houseCallSettingForm.worktime_no_fixed = worktime_no_fixed
 
                 // ---------还没有数据
-
+                this.is_allow_coincide=is_allow_coincide
 
                 this.departType = (response.data.type || response.data.type === 0 || response.data.type === "0") ? [Number(response.data.type)] : []
                 this.departIsFixed = response.data.is_fixed == "1" ? true : false

src/views/conflictDialog.vue

@@ -269,6 +269,10 @@ export default {
         // ..end
         async setDepartWorkTime() {
             const { display_work_days, planDays, worktime_no_fixed,worktimes } = this.houseCallSettingForm;
+            if(worktime_no_fixed == 1){
+                this.saveWorkTimeDirect()
+                return;
+            }
             const params = {
                 doctor_id: this.doctor_id,
                 depart_id: this.depart_id,
@@ -283,7 +287,7 @@ export default {
             // 检查冲突：当前设置医院的新排班 vs 其他医院的现有排班
             const conflictResults = this.checkScheduleConflict(worktimes, worktime_no_fixed);
             // 为固定出诊并且存在冲突时展示弹出框
-            if (conflictResults.hasConflict && worktime_no_fixed == 0) {
+            if (conflictResults.hasConflict) {
                 this.visitDialogVisible = true;
                 this.hasConflictresult = conflictResults.conflicts;
                 if(this.is_allow_coincide){