Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inv...

huminmin

2026-06-01 a563ea879ef5fb6897e76d2df661e465dce2ab9b

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

@@ -11,17 +11,18 @@
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="工序："
                          prop="process">
              <el-select v-model="form.process"
                         placeholder="请选择工序"
            <el-form-item label="采购合同号："
                          prop="purchaseContractNo">
              <el-select v-model="form.purchaseContractNo"
                         placeholder="请选择"
                         clearable
                         :disabled="isViewMode || processQuantityDisabled"
                         filterable
                         :disabled="isViewMode"
                         style="width: 100%">
                <el-option v-for="item in processList"
                           :key="item.name"
                           :label="item.name"
                           :value="item.name" />
                <el-option v-for="item in purchaseContractList"
                           :key="item.id"
                           :label="item.purchaseContractNumber + ' - ' + item.supplierName"
                           :value="item.purchaseContractNumber" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -216,7 +217,7 @@
    getCurrentInstance,
    nextTick,
  } from "vue";
  import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
  import { getOptions, purchaseListPage } from "@/api/procurementManagement/procurementLedger.js";
  import { modelList, productTreeList } from "@/api/basicData/product.js";
  import {
    qualityInspectAdd,
@@ -228,7 +229,7 @@
  } from "@/api/qualityManagement/metricMaintenance.js";
  import { userListNoPage } from "@/api/system/user.js";
  import { qualityInspectParamInfo } from "@/api/qualityManagement/qualityInspectParam.js";
  import { list } from "@/api/productionManagement/productionProcess";

  import qualified from "@/views/inventoryManagement/stockManagement/Qualified.vue";
  const { proxy } = getCurrentInstance();
  const emit = defineEmits(["close"]);
@@ -238,7 +239,6 @@
  const data = reactive({
    form: {
      checkTime: "",
      process: "",
      checkName: "",
      productName: "",
      productId: "",
@@ -251,20 +251,21 @@
      unqualifiedQuantity: "",
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
    },
    rules: {
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
      process: [{ required: true, message: "请选择工序", trigger: "change" }],
      checkTime: [{ required: false, message: "请输入", trigger: "blur" }],
      checkName: [{ required: false, message: "请输入", trigger: "blur" }],
      productId: [{ required: true, message: "请输入", trigger: "blur" }],
      productModelId: [{ required: true, message: "请选择", trigger: "change" }],
      testStandardId: [{ required: false, message: "请选择指标", trigger: "change" }],
      unit: [{ required: false, message: "请输入", trigger: "blur" }],
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      qualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
      unqualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
      quantity: [{ required: false, message: "请输入", trigger: "blur" }],
      qualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
      unqualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
      checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
      checkResult: [{ required: true, message: "请输入", trigger: "change" }],
      purchaseContractNo: [{ required: false, message: "请选择", trigger: "change" }],
      checkResult: [{ required: false, message: "请输入", trigger: "change" }],
    },
  });
  const userList = ref([]);
@@ -276,9 +277,10 @@
    const v = form.value || {};
    return !!(v.productMainId != null || v.purchaseLedgerId != null);
  });
  const processList = ref([]); // 工序下拉列表（工序名称 name）

  const supplierList = ref([]);
  const productOptions = ref([]);
  const purchaseContractList = ref([]); // 采购合同号列表
  const tableColumn = ref([
    {
      label: "指标",
@@ -315,20 +317,19 @@
    getOptions().then(res => {
      supplierList.value = res.data;
    });
    // 加载工序下拉列表
    try {
      const res = await list({ size: -1, current: -1 });
      processList.value = res.data.records || [];
    } catch (e) {
      console.error("加载工序列表失败", e);
      processList.value = [];
    }
    let userLists = await userListNoPage();
    userList.value = userLists.data;
    // 先重置表单数据（保持字段完整，避免弹窗首次渲染时触发必填红框“闪一下”）
    // 加载采购合同号列表
    try {
      const contractRes = await purchaseListPage({ pageNum: -1, pageSize: -1 });
      purchaseContractList.value = contractRes.data?.records || [];
    } catch (e) {
      console.error("加载采购合同号失败", e);
      purchaseContractList.value = [];
    }
    // 先重置表单数据（保持字段完整，避免弹窗首次渲染时触发必填红框"闪一下"）
    form.value = {
      checkTime: "",
      process: "",
      checkName: "",
      productName: "",
      productId: "",
@@ -339,6 +340,7 @@
      quantity: "",
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
    };
    testStandardOptions.value = [];
    tableData.value = [];
@@ -370,7 +372,6 @@
        let params = {
          productId: currentProductId.value,
          inspectType: 1,
          process: form.value.process || "",
        };
        qualityInspectDetailByProductId(params).then(res => {
          testStandardOptions.value = res.data || [];
@@ -518,9 +519,16 @@
          return;
        }

        // 根据采购合同号查找对应的 purchaseLedgerId
        const selectedContract = purchaseContractList.value.find(
          item => item.purchaseContractNumber === form.value.purchaseContractNo
        );
        const purchaseLedgerId = selectedContract ? selectedContract.id : null;

        const data = {
          ...form.value,
          process: processName, // 保留 process 字段以兼容后端
          purchaseLedgerId: purchaseLedgerId, // 提交 purchaseLedgerId
          qualityInspectParams: tableData.value,
        };
        if (operationType.value === "add") {