From cfa4a3fdb3dcd9a811157c4bd8f82ba4025917bc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 17 十二月 2024 08:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue
index 120746c..9fbfb5b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue
@@ -26,15 +26,34 @@
dataForGlassInventory.value = data;
};
+//鑾峰彇GlassInventory鐨勫��(鏌ヨ搴撳瓨)
+const sendDataGlassInventory = ref()
+const handleInventoyData = (selectedLabel1,selectedLabel2) => {
+ sendDataGlassInventory.value = {
+ selectedLabel1, selectedLabel2
+ };
+};
+
+//鍙抽敭鑿滃崟鎵撳紑淇竟
+const isTrimmingDialogVisible = ref(false);
+const sendTrimming = (value) => {
+ isTrimmingDialogVisible.value = value;
+ };
+
</script>
<template >
<div style="width: 100%;height: 100%">
<div id="main-body">
- <project-detail @changeDialog="changeDialog" @forward-data-to-grandparent="handleProjectDetailData"/>
+ <project-detail @changeDialog="changeDialog"
+ @forward-data-to-grandparent="handleProjectDetailData"
+ @send-inventory-to-op="handleInventoyData"
+ :TrimmingDialogVisible="isTrimmingDialogVisible" />
</div>
<div id="main-footer">
- <glass-inventory :receivedData="dataForGlassInventory"/>
+ <glass-inventory :receivedData="dataForGlassInventory"
+ :InventoryData="sendDataGlassInventory"
+ @select-trimming="sendTrimming"/>
</div>
--
Gitblit v1.8.0