From 5597058525db77230377747247ce568a3eccb9ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材
---
src/views/productionPlan/productionPlan/index.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 8289f26..649d991 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -1087,7 +1087,12 @@
}
console.log(mergeForm, "mergeForm");
- productionPlanCombine(mergeForm)
+ const strengthItem = block_strength.value.find(item => item.id === mergeForm.strength);
+ const payload = {
+ ...mergeForm,
+ strength: strengthItem ? strengthItem.label : mergeForm.strength
+ };
+ productionPlanCombine(payload)
.then(res => {
if (res.code === 200) {
ElMessage.success("涓嬪彂鎴愬姛");
--
Gitblit v1.9.3