From b25cb1dd0f1c64967f8b59e3ceb107cbadafe297 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 3 Apr 2026 00:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=BC=96=E7=A0=81=E3=80=81=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=8F=8A=E9=A2=91=E7=8E=87=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dv/machinery/MachineryCheckRecordList.vue | 22 ++++++++++++++++++-
 .../machinery/MachineryMaintenRecordList.vue  | 22 ++++++++++++++++++-
 .../mes/dv/machinery/MachineryRepairList.vue  | 13 +++++------
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/views/mes/dv/machinery/MachineryCheckRecordList.vue b/src/views/mes/dv/machinery/MachineryCheckRecordList.vue
index a6e4bad1a..877c002cb 100644
--- a/src/views/mes/dv/machinery/MachineryCheckRecordList.vue
+++ b/src/views/mes/dv/machinery/MachineryCheckRecordList.vue
@@ -2,8 +2,28 @@
 <template>
   <div class="overflow-hidden">
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：计划编码、计划名称、开始时间、结束日期、频率、状态 -->
+      <el-table-column label="计划编码" align="center" prop="planCode" width="120" />
       <el-table-column label="计划名称" align="center" prop="planName" min-width="120" />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="planStartDate"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column
+        label="结束日期"
+        align="center"
+        prop="planEndDate"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column label="频率数量" align="center" prop="planCycleCount" width="100" />
+      <el-table-column label="频率类型" align="center" prop="planCycleType" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_DV_CYCLE_TYPE" :value="scope.row.planCycleType" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="点检时间"
         align="center"
diff --git a/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue b/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue
index 866110f5d..1b2303759 100644
--- a/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue
+++ b/src/views/mes/dv/machinery/MachineryMaintenRecordList.vue
@@ -2,8 +2,28 @@
 <template>
   <div class="overflow-hidden">
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：计划编码、计划名称、开始时间、结束日期、频率、状态 -->
+      <el-table-column label="计划编码" align="center" prop="planCode" width="120" />
       <el-table-column label="计划名称" align="center" prop="planName" min-width="120" />
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="planStartDate"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column
+        label="结束日期"
+        align="center"
+        prop="planEndDate"
+        :formatter="dateFormatter"
+        width="180"
+      />
+      <el-table-column label="频率数量" align="center" prop="planCycleCount" width="100" />
+      <el-table-column label="频率类型" align="center" prop="planCycleType" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_DV_CYCLE_TYPE" :value="scope.row.planCycleType" />
+        </template>
+      </el-table-column>
       <el-table-column
         label="保养时间"
         align="center"
diff --git a/src/views/mes/dv/machinery/MachineryRepairList.vue b/src/views/mes/dv/machinery/MachineryRepairList.vue
index b11c86cc8..ba1fb31e5 100644
--- a/src/views/mes/dv/machinery/MachineryRepairList.vue
+++ b/src/views/mes/dv/machinery/MachineryRepairList.vue
@@ -2,11 +2,10 @@
 <template>
   <div class="overflow-hidden">
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <!-- TODO @AI：维护单编号、维修单名称、保修日期、维修完成日期、验收日期、维修结果、维修人员、验收人员、单据状态 -->
-      <el-table-column label="工单编码" align="center" prop="code" width="120" />
-      <el-table-column label="工单名称" align="center" prop="name" min-width="120" />
+      <el-table-column label="维护单编号" align="center" prop="code" width="120" />
+      <el-table-column label="维修单名称" align="center" prop="name" min-width="120" />
       <el-table-column
-        label="报修日期"
+        label="保修日期"
         align="center"
         prop="requireDate"
         :formatter="dateFormatter"
@@ -26,14 +25,14 @@
         :formatter="dateFormatter"
         width="180"
       />
-      <el-table-column label="维修人" align="center" prop="acceptedUserNickname" width="100" />
-      <el-table-column label="验收人" align="center" prop="confirmUserNickname" width="100" />
+      <el-table-column label="维修人员" align="center" prop="acceptedUserNickname" width="100" />
+      <el-table-column label="验收人员" align="center" prop="confirmUserNickname" width="100" />
       <el-table-column label="维修结果" align="center" prop="result" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_DV_REPAIR_RESULT" :value="scope.row.result" />
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status" width="100">
+      <el-table-column label="单据状态" align="center" prop="status" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_DV_REPAIR_STATUS" :value="scope.row.status" />
         </template>