新增过程检验、工序选择不到问题修改

zhangwencui

10 小时以前 1d56c4a275a4b52ee662c009685d06e838015307

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

@@ -1,24 +1,34 @@
<template>
  <div>
    <el-dialog
        v-model="dialogFormVisible"
    <el-dialog v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增过程检验' : '编辑过程检验'"
        width="70%"
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
               @close="closeDia">
      <el-form :model="form"
               label-width="140px"
               label-position="top"
               :rules="rules"
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="工序：" prop="process">
              <el-select v-model="form.process" placeholder="请选择工序" clearable :disabled="processQuantityDisabled" style="width: 100%">
                <el-option v-for="item in processList" :key="item.name" :label="item.name" :value="item.name"/>
            <el-form-item label="工序："
                          prop="process">
              <el-select v-model="form.process"
                         placeholder="请选择工序"
                         clearable
                         :disabled="processQuantityDisabled"
                         style="width: 100%">
                <el-option v-for="item in processList"
                           :key="item.name"
                           :label="item.name"
                           :value="item.name" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="产品名称：" prop="productId">
              <el-tree-select
                  v-model="form.productId"
            <el-form-item label="产品名称："
                          prop="productId">
              <el-tree-select v-model="form.productId"
                  placeholder="请选择"
                  clearable
                  check-strictly
@@ -26,104 +36,130 @@
                  :data="productOptions"
                  :render-after-expand="false"
                  :disabled="operationType === 'edit'"
                  style="width: 100%"
              />
                              style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="productModelId">
              <el-select v-model="form.productModelId" placeholder="请选择" clearable :disabled="operationType === 'edit'"
                         filterable readonly @change="handleChangeModel">
                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id" />
            <el-form-item label="规格型号："
                          prop="productModelId">
              <el-select v-model="form.productModelId"
                         placeholder="请选择"
                         clearable
                         :disabled="operationType === 'edit'"
                         filterable
                         readonly
                         @change="handleChangeModel">
                <el-option v-for="item in modelOptions"
                           :key="item.id"
                           :label="item.model"
                           :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select
                v-model="form.testStandardId"
            <el-form-item label="指标选择："
                          prop="testStandardId">
              <el-select v-model="form.testStandardId"
                placeholder="请选择指标"
                clearable
                @change="handleTestStandardChange"
                style="width: 100%"
              >
                <el-option
                  v-for="item in testStandardOptions"
                         style="width: 100%">
                <el-option v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
                           :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="单位：" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" disabled/>
            <el-form-item label="单位："
                          prop="unit">
              <el-input v-model="form.unit"
                        placeholder="请输入"
                        disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2" :disabled="processQuantityDisabled"/>
            <el-form-item label="数量："
                          prop="quantity">
              <el-input-number :step="0.01"
                               :min="0"
                               style="width: 100%"
                               v-model="form.quantity"
                               placeholder="请输入"
                               clearable
                               :precision="2"
                               :disabled="processQuantityDisabled" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测单位：" prop="checkCompany">
              <el-input v-model="form.checkCompany" placeholder="请输入" clearable/>
            <el-form-item label="检测单位："
                          prop="checkCompany">
              <el-input v-model="form.checkCompany"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
            <el-form-item label="检测结果："
                          prop="checkResult">
              <el-select v-model="form.checkResult">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="合格"
                           value="合格" />
                <el-option label="不合格"
                           value="不合格" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkName">
                     <el-select v-model="form.checkName" placeholder="请选择" clearable>
                        <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
            <el-form-item label="检验员："
                          prop="checkName">
              <el-select v-model="form.checkName"
                         placeholder="请选择"
                         clearable>
                <el-option v-for="item in userList"
                           :key="item.nickName"
                           :label="item.nickName"
                                        :value="item.nickName"/>
                     </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测日期：" prop="checkTime">
              <el-date-picker
                  v-model="form.checkTime"
            <el-form-item label="检测日期："
                          prop="checkTime">
              <el-date-picker v-model="form.checkTime"
                  type="date"
                  placeholder="请选择日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
              />
                              style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
         <PIMTable
            rowKey="id"
      <PIMTable rowKey="id"
            :column="tableColumn"
            :tableData="tableData"
            :tableLoading="tableLoading"
            height="400"
         >
                height="400">
            <template #slot="{ row }">
               <el-input v-model="row.testValue" clearable/>
          <el-input v-model="row.testValue"
                    clearable />
            </template>
         </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
@@ -132,21 +168,32 @@
</template>

<script setup>
import {ref, reactive, toRefs, computed, getCurrentInstance, nextTick} from "vue";
  import {
    ref,
    reactive,
    toRefs,
    computed,
    getCurrentInstance,
    nextTick,
  } from "vue";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
  import {
    qualityInspectAdd,
    qualityInspectUpdate,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import {
    qualityInspectDetailByProductId,
    getQualityTestStandardParamByTestStandardId,
  } 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";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])


  const { proxy } = getCurrentInstance();
  const emit = defineEmits(["close"]);

const dialogFormVisible = ref(false);
const operationType = ref('')
  const operationType = ref("");
const data = reactive({
  form: {
    checkTime: "",
@@ -163,12 +210,14 @@
    checkResult: "",
  },
  rules: {
    checkTime: [{ required: true, message: "请输入", trigger: "blur" },],
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
    process: [{ required: true, message: "请选择工序", trigger: "change" }],
    checkName: [{ required: false, message: "请输入", trigger: "blur" }],
    productId: [{ required: true, message: "请输入", trigger: "blur" }],
    productModelId: [{ required: true, message: "请选择", trigger: "change" }],
    testStandardId: [{required: false, message: "请选择指标", trigger: "change"}],
      testStandardId: [
        { required: false, message: "请选择指标", trigger: "change" },
      ],
    unit: [{ required: false, message: "请输入", trigger: "blur" }],
    quantity: [{ required: true, message: "请输入", trigger: "blur" }],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
@@ -205,8 +254,8 @@
   {
      label: "检验值",
      prop: "testValue",
      dataType: 'slot',
      slot: 'slot',
      dataType: "slot",
      slot: "slot",
   },
]);
const tableData = ref([]);
@@ -218,13 +267,13 @@
// 打开弹框
const openDialog = async (type, row) => {
   operationType.value = type;
   getOptions().then((res) => {
    getOptions().then(res => {
      supplierList.value = res.data;
   });
   // 加载工序下拉列表
   try {
      const res = await list();
      processList.value = res.data || [];
      const res = await list({ size: -1, current: -1 });
      processList.value = res.data.records || [];
   } catch (e) {
      console.error("加载工序列表失败", e);
      processList.value = [];
@@ -245,17 +294,17 @@
      quantity: "",
      checkCompany: "",
      checkResult: "",
   }
    };
   testStandardOptions.value = [];
   tableData.value = [];
   // 先确保产品树已加载，否则编辑时产品/规格型号无法反显
   await getProductOptions();
   if (operationType.value === 'edit') {
    if (operationType.value === "edit") {
      // 先保存 testStandardId，避免被清空
      const savedTestStandardId = row.testStandardId;
      // 先设置表单数据，但暂时清空 testStandardId，等选项加载完成后再设置
      form.value = {...row, testStandardId: ''}
      currentProductId.value = row.productId || 0
      form.value = { ...row, testStandardId: "" };
      currentProductId.value = row.productId || 0;
      // 关键：编辑时加载规格型号下拉选项，才能反显 productModelId
      if (currentProductId.value) {
         try {
@@ -276,8 +325,8 @@
         let params = {
            productId: currentProductId.value,
            inspectType: 1,
            process: form.value.process || ''
         }
          process: form.value.process || "",
        };
         qualityInspectDetailByProductId(params).then(res => {
            testStandardOptions.value = res.data || [];
            // 使用 nextTick 和 setTimeout 确保选项已经渲染到 DOM
@@ -286,8 +335,10 @@
                  // 如果编辑数据中有 testStandardId，则设置并加载对应的参数
                  if (savedTestStandardId) {
                     // 确保类型匹配（item.id 可能是数字或字符串）
                     const matchedOption = testStandardOptions.value.find(item => 
                        item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
                const matchedOption = testStandardOptions.value.find(
                  item =>
                    item.id == savedTestStandardId ||
                    String(item.id) === String(savedTestStandardId)
                     );
                     if (matchedOption) {
                        // 确保使用匹配项的 id（保持类型一致）
@@ -296,7 +347,12 @@
                        getQualityInspectParamList(row.id);
                     } else {
                        // 如果找不到匹配项，尝试直接使用原值
                        console.warn('未找到匹配的指标选项，testStandardId:', savedTestStandardId, '可用选项:', testStandardOptions.value);
                  console.warn(
                    "未找到匹配的指标选项，testStandardId:",
                    savedTestStandardId,
                    "可用选项:",
                    testStandardOptions.value
                  );
                        form.value.testStandardId = savedTestStandardId;
                        getQualityInspectParamList(row.id);
                     }
@@ -316,31 +372,33 @@
   nextTick(() => {
      proxy.$refs?.formRef?.clearValidate?.();
   });
}
  };
const getProductOptions = () => {
  return productTreeList().then((res) => {
    return productTreeList().then(res => {
    productOptions.value = convertIdToValue(res);
      return productOptions.value;
  });
};
const getModels = (value) => {
  const getModels = value => {
  form.value.productModelId = undefined;
  form.value.unit = undefined;
  modelOptions.value = [];
  currentProductId.value = value
    currentProductId.value = value;
  form.value.productName = findNodeById(productOptions.value, value);
  modelList({ id: value }).then((res) => {
    modelList({ id: value }).then(res => {
    modelOptions.value = res;
  })
    });
  if (currentProductId.value) {
    getList();
  }
};

const handleChangeModel = (value) => {
  form.value.model = modelOptions.value.find(item => item.id == value)?.model || '';
  form.value.unit = modelOptions.value.find(item => item.id == value)?.unit || '';
}
  const handleChangeModel = value => {
    form.value.model =
      modelOptions.value.find(item => item.id == value)?.model || "";
    form.value.unit =
      modelOptions.value.find(item => item.id == value)?.unit || "";
  };

const findNodeById = (nodes, productId) => {
  for (let i = 0; i < nodes.length; i++) {
@@ -357,7 +415,7 @@
  return null; // 没有找到节点，返回null
};
function convertIdToValue(data) {
  return data.map((item) => {
    return data.map(item => {
    const { id, children, ...rest } = item;
    const newItem = {
      ...rest,
@@ -375,83 +433,86 @@
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      form.value.inspectType = 1
         const processName = form.value.process || '';
        form.value.inspectType = 1;
        const processName = form.value.process || "";
         if (operationType.value === "add") {
            tableData.value.forEach((item) => {
               delete item.id
            })
          tableData.value.forEach(item => {
            delete item.id;
          });
         }
         const data = {
            ...form.value, 
            process: processName, // 保留 process 字段以兼容后端
            qualityInspectParams: tableData.value
         }
          qualityInspectParams: tableData.value,
        };
      if (operationType.value === "add") {
        qualityInspectAdd(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
          });
      } else {
        qualityInspectUpdate(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
          });
      }
    }
  })
}
    });
  };
const getList = () => {
   if (!currentProductId.value) {
      testStandardOptions.value = [];
      tableData.value = [];
      return;
   }
   const processName = form.value.process || '';
    const processName = form.value.process || "";
   let params = {
      productId: currentProductId.value,
      inspectType: 1,
      process: processName
   }
      process: processName,
    };
   qualityInspectDetailByProductId(params).then(res => {
      // 保存下拉框选项数据
      testStandardOptions.value = res.data || [];
      // 清空表格数据，等待用户选择指标
      tableData.value = [];
      // 清空指标选择
      form.value.testStandardId = '';
   })
}
      form.value.testStandardId = "";
    });
  };

// 指标选择变化处理
const handleTestStandardChange = (testStandardId) => {
  const handleTestStandardChange = testStandardId => {
   if (!testStandardId) {
      tableData.value = [];
      return;
   }
   tableLoading.value = true;
   getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
    getQualityTestStandardParamByTestStandardId(testStandardId)
      .then(res => {
      tableData.value = res.data || [];
   }).catch(error => {
      console.error('获取标准参数失败:', error);
      tableData.value = [];
   }).finally(() => {
      tableLoading.value = false;
   })
}
const getQualityInspectParamList = (id) => {
      .catch(error => {
        console.error("获取标准参数失败:", error);
        tableData.value = [];
      })
      .finally(() => {
        tableLoading.value = false;
      });
  };
  const getQualityInspectParamList = id => {
   qualityInspectParamInfo(id).then(res => {
      tableData.value = res.data;
   })
}
    });
  };
// 关闭弹框
const closeDia = () => {
  proxy.resetForm("formRef");
  tableData.value = [];
  testStandardOptions.value = [];
  form.value.testStandardId = '';
    form.value.testStandardId = "";
  dialogFormVisible.value = false;
  emit('close')
    emit("close");
};
defineExpose({
  openDialog,
@@ -459,5 +520,4 @@
</script>

<style scoped>

</style>