From 162920899c517b725c2f59e9439acc944cdc7d64 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 13 Sep 2023 10:51:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug=20=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=EF=BC=8C=E9=97=AE=E8=AF=8A=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/confirmModal.vue        |  5 +++--
 src/views/order/medince-list/index.vue |  9 ++++++---
 src/views/order/order-list/index.vue   | 11 +++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue
index 896e2e4..66f50e9 100644
--- a/src/components/confirmModal.vue
+++ b/src/components/confirmModal.vue
@@ -50,7 +50,8 @@ const {okVisible,title,id,api} = toRefs(props);
 
 // Akiraka 20230210 关闭弹窗
 const handleClose = () =>  {
-  emits('closeChange', false);
+  emits('closeChange',false);
+ // alert(flag)
 }
 // Akiraka 20230210 删除数据校验
 const rules = reactive({
@@ -68,7 +69,7 @@ const handleConfirm = () => {
         }else{
           proxy.$notification.error(response.message);
         }
-        handleClose();
+        emits('closeChange',true);
       })
     }
   })
diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue
index a83eced..7d6b18d 100644
--- a/src/views/order/medince-list/index.vue
+++ b/src/views/order/medince-list/index.vue
@@ -747,11 +747,14 @@ const toggleExpand=()=>{
    }
 };
 //关闭确认框
-const closeChange=()=>{
+const closeChange=(data)=>{
   cur_product_id.value="";
   okVisible.value=false;
-  modalVisible.value=false;
-  getProductInfo(pager);
+  if(data){
+    modalVisible.value=false;
+    getProductInfo({ ...pager, ...queryForm });
+  }
+ 
 }
 // 重置搜索
 const handleResetQuery = () => {
diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue
index af26c88..e69de2b 100644
--- a/src/views/order/order-list/index.vue
+++ b/src/views/order/order-list/index.vue
@@ -316,7 +316,7 @@
 
       <!-- 医生详情弹框 -->
       <doctorModal :doctorVisible="doctorVisible" :doctor_id="doctor_id" @doctorVisibleChange="() => {doctorVisible = false;doctor_id='';}"></doctorModal>
-      <confirmModal :okVisible="okVisible"  :api="cancelInquiry" :title="'确定取消此订单吗？'" :dealType="'order_inquiry_id'" :id="cur_inruiry_id" @closeChange="closeChange"></confirmModal>
+      <confirmModal :okVisible="okVisible"  :api="cancelInquiry" :title="'确定取消此订单吗？'" :dealType="'order_inquiry_id'" :id="cur_inruiry_id" @closeChange="handelCloseChange"></confirmModal>
   </div>
 
 
@@ -532,11 +532,14 @@ const openPatient=()=>{
   alert('开发中')
 }
 //关闭确认框
-const closeChange=()=>{
+const handelCloseChange=(data)=>{
   cur_inruiry_id.value="";
   okVisible.value=false;
-  modalVisible.value=false;
-  getOrderInfo(pager);
+  console.log(data)
+  if(data){
+    modalVisible.value=false;
+     getOrderInfo({ ...pager, ...queryForm });
+  }
 }
 // 重置搜索
 const handleResetQuery = () => {