From b8ea0645d3402fce8f7048884e068255a3ebdb27 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 20 Feb 2026 18:42:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E6=9B=B4=E6=96=B0=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E6=95=B4=E6=95=B0=EF=BC=8C=E9=87=8D=E6=9E=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9E=9A=E4=B8=BE=E5=92=8C=E7=8A=B6=E6=80=81=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dv/checkrecord/index.ts           |  1 -
 src/api/mes/dv/checkrecord/line/index.ts      |  3 +-
 .../mes/dv/checkrecord/CheckRecordForm.vue    |  2 -
 .../dv/checkrecord/CheckRecordLineList.vue    | 41 ++++---------------
 src/views/mes/dv/checkrecord/index.vue        |  9 ++--
 src/views/mes/utils/constants.ts              | 12 ++++++
 6 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/api/mes/dv/checkrecord/index.ts b/src/api/mes/dv/checkrecord/index.ts
index 0c5e43883..1d17dd2a9 100644
--- a/src/api/mes/dv/checkrecord/index.ts
+++ b/src/api/mes/dv/checkrecord/index.ts
@@ -4,7 +4,6 @@ import request from '@/config/axios'
 export interface DvCheckRecordVO {
   id: number // 编号
   planId: number // 点检计划编号
-  planType?: number // 计划类型
   planName?: string // 计划名称
   machineryId: number // 设备编号
   machineryCode?: string // 设备编码
diff --git a/src/api/mes/dv/checkrecord/line/index.ts b/src/api/mes/dv/checkrecord/line/index.ts
index 424f63b07..e3607041d 100644
--- a/src/api/mes/dv/checkrecord/line/index.ts
+++ b/src/api/mes/dv/checkrecord/line/index.ts
@@ -9,8 +9,7 @@ export interface DvCheckRecordLineVO {
   subjectName?: string // 项目名称
   subjectContent?: string // 检查内容
   subjectStandard?: string // 检查标准
-  // TODO @AI：number
-  checkStatus: string // 点检结果
+  checkStatus: number // 点检结果
   checkResult?: string // 异常描述
   remark: string // 备注
 }
diff --git a/src/views/mes/dv/checkrecord/CheckRecordForm.vue b/src/views/mes/dv/checkrecord/CheckRecordForm.vue
index 45f89e7b4..cfaba1cf6 100644
--- a/src/views/mes/dv/checkrecord/CheckRecordForm.vue
+++ b/src/views/mes/dv/checkrecord/CheckRecordForm.vue
@@ -78,7 +78,6 @@ const formData = ref({
   machineryId: undefined,
   checkTime: undefined,
   userId: undefined,
-  status: undefined,
   remark: ''
 })
 const formRules = reactive({
@@ -139,7 +138,6 @@ const resetForm = () => {
     machineryId: undefined,
     checkTime: undefined,
     userId: undefined,
-    status: undefined,
     remark: ''
   }
   formRef.value?.resetFields()
diff --git a/src/views/mes/dv/checkrecord/CheckRecordLineList.vue b/src/views/mes/dv/checkrecord/CheckRecordLineList.vue
index eaa441770..b64d14336 100644
--- a/src/views/mes/dv/checkrecord/CheckRecordLineList.vue
+++ b/src/views/mes/dv/checkrecord/CheckRecordLineList.vue
@@ -38,26 +38,12 @@
     <Dialog :title="formTitle" v-model="formVisible" width="500px">
       <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
         <el-form-item label="点检项目" prop="subjectId">
-          <el-select
-            v-model="formData.subjectId"
-            filterable
-            remote
-            reserve-keyword
-            placeholder="请输入项目名称搜索"
-            :remote-method="getSubjectOptions"
-          >
-            <el-option
-              v-for="item in subjectOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
+          <DvSubjectSelect v-model="formData.subjectId" />
         </el-form-item>
         <el-form-item label="点检结果" prop="checkStatus">
           <el-radio-group v-model="formData.checkStatus">
             <el-radio
-              v-for="dict in getStrDictOptions(DICT_TYPE.MES_DV_CHECK_RESULT)"
+              v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_CHECK_RESULT)"
               :key="dict.value"
               :value="dict.value"
             >
@@ -65,8 +51,7 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <!-- TODO @AI：checkStatus 改成 int 枚举；然后 constants.ts 里； -->
-        <el-form-item label="异常描述" prop="checkResult" v-if="formData.checkStatus === 'N'">
+        <el-form-item label="异常描述" prop="checkResult" v-if="formData.checkStatus === MesDvCheckResultEnum.ABNORMAL">
           <el-input v-model="formData.checkResult" type="textarea" placeholder="请输入异常描述" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -82,9 +67,10 @@
 </template>
 
 <script setup lang="ts">
-import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { DvCheckRecordLineApi } from '@/api/mes/dv/checkrecord/line'
-import { DvSubjectApi } from '@/api/mes/dv/subject'
+import DvSubjectSelect from '@/views/mes/dv/subject/components/DvSubjectSelect.vue'
+import { MesDvCheckResultEnum } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'CheckRecordLineList' })
 
@@ -116,7 +102,6 @@ const formRules = reactive({
   subjectId: [{ required: true, message: '点检项目不能为空', trigger: 'blur' }],
   checkStatus: [{ required: true, message: '点检结果不能为空', trigger: 'blur' }]
 })
-const subjectOptions = ref<any[]>([]) // 项目选项列表
 
 /** 查询列表 */
 const getList = async () => {
@@ -139,16 +124,12 @@ const openForm = async (type: string, row?: any) => {
     formData.value = {
       recordId: props.recordId,
       subjectId: undefined,
-      checkStatus: 'Y',
+      checkStatus: MesDvCheckResultEnum.NORMAL,
       checkResult: '',
       remark: ''
     }
   } else {
     formData.value = { ...row }
-    if (row.subjectId) {
-      const subject = await DvSubjectApi.getSubject(row.subjectId)
-      if (subject) subjectOptions.value = [subject]
-    }
   }
   formRef.value?.resetFields()
 }
@@ -183,14 +164,6 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-/** 获取项目选项 */
-const getSubjectOptions = async (query: string) => {
-  try {
-    const data = await DvSubjectApi.getSubjectPage({ name: query, pageNo: 1, pageSize: 20 })
-    subjectOptions.value = data.list
-  } catch {}
-}
-
 /** 监听记录编号变化 */
 watch(
   () => props.recordId,
diff --git a/src/views/mes/dv/checkrecord/index.vue b/src/views/mes/dv/checkrecord/index.vue
index c0a1e967b..2ee773309 100644
--- a/src/views/mes/dv/checkrecord/index.vue
+++ b/src/views/mes/dv/checkrecord/index.vue
@@ -85,31 +85,29 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <!-- TODO @AI：只有草稿，可以编辑； -->
           <el-button
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
+            v-if="scope.row.status === MesDvCheckRecordStatusEnum.DRAFT"
             v-hasPermi="['mes:dv-check-record:update']"
           >
             编辑
           </el-button>
-          <!-- TODO @AI：10 这些，都换成枚举 -->
           <el-button
             link
             type="success"
             @click="handleSubmit(scope.row)"
-            v-if="scope.row.status === 10"
+            v-if="scope.row.status === MesDvCheckRecordStatusEnum.DRAFT"
             v-hasPermi="['mes:dv-check-record:update']"
           >
             提交
           </el-button>
-          <!-- TODO @AI：只有草稿，可以删除； -->
           <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-if="scope.row.status === 10"
+            v-if="scope.row.status === MesDvCheckRecordStatusEnum.DRAFT"
             v-hasPermi="['mes:dv-check-record:delete']"
           >
             删除
@@ -139,6 +137,7 @@ import CheckRecordForm from './CheckRecordForm.vue'
 import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
 import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
+import { MesDvCheckRecordStatusEnum } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'MesDvCheckRecord' })
 
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index 57c9175d7..6865e8bce 100644
--- a/src/views/mes/utils/constants.ts
+++ b/src/views/mes/utils/constants.ts
@@ -106,6 +106,18 @@ export const MesDvMaintenStatusEnum = {
   ABNORMAL: 2 // 异常
 }
 
+/** MES 设备点检记录状态枚举 */
+export const MesDvCheckRecordStatusEnum = {
+  DRAFT: 10, // 草稿
+  FINISHED: 20 // 已完成
+}
+
+/** MES 设备点检结果枚举（对应字典 mes_dv_check_result） */
+export const MesDvCheckResultEnum = {
+  NORMAL: 1, // 正常
+  ABNORMAL: 2 // 异常
+}
+
 /** 获取物料/产品标识的标签 */
 export const getItemOrProductLabel = (value: string): string => {
   for (const item of Object.values(MesItemOrProductEnum)) {