From e9f8d23f55f64903d834308f9f167aaf3195c20d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 30 七月 2025 09:10:26 +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/ProjectCreate.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue
index 68ced28..c13860e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/glassOptimize/ProjectCreate.vue
@@ -122,12 +122,18 @@
       const projectNumber = row.projectNumber;
       const thickness = row.glass_thickness;
       const glassType = row.glass_type;
+      const quantity = row.quantity;
+      const area = row.glass_total_area;
+      const optimizeState = row.optimize_state;
       await router.push({
         name: 'optimizeInfo',
         params: {
           projectNo: projectNumber,
           thickNess: thickness,
-          model: glassType
+          model: glassType,
+          quantity: quantity,
+          area: area,
+          optimizeState:optimizeState
         }
       });
     }
@@ -183,13 +189,16 @@
 }
 
 // 鍏叡澶勭悊鍑芥暟锛屽鐞嗙浉鍚屾暟鎹椂鐨勬搷浣滐紝骞惰繑鍥瀟argetRoute瀵硅薄锛堝彸閿彍鍗曞拰鍙屽嚮鎵撳紑锛�
-const handleSameDataOperation = async ({projectNumber, thickness, glassType}) => {
+const handleSameDataOperation = async ({projectNumber, thickness, glassType,quantity,glass_total_area,optimize_state}) => {
   const targetRoute = {
     name: 'optimizeInfo',
     params: {
       projectNo: projectNumber,
-      thickNess: String(thickness),
-      model: glassType
+      thickNess: thickness,
+      model: glassType,
+      quantity: quantity,
+      area: glass_total_area,
+      optimizeState:optimize_state
     }
   };
   const currentRoute = router.currentRoute.value;

--
Gitblit v1.8.0