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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 3116256..881e290 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -91,10 +91,14 @@
:status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
</template>
<template #quantity="{ row }">
- {{ row.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 鍧�</span>
+ {{ row.quantity || '-' }}<span style="color:rgb(63, 95, 211)"> 鏂�</span>
</template>
<template #completeQuantity="{ row }">
{{ row.completeQuantity || '-' }}<span style="color:rgb(42, 169, 146)"> 鏂�</span>
+ </template>
+ <template #strength="{ row }">
+ <el-tag v-if="row.strength"
+ :type="row.strength === 'A3.5' ? 'primary' : 'warning'">{{ row.strength }}</el-tag>
</template>
</PIMTable>
</div>
@@ -208,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>
@@ -312,7 +316,7 @@
{
label: "鐢熶骇璁㈠崟鍙�",
prop: "npsNo",
- width: "120px",
+ width: "150px",
},
{
label: "浜у搧鍚嶇О",
@@ -329,7 +333,9 @@
label: "寮哄害",
prop: "strength",
width: "120px",
- dataType: "tag",
+ dataType: "slot",
+ slot: "strength",
+ // formatData: val => (val ? val : ""),
},
{
label: "鐗╂枡缂栫爜",
@@ -533,7 +539,7 @@
},
{
label: "宸蹭笅鍙戞柟鏁�",
- prop: "assignedQuantity",
+ prop: "totalAssignedQuantity",
width: "150px",
className: "spec-cell",
formatData: cell => (cell ? `${cell}鏂筦 : 0),
@@ -808,6 +814,7 @@
orderId: row.id,
type: "order",
editable: true,
+ status: row.status || false,
},
});
} catch (e) {
@@ -864,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