From 7df07858186b83bb5bfa4d81868ca96cf0dbe4d5 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Feb 2026 00:15:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mes-qc):=20=E4=BC=98=E5=8C=96=20IPQC/I?=
 =?UTF-8?q?QC=20=E8=B4=A8=E6=A3=80=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  IPQC 优化：
  - 修复 TODO AI 项：模板检索方法、tool 字段重构、删除冗余字段
  - 新增废品数量字段（工废/料废/其他废品）及验证
  - 添加检测人员和物料的存在性验证

  IQC 优化：
  - 检测人员由后端自动设置改为前端传递
  - 添加检测人员存在性验证
---
 src/api/mes/qc/ipqc/index.ts       | 10 ++--
 src/views/mes/qc/ipqc/IpqcForm.vue | 93 ++++++++++++++++--------------
 src/views/mes/qc/ipqc/index.vue    | 35 +++--------
 src/views/mes/qc/iqc/IqcForm.vue   | 18 +++---
 4 files changed, 72 insertions(+), 84 deletions(-)

diff --git a/src/api/mes/qc/ipqc/index.ts b/src/api/mes/qc/ipqc/index.ts
index a2be7b93f..3d6d4075d 100644
--- a/src/api/mes/qc/ipqc/index.ts
+++ b/src/api/mes/qc/ipqc/index.ts
@@ -24,10 +24,10 @@ export interface QcIpqcVO {
   itemName: string // 产品物料名称（关联查询）
   itemSpecification: string // 规格型号（关联查询）
   unitName: string // 单位名称（关联查询）
-  checkQuantity: number // 检测数量
-  qualifiedQuantity: number // 合格品数量
-  unqualifiedQuantity: number // 不合格品数量
-  laborScrapQuantity: number // 工废数量
+  checkQuantity?: number // 检测数量
+  qualifiedQuantity?: number // 合格品数量
+  unqualifiedQuantity?: number // 不合格品数量
+  laborScrapQuantity?: number // 工废数量
   materialScrapQuantity: number // 料废数量
   otherScrapQuantity: number // 其他废品数量
   criticalRate: number // 致命缺陷率（%）
@@ -40,7 +40,7 @@ export interface QcIpqcVO {
   inspectDate: Date // 检测日期
   inspectorUserId: number // 检测人员用户 ID
   inspectorNickname: string // 检测人员昵称（关联查询）
-  status: number // 状态
+  status?: number // 状态
   remark: string // 备注
 }
 
diff --git a/src/views/mes/qc/ipqc/IpqcForm.vue b/src/views/mes/qc/ipqc/IpqcForm.vue
index 1c26f8e6a..ac83f796d 100644
--- a/src/views/mes/qc/ipqc/IpqcForm.vue
+++ b/src/views/mes/qc/ipqc/IpqcForm.vue
@@ -8,6 +8,7 @@
       :rules="formRules"
       label-width="120px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row :gutter="16">
         <el-col :span="8">
@@ -64,76 +65,86 @@
 
       <el-divider content-position="left">检测情况</el-divider>
       <el-row :gutter="16">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="检测数量" prop="checkQuantity">
             <el-input-number
               v-model="formData.checkQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入检测数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="合格品数量" prop="qualifiedQuantity">
             <el-input-number
               v-model="formData.qualifiedQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入合格品数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="不合格品数量" prop="unqualifiedQuantity">
             <el-input-number
               v-model="formData.unqualifiedQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入不合格品数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="16">
-        <el-col :span="6">
+      <!-- 废品数量（当不合格数量大于 0 时显示） -->
+      <el-row :gutter="16" v-if="formData.unqualifiedQuantity && formData.unqualifiedQuantity > 0">
+        <el-col :span="8">
           <el-form-item label="工废数量" prop="laborScrapQuantity">
             <el-input-number
               v-model="formData.laborScrapQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入工废数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="料废数量" prop="materialScrapQuantity">
             <el-input-number
               v-model="formData.materialScrapQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入料废数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="其他废品数量" prop="otherScrapQuantity">
             <el-input-number
               v-model="formData.otherScrapQuantity"
               :min="0"
               :precision="2"
-              placeholder="请输入"
+              placeholder="请输入其他废品数量"
               class="!w-1/1"
             />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="16">
+        <el-col :span="8">
+          <el-form-item label="检测人员" prop="inspectorUserId">
+            <UserSelect
+              v-model="formData.inspectorUserId"
+              placeholder="请选择检测人员"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="检测日期" prop="inspectDate">
             <el-date-picker
@@ -145,15 +156,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="检测人员" prop="inspectorUserId">
-            <UserSelect
-              v-model="formData.inspectorUserId"
-              placeholder="请选择检测人员"
-              class="!w-1/1"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="检测结果" prop="checkResult">
             <el-select
@@ -220,8 +222,8 @@
       </template>
     </el-form>
 
-    <!-- 子表标签页（编辑模式下显示） -->
-    <template v-if="formType === 'update' && formData.id">
+    <!-- 子表标签页（编辑/详情模式下显示） -->
+    <template v-if="(formType === 'update' || formType === 'detail') && formData.id">
       <el-divider />
       <el-tabs v-model="activeTab">
         <el-tab-pane label="检验项" name="line">
@@ -234,12 +236,7 @@
     </template>
 
     <template #footer>
-      <el-button
-        @click="submitForm"
-        type="primary"
-        :disabled="formLoading"
-        v-if="formData.status === 0"
-      >
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!isDetail">
         保 存
       </el-button>
       <el-button @click="dialogVisible = false">关 闭</el-button>
@@ -264,10 +261,18 @@ const { t } = useI18n()
 const message = useMessage()
 
 const dialogVisible = ref(false)
-const dialogTitle = ref('')
 const formLoading = ref(false)
 const formType = ref('')
 const activeTab = ref('line')
+const dialogTitle = computed(() => {
+  const titles = {
+    create: '新增过程检验单',
+    update: '修改过程检验单',
+    detail: '查看过程检验单'
+  }
+  return titles[formType.value] || t('action.' + formType.value)
+})
+const isDetail = computed(() => formType.value === 'detail')
 
 const formData = ref({
   id: undefined as number | undefined,
@@ -277,7 +282,6 @@ const formData = ref({
   templateId: undefined,
   sourceDocId: undefined,
   sourceDocType: undefined,
-  sourceDocCode: undefined,
   sourceLineId: undefined,
   workOrderId: undefined,
   taskId: undefined,
@@ -285,8 +289,8 @@ const formData = ref({
   processId: undefined,
   itemId: undefined,
   checkQuantity: undefined,
-  qualifiedQuantity: 0,
-  unqualifiedQuantity: 0,
+  qualifiedQuantity: undefined,
+  unqualifiedQuantity: undefined,
   laborScrapQuantity: 0,
   materialScrapQuantity: 0,
   otherScrapQuantity: 0,
@@ -294,7 +298,6 @@ const formData = ref({
   inspectDate: undefined,
   inspectorUserId: undefined,
   remark: undefined,
-  status: 0,
   // 缺陷统计（只读）
   criticalRate: 0,
   majorRate: 0,
@@ -303,24 +306,30 @@ const formData = ref({
   majorQuantity: 0,
   minorQuantity: 0
 })
-// TODO @AI：必填；前后端都加上；检验类型、不合格数；合格品数量；检测数量；检测日期；检测人员；
 const formRules = reactive({
   code: [{ required: true, message: '检验单编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '检验单名称不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '检验类型不能为空', trigger: 'change' }],
   workOrderId: [{ required: true, message: '生产工单不能为空', trigger: 'change' }],
-  workstationId: [{ required: true, message: '工位不能为空', trigger: 'change' }]
+  workstationId: [{ required: true, message: '工位不能为空', trigger: 'change' }],
+  checkQuantity: [{ required: true, message: '检测数量不能为空', trigger: 'blur' }],
+  qualifiedQuantity: [{ required: true, message: '合格品数量不能为空', trigger: 'blur' }],
+  unqualifiedQuantity: [{ required: true, message: '不合格品数量不能为空', trigger: 'blur' }],
+  laborScrapQuantity: [{ required: true, message: '工废数量不能为空', trigger: 'blur' }],
+  materialScrapQuantity: [{ required: true, message: '料废数量不能为空', trigger: 'blur' }],
+  otherScrapQuantity: [{ required: true, message: '其他废品数量不能为空', trigger: 'blur' }],
+  inspectorUserId: [{ required: true, message: '检测人员不能为空', trigger: 'change' }],
+  inspectDate: [{ required: true, message: '检测日期不能为空', trigger: 'change' }]
 })
 const formRef = ref()
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
   formType.value = type
   activeTab.value = 'line'
   resetForm()
-  // 修改时，设置数据
+  // 修改/详情时，设置数据
   if (id) {
     formLoading.value = true
     try {
@@ -365,7 +374,6 @@ const resetForm = () => {
     templateId: undefined,
     sourceDocId: undefined,
     sourceDocType: undefined,
-    sourceDocCode: undefined,
     sourceLineId: undefined,
     workOrderId: undefined,
     taskId: undefined,
@@ -373,8 +381,8 @@ const resetForm = () => {
     processId: undefined,
     itemId: undefined,
     checkQuantity: undefined,
-    qualifiedQuantity: 0,
-    unqualifiedQuantity: 0,
+    qualifiedQuantity: undefined,
+    unqualifiedQuantity: undefined,
     laborScrapQuantity: 0,
     materialScrapQuantity: 0,
     otherScrapQuantity: 0,
@@ -382,7 +390,6 @@ const resetForm = () => {
     inspectDate: undefined,
     inspectorUserId: undefined,
     remark: undefined,
-    status: 0,
     criticalRate: 0,
     majorRate: 0,
     minorRate: 0,
diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue
index 004e3af1b..07dbf042f 100644
--- a/src/views/mes/qc/ipqc/index.vue
+++ b/src/views/mes/qc/ipqc/index.vue
@@ -41,15 +41,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：workstationId 前后端检索，都去掉这个字段； -->
-      <el-form-item label="工位" prop="workstationId">
-        <MdWorkstationSelect
-          v-model="queryParams.workstationId"
-          placeholder="请选择工位"
-          clearable
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="产品物料" prop="itemId">
         <MdItemSelect
           v-model="queryParams.itemId"
@@ -73,18 +64,6 @@
           />
         </el-select>
       </el-form-item>
-      <!-- TODO @AI：inspectDate 前后端检索，都去掉这个字段； -->
-      <el-form-item label="检测日期" prop="inspectDate">
-        <el-date-picker
-          v-model="queryParams.inspectDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -112,8 +91,13 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：需要有超链接； -->
-      <el-table-column label="检验单编号" align="center" prop="code" width="160" />
+      <el-table-column label="检验单编号" align="center" prop="code" width="160">
+        <template #default="scope">
+          <el-link type="primary" @click="openForm('detail', scope.row.id)">
+            {{ scope.row.code }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="检验单名称" align="center" prop="name" min-width="180" />
       <el-table-column label="检验类型" align="center" prop="type" width="120">
         <template #default="scope">
@@ -196,7 +180,6 @@ import { QcIpqcApi, QcIpqcVO } from '@/api/mes/qc/ipqc'
 import IpqcForm from './IpqcForm.vue'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
-import MdWorkstationSelect from '@/views/mes/md/workstation/components/MdWorkstationSelect.vue'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import { MesOrderStatusEnum } from '@/views/mes/utils/constants'
 
@@ -214,10 +197,8 @@ const queryParams = reactive({
   code: undefined,
   type: undefined,
   workOrderId: undefined,
-  workstationId: undefined,
   itemId: undefined,
-  checkResult: undefined,
-  inspectDate: undefined
+  checkResult: undefined
 })
 const queryFormRef = ref()
 const exportLoading = ref(false)
diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue
index 4c4702dde..0c05f7db9 100644
--- a/src/views/mes/qc/iqc/IqcForm.vue
+++ b/src/views/mes/qc/iqc/IqcForm.vue
@@ -95,14 +95,11 @@
       </el-row>
       <el-row :gutter="16">
         <el-col :span="8">
-          <el-form-item label="来料日期" prop="receiveDate">
-            <el-date-picker
-              v-model="formData.receiveDate"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择来料日期"
+          <el-form-item label="检测人员" prop="inspectorUserId">
+            <UserSelect
+              v-model="formData.inspectorUserId"
+              placeholder="请选择检测人员"
               class="!w-1/1"
-              :disabled="isFromPendingTask"
             />
           </el-form-item>
         </el-col>
@@ -248,9 +245,10 @@ const formData = ref({
   receivedQuantity: undefined,
   qualifiedQuantity: undefined,
   unqualifiedQuantity: undefined,
+  inspectorUserId: undefined,
+  inspectDate: undefined,
   checkResult: undefined,
   receiveDate: undefined,
-  inspectDate: undefined,
   remark: undefined,
   // 缺陷统计（只读）
   criticalRate: 0,
@@ -269,6 +267,7 @@ const formRules = reactive({
   qualifiedQuantity: [{ required: true, message: '合格品数量不能为空', trigger: 'blur' }],
   unqualifiedQuantity: [{ required: true, message: '不合格品数量不能为空', trigger: 'blur' }],
   receiveDate: [{ required: true, message: '来料日期不能为空', trigger: 'change' }],
+  inspectorUserId: [{ required: true, message: '检测人员不能为空', trigger: 'change' }],
   inspectDate: [{ required: true, message: '检测日期不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
@@ -342,9 +341,10 @@ const resetForm = () => {
     receivedQuantity: undefined,
     qualifiedQuantity: undefined,
     unqualifiedQuantity: undefined,
+    inspectorUserId: undefined,
+    inspectDate: undefined,
     checkResult: undefined,
     receiveDate: undefined,
-    inspectDate: undefined,
     remark: undefined,
     criticalRate: 0,
     majorRate: 0,