From a3b19d8565c22f7532051e4f998bbb4128ef85a7 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Fri, 12 Dec 2025 17:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E8=AF=8A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=B1=95=E7=A4=BA=E6=97=A5=E6=9C=9F=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HosInformation.vue | 3 ++-
 src/views/conflictDialog.vue | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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) {