Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

zhangwencui

5 小时以前 58916670fe54367e9c9350596fb293787b73b425

 src/views/productionManagement/processRoute/processRouteItem/index.vue

@@ -262,6 +262,21 @@
                      <span v-else>{{ row.unit }}</span>
                    </template>
                  </el-table-column>
                   <el-table-column prop="unitPrice"
                                   label="单价">
                    <template #default="{ row }">
                      <el-form-item v-if="bomDataValue.isEdit"
                                    style="margin: 0">
                        <el-input-number v-model="row.unitPrice"
                                         :min="0"
                                         :step="1"
                                         controls-position="right"
                                         style="width: 100%"
                                         :disabled="!bomDataValue.isEdit" />
                      </el-form-item>
                      <span v-else>{{ row.unitPrice }}</span>
                    </template>
                  </el-table-column>
                  <el-table-column label="操作"
                                   fixed="right"
                                   v-if="pageType === 'order'"
@@ -777,6 +792,7 @@
        processId: "",
        processName: "",
        unitQuantity: 0,
        unitPrice: 0,
        unit: "",
        children: [],
        tempId: new Date().getTime(),
@@ -805,6 +821,7 @@
            processId: "",
            processName: "",
            unitQuantity: 0,
            unitPrice: 0,
            unit: "",
            children: [],
            tempId: new Date().getTime(),
@@ -911,6 +928,15 @@
          ElMessage.error("请填写单位产出所需数量");
          return false;
        }
        // 校验单价是否必填
        if (
          item.unitPrice === undefined ||
          item.unitPrice === null ||
          item.unitPrice === 0
        ) {
          ElMessage.error("请填写单价");
          return false;
        }
        // 递归校验子项
        if (item.children && item.children.length > 0) {
          if (!validateBomData(item.children)) {
@@ -940,6 +966,7 @@
        productModelId: item.productModelId || null,
        processId: item.processId || null,
        unitQuantity: item.unitQuantity || 0,
        unitPrice: item.unitPrice || 0,
        demandedQuantity: item.demandedQuantity || null,
        unit: item.unit || "",
        tempId: item.tempId || new Date().getTime(),