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

@@ -1,7 +1,7 @@
<template>
  <div>
    <el-dialog v-model="dialogFormVisible"
               :title="operationType === 'add' ? '新增过程检验' : '编辑过程检验'"
               :title="operationType === 'add' ? '新增过程检验' : operationType === 'view' ? '查看过程检验' : '编辑过程检验'"
               width="70%"
               @close="closeDia">
      <el-form :model="form"
@@ -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="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>
@@ -35,7 +36,7 @@
                              @change="getModels"
                              :data="productOptions"
                              :render-after-expand="false"
                              :disabled="operationType === 'edit'"
                              :disabled="isViewMode || operationType === 'edit'"
                              style="width: 100%" />
            </el-form-item>
          </el-col>
@@ -47,7 +48,7 @@
              <el-select v-model="form.productModelId"
                         placeholder="请选择"
                         clearable
                         :disabled="operationType === 'edit'"
                         :disabled="isViewMode || operationType === 'edit'"
                         filterable
                         readonly
                         @change="handleChangeModel">
@@ -65,7 +66,8 @@
                         placeholder="请选择指标"
                         clearable
                         @change="handleTestStandardChange"
                         style="width: 100%">
                         style="width: 100%"
                         :disabled="isViewMode">
                <el-option v-for="item in testStandardOptions"
                           :key="item.id"
                           :label="item.standardName || item.standardNo"
@@ -93,7 +95,7 @@
                               placeholder="请输入"
                               clearable
                               :precision="2"
                               :disabled="processQuantityDisabled" />
                               :disabled="isViewMode || processQuantityDisabled" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -108,7 +110,8 @@
                               placeholder="请输入"
                               clearable
                               :precision="2"
                               @change="handleQualifiedQuantityChange" />
                               @change="handleQualifiedQuantityChange"
                               :disabled="isViewMode" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -121,7 +124,8 @@
                               placeholder="请输入"
                               clearable
                               :precision="2"
                               @change="handleUnqualifiedQuantityChange" />
                               @change="handleUnqualifiedQuantityChange"
                               :disabled="isViewMode" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -131,13 +135,14 @@
                          prop="checkCompany">
              <el-input v-model="form.checkCompany"
                        placeholder="请输入"
                        clearable />
                        clearable
                        :disabled="isViewMode" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果："
                          prop="checkResult">
              <el-select v-model="form.checkResult">
              <el-select v-model="form.checkResult" :disabled="isViewMode">
                <el-option label="合格"
                           value="合格" />
                <el-option label="不合格"
@@ -154,7 +159,8 @@
                          prop="checkName">
              <el-select v-model="form.checkName"
                         placeholder="请选择"
                         clearable>
                         clearable
                         :disabled="isViewMode">
                <el-option v-for="item in userList"
                           :key="item.nickName"
                           :label="item.nickName"
@@ -171,7 +177,8 @@
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              clearable
                              style="width: 100%" />
                              style="width: 100%"
                              :disabled="isViewMode" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -183,14 +190,18 @@
                height="400">
        <template #slot="{ row }">
          <el-input v-model="row.testValue"
                    clearable />
                    clearable
                    :disabled="isViewMode" />
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
          <template v-if="!isViewMode">
            <el-button type="primary"
                       @click="submitForm">确认</el-button>
            <el-button @click="closeDia">取消</el-button>
          </template>
          <el-button v-else @click="closeDia">关闭</el-button>
        </div>
      </template>
    </el-dialog>
@@ -206,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,
@@ -218,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"]);
@@ -228,7 +239,6 @@
  const data = reactive({
    form: {
      checkTime: "",
      process: "",
      checkName: "",
      productName: "",
      productId: "",
@@ -241,32 +251,36 @@
      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([]);
  const { form, rules } = toRefs(data);
  // 是否为查看模式
  const isViewMode = computed(() => operationType.value === 'view');
  // 编辑时：productMainId 或 purchaseLedgerId 任一有值则工序、数量置灰
  const processQuantityDisabled = computed(() => {
    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: "指标",
@@ -303,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: "",
@@ -327,12 +340,13 @@
      quantity: "",
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
    };
    testStandardOptions.value = [];
    tableData.value = [];
    // 先确保产品树已加载，否则编辑时产品/规格型号无法反显
    await getProductOptions();
    if (operationType.value === "edit") {
    if (operationType.value === "edit" || operationType.value === "view") {
      // 先保存 testStandardId，避免被清空
      const savedTestStandardId = row.testStandardId;
      // 先设置表单数据，但暂时清空 testStandardId，等选项加载完成后再设置
@@ -358,7 +372,6 @@
        let params = {
          productId: currentProductId.value,
          inspectType: 1,
          process: form.value.process || "",
        };
        qualityInspectDetailByProductId(params).then(res => {
          testStandardOptions.value = res.data || [];
@@ -506,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") {
@@ -557,6 +577,10 @@
    getQualityTestStandardParamByTestStandardId(testStandardId)
      .then(res => {
        tableData.value = res.data || [];
        tableData.value = tableData.value.map(item => ({
          ...item,
          id: null
        }));
      })
      .catch(error => {
        console.error("获取标准参数失败:", error);