下发增加传参productMaterialId、修正不属于砌块的强度问题

zhangwencui

10 小时以前 0a50c9a0fa8fe33f5b9c2b79cb8a06031b1b13fb

下发增加传参productMaterialId、修正不属于砌块的强度问题

 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: "物料编码",

 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) => {