From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeProject.vue | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 ec9ff1a..f162aaa 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
@@ -4,10 +4,13 @@
import ProjectCreate from "@/views/pp/glassOptimize/ProjectCreate.vue"
import GlassComputed from "@/views/pp/glassOptimize/GlassComputed.vue";
import ProjectMange from "@/views/pp/glassOptimize/ProjectMange.vue";
+import OptimizationRectPrint from "@/views/pp/glassOptimize/OptimizationRectPrint.vue";
import {ref} from "vue";
+import {ElMessage} from "element-plus";
let dialogVisible = ref(false)
let detailPage = ref(0)
+let state = ref(1)
const changeDialog = (value) => {
dialogVisible.value = true
detailPage.value = value
@@ -15,9 +18,23 @@
//浠庡伐绋嬬鐞嗚幏鍙栧伐绋嬪彿锛屽苟璺宠浆
const projectNumber = ref();
+
+const glassInventoryRef=ref(null)
const switchDialog = (number) => {
projectNumber.value = number;
detailPage.value = 3;
+};
+
+const switchDialog1 = (number) => {
+ projectNumber.value = number;
+ detailPage.value = 4;
+ state.value=1;
+};
+
+const switchDialog2 = (number) => {
+ projectNumber.value = number;
+ detailPage.value = 4;
+ state.value=2;
};
//宸ョ▼绠＄悊鍏抽棴寮圭獥
@@ -33,9 +50,9 @@
//鑾峰彇GlassInventory鐨勫��(鏌ヨ搴撳瓨)
const sendDataGlassInventory = ref()
-const handleInventoyData = (selectedLabel1,selectedLabel2) => {
+const handleInventoyData = (selectedLabel1,selectedLabel2,type) => {
sendDataGlassInventory.value = {
- selectedLabel1, selectedLabel2
+ selectedLabel1, selectedLabel2,type
};
};
@@ -45,6 +62,14 @@
isTrimmingDialogVisible.value = value;
};
+let checkboxChangeData = ref('');
+const getSmallPieceData = () => {
+ checkboxChangeData.value=glassInventoryRef.value.checkboxChanges();
+};
+
+
+
+
</script>
<template >
@@ -53,10 +78,12 @@
<project-detail @changeDialog="changeDialog"
@forward-data-to-grandparent="handleProjectDetailData"
@send-inventory-to-op="handleInventoyData"
- :TrimmingDialogVisible="isTrimmingDialogVisible" />
+ @getSmallPieceData="getSmallPieceData"
+ :TrimmingDialogVisible="isTrimmingDialogVisible" :CheckboxChangeData="checkboxChangeData" />
</div>
<div id="main-footer">
- <glass-inventory :receivedData="dataForGlassInventory"
+ <glass-inventory ref="glassInventoryRef"
+ :receivedData="dataForGlassInventory"
:InventoryData="sendDataGlassInventory"
@select-trimming="sendTrimming"/>
</div>
@@ -66,12 +93,14 @@
v-model="dialogVisible"
:title="detailPage ===1? '鍒涘缓宸ョ▼' : detailPage ===2? '宸ョ▼绠＄悊' : detailPage ===3? '妯℃嫙璁＄畻':''"
destroy-on-close
- style="width: 90%;height:90%;margin-top: 3vh"
+ style="width: 90%;height:90%;margin-top: 3vh;overflow: auto"
z-index="100"
>
<project-create v-if="detailPage===1" @switch-dialog="switchDialog"/>
- <project-mange v-if="detailPage===2" @switch-dialog="switchDialog" @closeDetailPage="handlePopupClose"/>
+ <project-mange v-if="detailPage===2" @switch-dialog="switchDialog" @switch-dialog-print="switchDialog1"
+ @switch-dialog-print2="switchDialog2" @closeDetailPage="handlePopupClose"/>
<glass-computed v-if="detailPage===3" :project="projectNumber"/>
+ <optimization-rect-print v-if="detailPage===4" :project="projectNumber" :state="state"/>
<div v-else></div>
</el-dialog>
@@ -92,7 +121,7 @@
height: calc(100% - 55px);
width: 100%;
margin-top: 30px;
- //padding: 0;
+ /* padding: 0; */
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0