From 515025ffd3ace6f7382f9a853d3aba50f191c8d0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 12 十二月 2024 08:30:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
index 9bb5e38..5ccbddd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue
@@ -143,9 +143,7 @@
},
})
-let emit = defineEmits([
- 'changeDialog'
-])
+
const handleCommand = async (command) => {
await emit('changeDialog', command)
}
@@ -225,6 +223,15 @@
});
};
+//涓浆绔欐帴鍙桽etTrimming鐨勫��
+const emit = defineEmits([
+ 'changeDialog',
+ 'forward-data-to-grandparent'
+]);
+
+const handleTrimmingData = (data) => {
+ emit('forward-data-to-grandparent', data);
+};
</script>
@@ -294,7 +301,7 @@
title="璁剧疆淇竟"
destroy-on-close
style="width: 35%;height:80%;margin-top: 3vh;">
- <set-trimming />
+ <set-trimming :closeDialog="closeDialog" @send-data-event="handleTrimmingData"/>
</el-dialog>
<el-button id="button" type="primary">淇濆瓨</el-button>
--
Gitblit v1.8.0