From 0d8685c7172cbd9a8f678144c68a9630e1b06502 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 13 Jun 2024 15:41:42 +0800
Subject: [PATCH] =?UTF-8?q?6.13=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/hospitalDetailModal.vue   | 17 ++++++-------
 src/views/basic/area/index.vue           |  8 ++++--
 src/views/basic/hospital/index.vue       |  2 +-
 src/views/inquiry/healthconfig/index.vue | 13 ++++++----
 src/views/inquiry/visitconfig/index.vue  | 32 +++++++++++++++++++-----
 5 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/components/hospitalDetailModal.vue b/src/components/hospitalDetailModal.vue
index ab35b33..2f7298f 100644
--- a/src/components/hospitalDetailModal.vue
+++ b/src/components/hospitalDetailModal.vue
@@ -211,17 +211,8 @@ watch(()=>props.id,()=>{
   }
 
 },{immediate:true})
-watch(()=>props.modalForm,()=>{
-  if(props.id){
-    handelAreaList('',modalForm.value.province_id
-  ,3)
-  handelAreaList('',modalForm.value.city_id
-  ,4)
-  }
 
 
-},{immediate:true,deep:true})
-
 const rules = {
     hospital_name: [{ required: true, message: '请输入医院名称' }],
     county_id:[{ required: true, message: '请选择省市区' }],
@@ -280,8 +271,14 @@ const handleClose = () => {
   proxy.$refs.modalFormRef.resetFields();
   emits('familyVisibleChange', false);
 };
-const getData = () => {
+const getData = (flag=false) => {
   handelAreaList('', '', 2);
+  if(flag){
+    handelAreaList('',modalForm.value.province_id
+  ,3)
+  handelAreaList('',modalForm.value.city_id
+  ,4)
+  }
 };
 defineExpose({
   getData,
diff --git a/src/views/basic/area/index.vue b/src/views/basic/area/index.vue
index 5d478c1..9afdcea 100644
--- a/src/views/basic/area/index.vue
+++ b/src/views/basic/area/index.vue
@@ -23,7 +23,6 @@
         </span>
       </template>
     </el-tree>
-
     <a-modal v-model:visible="okVisible" :modal-style="{width:'420px'}" body-class="okmodal" @ok="handleConfirm"
       @cancel="handleClose" >
       <template #title>
@@ -33,6 +32,9 @@
         <a-form-item field="area_name" label="名称" >
           <a-textarea v-model.trim="form.area_name" allow-clear placeholder="请输入名称"></a-textarea>
         </a-form-item>
+        <a-form-item field="area_id" label="区域id" >
+          <a-input v-model="form.area_id" allow-clear placeholder="请输入区域id"></a-input>
+        </a-form-item>
         <a-form-item field="label" label="上级名称" v-if="title=='添加区域'">
           <a-input v-model="form.label" disabled placeholder="请输入级名称" size="large" class="input-demo"  />
         </a-form-item>
@@ -99,7 +101,8 @@ const handleNodeClick = (data) => {
   const cityData = ref([]);
   const countryData = ref([]);
   const rules= reactive({
-    area_name:  [{ required: true, message: '请输入名称' }]
+    area_name:  [{ required: true, message: '请输入名称' }],
+    area_id:[{ required: true, message: '请输入区域id' }]
 });
   let id = 1000;
   const append=(data)=>{
@@ -122,6 +125,7 @@ const handleNodeClick = (data) => {
     title.value="修改区域";
     form.parent_id=node.data.id;
     form.area_name=node.data.label;
+    form.area_id=node.data.id;
     okVisible.value=true;
     current.id=data.id;
     current.parent_id=data.parent_id;
diff --git a/src/views/basic/hospital/index.vue b/src/views/basic/hospital/index.vue
index e0d7f07..f209db5 100644
--- a/src/views/basic/hospital/index.vue
+++ b/src/views/basic/hospital/index.vue
@@ -208,11 +208,11 @@
   //详情
   const handleDetail = async (record) => {
     const { code, data, message } = await getHospitalDetail(record.hospital_id)
-    hospitalChild.value.getData();
     if (code == 200) {
         Object.assign(modalForm, data);
         modalVisible.value = true;
       }
+      hospitalChild.value.getData(true);
     };
   // 批量删除
   const handleBatchDelete = () => {
diff --git a/src/views/inquiry/healthconfig/index.vue b/src/views/inquiry/healthconfig/index.vue
index a4a3e0d..cf7a035 100644
--- a/src/views/inquiry/healthconfig/index.vue
+++ b/src/views/inquiry/healthconfig/index.vue
@@ -10,6 +10,7 @@
   
       <!-- table -->
       <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1500 }"
         :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
         row-key="package_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
@@ -28,9 +29,10 @@
         <template #multi_point_status="{record}">
           <div>{{formatMultipoint(record.user_doctor.multi_point_status)}}</div>
         </template>
-        <template #inquiry_mode="{ record }">
-           <div v-if="record.doctor_inquiry_config.inquiry_mode==8">健康包</div>
-           <div v-else-if="record.doctor_inquiry_config.inquiry_mode==9">随访包</div>
+       
+        <template #last_enable_method="{record}">
+          <div class="reason" v-if="record.doctor_inquiry_config.last_enable_method==1" >自己</div>
+          <div v-else>后台</div>
         </template>
         <template #monthly_frequency="{ record }">
            <div v-if="record.health_package.monthly_frequency==0">不限次</div>
@@ -133,7 +135,7 @@
     // Table Columns
     const columns = [
       { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
-      { title: '服务名称', dataIndex: 'inquiry_mode',slotName:'inquiry_mode',width:180 },
+      // { title: '服务名称', dataIndex: 'inquiry_mode',slotName:'inquiry_mode',width:180 },
       { title: '医生姓名', dataIndex: 'doctor_name',slotName:'doctor_name',width:180 },
       { title: '医生科室', dataIndex: 'department_custom_name',slotName:'department_custom_name',width:180 },
       { title: '职称', dataIndex: 'doctor_title',slotName:'doctor_title',width:180 },
@@ -142,7 +144,8 @@
       { title: '服务有效天数', dataIndex: 'effective_days', slotName:'effective_days', width: 150 },
        { title: '服务费率', dataIndex: 'service_rate', slotName: 'service_rate',width:80 },
        { title: '服务价格(元)', dataIndex: 'service_price',width:80 },
-       { title: '状态', dataIndex: 'status',slotName:'status',width:80 },
+       { title: '启用状态', dataIndex: 'status',slotName:'status',width:100 },
+       { title: '申请人', dataIndex: 'last_enable_method',slotName:'last_enable_method',width:80 },
       { title: '操作', slotName: 'action', fixed: "right", width: 180 },
     ];
   
diff --git a/src/views/inquiry/visitconfig/index.vue b/src/views/inquiry/visitconfig/index.vue
index 103b34c..3fac507 100644
--- a/src/views/inquiry/visitconfig/index.vue
+++ b/src/views/inquiry/visitconfig/index.vue
@@ -10,16 +10,30 @@
   
       <!-- table -->
       <a-table :columns="columns" :data="tableData" 
+      :scroll="{ x: 1500 }"
         :pagination="{ 'show-total': true, 'show-jumper': true, 'show-page-size': true, total: pager.total, current: currentPage }"
         row-key="package_id" @selection-change="(selection) => {deleteData = selection;console.log(selection)}"
         @page-change="handlePageChange" @page-size-change="handlepage_sizeChange">
         <template #doctor_id="{record,rowIndex}">
           <div>{{(rowIndex+1)+(pager.page-1)*pager.page_size}}</div>
         </template>
-        <template #inquiry_mode="{ record }">
-
-           <div>随访包</div>
-        </template> 
+        <template #doctor_name="{record}">
+          <div>{{record.user_doctor.user_name}}</div>
+        </template>
+        <template #department_custom_name="{record}">
+          <div>{{record.user_doctor.department_custom_name}}</div>
+        </template>
+        <template #doctor_title="{record}">
+          <div>{{formatDoctorTitle(record.user_doctor.doctor_title)}}</div>
+        </template>
+        <template #multi_point_status="{record}">
+          <div>{{formatMultipoint(record.user_doctor.multi_point_status)}}</div>
+        </template>
+       
+        <template #last_enable_method="{record}">
+          <div class="reason" v-if="record.doctor_inquiry_config && record.doctor_inquiry_config.last_enable_method==1" >自己</div>
+          <div v-else>后台</div>
+        </template>
          <template #monthly_frequency="{ record }">
            <div v-if="record.monthly_frequency==0">不限次</div>
            <div v-else>{{record.monthly_frequency}}</div>
@@ -64,6 +78,7 @@
   <script setup>
     import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
     import { getVisitConfigList,visitConfigDetail} from '@/api/inquiry/service';
+    import {formatDoctorTitle,formatMultipoint} from "@/utils/format"
     // Akiraka 20230210 删除数据
     const deleteData = ref([])
     // Akiraka 20230210 删除对话框
@@ -103,11 +118,16 @@
     // Table Columns
     const columns = [
       { title: '编号', dataIndex: 'doctor_id', slotName: 'doctor_id', width: '90' },
-      { title: '服务名称', dataIndex: 'inquiry_mode',slotName:'inquiry_mode',width:180 },
+      { title: '医生姓名', dataIndex: 'doctor_name',slotName:'doctor_name',width:180 },
+      { title: '医生科室', dataIndex: 'department_custom_name',slotName:'department_custom_name',width:180 },
+      { title: '职称', dataIndex: 'doctor_title',slotName:'doctor_title',width:180 },
+      { title: '多点执业', dataIndex: 'multi_point_status',slotName:'multi_point_status',width:180 },
+      // { title: '服务名称', dataIndex: 'inquiry_mode',slotName:'inquiry_mode',width:180 },
       { title: '每月次数', dataIndex: 'monthly_frequency',slotName:'monthly_frequency', width:130 },
       { title: '服务回合数', dataIndex: 'service_rounds', slotName:'service_rounds', width: 150 },
       //  { title: '服务价格(元)', dataIndex: 'service_price',slotName:'service_price',width:80 },
-       { title: '状态', dataIndex: 'status',slotName:'status',width:80 },
+       { title: '启用状态', dataIndex: 'status',slotName:'status',width:80 },
+       { title: '申请人', dataIndex: 'last_enable_method',slotName:'last_enable_method',width:80 },
       { title: '操作', slotName: 'action', fixed: "right", width: 180 },
     ];