From 2fc5362a7e3cfb6f07baaa83340f3bc35769f0a6 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 25 Feb 2026 19:24:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E4=BC=98=E5=8C=96=20RQC=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BA=A4=E4=BA=92=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA=20=20=20?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=8F=98=E6=9B=B4=EF=BC=9A=20=20=20-=20RqcFo?=
 =?UTF-8?q?rm=20=E6=B7=BB=E5=8A=A0=E7=BC=BA=E9=99=B7=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=92=8C=20detail=20?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=AF=E6=8C=81=20=20=20-=20=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=AF=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=88=E5=AF=B9=E9=BD=90=20IQC=EF=BC=89=20?=
 =?UTF-8?q?=20=20-=20=E5=88=A0=E9=99=A4=20sourceDocCode=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8CrqcType=20=E6=94=B9=E4=B8=BA=20type=20=20=20-?=
 =?UTF-8?q?=20RQC=20Line=20=E7=9A=84=20toolId/toolName=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20tool=20=E5=AD=97=E6=AE=B5=20=20=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=88=90=E5=8A=9F=E5=90=8E=E8=87=AA=E5=8A=A8=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E7=BC=96=E8=BE=91=E6=A8=A1=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E7=BB=A7=E7=BB=AD=E7=BC=96=E8=BE=91=E5=AD=90=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/qc/rqc/index.ts          |  10 ++-
 src/api/mes/qc/rqc/line/index.ts     |   3 +-
 src/utils/dict.ts                    |   2 +-
 src/views/mes/qc/rqc/RqcForm.vue     | 127 ++++++++++++++++++++-------
 src/views/mes/qc/rqc/RqcLineList.vue |   2 +-
 src/views/mes/qc/rqc/index.vue       |  72 ++++++---------
 6 files changed, 135 insertions(+), 81 deletions(-)

diff --git a/src/api/mes/qc/rqc/index.ts b/src/api/mes/qc/rqc/index.ts
index 126f7af98..9718fd5a2 100644
--- a/src/api/mes/qc/rqc/index.ts
+++ b/src/api/mes/qc/rqc/index.ts
@@ -8,9 +8,8 @@ export interface QcRqcVO {
   templateId: number // 检验模板 ID
   sourceDocId: number // 来源单据 ID
   sourceDocType: string // 来源单据类型
-  sourceDocCode: string // 来源单据编号
   sourceLineId: number // 来源单据行 ID
-  rqcType: number // 检验类型
+  type: number // 检验类型
   itemId: number // 产品物料 ID
   itemCode: string // 产品物料编码（关联查询）
   itemName: string // 产品物料名称（关联查询）
@@ -26,6 +25,13 @@ export interface QcRqcVO {
   inspectorNickname: string // 检测人员昵称（关联查询）
   status: number // 状态
   remark: string // 备注
+  // 缺陷统计
+  criticalQuantity: number // 致命缺陷数量
+  majorQuantity: number // 严重缺陷数量
+  minorQuantity: number // 轻微缺陷数量
+  criticalRate: number // 致命缺陷率（%）
+  majorRate: number // 严重缺陷率（%）
+  minorRate: number // 轻微缺陷率（%）
 }
 
 // MES 退货检验单 API
diff --git a/src/api/mes/qc/rqc/line/index.ts b/src/api/mes/qc/rqc/line/index.ts
index 6740200c0..dccf7eb26 100644
--- a/src/api/mes/qc/rqc/line/index.ts
+++ b/src/api/mes/qc/rqc/line/index.ts
@@ -8,8 +8,7 @@ export interface QcRqcLineVO {
   indicatorCode: string // 检测指标编码（关联查询）
   indicatorName: string // 检测指标名称（关联查询）
   indicatorType: string // 检测指标类型（关联查询）
-  toolId: number // 检测工具 ID
-  toolName: string // 检测工具名称（关联查询）
+  tool: string // 检测工具
   checkMethod: string // 检测方法
   standardValue: number // 标准值
   unitMeasureId: number // 计量单位 ID
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 364dc7cad..07d8e97e7 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -293,5 +293,5 @@ export enum DICT_TYPE {
   MES_PRO_ANDON_LEVEL = 'mes_pro_andon_level', // MES 安灯级别
   MES_RQC_TYPE = 'mes_rqc_type', // MES 退货检验类型
   MES_WM_ARRIVAL_NOTICE_STATUS = 'mes_wm_arrival_notice_status', // MES 到货通知单状态
-  MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status' // MES 物料接收单状态
+  MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态
 }
diff --git a/src/views/mes/qc/rqc/RqcForm.vue b/src/views/mes/qc/rqc/RqcForm.vue
index 0442fb6dd..67226ff4d 100644
--- a/src/views/mes/qc/rqc/RqcForm.vue
+++ b/src/views/mes/qc/rqc/RqcForm.vue
@@ -8,6 +8,7 @@
       :rules="formRules"
       label-width="120px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row :gutter="16">
         <el-col :span="8">
@@ -26,21 +27,14 @@
             <el-input v-model="formData.name" placeholder="请输入检验单名称" />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：不用前端选择，后端自己计算出来！ -->
-        <el-col :span="8">
-          <el-form-item label="质检方案" prop="templateId">
-            <QcTemplateSelect v-model="formData.templateId" class="!w-1/1" />
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <el-divider content-position="left">物料信息</el-divider>
       <el-row :gutter="16">
         <el-col :span="8">
-          <!-- TODO @AI：应该有 3 个类型（字典要加下）：生产退料检验、委外退料检验、销售退货检验 -->
-          <el-form-item label="检验类型" prop="rqcType">
+          <el-form-item label="检验类型" prop="type">
             <el-select
-              v-model="formData.rqcType"
+              v-model="formData.type"
               placeholder="请选择检验类型"
               clearable
               class="!w-1/1"
@@ -58,7 +52,12 @@
         <!-- TODO @芋艿：【暂时不处理】来源单据编号 -->
         <el-col :span="8">
           <el-form-item label="产品物料" prop="itemId">
-            <MdItemSelect v-model="formData.itemId" placeholder="请选择产品物料" class="!w-1/1" />
+            <MdItemSelect
+              v-model="formData.itemId"
+              placeholder="请选择产品物料"
+              class="!w-1/1"
+              :disabled="isFromPendingTask"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -150,10 +149,47 @@
           </el-form-item>
         </el-col>
       </el-row>
+
+      <!-- 缺陷统计（只读） -->
+      <el-divider content-position="left">缺陷情况</el-divider>
+      <el-row :gutter="16">
+        <el-col :span="8">
+          <el-form-item label="致命缺陷数">
+            <el-input :model-value="formData.criticalQuantity" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="严重缺陷数">
+            <el-input :model-value="formData.majorQuantity" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="轻微缺陷数">
+            <el-input :model-value="formData.minorQuantity" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="16">
+        <el-col :span="8">
+          <el-form-item label="致命缺陷率">
+            <el-input :model-value="formData.criticalRate + '%'" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="严重缺陷率">
+            <el-input :model-value="formData.majorRate + '%'" disabled />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="轻微缺陷率">
+            <el-input :model-value="formData.minorRate + '%'" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </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">
@@ -166,7 +202,9 @@
     </template>
 
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading"> 保 存 </el-button>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!isDetail">
+        保 存
+      </el-button>
       <el-button @click="dialogVisible = false">关 闭</el-button>
     </template>
   </Dialog>
@@ -178,7 +216,6 @@ import { generateRandomStr } from '@/utils'
 import { QcRqcApi, QcRqcVO } from '@/api/mes/qc/rqc'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
-import QcTemplateSelect from '@/views/mes/qc/template/components/QcTemplateSelect.vue'
 import RqcLineList from './RqcLineList.vue'
 import QcIndicatorResultList from '@/views/mes/qc/indicatorresult/components/QcIndicatorResultList.vue'
 import { MesQcTypeEnum } from '@/views/mes/utils/constants'
@@ -189,10 +226,21 @@ const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
 const activeTab = ref('line') // 当前激活的标签页
+const dialogTitle = computed(() => {
+  const titles = {
+    create: '新增退货检验单',
+    update: '修改退货检验单',
+    detail: '查看退货检验单'
+  }
+  return titles[formType.value] || t('action.' + formType.value)
+}) // 弹窗标题，根据 formType 自动显示
+const isDetail = computed(() => formType.value === 'detail') // 表单是否为详情模式（只读）
+const isFromPendingTask = computed(
+  () => formType.value === 'create' && formData.value.sourceDocId != null
+) // 是否来自待检任务（有预填的来源单据信息）
 
 const formData = ref({
   id: undefined as number | undefined,
@@ -201,9 +249,8 @@ const formData = ref({
   templateId: undefined,
   sourceDocId: undefined,
   sourceDocType: undefined,
-  sourceDocCode: undefined,
   sourceLineId: undefined,
-  rqcType: undefined,
+  type: undefined,
   itemId: undefined,
   batchCode: undefined,
   checkQuantity: undefined,
@@ -212,14 +259,25 @@ const formData = ref({
   checkResult: undefined,
   inspectDate: undefined,
   inspectorUserId: undefined,
-  remark: undefined
+  remark: undefined,
+  // 缺陷统计（只读）
+  criticalRate: 0,
+  majorRate: 0,
+  minorRate: 0,
+  criticalQuantity: 0,
+  majorQuantity: 0,
+  minorQuantity: 0
 })
-// TODO @AI：必填：检验类型、检测数量、合格品数量、不合格数量、检验人员；前后端，都加上校验；
 const formRules = reactive({
   code: [{ required: true, message: '检验单编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '检验单名称不能为空', trigger: 'blur' }],
-  templateId: [{ required: true, message: '检验模板不能为空', trigger: 'change' }],
-  itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }]
+  type: [{ required: true, message: '检验类型不能为空', trigger: 'change' }],
+  itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
+  checkQuantity: [{ required: true, message: '检测数量不能为空', trigger: 'blur' }],
+  qualifiedQuantity: [{ required: true, message: '合格品数量不能为空', trigger: 'blur' }],
+  unqualifiedQuantity: [{ required: true, message: '不合格数量不能为空', trigger: 'blur' }],
+  inspectDate: [{ required: true, message: '检测日期不能为空', trigger: 'change' }],
+  inspectorUserId: [{ required: true, message: '检测人员不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -229,13 +287,12 @@ const generateCode = () => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, data?: QcRqcVO) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
   formType.value = type
   activeTab.value = 'line'
   resetForm()
-  // 修改时，设置数据
+  // 修改/详情时，设置数据
   if (id) {
     formLoading.value = true
     try {
@@ -243,6 +300,9 @@ const open = async (type: string, id?: number) => {
     } finally {
       formLoading.value = false
     }
+  } else if (data) {
+    // 预填模式：来自待检任务（pending inspect）
+    Object.assign(formData.value, data)
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -259,13 +319,15 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as QcRqcVO
     if (formType.value === 'create') {
-      await QcRqcApi.createRqc(data)
+      const res = await QcRqcApi.createRqc(data)
       message.success(t('common.createSuccess'))
+      // 新增成功后，切换到修改模式，设置 id
+      formData.value.id = res
+      formType.value = 'update'
     } else {
       await QcRqcApi.updateRqc(data)
       message.success(t('common.updateSuccess'))
     }
-    dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -282,9 +344,8 @@ const resetForm = () => {
     templateId: undefined,
     sourceDocId: undefined,
     sourceDocType: undefined,
-    sourceDocCode: undefined,
     sourceLineId: undefined,
-    rqcType: undefined,
+    type: undefined,
     itemId: undefined,
     batchCode: undefined,
     checkQuantity: undefined,
@@ -293,7 +354,13 @@ const resetForm = () => {
     checkResult: undefined,
     inspectDate: undefined,
     inspectorUserId: undefined,
-    remark: undefined
+    remark: undefined,
+    criticalRate: 0,
+    majorRate: 0,
+    minorRate: 0,
+    criticalQuantity: 0,
+    majorQuantity: 0,
+    minorQuantity: 0
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/mes/qc/rqc/RqcLineList.vue b/src/views/mes/qc/rqc/RqcLineList.vue
index 191a7e4bc..ea515e454 100644
--- a/src/views/mes/qc/rqc/RqcLineList.vue
+++ b/src/views/mes/qc/rqc/RqcLineList.vue
@@ -9,7 +9,7 @@
           <dict-tag :type="DICT_TYPE.MES_INDICATOR_TYPE" :value="scope.row.indicatorType" />
         </template>
       </el-table-column>
-      <el-table-column label="检测工具" align="center" prop="toolName" width="120" />
+      <el-table-column label="检测工具" align="center" prop="tool" width="120" />
       <el-table-column label="检测方法" align="center" prop="checkMethod" min-width="180" />
       <el-table-column label="标准值" align="center" prop="standardValue" width="100" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
diff --git a/src/views/mes/qc/rqc/index.vue b/src/views/mes/qc/rqc/index.vue
index 04f0092e2..b65d0f048 100644
--- a/src/views/mes/qc/rqc/index.vue
+++ b/src/views/mes/qc/rqc/index.vue
@@ -18,25 +18,24 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：来源类型，应该是个字典（并且要按照 rqc 做下过滤） -->
+      <!--
+      TODO @芋艿：【暂时不用处理】等后面接完 source 业务！
       <el-form-item label="来源单据类型" prop="sourceDocType">
-        <el-input
+        <el-select
           v-model="queryParams.sourceDocType"
-          placeholder="请输入来源单据类型"
+          placeholder="请选择来源单据类型"
           clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="来源单据编号" prop="sourceDocCode">
-        <el-input
-          v-model="queryParams.sourceDocCode"
-          placeholder="请输入来源单据编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
+      -->
       <el-form-item label="产品物料" prop="itemId">
         <MdItemSelect
           v-model="queryParams.itemId"
@@ -45,22 +44,14 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：批次号 batchCode -->
-      <!-- TODO @AI：不需要 rqcType 的检索，去掉去掉，前后端都去掉； -->
-      <el-form-item label="检验类型" prop="rqcType">
-        <el-select
-          v-model="queryParams.rqcType"
-          placeholder="请选择检验类型"
+      <el-form-item label="批次号" prop="batchCode">
+        <el-input
+          v-model="queryParams.batchCode"
+          placeholder="请输入批次号"
           clearable
+          @keyup.enter="handleQuery"
           class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_RQC_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        />
       </el-form-item>
       <el-form-item label="检测结果" prop="checkResult">
         <el-select
@@ -77,18 +68,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 label="检测人员" prop="inspectorUserId">
         <UserSelect
           v-model="queryParams.inspectorUserId"
@@ -124,10 +103,15 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <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="sourceDocType" width="120" />
-      <el-table-column label="来源单据编号" align="center" prop="sourceDocCode" width="140" />
       <el-table-column label="产品物料编码" align="center" prop="itemCode" width="130" />
       <el-table-column label="产品物料名称" align="center" prop="itemName" min-width="150" />
       <el-table-column label="规格型号" align="center" prop="itemSpecification" width="130" />
@@ -219,11 +203,9 @@ const queryParams = reactive({
   pageSize: 10,
   code: undefined,
   sourceDocType: undefined,
-  sourceDocCode: undefined,
   itemId: undefined,
-  rqcType: undefined,
+  batchCode: undefined,
   checkResult: undefined,
-  inspectDate: undefined,
   inspectorUserId: undefined
 })
 const queryFormRef = ref() // 搜索的表单