Merge branch 'master' of gitea.intra.yunpaper.com:zhangqi/acupuncture_admin into projectFee-1118

src/views/HosInformation.vue

@@ -58,6 +58,7 @@
                                 </GuipSwitch>
                             </div>
                         </GuipFormItem>
+
                         <GuipFormItem column="column" class="mb24" label="使用功能">
                             <el-checkbox-group slot="formDom" v-model="departType" @change="validateSelection"
                                 class="checkboxGroup">
@@ -68,6 +69,16 @@
                                 <el-checkbox :label="2">仅医生名片</el-checkbox>
                             </el-checkbox-group>
                         </GuipFormItem>
+
+                        <GuipFormItem column="column" class="mb24" v-if="departType.length > 0 && departType[0] == 1">
+                            <div slot="formLeft" class="form-top-icon">预约开关</div>
+                            <div class="flex" slot="formDom" style="padding: 9px 0px;">
+                                <GuipSwitch :value="previewIsOpen" @change="onPreviewSwitchChange" activeText="开启预约"
+                                    inactiveText="关闭预约" :active-value="true" :inactive-value="false">
+                                </GuipSwitch>
+                            </div>
+                        </GuipFormItem>
+
                         <GuipFormItem column="column" class="" label="就诊提醒">
                             <div slot="formRight" class="desc">就诊前的注意事项，非必填</div>
                             <GuipTextarea slot="formDom" v-model="form.notice" prop="notice" width="100%" height="84px"
@@ -810,6 +821,7 @@ export default {
             hospitalSearchFlag: false,
             hospitalSearchTimeout: false,
             departIsFixed: -1,
+            previewIsOpen:-1,
             projectList: [],
             projectTagData: [],
             courseList: [],
@@ -1992,14 +2004,14 @@ export default {
                         });
                         // 存储一份副本，用于后续操作
                         this.hosListCopy = JSON.parse(JSON.stringify(this.hosList))
-    
+
                         // 保存原始数据
                         this.rawScheduleData = JSON.parse(JSON.stringify(list));
-    
+
                         // 初始化当前月份的排班数据
                         this.generateMonthSchedule(this.currentDay);
                         this.countMonthlyConflicts();
-    
+
                         this.hosLength = Object.keys(list).length;
 
                 }
@@ -2734,7 +2746,7 @@ export default {
                     'afternoon_worktime': response.data.afternoon_worktime ? response.data.afternoon_worktime.split('-') : ''
                 }
                 this.houseCallSettingForm.worktimes = JSON.parse(JSON.stringify(this.form.worktimes));
-                const {type,is_fixed,pay_switch,has_visit_fee,has_project_fee,is_on_credit,visit_price,display_work_days,worktime_no_fixed,is_allow_coincide} = 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{
@@ -2743,13 +2755,12 @@ export default {
                 this.houseCallSettingForm.worktime_no_fixed = worktime_no_fixed
                 this.is_allow_coincide=is_allow_coincide
 
-                this.departType = (type || type === 0 || type === "0") ? [Number(type)] : []
-                this.departIsFixed = is_fixed == "1" ? true : false
-                this.onLinePay = pay_switch
-                this.hasVisitFee = has_visit_fee
-                this.hasProjectFee = has_project_fee;
-                this.is_on_credit = is_on_credit;
-                this.registerMoney = visit_price
+                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
+                this.previewIsOpen = response.data.preview_is_open == "1" ? true : false
+                this.onLinePay = response.data.pay_switch
+                this.hasVisitFee = response.data.has_visit_fee
+                this.registerMoney = response.data.visit_price
 
                 this.hasAgainVisitFreeDays = response.data.has_again_visit_free_days
                 this.againVisitFreeDays = response.data.again_visit_free_days
@@ -2949,6 +2960,10 @@ export default {
             this.$set(this.projectList, row)
             this.editorProjectInfo({ status: row.status, project_id: row.id })
         },
+        onPreviewSwitchChange(data) {
+            this.form.preview_is_open = data ? 1 : 0
+            this.previewIsOpen = data
+        },
         onSwitchChange2(row) {
             var tmpstatus = row.status == 1 ? 0 : 1
             this.$set(this.courseList, row)
@@ -3148,7 +3163,8 @@ export default {
                                 is_fixed: this.form.is_fixed,
                                 type: this.departType[0],
                                 notice: this.form.notice,
-                                h_shortname: this.form.h_shortname
+                                h_shortname: this.form.h_shortname,
+                                preview_is_open: this.previewIsOpen ? 1 : 0
                             }
 
                             if (this.doctor_id && !this.depart_id) {