From 0a50c9a0fa8fe33f5b9c2b79cb8a06031b1b13fb Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 30 三月 2026 14:44:40 +0800
Subject: [PATCH] 下发增加传参productMaterialId、修正不属于砌块的强度问题
---
src/views/productionManagement/productionOrder/index.vue | 8 +++++++-
src/views/productionPlan/productionPlan/index.vue | 6 ++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 4760456..2182126 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -96,6 +96,10 @@
<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>
<el-dialog v-model="bindRouteDialogVisible"
@@ -329,7 +333,9 @@
label: "寮哄害",
prop: "strength",
width: "120px",
- dataType: "tag",
+ dataType: "slot",
+ slot: "strength",
+ // formatData: val => (val ? val : ""),
},
{
label: "鐗╂枡缂栫爜",
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 7fe0e90..06e26c4 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -556,6 +556,7 @@
mergeForm.totalAssignedQuantity =
(Number(row.volume) - Number(row.assignedQuantity)).toFixed(4) || 0;
mergeForm.planCompleteTime = row.planCompleteTime || "";
+ mergeForm.productMaterialId = row.productMaterialId || "";
mergeForm.strength = row.strength || "";
sumAssignedQuantity.value = mergeForm.totalAssignedQuantity;
// 鎵撳紑寮圭獥
@@ -599,6 +600,7 @@
totalAssignedQuantity: 0,
planCompleteTime: "",
strength: "",
+ productMaterialId: "",
});
// 瀵煎叆鐩稿叧
@@ -935,6 +937,7 @@
mergeForm.height = firstRow.height || 0;
mergeForm.totalAssignedQuantity = totalAssignedQuantity;
mergeForm.planCompleteTime = firstRow.planCompleteTime || "";
+ mergeForm.productMaterialId = firstRow.productMaterialId || "";
mergeForm.strength = firstStrength;
mergeForm.ids = selectedRows.value.map(row => row.id);
@@ -953,6 +956,9 @@
ElMessage.error("鐮屽潡浜у搧鐨勫己搴︿负蹇呭～椤�");
return;
}
+ if (mergeForm.productName != "鐮屽潡") {
+ mergeForm.strength = "";
+ }
console.log(sumAssignedQuantity.value, "sumAssignedQuantity");
// 璁＄畻褰撳墠閫変腑琛岀殑鎬绘柟鏁�
const totalVolume = selectedRows.value.reduce((sum, row) => {
--
Gitblit v1.9.3