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/productionPlan/productionPlan/index.vue | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 7fe0e90..9cdbfd6 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: "",
});
// 瀵煎叆鐩稿叧
@@ -672,7 +674,10 @@
router.push({
path: "/productionPlan/trackProgress",
query: {
- applyNo: encodeURIComponent(row.applyNo),
+ id: row.id,
+ applyNo: row.applyNo,
+ productName: row.productName,
+ model: row.model,
},
});
};
@@ -935,6 +940,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);
@@ -952,6 +958,9 @@
if (mergeForm.productName === "鐮屽潡" && !mergeForm.strength) {
ElMessage.error("鐮屽潡浜у搧鐨勫己搴︿负蹇呭～椤�");
return;
+ }
+ if (mergeForm.productName != "鐮屽潡") {
+ mergeForm.strength = "";
}
console.log(sumAssignedQuantity.value, "sumAssignedQuantity");
// 璁＄畻褰撳墠閫変腑琛岀殑鎬绘柟鏁�
@@ -1553,4 +1562,7 @@
// margin-bottom: 0px !important;
// }
// }
+ :deep(.el-table .el-table__body-wrapper tr td) {
+ background-color: #fff;
+ }
</style>
--
Gitblit v1.9.3