From 1cf342fa23a6c34bd9dd1ff4e416cd255c044fdd Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 02 四月 2026 11:41:17 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

---
 src/views/productionManagement/productionOrder/index.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 2182126..881e290 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -212,7 +212,7 @@
                   </div>
                   <div class="info-item">
                     <div class="info-label">宸蹭笅鍙戞柟鏁�</div>
-                    <div class="info-value">{{ item.assignedQuantity ? `${item.assignedQuantity}` : 0 }}<span style="color:rgba(214, 134, 22, 0.76)"> 鏂�</span></div>
+                    <div class="info-value">{{ item.totalAssignedQuantity ? `${item.totalAssignedQuantity}` : 0 }}<span style="color:rgba(214, 134, 22, 0.76)"> 鏂�</span></div>
                   </div>
                   <div class="info-item">
                     <div class="info-label">灏哄</div>
@@ -539,7 +539,7 @@
     },
     {
       label: "宸蹭笅鍙戞柟鏁�",
-      prop: "assignedQuantity",
+      prop: "totalAssignedQuantity",
       width: "150px",
       className: "spec-cell",
       formatData: cell => (cell ? `${cell}鏂筦 : 0),
@@ -814,6 +814,7 @@
           orderId: row.id,
           type: "order",
           editable: true,
+          status: row.status || false,
         },
       });
     } catch (e) {
@@ -870,6 +871,7 @@
                   volume: plan.volume,
                   status: plan.status,
                   assignedQuantity: plan.assignedQuantity,
+                  totalAssignedQuantity: plan.totalAssignedQuantity,
                   length: plan.length,
                   width: plan.width,
                   height: plan.height,

--
Gitblit v1.9.3