Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材

zss

12 小时以前 5597058525db77230377747247ce568a3eccb9ad

Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材

 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("下发成功");