From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/components/orderOut/orderOutMergePreview/index.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/index.vue
index 7edcf19..2551d32 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/index.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutMergePreview/index.vue
@@ -24,6 +24,7 @@
 const open = ref(false);
 const showWidth = ref("60%")
 const records = ref([])
+const waveId = ref(null)
 const loading = ref(false)
 const stockOutChild = ref(null)
 
@@ -115,9 +116,10 @@
 
     stockOutChild.value.open = true;
     stockOutChild.value.records = param;
+    stockOutChild.value.waveId = waveId.value;
     stockOutChild.value.showWidth = '55%'
 
-    emit('reload', true)
+    // emit('reload', true)
 }
 
 const handleOrderMergePreview = () => {
@@ -143,12 +145,14 @@
 
 const handleCloseParent = () => {
     open.value = false;
+    emit('reload', true)
 }
 
 defineExpose({
     open,
     showWidth,
     records,
+    waveId,
 })
 
 </script>

--
Gitblit v1.9.1