From 154f3f8e6e8a98e0472d9cc02e7a11dc6bc2b0eb Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 01 四月 2026 14:58:01 +0800
Subject: [PATCH] 标准/实际成本对比分析联调
---
src/views/productionPlan/productionPlan/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 7fe0e90..b337aa3 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -292,9 +292,9 @@
placeholder="璇烽�夋嫨寮哄害"
style="width: 100%">
<el-option v-for="item in block_strength"
- :key="item.id"
+ :key="item.label"
:label="item.label"
- :value="item.id" />
+ :value="item.label" />
</el-select>
</el-form-item>
<el-form-item label="澶囨敞 1"
@@ -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