Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

spring

7 小时以前 32556bda58dc73c0450b4082530b7ee78e17384d

 src/views/qualityManagement/processInspection/components/formDia.vue

@@ -37,11 +37,18 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="规格型号："
                          prop="model">
              <el-input v-model="form.model"
                        placeholder="请输入"
                        :disabled="operationType === 'edit'"
                        clearable />
                          prop="productModelId">
              <el-select v-model="form.productModelId"
                         placeholder="请选择"
                         clearable
                         :disabled="operationType === 'edit'"
                         filterable
                         readonly>
                <el-option v-for="item in modelOptions"
                           :key="item.id"
                           :label="item.model"
                           :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@@ -156,7 +163,7 @@
<script setup>
  import { ref } from "vue";
  import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
  import { productTreeList } from "@/api/basicData/product.js";
  import {modelList, productTreeList} from "@/api/basicData/product.js";
  import {
    qualityInspectAdd,
    qualityInspectUpdate,
@@ -176,7 +183,7 @@
      checkName: "",
      productName: "",
      productId: "",
      model: "",
      productModelId: undefined,
      unit: "",
      quantity: "",
      checkCompany: "",
@@ -188,17 +195,21 @@
      process: [{ required: true, message: "请输入", trigger: "blur" }],
      checkName: [{ required: false, message: "请输入", trigger: "blur" }],
      productId: [{ required: true, message: "请输入", trigger: "blur" }],
      model: [{ required: false, message: "请输入", trigger: "blur" }],
      productModelId: [{ required: false, message: "请选择", trigger: "blur" }],
      unit: [{ required: false, message: "请输入", trigger: "blur" }],
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
      checkResult: [{ required: true, message: "请输入", trigger: "change" }],
      defectivePhenomena: [
        { required: true, message: "请输入", trigger: "blur" },
      ],
    },
  });
  const userList = ref([]);
  const { form, rules } = toRefs(data);
  const supplierList = ref([]);
  const productOptions = ref([]);
  const modelOptions = ref([]);
  const tableColumn = ref([
    {
      label: "指标",
@@ -239,6 +250,7 @@
    form.value = {};
    getProductOptions();
    if (operationType.value === "edit") {
      getModels(row.productId || 0);
      form.value = { ...row };
      currentProductId.value = row.productId || 0;
      getQualityInspectParamList(row.id);
@@ -251,8 +263,11 @@
  };
  const getModels = value => {
    currentProductId.value = value;
    form.value.productModelId = undefined;
    form.value.productName = findNodeById(productOptions.value, value);

    modelList({ id: value }).then((res) => {
      modelOptions.value = res;
    });
    if (currentProductId) {
      getList();
    }