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 @@ - + @@ -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 = () => {