From 1863bdde50779bf016c2ee2bbd11017f7249e4e3 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 17 Jun 2024 10:31:22 +0800
Subject: [PATCH] 6.17

---
 src/components/addHealthConfigModal.vue | 15 ++++++++++++-
 src/components/addVisitConfigModal.vue  | 30 +++++++++++++------------
 src/components/inquiryDetailModal.vue   |  2 +-
 src/components/medinceOrderModal.vue    |  5 ++++-
 src/utils/format.js                     |  2 +-
 src/views/medince/sys-medince/index.vue |  4 ++--
 src/views/order/service-list/index.vue  |  4 ++--
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/components/addHealthConfigModal.vue b/src/components/addHealthConfigModal.vue
index bd12e25..5d3005d 100644
--- a/src/components/addHealthConfigModal.vue
+++ b/src/components/addHealthConfigModal.vue
@@ -173,7 +173,8 @@ const handleGetDoctor=async(name='',id='')=>{
   loading.value=true;
   const {code,data}=await getDoctorList({
     user_name:name,
-    doctor_id:id
+    doctor_id:id,
+    multi_point_status:1
   });
   if(code==200){
     doctorList.value=data;
@@ -192,6 +193,8 @@ const reset=()=>{
     product_data.value=[];
 };
 
+let multi_point_status=null;
+let tuwenPrice='';
 const configDetail=async()=>{
   const {code,data}=await getInquiryconfigDetail({
     inquiry_config_id:'',
@@ -201,11 +204,13 @@ const configDetail=async()=>{
   });
   if(code==200){
     if(data.inquiry_price){
+      tuwenPrice=data.inquiry_price;
       emits('setPrice',data.inquiry_price*0.6*5)
     }else{
       proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
     }
     if(data.multi_point_status!=1){
+      multi_point_status=data.multi_point_status;
       proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
     }
   }
@@ -250,6 +255,14 @@ const changeDoctor=(val)=>{
   const handleSubmit=()=>{
     proxy.$refs.modalFormRefConfig.validate(async (valid) => {
         let data=null;
+        if(tuwenPrice ===''){
+          proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
+          return false;
+        }
+        if(multi_point_status!=1){
+          proxy.$message.warning('本服务需开处方，该医生需要做多点执业认证');
+          return false;
+        };
         let {doctor_id,package_id,service_price,is_enable}=modalForm.value;
         if (!valid) {
           if(props.id){
diff --git a/src/components/addVisitConfigModal.vue b/src/components/addVisitConfigModal.vue
index e0031e1..bc8eff4 100644
--- a/src/components/addVisitConfigModal.vue
+++ b/src/components/addVisitConfigModal.vue
@@ -108,7 +108,7 @@
                 <template #service_price="{ record }">
                   <div class="box" >
                     <a-input-number v-model="record.service_price" :min="0" />
-                    <span class="tips" >建议价格设置为：
+                    <span class="tips" >建议价格设置为：{{  }}
                       <span v-if="record.service_period==30">{{tuwenPrice*10*0.5.toFixed(2)}}</span>
                       <span v-else-if="record.service_period==90">{{tuwenPrice*30*0.4.toFixed(2)}}</span>
                       <span v-else-if="record.service_period==180">{{tuwenPrice*60*0.3.toFixed(2)}}</span>
@@ -257,6 +257,16 @@ const configDetail=async()=>{
     }else{
       proxy.$message.warning('该医生需要开启图文问诊，才能开通此服务');
     }
+    let itemname = props.modalForm.doctor_config_follow_package_item;
+    if (itemname) {
+      package_data.value = itemname.map((item) => {
+        return {
+          service_period: item.service_period,
+          service_price: item.service_price,
+          follow_package_item_id: item.follow_package_item_id,
+        };
+      });
+    }
   }
 }
 const package_columns = [
@@ -281,6 +291,9 @@ const package_columns = [
     slotName: 'action',
   },
 ];
+const changeDoctor=()=>{
+   configDetail();
+}
 const { modalVisible, id, modalForm } = toRefs(props);
 const emits = defineEmits(['healthVisibleChange', 'freshList']);
 watch(
@@ -300,16 +313,7 @@ watch(
   (newVal, oldValval) => {
     if (props.modalForm.doctor_inquiry_config) {
       handleGetDoctor('', props.modalForm.doctor_inquiry_config.doctor_id);
-    }
-    let item = props.modalForm.doctor_config_follow_package_item;
-    if (item) {
-      package_data.value = item.map((item) => {
-        return {
-          service_period: item.service_period,
-          service_price: item.service_price,
-          follow_package_item_id: item.follow_package_item_id,
-        };
-      });
+      changeDoctor();
     }
   },
   { immediate: true, deep: true }
@@ -370,9 +374,7 @@ const handleSubmit = () => {
     }
   });
 };
-const changeDoctor=()=>{
-   configDetail();
-}
+
 const rules = {
   monthly_frequency: [{ required: true, message: '请选择每月次数' }],
   doctor_id: [{ required: true, message: '请选择医生' }],
diff --git a/src/components/inquiryDetailModal.vue b/src/components/inquiryDetailModal.vue
index 19f4410..002c649 100644
--- a/src/components/inquiryDetailModal.vue
+++ b/src/components/inquiryDetailModal.vue
@@ -51,7 +51,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item field="inquiry_mode" label="问诊类型：">
+          <a-form-item field="inquiry_mode" label="问诊方式：">
             <span>{{ formatMode(modalForm.inquiry_mode) }}</span>
           </a-form-item>
         </a-col>
diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue
index 9d9fad4..337676d 100644
--- a/src/components/medinceOrderModal.vue
+++ b/src/components/medinceOrderModal.vue
@@ -460,6 +460,9 @@
               >上报处方平台</a-button
             >
           </a-space>
+         <!-- {{(modalForm.order_product_status == 2 && modalForm.pay_status==2
+                 && (modalForm.refund_status==4 || modalForm.refund_status==5 || modalForm.refund_status==0) &&
+                modalForm.report_pre_status != 1 )}}   -->
           <!-- 订单状态=2退款状态=4，5支付状态=2上报状态!=1 -->
           <a-space
             style="margin-right: 8px"
@@ -476,7 +479,7 @@
               type="primary"
               v-has="'admin:sysProductList:cancel'"
               status="danger"
-              v-show="showCancelOrderBtn"
+            
               @click="
                 () => {
                   okVisible = true;
diff --git a/src/utils/format.js b/src/utils/format.js
index ddabdeb..2a0a8a5 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -120,7 +120,7 @@ export const formatRelation=(val)=>{
 
  export const formatMode=(val)=>{
    //1:图文 2:视频 3:语音 4:电话 5:会员
-   let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员',6:'疑难会诊',7:'附赠沟通',8:'健康包',9:'服务包'}
+   let data={1:'图文',2:'视频', 3:'语音', 4:'电话',5:'会员',6:'疑难会诊',7:'附赠沟通',8:'健康包',9:'随访包'}
       if(val){
        return data[val]
       }else{
diff --git a/src/views/medince/sys-medince/index.vue b/src/views/medince/sys-medince/index.vue
index 1b8477a..f8891e5 100644
--- a/src/views/medince/sys-medince/index.vue
+++ b/src/views/medince/sys-medince/index.vue
@@ -53,7 +53,7 @@
      <!-- action -->
    <div class="action">
       <a-space>
-        <a-button v-has="'admin:sysMedinceList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增 1</a-button> 
+        <a-button v-has="'admin:sysMedinceList:add'" type="primary" @click="handleAdd"><icon-plus /> 新增</a-button> 
         <!-- <a-button v-has="'admin:sysMedinceList:remove'" type="primary" status="danger" @click="handleAdd"><icon-delete /> 删除 </a-button> -->
         <a-button v-has="'admin:sysMedinceList:selectExport'" type="primary" @click="handlExport(2)"><icon-export /> 选择数据导出 </a-button>
         <a-button v-has="'admin:sysMedinceList:searchExport'" type="primary"  @click="handlExport(1)"><icon-export /> 当前搜索全部导出</a-button> 
@@ -106,7 +106,7 @@
 
 <script setup>
   import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch, computed } from 'vue';
-  import { getSysMedinceList,getSysMedinceDetail} from '@/api/medince/list';
+  import { getSysMedinceList,getSysMedinceDetail,exportProduct} from '@/api/medince/list';
   import { downloadFile } from '@/utils/downloadFile';
   import {formatProductStatus} from '@/utils/format';
   // Akiraka 20230210 删除数据
diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue
index 1aed812..1d1c8f6 100644
--- a/src/views/order/service-list/index.vue
+++ b/src/views/order/service-list/index.vue
@@ -476,7 +476,7 @@
           <a-col :span="24">
             <a-form-item field="license_cert" label="服务内容：" v-if="rightDetail.order_service_package_detail">
               {{(rightDetail.order_service_package_detail.service_period)/30
-}}个月内{{rightDetail.order_service_package_detail.service_count==0?'不限':(rightDetail.order_service_package_detail.service_count)}}次问诊，30盒肝爽颗粒（步长）、价值5元的全品类药品优惠劵2张、价值100元的肝胆商城优惠劵1张
+}}个月内{{rightDetail.order_service_package_detail.service_count==0?'不限':(rightDetail.order_service_package_detail.service_count)}}次问诊<span v-if=" modalForm.order_service_type == 1">，30盒肝爽颗粒（步长）、价值5元的全品类药品优惠劵2张、价值100元的肝胆商城优惠劵1张</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1461,7 +1461,7 @@ const getRightDetail = async (id) => {
 //获取订单详情
 const handleDetail = async (record) => {
   modalVisible.value = true;
-  modalTitle.value = '健康包订单详情';
+  modalTitle.value = record.order_service_type==1?'健康包订单详情':'随访包订单详情';
   Object.assign(patientData, {});
 
   const { code, data, message } = await serviceDetail(record.order_service_id);