diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue index b9a7779..5c81603 100644 --- a/src/views/HosInformation.vue +++ b/src/views/HosInformation.vue @@ -2335,8 +2335,8 @@ export default { this.generateMonthSchedule(this.currentDay); this.countMonthlyConflicts(); // 添加统计 }, + // 设置科室工作时间 async setDepartWorkTime() { - console.log('=====执行了'); this.$refs.conflictDialog.setDepartWorkTime() }, formatMonth(date, dayFlag) { @@ -3239,6 +3239,7 @@ export default { } .conflictTip { + width: 50px; height: 22px; display: flex; justify-content: center; diff --git a/src/views/conflictDialog.vue b/src/views/conflictDialog.vue index 13c8184..502c789 100644 --- a/src/views/conflictDialog.vue +++ b/src/views/conflictDialog.vue @@ -299,6 +299,8 @@ export default { this.visitShowCancelBtn = false; } return; + }else{ + await this.saveWorkTimeDirect() } }, async saveWorkTimeDirect() { @@ -462,7 +464,7 @@ export default { return conflict; }, getWeekDayName(weekDay) { - const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; + const weekDays = [ '周一', '周二', '周三', '周四', '周五', '周六', '周日']; return weekDays[weekDay - 1] || `周${weekDay}`; }, getConflictShift(newPlan, existingPlan) {