From 664f375d8c8c5f1328ad54f087ac2bbfe05451ab Mon Sep 17 00:00:00 2001
From: longchao <588888888@qq.com>
Date: Mon, 19 Jan 2026 16:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/HosInformation.vue | 39 ++++++++++++++++++++++++++++++++-------
 src/views/conflictDialog.vue |  8 +++-----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index a16009a..86719ef 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -31,7 +31,7 @@
                         </GuipFormItem>
                         <div class="mb24" style="margin-top:-24px;" v-if="!depart_id && doctor_id">
                             <el-autocomplete v-model="hospitalSearchState" style="width: 100%"
-                                :fetch-suggestions="queryHospital" placeholder="请输入医院名称或地址" ref="hospitalAutocomplete"
+                                :fetch-suggestions="queryHospital" :placeholder="'请输入'+pageCurDescText.nameKey+'名称或地址'" ref="hospitalAutocomplete"
                                 :popper-class="((hospitalSearchFlag || hospitalRestaurants.length > 0) ? '' : ' el-autocomplete-noloading')"
                                 @select="hospitalHandleSelect">
                                 <template #append>
@@ -136,7 +136,7 @@
 
                         </div>
 
-                        <div class="bidwrap-item bidwrap-item-pd24" v-if="departIsFixed != -1 && sceneType != 1">
+                        <div class="bidwrap-item bidwrap-item-pd24" v-if="departIsFixed != -1 && sceneType != 1 && departType != 2">
                             <div class="biditemMast flex-between biditemMast-nopd">
                                 <p>医保定点</p>
                                 <div class="flex">
@@ -474,13 +474,13 @@
 
         <div class="siteMessage flex-common mt12" id="siteMessage9">
             <div class="littleTitle mb12">{{pageCurDescText.calendar.text1}}</div>
-            <PromptText text='不同色块代表不同的医院，点击日期，可临时调整当天出诊时间。' :type="1" class="mb24" />
+            <PromptText :text='"不同色块代表不同的"+pageCurDescText.nameKey+"，点击日期，可临时调整当天出诊时间。"' :type="1" class="mb24" />
             <div class="custom-calendar-header">
                 <div class="header-left">
                     <span class="month-text">{{ formatMonth(currentDay) }}</span>
                     <span v-if="isCurrentMonth(currentDay)" class="current-month-badge">（本月）</span>
                     <span class="header-tip" v-if="conflictCount > 0 && !is_allow_coincide">本月有 {{ conflictCount }}
-                        天出诊医院重合，请检查——</span>
+                        天出诊{{pageCurDescText.nameKey}}重合，请检查——</span>
                 </div>
                 <div class="header-right">
                     <el-button-group>
@@ -1162,6 +1162,7 @@ export default {
                 {
                     location: '出诊医院省市',
                     unitName:'出诊医院名称',
+                    nameKey:'医院',
                     shortName:'医院简称',
                     previewNotice:'就诊提醒',
                     previewNoticeTitle:'就诊前的注意事项，非必填',
@@ -1184,6 +1185,7 @@ export default {
                 },
                 {
                     location: '机构所在省市',
+                    nameKey:'机构',
                     unitName: '机构名称',
                     shortName:'机构简称',
                     previewNotice:'预约提醒',
@@ -1221,6 +1223,11 @@ export default {
 
         const { depart_id, doctor_id } = this.$route.query; // 获取 doctorId 参数
         if (doctor_id) this.doctor_id = doctor_id;
+        if(!depart_id) {
+            this.sceneType = 0
+            this.sceneTypeChange(this.sceneType)
+        }
+
         if (doctor_id && depart_id) {
             // 请求医生信息
             this.depart_id = depart_id;
@@ -1375,7 +1382,6 @@ export default {
                 this.$message.error('设置失败');
             }
         },
-
         sceneTypeChange(e) {
             this.pageCurDescText = this.pageDescTexts[e]
         },
@@ -1386,7 +1392,6 @@ export default {
         // 出诊冲突提示框-关闭
         handleVisitClose() {
             this.visitDialogVisible = false;
-
         },
         isMorningCheckboxVisible(hospitalId) {
             if (this.is_allow_coincide) return true;
@@ -3371,6 +3376,7 @@ export default {
                                 }
                             }
 
+                            this.departType[0] = 0;
                             if (this.departType.length <= 0) {
                                 this.$Message.info('请选择使用功能')
                                 return;
@@ -3403,7 +3409,26 @@ export default {
                                     return;
                                 }
 
-                                props = this.form
+                                props = this.form;
+                                props.is_fixed = this.form.is_fixed;
+                                props.type = this.departType[0];
+                                props.notice = this.form.notice;
+                                props.h_shortname = this.form.h_shortname;
+                                props.preview_is_open = this.previewIsOpen ? 1 : 0;
+                                props.scene_type = this.sceneType;
+                                props.pay_switch = this.onLinePay ? 1 : 0;
+
+                                if(this.previewFunctions.indexOf(1)>-1) props.first_visit_audit = 1
+                                if(this.previewFunctions.indexOf(2)>-1) props.has_visit_fee = 1
+
+                                props.can_check_in = 0
+                                if(this.canCheckInList.length > 0) props.can_check_in = 1
+                                if(this.showProjectPrice.length > 0) {
+                                    props.show_project_price = 1
+                                }else{
+                                    props.show_project_price = 0
+                                }
+
                                 props.type = this.departType[0]
                             }
                             rqurl = "/api/admin/set_hospital_depart";
diff --git a/src/views/conflictDialog.vue b/src/views/conflictDialog.vue
index 13c8184..03b0550 100644
--- a/src/views/conflictDialog.vue
+++ b/src/views/conflictDialog.vue
@@ -77,7 +77,7 @@ export default {
         rawScheduleDataProp(newVal) {
                 this.rawScheduleData1 = newVal
         },
-        
+
     } ,
     mounted() {
         if(this.cancelBtnShow == '0'){
@@ -278,10 +278,7 @@ export default {
                 worktime_no_fixed: worktime_no_fixed,
                 week_visit_plan: JSON.stringify(this.formatWorktimesArray(worktimes))
             }
-
-            if (display_work_days == 1 && planDays > 0) {
-                params.display_work_days = planDays
-            }
+            if (display_work_days == 1 && planDays > 0) params.display_work_days = planDays
 
             // 检查冲突：当前设置医院的新排班 vs 其他医院的现有排班
             const conflictResults = this.checkScheduleConflict(worktimes, worktime_no_fixed);
@@ -300,6 +297,7 @@ export default {
                 }
                 return;
             }
+            this.saveWorkTimeDirect()
         },
         async saveWorkTimeDirect() {
             const { display_work_days, planDays, worktime_no_fixed, worktimes } = this.houseCallSettingForm;