From 11ff30f23d0c5e8af4974de68ee74cb5b075ebf9 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期三, 01 四月 2026 17:56:35 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/productionManagement/productionProcess/index.vue | 4 ++--
src/views/productionManagement/productionOrder/index.vue | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 2182126..3827f39 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),
@@ -870,6 +870,7 @@
volume: plan.volume,
status: plan.status,
assignedQuantity: plan.assignedQuantity,
+ totalAssignedQuantity: plan.totalAssignedQuantity,
length: plan.length,
width: plan.width,
height: plan.height,
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index d813d7d..18387d6 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -492,8 +492,8 @@
label: "鍙傛暟妯″紡",
prop: "valueMode",
dataType: "tag",
- formatType: row => (row.valueMode === "1" ? "success" : "warning"),
- formatData: row => (row.valueMode === "1" ? "鍗曞��" : "鍖洪棿"),
+ formatType: row => (row == "1" ? "success" : "warning"),
+ formatData: row => (row == "1" ? "鍗曞��" : "鍖洪棿"),
},
{
label: "鍙傛暟绫诲瀷",
--
Gitblit v1.9.3