From 51d255a9fdf4300224df060da7bd80f3e8a3d621 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 20 Feb 2026 19:50:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=9D=E5=85=BB=E8=AE=B0=E5=BD=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dv/repair/RepairForm.vue     | 35 ++++++++++------------
 src/views/mes/dv/repair/RepairLineList.vue |  6 ++--
 src/views/mes/utils/constants.ts           | 12 ++++++++
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/dv/repair/RepairForm.vue b/src/views/mes/dv/repair/RepairForm.vue
index 3677fafb3..c55463bc5 100644
--- a/src/views/mes/dv/repair/RepairForm.vue
+++ b/src/views/mes/dv/repair/RepairForm.vue
@@ -11,12 +11,12 @@
         <!-- TODO @ai：生成 -->
         <el-col :span="8">
           <el-form-item label="维修单编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入工单编码" />
+            <el-input v-model="formData.code" placeholder="请输入维修单编码" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="维修单名称" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入工单名称" />
+            <el-input v-model="formData.name" placeholder="请输入维修单名称" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -36,21 +36,6 @@
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：维修完成日期，往前放 -->
-        <!-- TODO @AI：验收日期，往前放 -->
-        <!-- TODO @AI：保修结果，往前放 -->
-        <el-col :span="8">
-          <el-form-item label="维修人" prop="acceptedUserId">
-            <UserSelect v-model="formData.acceptedUserId" placeholder="请选择维修人" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="验收人" prop="confirmUserId">
-            <UserSelect v-model="formData.confirmUserId" placeholder="请选择验收人" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="8">
           <el-form-item label="维修完成日期" prop="finishDate">
             <el-date-picker
@@ -71,6 +56,8 @@
             />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="维修结果" prop="result">
             <el-select v-model="formData.result" placeholder="请选择维修结果" clearable>
@@ -83,6 +70,16 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="维修人" prop="acceptedUserId">
+            <UserSelect v-model="formData.acceptedUserId" placeholder="请选择维修人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="验收人" prop="confirmUserId">
+            <UserSelect v-model="formData.confirmUserId" placeholder="请选择验收人" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -131,11 +128,10 @@ const formData = ref({
   result: undefined,
   acceptedUserId: undefined,
   confirmUserId: undefined,
-  status: 10, // TODO @AI：不用传递 status，后端会设置；
   remark: ''
 })
 const formRules = reactive({
-  code: [{ required: true, message: '工单编码不能为空', trigger: 'blur' }],
+  code: [{ required: true, message: '维修单编码不能为空', trigger: 'blur' }],
   machineryId: [{ required: true, message: '设备不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -197,7 +193,6 @@ const resetForm = () => {
     result: undefined,
     acceptedUserId: undefined,
     confirmUserId: undefined,
-    status: 10,
     remark: ''
   }
   formRef.value?.resetFields()
diff --git a/src/views/mes/dv/repair/RepairLineList.vue b/src/views/mes/dv/repair/RepairLineList.vue
index fed776fc1..02eacaae7 100644
--- a/src/views/mes/dv/repair/RepairLineList.vue
+++ b/src/views/mes/dv/repair/RepairLineList.vue
@@ -10,11 +10,11 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="项目名称" align="center" prop="subjectName" />
-      <!-- TODO @AI：故障描述、故障描述资源、维修情况；往前放 -->
+      <el-table-column label="故障描述" align="center" prop="malfunction" />
+      <el-table-column label="故障图片" align="center" prop="malfunctionUrl" />
+      <el-table-column label="维修描述" align="center" prop="description" />
       <el-table-column label="项目内容" align="center" prop="subjectContent" />
       <el-table-column label="标准" align="center" prop="subjectStandard" />
-      <el-table-column label="故障描述" align="center" prop="malfunction" />
-      <el-table-column label="维修描述" align="center" prop="description" />
       <el-table-column label="操作" align="center" width="130" v-if="!disabled">
         <template #default="scope">
           <el-button link type="primary" @click="openForm('update', scope.row)">编辑</el-button>
diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts
index 6865e8bce..fc8384730 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 MesDvRepairStatusEnum = {
+  DRAFT: 10, // 草稿
+  CONFIRMED: 20 // 已确认
+}
+
+/** MES 维修结果枚举（对应字典 mes_dv_repair_result） */
+export const MesDvRepairResultEnum = {
+  PASS: 1, // 通过
+  FAIL: 2 // 不通过
+}
+
 /** MES 设备点检记录状态枚举 */
 export const MesDvCheckRecordStatusEnum = {
   DRAFT: 10, // 草稿