From 28f8106c4765a958b1ebbab8f2d12e62989e4fd7 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 14 Jul 2025 16:02:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(dms):=20=E4=BC=98=E5=8C=96=20DMS?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E5=A4=9A=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整表格列的显示顺序和可见性
- 修改部分字段的标签名称
- 移除不必要的功能按钮
- 优化表单布局和字段验证
---
 src/views/dms/dmsBaseMaintStation/index.vue   |   6 +-
 src/views/dms/dmsBillsFaultInstance/index.vue | 108 +++++++++---------
 .../dms/dmsBillsInspectInstance/index.vue     |  16 +--
 src/views/dms/dmsBillsMaintInstance/index.vue |  42 +++----
 src/views/dms/dmsPlanInspect/index.vue        |  24 ++--
 src/views/dms/dmsPlanMaint/index.vue          |  68 +++++------
 6 files changed, 134 insertions(+), 130 deletions(-)

diff --git a/src/views/dms/dmsBaseMaintStation/index.vue b/src/views/dms/dmsBaseMaintStation/index.vue
index 24cc275..fddb189 100644
--- a/src/views/dms/dmsBaseMaintStation/index.vue
+++ b/src/views/dms/dmsBaseMaintStation/index.vue
@@ -56,7 +56,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键标识" align="center" prop="maintStationId" v-if="columns[0].visible"/>
         <el-table-column label="设备类型" align="center" prop="deviceTypeName" v-if="columns[2].visible"/>
-        <el-table-column label="保养标准" align="center" prop="maintStandardCode" v-if="columns[3].visible"/>
+        <el-table-column label="保养标准编号" align="center" prop="maintStandardCode" v-if="columns[3].visible"/>
         <el-table-column label="部位编号" align="center" prop="maintStationCode" v-if="columns[4].visible"/>
         <el-table-column label="部位名称" align="center" prop="maintStationName" v-if="columns[5].visible"/>
         <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[6].visible">
@@ -178,7 +178,7 @@ const columns = ref<FieldOption[]>([
         { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `租户编号`, visible: false },
         { key: 2, label: `设备类型`, visible: true },
-        { key: 3, label: `保养标准ID`, visible: true },
+        { key: 3, label: `保养标准编号`, visible: true },
         { key: 4, label: `部位编号`, visible: true },
         { key: 5, label: `部位名称`, visible: true },
         { key: 6, label: `激活标识`, visible: true },
@@ -198,6 +198,7 @@ const initFormData: DmsBaseMaintStationForm = {
   maintStationName: undefined,
   activeFlag: '1',
   remark: undefined,
+  maintStandardCode: undefined,
   maintProjectIds: []
 }
 const data = reactive<PageData<DmsBaseMaintStationForm, DmsBaseMaintStationQuery>>({
@@ -211,6 +212,7 @@ const data = reactive<PageData<DmsBaseMaintStationForm, DmsBaseMaintStationQuery
     maintStationCode: undefined,
     maintStationName: undefined,
     activeFlag: undefined,
+    maintStandardCode: undefined,
     params: {
     }
   },
diff --git a/src/views/dms/dmsBillsFaultInstance/index.vue b/src/views/dms/dmsBillsFaultInstance/index.vue
index daf4190..592c245 100644
--- a/src/views/dms/dmsBillsFaultInstance/index.vue
+++ b/src/views/dms/dmsBillsFaultInstance/index.vue
@@ -96,12 +96,12 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsFaultInstance:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsFaultInstance:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsFaultInstance:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsFaultInstance:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsFaultInstance:remove']">删除</el-button>
           </el-col>
@@ -115,63 +115,63 @@
       <el-table v-loading="loading" :data="dmsBillsFaultInstanceList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键标识" align="center" prop="repairInstanceId" v-if="columns[0].visible"/>
-        <el-table-column label="工单编号" align="center" prop="billsFaultCode" v-if="columns[2].visible"/>
-        <el-table-column label="工单类型" align="center" prop="instanceType" v-if="columns[3].visible">
+        <el-table-column label="工单编号" align="center" prop="billsFaultCode" v-if="columns[1].visible"/>
+        <el-table-column label="工单类型" align="center" prop="instanceType" v-if="columns[2].visible">
           <template #default="scope">
             <dict-tag :options="instance_type" :value="scope.row.instanceType"/>
           </template>
         </el-table-column>
-        <el-table-column label="报修来源类型" align="center" prop="faultSourceType" v-if="columns[4].visible">
+        <!-- <el-table-column label="报修来源类型" align="center" prop="faultSourceType" v-if="columns[3].visible">
           <template #default="scope">
             <dict-tag :options="fault_source_type" :value="scope.row.faultSourceType"/>
           </template>
-        </el-table-column>
-        <el-table-column label="报修来源ID" align="center" prop="faultSourceId" v-if="columns[5].visible"/>
-        <el-table-column label="流程定义" align="center" prop="wfDefinitionId" v-if="columns[6].visible"/>
-        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[7].visible"/>
-        <el-table-column label="申请人" align="center" prop="applyUser" v-if="columns[8].visible"/>
-        <el-table-column label="申请时间" align="center" prop="applyTime" width="180" v-if="columns[9].visible">
+        </el-table-column> -->
+<!--        <el-table-column label="报修来源ID" align="center" prop="faultSourceId" v-if="columns[5].visible"/>-->
+        <el-table-column label="流程定义" align="center" prop="wfDefinitionId" v-if="columns[3].visible"/>
+        <el-table-column label="设备" align="center" prop="machineName" v-if="columns[4].visible"/>
+        <el-table-column label="申请人" align="center" prop="applyUser" v-if="columns[5].visible"/>
+        <el-table-column label="申请时间" align="center" prop="applyTime" width="180" v-if="columns[6].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[10].visible">
+        <el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[7].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180" v-if="columns[11].visible">
+        <el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180" v-if="columns[8].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="要求完成时间" align="center" prop="requireEndTime" width="180" v-if="columns[12].visible">
+        <el-table-column label="要求完成时间" align="center" prop="requireEndTime" width="180" v-if="columns[9].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.requireEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="工单状态" align="center" prop="billsStatus" v-if="columns[13].visible">
+        <el-table-column label="工单状态" align="center" prop="billsStatus" v-if="columns[10].visible">
           <template #default="scope">
             <dict-tag :options="bills_status" :value="scope.row.billsStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[14].visible">
+        <el-table-column label="审批状态" align="center" prop="approveStatus" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="dms_approve_status" :value="scope.row.approveStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="确认状态" align="center" prop="repairConfirm" v-if="columns[15].visible">
+        <el-table-column label="确认状态" align="center" prop="repairConfirm" v-if="columns[12].visible">
           <template #default="scope">
             <dict-tag :options="repair_confirm" :value="scope.row.repairConfirm"/>
           </template>
         </el-table-column>
-        <el-table-column label="确认人" align="center" prop="confirmUser" v-if="columns[16].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[17].visible">
+        <el-table-column label="确认人" align="center" prop="confirmUser" v-if="columns[13].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[14].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[18].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[15].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <!-- 启动工单按钮 -->
@@ -181,15 +181,15 @@
             </el-tooltip>
 
             <!-- 处理工单按钮：根据工单状态跳转到相应的处理页面 -->
-            <el-tooltip content="处理工单" placement="top" v-if="needProcessButton(scope.row)">
+            <!-- <el-tooltip content="处理工单" placement="top" v-if="needProcessButton(scope.row)">
               <el-button link type="primary" icon="Operation" @click="handleProcess(scope.row)"></el-button>
-            </el-tooltip>
+            </el-tooltip> -->
 
             <!-- 查看工单进度按钮 -->
-            <el-tooltip content="查看进度" placement="top" v-if="scope.row.wfDefinitionId">
+            <!-- <el-tooltip content="查看进度" placement="top" v-if="scope.row.wfDefinitionId">
               <el-button link type="info" icon="View" @click="handleWorkflowProgress(scope.row)"></el-button>
-            </el-tooltip>
-            
+            </el-tooltip> -->
+
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:dmsBillsFaultInstance:edit']"></el-button>
             </el-tooltip>
@@ -370,29 +370,29 @@ const dialog = reactive<DialogOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `主键标识`, visible: false },
-  { key: 1, label: `租户编号`, visible: false },
-  { key: 2, label: `工单编号`, visible: true },
-  { key: 3, label: `工单类型`, visible: true },
-  { key: 4, label: `报修来源类型`, visible: true },
-  { key: 5, label: `报修来源ID`, visible: false },
-  { key: 6, label: `流程定义`, visible: false },
-  { key: 7, label: `设备`, visible: true },
-  { key: 8, label: `申请人`, visible: true },
-  { key: 9, label: `申请时间`, visible: true },
-  { key: 10, label: `实际开始时间`, visible: true },
-  { key: 11, label: `实际完成时间`, visible: true },
-  { key: 12, label: `要求完成时间`, visible: true },
-  { key: 13, label: `工单状态`, visible: true },
-  { key: 14, label: `审批状态`, visible: true },
-  { key: 15, label: `确认状态`, visible: true },
-  { key: 16, label: `确认人`, visible: true },
-  { key: 17, label: `激活标识`, visible: true },
-  { key: 18, label: `备注`, visible: true },
-  { key: 19, label: `创建部门`, visible: false },
-  { key: 20, label: `创建人`, visible: false },
-  { key: 21, label: `创建时间`, visible: false },
-  { key: 22, label: `更新人`, visible: false },
-  { key: 23, label: `更新时间`, visible: false },
+  // { key: 1, label: `租户编号`, visible: false },
+  { key: 1, label: `工单编号`, visible: true },
+  { key: 2, label: `工单类型`, visible: true },
+  // { key: 3, label: `报修来源类型`, visible: true },
+  // { key: 5, label: `报修来源ID`, visible: false },
+  { key: 3, label: `流程定义`, visible: false },
+  { key: 4, label: `设备`, visible: true },
+  { key: 5, label: `申请人`, visible: true },
+  { key: 6, label: `申请时间`, visible: true },
+  { key: 7, label: `实际开始时间`, visible: true },
+  { key: 8, label: `实际完成时间`, visible: true },
+  { key: 9, label: `要求完成时间`, visible: false },
+  { key: 10, label: `工单状态`, visible: true },
+  { key: 11, label: `审批状态`, visible: true },
+  { key: 12, label: `确认状态`, visible: true },
+  { key: 13, label: `确认人`, visible: true },
+  { key: 14, label: `激活标识`, visible: true },
+  { key: 15, label: `备注`, visible: false },
+  // { key: 19, label: `创建部门`, visible: false },
+  // { key: 20, label: `创建人`, visible: false },
+  // { key: 21, label: `创建时间`, visible: false },
+  // { key: 22, label: `更新人`, visible: false },
+  // { key: 23, label: `更新时间`, visible: false },
 ]);
 
 const initFormData: DmsBillsFaultInstanceForm = {
@@ -696,14 +696,14 @@ const needProcessButton = (row: DmsBillsFaultInstanceVO) => {
 // 处理工单：跳转到dmsFaultInstanceActivity页面
 const handleProcess = (row: DmsBillsFaultInstanceVO) => {
   let processType = '';
-  
+
   // 判断处理类型
   if (row.approveStatus === '1') {
     processType = 'approval'; // 审批
   } else if (row.billsStatus === '2' && row.repairConfirm === '0' && row.approveStatus === '2') {
     processType = 'confirm'; // 确认
   }
-  
+
   if (processType) {
     router.push({
       path: '/dms/dmsFaultInstanceActivity',
diff --git a/src/views/dms/dmsBillsInspectInstance/index.vue b/src/views/dms/dmsBillsInspectInstance/index.vue
index 5379c09..a892648 100644
--- a/src/views/dms/dmsBillsInspectInstance/index.vue
+++ b/src/views/dms/dmsBillsInspectInstance/index.vue
@@ -73,12 +73,12 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsInspectInstance:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsInspectInstance:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsInspectInstance:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsInspectInstance:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsInspectInstance:remove']">删除</el-button>
           </el-col>
@@ -99,7 +99,7 @@
             <dict-tag :options="inspect_type" :value="scope.row.inspectType"/>
           </template>
         </el-table-column>
-        <el-table-column label="巡检线路" align="center" prop="inspectRouteId" v-if="columns[5].visible"/>
+        <el-table-column label="巡检线路" align="center" prop="routeName" v-if="columns[5].visible"/>
         <el-table-column label="巡检编号" align="center" prop="billsInspectCode" v-if="columns[6].visible"/>
         <el-table-column label="计划开始时间" align="center" prop="planBeginTime" width="180" v-if="columns[7].visible">
           <template #default="scope">
@@ -299,6 +299,7 @@ const initFormData: DmsBillsInspectInstanceForm = {
   realEndTime: undefined,
   inspectStatus: undefined,
   remark: undefined,
+  routeName: undefined,
 }
 const data = reactive<PageData<DmsBillsInspectInstanceForm, DmsBillsInspectInstanceQuery>>({
   form: {...initFormData},
@@ -316,6 +317,7 @@ const data = reactive<PageData<DmsBillsInspectInstanceForm, DmsBillsInspectInsta
     realBeginTime: undefined,
     realEndTime: undefined,
     inspectStatus: undefined,
+    routeName: undefined,
     params: {
     }
   },
diff --git a/src/views/dms/dmsBillsMaintInstance/index.vue b/src/views/dms/dmsBillsMaintInstance/index.vue
index 2f237a6..c8c5173 100644
--- a/src/views/dms/dmsBillsMaintInstance/index.vue
+++ b/src/views/dms/dmsBillsMaintInstance/index.vue
@@ -79,12 +79,12 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsMaintInstance:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsMaintInstance:edit']">修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:dmsBillsMaintInstance:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:dmsBillsMaintInstance:edit']">修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:dmsBillsMaintInstance:remove']">删除</el-button>
           </el-col>
@@ -133,8 +133,8 @@
             <dict-tag :options="maint_status" :value="scope.row.maintStatus"/>
           </template>
         </el-table-column>
-        <el-table-column label="保养完成率" align="center" prop="maintCompRate" v-if="columns[13].visible" width="100" />
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[14].visible"/>
+        <!-- <el-table-column label="保养完成率" align="center" prop="maintCompRate" v-if="columns[13].visible" width="100" /> -->
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <!-- 启动工单按钮 -->
@@ -255,11 +255,11 @@
 </template>
 
 <script setup name="DmsBillsMaintInstance" lang="ts">
-import { 
-  listDmsBillsMaintInstance, 
-  getDmsBillsMaintInstance, 
-  delDmsBillsMaintInstance, 
-  addDmsBillsMaintInstance, 
+import {
+  listDmsBillsMaintInstance,
+  getDmsBillsMaintInstance,
+  delDmsBillsMaintInstance,
+  addDmsBillsMaintInstance,
   updateDmsBillsMaintInstance,
   updateWfDefinitionIdById
 } from '@/api/dms/dmsBillsMaintInstance';
@@ -293,7 +293,7 @@ const columns = ref<FieldOption[]>([
         { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `租户编号`, visible: false },
         { key: 2, label: `保养计划`, visible: true },
-        { key: 3, label: `流程定义`, visible: true },
+        { key: 3, label: `流程定义`, visible: false },
         { key: 4, label: `保养单号`, visible: true },
         { key: 5, label: `保养组别`, visible: true },
         { key: 6, label: `保养负责人`, visible: true },
@@ -303,13 +303,13 @@ const columns = ref<FieldOption[]>([
         { key: 10, label: `计划完成时间`, visible: true },
         { key: 11, label: `实际完成时间`, visible: true },
         { key: 12, label: `保养状态`, visible: true },
-        { key: 13, label: `保养完成率`, visible: true },
-        { key: 14, label: `备注`, visible: true },
-        { key: 15, label: `创建部门`, visible: false },
-        { key: 16, label: `创建人`, visible: false },
-        { key: 17, label: `创建时间`, visible: false },
-        { key: 18, label: `更新人`, visible: false },
-        { key: 19, label: `更新时间`, visible: false },
+        // { key: 13, label: `保养完成率`, visible: true },
+        { key: 13, label: `备注`, visible: true },
+        // { key: 15, label: `创建部门`, visible: false },
+        // { key: 16, label: `创建人`, visible: false },
+        // { key: 17, label: `创建时间`, visible: false },
+        // { key: 18, label: `更新人`, visible: false },
+        // { key: 19, label: `更新时间`, visible: false },
 ]);
 
 const initFormData: DmsBillsMaintInstanceForm = {
diff --git a/src/views/dms/dmsPlanInspect/index.vue b/src/views/dms/dmsPlanInspect/index.vue
index c62e795..dd34b18 100644
--- a/src/views/dms/dmsPlanInspect/index.vue
+++ b/src/views/dms/dmsPlanInspect/index.vue
@@ -24,14 +24,14 @@
             <el-form-item label="设备总数" prop="deviceAmount">
               <el-input v-model="queryParams.deviceAmount" placeholder="请输入设备总数" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="计划巡检时间" prop="planTime">
-              <el-date-picker clearable
-                v-model="queryParams.planTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择计划巡检时间"
-              />
-            </el-form-item>
+<!--            <el-form-item label="计划巡检时间" prop="planTime">-->
+<!--              <el-date-picker clearable-->
+<!--                v-model="queryParams.planTime"-->
+<!--                type="date"-->
+<!--                value-format="YYYY-MM-DD"-->
+<!--                placeholder="请选择计划巡检时间"-->
+<!--              />-->
+<!--            </el-form-item>-->
             <!--<el-form-item label="时限(秒)" prop="timeLimit">
               <el-input v-model="queryParams.timeLimit" placeholder="请输入时限(秒)" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -102,7 +102,7 @@
         </el-table-column>
         <el-table-column label="关联sj_job主键id" align="center" prop="jobId" v-if="columns[9].visible"/>
         <el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[10].visible"/>
-        <el-table-column label="执行人员" align="center" prop="performer" v-if="columns[11].visible"/>
+        <el-table-column label="负责人员" align="center" prop="performer" v-if="columns[11].visible"/>
         <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[12].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
@@ -216,7 +216,7 @@
 <!--        <el-form-item label="循环周期" prop="cyclePeriod">
           <el-input v-model="form.cyclePeriod" placeholder="请输入循环周期" />
         </el-form-item>-->
-        <el-form-item label="执行人员" prop="performer">
+        <el-form-item label="负责人员" prop="performer">
           <el-select v-model="form.performer" placeholder="请选择执行人">
             <el-option
               v-for="item in userList"
@@ -313,7 +313,7 @@ const columns = ref<FieldOption[]>([
         { key: 8, label: `时限`, visible: true },
         { key: 9, label: `关联sj_job主键id`, visible: false },
         { key: 10, label: `循环周期`, visible: false },
-        { key: 11, label: `执行人员`, visible: true },
+        { key: 11, label: `负责人员`, visible: true },
         { key: 12, label: `激活标识`, visible: true },
         { key: 13, label: `备注`, visible: true },
         { key: 14, label: `创建部门`, visible: false },
@@ -428,7 +428,7 @@ const data = reactive<PageData<DmsPlanInspectForm, DmsPlanInspectQuery>>({
       }}
     ],
     performer: [
-      { required: true, message: "执行人员不能为空", trigger: "change" }
+      { required: true, message: "负责人员不能为空", trigger: "change" }
     ],
     hour: [
       { required: true, message: "小时不能为空", trigger: "blur" }
diff --git a/src/views/dms/dmsPlanMaint/index.vue b/src/views/dms/dmsPlanMaint/index.vue
index 26c4c76..73a3472 100644
--- a/src/views/dms/dmsPlanMaint/index.vue
+++ b/src/views/dms/dmsPlanMaint/index.vue
@@ -43,11 +43,11 @@
                 <el-option v-for="dict in maint_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item> -->
-            <el-form-item label="创建方式" prop="createMethod">
+            <!-- <el-form-item label="创建方式" prop="createMethod">
               <el-select v-model="queryParams.createMethod" placeholder="请选择创建方式" clearable >
                 <el-option v-for="dict in create_method" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="激活标识" prop="activeFlag">
               <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
                 <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -85,39 +85,39 @@
       <el-table v-loading="loading" :data="dmsPlanMaintList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="主键标识" align="center" prop="planMaintId" v-if="columns[0].visible"/>
-        <el-table-column label="计划编号" align="center" prop="planMaintCode" v-if="columns[2].visible"/>
-        <el-table-column label="保养级别" align="center" prop="maintLevel" v-if="columns[3].visible">
+        <el-table-column label="计划编号" align="center" prop="planMaintCode" v-if="columns[1].visible"/>
+        <el-table-column label="保养级别" align="center" prop="maintLevel" v-if="columns[2].visible">
           <template #default="scope">
             <dict-tag :options="maint_level" :value="scope.row.maintLevel"/>
           </template>
         </el-table-column>
-        <el-table-column label="保养组别" align="center" prop="maintGroup" v-if="columns[4].visible"/>
-        <el-table-column label="保养负责人" align="center" prop="maintSupervisor" v-if="columns[5].visible" width="100px"/>
-        <el-table-column label="本次保养时间" align="center" prop="maintTime" width="180" v-if="columns[6].visible">
+        <el-table-column label="保养组别" align="center" prop="maintGroup" v-if="columns[3].visible"/>
+        <el-table-column label="保养负责人" align="center" prop="maintSupervisor" v-if="columns[4].visible" width="100px"/>
+        <el-table-column label="本次保养时间" align="center" prop="maintTime" width="180" v-if="columns[5].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.maintTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="jobId" align="center" prop="jobId" v-if="columns[7].visible"/>
-        <el-table-column label="时限" align="center" prop="timeLimit" v-if="columns[8].visible">
+        <!-- <el-table-column label="jobId" align="center" prop="jobId" v-if="columns[7].visible"/> -->
+        <el-table-column label="时限" align="center" prop="timeLimit" v-if="columns[6].visible">
           <template #default="scope">
             <span v-if="scope.row.timeLimitDays && scope.row.timeLimitDays !== 0">{{scope.row.timeLimitDays}}天</span>
             <span v-if="scope.row.timeLimitHours && scope.row.timeLimitHours !== 0">{{scope.row.timeLimitHours}}小时</span>
           </template>
         </el-table-column>
-        <el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[9].visible"/>
-        <el-table-column label="保养状态" align="center" prop="maintStatus" v-if="columns[10].visible">
+        <!-- <el-table-column label="循环周期" align="center" prop="cyclePeriod" v-if="columns[9].visible"/> -->
+        <!-- <el-table-column label="保养状态" align="center" prop="maintStatus" v-if="columns[7].visible">
           <template #default="scope">
             <dict-tag :options="maint_status" :value="scope.row.maintStatus"/>
           </template>
-        </el-table-column>
-        <el-table-column label="创建方式" align="center" prop="createMethod" v-if="columns[11].visible">
+        </el-table-column> -->
+        <!-- <el-table-column label="创建方式" align="center" prop="createMethod" v-if="columns[11].visible">
           <template #default="scope">
             <dict-tag :options="create_method" :value="scope.row.createMethod"/>
           </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[12].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[13].visible">
+        </el-table-column> -->
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[8].visible">
           <template #default="scope">
             <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
           </template>
@@ -296,24 +296,24 @@ const dialog = reactive<DialogOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
         { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `租户编号`, visible: false },
-        { key: 2, label: `计划编号`, visible: true },
-        { key: 3, label: `保养级别`, visible: true },
-        { key: 4, label: `保养组别`, visible: true },
-        { key: 5, label: `保养负责人`, visible: true },
-        { key: 6, label: `本次保养时间`, visible: true },
-        { key: 7, label: `关联sj_job主键id`, visible: false },
-        { key: 8, label: `时限`, visible: true },
-        { key: 9, label: `循环周期`, visible: true },
-        { key: 10, label: `保养状态`, visible: true },
-        { key: 11, label: `创建方式`, visible: true },
-        { key: 12, label: `备注`, visible: true },
-        { key: 13, label: `激活标识`, visible: true },
-        { key: 14, label: `创建部门`, visible: false },
-        { key: 15, label: `创建人`, visible: false },
-        { key: 16, label: `创建时间`, visible: false },
-        { key: 17, label: `更新人`, visible: false },
-        { key: 18, label: `更新时间`, visible: false },
+        // { key: 1, label: `租户编号`, visible: false },
+        { key: 1, label: `计划编号`, visible: true },
+        { key: 2, label: `保养级别`, visible: true },
+        { key: 3, label: `保养组别`, visible: true },
+        { key: 4, label: `保养负责人`, visible: true },
+        { key: 5, label: `本次保养时间`, visible: true },
+        // { key: 7, label: `关联sj_job主键id`, visible: false },
+        { key: 6, label: `时限`, visible: true },
+        // { key: 9, label: `循环周期`, visible: false },
+        // { key: 7, label: `保养状态`, visible: true },
+        // { key: 11, label: `创建方式`, visible: false },
+        { key: 7, label: `备注`, visible: true },
+        { key: 8, label: `激活标识`, visible: true },
+        // { key: 10, label: `创建部门`, visible: false },
+        // { key: 11, label: `创建人`, visible: false },
+        // { key: 12, label: `创建时间`, visible: false },
+        // { key: 13, label: `更新人`, visible: false },
+        // { key: 14, label: `更新时间`, visible: false },
 ]);
 
 // 表单初始数据

From 85ac97fc65f45684ed60345b6ecbc00f3ac13650 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 14 Jul 2025 16:03:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?add(dms):=20DmsBillsInspectInstance?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20-=20=E5=9C=A8=20DmsBillsInspectInstance=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E6=B7=BB=E5=8A=A0=20routeName=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=20-=20=E5=9C=A8=20DmsBillsInspectInstanceForm=20?=
 =?UTF-8?q?=E5=92=8C=20DmsBillsInspectInstanceQuery=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=8F=AF=E9=80=89=E7=9A=84=20routeN?=
 =?UTF-8?q?ame=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dms/dmsBillsInspectInstance/types.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/api/dms/dmsBillsInspectInstance/types.ts b/src/api/dms/dmsBillsInspectInstance/types.ts
index 3d95540..3e31edf 100644
--- a/src/api/dms/dmsBillsInspectInstance/types.ts
+++ b/src/api/dms/dmsBillsInspectInstance/types.ts
@@ -59,8 +59,9 @@ export interface DmsBillsInspectInstanceVO {
    */
   remark: string;
 
-}
+  routeName: string;
 
+}
 export interface DmsBillsInspectInstanceForm extends BaseEntity {
   /**
    * 主键标识
@@ -127,6 +128,8 @@ export interface DmsBillsInspectInstanceForm extends BaseEntity {
    */
   status?: string;
 
+  routeName?: string;
+
 }
 
 export interface DmsBillsInspectInstanceQuery extends PageQuery {
@@ -186,6 +189,8 @@ export interface DmsBillsInspectInstanceQuery extends PageQuery {
    */
   inspectStatus?: string;
 
+  routeName?: string;
+
     /**
      * 日期范围参数
      */