From 1e98beb2ee2eeb57872a35b81942b7467efb9275 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Sep 2023 10:12:34 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8Dcancel=5Fresson?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=A1=86=E5=8E=9F=E5=9B=A0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/confirmModal.vue        |  1 +
 src/main.js                            |  1 -
 src/utils/format.js                    | 28 ++++++++++++++++++++++++++
 src/views/order/medince-list/index.vue | 10 +++++----
 src/views/order/order-list/index.vue   | 11 +++++-----
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue
index d967948..896e2e4 100644
--- a/src/components/confirmModal.vue
+++ b/src/components/confirmModal.vue
@@ -64,6 +64,7 @@ const handleConfirm = () => {
         // Akiraka 20230210 关闭弹窗
         if(response.code==200){
           Message.success("取消成功");
+          proxy.$refs.modalFormRef.resetFields();
         }else{
           proxy.$notification.error(response.message);
         }
diff --git a/src/main.js b/src/main.js
index 5a20818..9868b05 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,6 @@ import '@arco-design/web-vue/dist/arco.css';
 import router from './router/';
 import { parseTime } from '@/utils/parseTime';
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-import {getList} from "./api/order/list"
 // Directive
 import permission from '@/directive/permission/permission';
 
diff --git a/src/utils/format.js b/src/utils/format.js
index 668ab79..2f2f5bf 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -25,3 +25,31 @@ export const formatDoctorTitle=(val)=>{
       return ''
      }
   }
+  export const formatOrderCancelReason=(val)=>{
+   //取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
+   let data={1:'医生未接诊', 2:'主动取消', 3:'无可分配医生',4:'客服取消',5:'支付超时'}
+    if(val){
+     return data[val]
+    }else{
+     return ''
+    }
+ }
+ export const formatProductCancelReason=(val)=>{
+   //1:主动取消 2:复核失败/库存不足 3:支付超时 4:客服取消
+   let data={1:'主动取消', 2:'复核失败/库存不足', 3:'支付超时',4:'客服取消'}
+    if(val){
+     return data[val]
+    }else{
+     return ''
+    }
+ }
+ export const formatCheckCancelReason=(val)=>{
+   //1:主动取消 2:客服取消 3:支付超时
+   let data={1:'主动取消', 2:'客服取消/库存不足', 3:'支付超时'}
+    if(val){
+     return data[val]
+    }else{
+     return ''
+    }
+ }
+
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index 2585777..a83eced 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -197,10 +197,10 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="modalForm.cancel_remarks">
+        <a-row :gutter="24" v-if="modalForm.cancel_reason">
           <a-col :span="24">
             <a-form-item field="department_custom_name" label="备   注 ：">
-              <span>{{ modalForm.cancel_remarks }}</span>
+              <span>{{formatProductCancelReason(modalForm.cancel_reason) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -465,7 +465,7 @@ import {
 } from 'vue';
 import { productList, getProductDetail,cancelProduct} from '@/api/order/list';
 import { parseTime } from '@/utils/parseTime';
-import {formatDoctorTitle,formatPrescriptionStatus,formatPharmacistStatus} from "@/utils/format"
+import {formatDoctorTitle,formatPrescriptionStatus,formatPharmacistStatus,formatProductCancelReason} from "@/utils/format"
 const IMG_URL=import.meta.env.VITE_IMG_URL;
 // Akiraka 20230210 删除数据
 const deleteData = ref([]);
@@ -749,7 +749,9 @@ const toggleExpand=()=>{
 //关闭确认框
 const closeChange=()=>{
   cur_product_id.value="";
-  okVisible.value=false
+  okVisible.value=false;
+  modalVisible.value=false;
+  getProductInfo(pager);
 }
 // 重置搜索
 const handleResetQuery = () => {
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index a0839f1..af26c88 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -156,10 +156,10 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="modalForm.cancel_remarks">
+        <a-row :gutter="24" v-if="modalForm.cancel_reason">
           <a-col :span="24">
             <a-form-item field="department_custom_name" label="备   注 ：">
-             <span>{{ modalForm.cancel_remarks}}</span>
+             <span>{{ formatOrderCancelReason(modalForm.cancel_reason)}}</span>
         </a-form-item>
           </a-col>
         </a-row>
@@ -278,7 +278,6 @@
                   <div class="row">
                     <div class="nameDesc">回复质量：</div>
                     <div class="desc"><a-rate :default-value="modalForm.order_evaluation.reply_quality" readonly /></div>
-      
                   </div>
                   <div class="row">
                     <div class="nameDesc">服务态度：</div>
@@ -327,7 +326,7 @@
 import { reactive, ref, getCurrentInstance, onMounted, nextTick, watch } from 'vue';
 import { getOrderList,getOrderDetail,cancelInquiry} from '@/api/order/list';
 import { parseTime } from '@/utils/parseTime';
-import {formatDoctorTitle} from "@/utils/format"
+import {formatDoctorTitle,formatOrderCancelReason} from "@/utils/format"
 
 // Akiraka 20230210 删除数据
 const deleteData = ref([])
@@ -535,7 +534,9 @@ const openPatient=()=>{
 //关闭确认框
 const closeChange=()=>{
   cur_inruiry_id.value="";
-  okVisible.value=false
+  okVisible.value=false;
+  modalVisible.value=false;
+  getOrderInfo(pager);
 }
 // 重置搜索
 const handleResetQuery = () => {