Merge pull request '修改日历展示不更新问题' (#17) from calender-1105 into master

Reviewed-on: #17

src/views/HosInformation.vue

@@ -697,7 +697,7 @@
             </el-form>
         </GuipDialog>
          <ConflictDialog :is_allow_coincide="is_allow_coincide" :h_realname="form.h_realname" :houseCallSettingForm="houseCallSettingForm"
-          ref="conflictDialog" :doctor_id="doctor_id" :rawScheduleDataProp="rawScheduleData" :depart_id="depart_id" :oldWorktimes="form.worktimes"/>
+          ref="conflictDialog" :doctor_id="doctor_id" :rawScheduleDataProp="rawScheduleData" :depart_id="depart_id" :oldWorktimes="form.worktimes" @updateCalender="getDoctorHosPreview"/>
 
         <GuipDialog :dialogVisible="dialogVisible" :title="dialogTitle" :show-close-button="true" width="762px"
             :show-cancel-button="true" @confirm="handleConfirm" @cancel="handleCancel" @close="handleClose"
@@ -1969,23 +1969,23 @@ export default {
             }).then(response => {
                 const list = response.msg;
                 if (response.code == 0) {
-                    this.hosList = Object.keys(list).map(item => {
+                        this.hosList = Object.keys(list).map(item => {
-                        return {
+                            return {
-                            hid: item,
+                                hid: item,
-                            h_depart_name: list[item].h_depart_name
+                                h_depart_name: list[item].h_depart_name
-                        }
+                            }
-                    });
+                        });
-                    // 存储一份副本，用于后续操作
+                        // 存储一份副本，用于后续操作
-                    this.hosListCopy = JSON.parse(JSON.stringify(this.hosList))
+                        this.hosListCopy = JSON.parse(JSON.stringify(this.hosList))
-
+    
-                    // 保存原始数据
+                        // 保存原始数据
-                    this.rawScheduleData = JSON.parse(JSON.stringify(list));
+                        this.rawScheduleData = JSON.parse(JSON.stringify(list));
-
+    
-                    // 初始化当前月份的排班数据
+                        // 初始化当前月份的排班数据
-                    this.generateMonthSchedule(this.currentDay);
+                        this.generateMonthSchedule(this.currentDay);
-                    this.countMonthlyConflicts();
+                        this.countMonthlyConflicts();
-
+    
-                    this.hosLength = Object.keys(list).length;
+                        this.hosLength = Object.keys(list).length;
 
                 }
             }).catch(error => {
@@ -2044,8 +2044,8 @@ export default {
 
                 currentDate.setDate(currentDate.getDate() + 1);
             }
-
+            this.$set(this, 'calendarList', tempCalendarData)
-            this.calendarList = tempCalendarData;
+            // this.calendarList = tempCalendarData;
             console.log(this.calendarList,'===this.calendarList:');
         },
         addHospitalToSchedule(daySchedule, hospitalId, hospital, plan, workDesc) {
@@ -2178,7 +2178,7 @@ export default {
 
             // 检查冲突
             this.checkScheduleConflicts(daySchedule, dateStr);
-            console.log(daySchedule,'daySchedule===');
+            // console.log(daySchedule,'daySchedule===');
 
             return Object.keys(daySchedule).length > 1 ? daySchedule : null;
         },
@@ -2369,9 +2369,6 @@ export default {
 
         // 获取指定日期的排班信息（修改后的版本）
         getDateSchedule(dateString) {
-            if(dateString == '2025-11-18'){
-                console.log('dateString==:',this.formattedCalendarData[dateString]);
-            }
             return this.formattedCalendarData[dateString] || null;
         },
         // 修改判断方法

src/views/conflictDialog.vue

@@ -41,7 +41,6 @@ export default {
         cancelBtnShow: String,
         title: String,
         // houseCallSettingForm: Object,
-        // getDoctorHosPreview: Function,
         // formatWorktimesArray: Function,
     },
     components: {
@@ -322,7 +321,8 @@ export default {
                 if (response.code == 0) {
                     this.$Message.success(response.msg || '设置成功')
                     // this.form.worktimes = worktimes;
-                    this.getDoctorHosPreview();
+                    this.$emit('updateCalender')
+                    // this.getDoctorHosPreview();
                 }
             }).catch(error => {
                 console.error(error, 'error')