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

zhangwencui

3 天以前 01007b1423086d90a42ee99474c45235007eca62

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

 src/views/productionManagement/productStructure/Detail/index.vue

@@ -141,6 +141,8 @@
      </el-table-column>
      <el-table-column label="BOM编号"
                       prop="bomNo" />
      <el-table-column label="产品编码"
                       prop="productCode" />
      <el-table-column label="产品名称"
                       prop="productName" />
      <el-table-column label="规格型号"
@@ -192,6 +194,7 @@

  // 从路由参数获取产品信息
  const routeBomNo = computed(() => route.query.bomNo || "");
  const routeProductCode = computed(() => route.query.productCode || "");
  const routeProductName = computed(() => route.query.productName || "");
  const routeProductModelName = computed(
    () => route.query.productModelName || ""

 src/views/productionManagement/productStructure/index.vue

@@ -132,6 +132,12 @@
      minWidth: 140,
    },
    {
      label: "产品编码",
      prop: "productCode",

      minWidth: 160,
    },
    {
      label: "产品名称",
      prop: "productName",


 src/views/productionManagement/productionProcess/index.vue

@@ -377,13 +377,11 @@
    name: [{ required: true, message: "请输入工序名称", trigger: "blur" }],
    salaryQuota: [
      {
        required: true,
        required: false,
        message: "请输入工资定额",
        trigger: "blur",
        validator: (rule, value, callback) => {
          if (value === null || value === undefined || value === "") {
            callback(new Error("请输入工资定额"));
          } else if (isNaN(value) || value < 0) {
          if (isNaN(value) || value < 0) {
            callback(new Error("工资定额必须是非负数字"));
          } else {
            callback();