From 3bf08732bd9fbe8b05d66432d14f332f7f1ddb24 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Tue, 28 May 2024 10:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=BB=A3=E7=A0=81=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/DetailLedger.vue    | 144 ++++++++++++----
 src/utils/dict.ts                             |   7 +-
 src/views/eam/equipmentAccounts/index.vue     |  72 +++++++-
 .../equipmentInspectionRecordDetail.data.ts   |  98 ++---------
 .../equipmentInspectionRecordMain.data.ts     | 120 +++-----------
 .../equipmentMaintenanceRecordDetail.data.ts  |  96 ++---------
 .../equipmentMaintenanceRecordMain.data.ts    | 122 +++-----------
 .../equipmentRepairRecordDetail.data.ts       |  86 +---------
 .../equipmentRepairRecordMain.data.ts         | 156 +++++-------------
 .../equipmentReportRepairRequest.data.ts      | 114 +++----------
 .../equipmentSpotCheckRecordMain.data.ts      | 126 +++-----------
 11 files changed, 361 insertions(+), 780 deletions(-)

diff --git a/src/components/Detail/src/DetailLedger.vue b/src/components/Detail/src/DetailLedger.vue
index 5633f4bdb..887778ba4 100644
--- a/src/components/Detail/src/DetailLedger.vue
+++ b/src/components/Detail/src/DetailLedger.vue
@@ -55,12 +55,6 @@
             v-model:currentPage="tableObjectRef.currentPage"
             v-model:sort="tableObjectRef.sort"
           >
-            <!-- <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template> -->
           </Table>
           <Table
             v-if="!isBasic && fromeWhere != 'countPlan'"
@@ -97,7 +91,56 @@
             </template>
           </DetailTable>
         </ContentWrap>
-       
+       <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
+         <el-tabs class="demo-tabs" v-model="fileParmas.fileBusiType" @tab-change="handleTabsChange">
+            <el-tab-pane
+              v-for="item in subTabsList"
+              :key="item.value"
+              :label="item.label"
+              :name="item.value"
+            />
+              <!-- 附件组件 -->
+              <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+                <AnnexLedger
+                    :annexData="annexData"
+                    :showDownload = "annexAlias.showDownload"
+                    :hiddenDelete = "annexAlias.hiddenDelete"
+                    @handleAnnexSuccess="handleAnnexSuccess"
+                    @deleteAnnexSuccess="deleteAnnexSuccess"
+                    :upData="remarksData.data" 
+                    :key="count"
+                    @saveEdit="saveEdit"
+                  />
+              </ElScrollbar>
+          </el-tabs>
+        </ContentWrap>
+        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='操作记录'" :style="{height:remarkHeight+'px'}">
+         <el-tabs class="demo-tabs" v-model="operationRecordType" @tab-change="handleOperationTabsChange">
+            <el-tab-pane
+              v-for="item in operationRecordList"
+              :key="item.value"
+              :label="item.label"
+              :name="item.value"
+            />
+              <!-- 附件组件 -->
+              <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+                <Table
+                  :columns="detailAllSchemasRef?.tableColumns?.filter(column => column.field !== 'action')"
+                  :data="tableObjectRef.tableList"
+                  :loading="tableObjectRef.loading"
+                  :pagination="{ total: tableObjectRef.total }"
+                  v-model:pageSize="tableObjectRef.pageSize"
+                  v-model:currentPage="tableObjectRef.currentPage"
+                >
+                  <template #number="{ row }">
+                    <el-button type="primary" link @click="openDialog(row, '编号', row.number)">
+                      <span>{{ row.number }}</span>
+                    </el-button>
+                  </template>
+                </Table>
+              </ElScrollbar>
+          </el-tabs>
+        </ContentWrap>
         <!-- 附件/备注/变更记录 -->
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
          <el-tabs class="demo-tabs" v-model="fileParmas.fileBusiType" @tab-change="handleTabsChange">
@@ -144,25 +187,7 @@
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='拓展属性'" :style="{height:remarkHeight+'px'}">
           <!-- 拓展属性 -->
           <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <!-- <el-form :model="form" :rules="rules" ref="expandPropsFormRef">
-              <el-row v-for="(field, index) in fields" :key="index" :gutter="20">
-                <el-col :span="8">
-                  <el-form-item :label="field.code.label" :prop="field.code.prop">
-                    <el-input v-model="form[field.code.prop]" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item :label="field.value.label" :prop="field.value.prop">
-                    <el-input v-model="form[field.value.prop]" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="2">
-                  <el-button type="danger" icon="el-icon-delete" @click="removeFields(index)">删除</el-button>
-                </el-col>
-              </el-row>
-              <el-button type="primary" @click="submitExpandPropsForm">提交</el-button>
-              <el-button @click="addFields">添加字段</el-button>
-            </el-form> -->
+            
             <AutoIncrementField :initialData="initialData" :codeLabelPrefix="codeLabelPrefix" :valueLabelPrefix="valueLabelPrefix" @submit="submitExpandPropsForm"/>
           </ElScrollbar> 
         </ContentWrap>
@@ -390,6 +415,21 @@ const props = defineProps({
     required: false,
     default: ''
   },
+  operationRecordList: {
+    type: Array,
+    required: false,
+    default: () => []
+  },
+  dialogApiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  dialogAllSchemas: {
+    type: Object,
+    required: false,
+    default: null
+  },
   // 附件 备注 变更记录 别名
 })
 const isShowDrawer = ref(false)
@@ -400,6 +440,8 @@ const fileParmas = ref({
   funcCode: props.funcCode,
   fileBusiType: ''
 })
+const operationRecordType = ref()
+const operationRecordList = ref(props.operationRecordList)
 if (props.isBasic == true) {
   if (tabsList.value && tabsList.value.length > 0) {
     tabsList.value.unshift({
@@ -585,6 +627,10 @@ const change = (item, index) => {
   }
   if(item.prop == 'ExpandProps'){
     getExtendedPropsList()   
+  }else if(item.prop == 'OperationRecord'){
+    if(props.operationRecordList){
+      operationRecordType.value = props.operationRecordList[0]?.value
+    }
   }
 }
 
@@ -738,7 +784,6 @@ const detailAllSchemasRef = ref()
 const { tableObject, tableMethods } = useTable({
   getListApi: props.apiPage // 分页接口
 })
-
 tableObjectRef.value = tableObject
 tableMethodsRef.value = tableMethods
 detailAllSchemasRef.value = props.detailAllSchemas
@@ -919,7 +964,8 @@ const emit = defineEmits([
   'onBlur',
   'detailBasicFormOnChange',
   'formFormDateChange',
-  'buttonBaseClick'
+  'buttonBaseClick',
+  'handleOperationTabsChange'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -1061,6 +1107,47 @@ const getExtendedPropsList = async () => {
   });
 }
 
+const handleOperationTabsChange = async (val) => {
+  emit("handleOperationTabsChange",val)
+}
+
+
+const dialogVisible = ref(false)
+const dialogTitle = ref()
+const dialogAllSchemasRef = ref()
+const dialogTableObjectRef = ref()
+const dialogTableMethodsRef = ref()
+const dialogUploadTitle = ref('文件上传')
+const dialogUploadVisible = ref(false)
+const dialogUploadNumber = ref()
+const dialogUploadBusiCode = ref()
+const dialogFormKey = ref(0)
+const openDialog = async(row: any, titleName: any, titleValue: any) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.dialogApiPage, // 分页接口
+    defaultParams: getDialogParams(row)
+  })
+  dialogVisible.value = true
+  dialogTitle.value = getDialogName()
+  dialogAllSchemasRef.value = props.dialogAllSchemas
+  dialogTableObjectRef.value = tableObject
+  dialogTableMethodsRef.value = tableMethods
+  dialogTableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+}
+
+function getDialogParams(row: any) {
+  return {
+    number: row.number
+  }
+}
+
+function getDialogName(){
+  // return operationRecordList.value.find(element=>element.value == operationRecordType)?.value
+}
+
 
 //监视属性
 watch(
@@ -1082,6 +1169,7 @@ watch(
     getList()
   }
 )
+
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 320790719..ee6af062d 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -348,5 +348,10 @@ export enum DICT_TYPE {
   SUBJECT = 'subject', //科目
   REGION = 'region', //区域
   PART_CLASS = 'part_class', //备件分类
-  MAINTENANCE_CYCLE ='maintenance_cycle' // 保养周期
+  MAINTENANCE_CYCLE = 'maintenance_cycle', // 保养周期
+  FAILURE_DEGREE = 'failure_degree', // 紧急程度
+  FAILURE_REASON = 'failure_reason', //故障类型
+  REPAIR_DEGREE = 'repair_degree', //
+  REPAIR_LEVEL = 'repair_level', //维修级别
+  IS_COMPLETED = 'is_completed', //是否完成
 }
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index 1de616619..3cea5f4bd 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -51,7 +51,19 @@
   />
 
   <!-- 详情 -->
-  <DetailLedger ref="detailRef" :isBasic="true" :allSchemas="EquipmentAccounts.allSchemas" :subTabs="subTabList" funcCode="device_mould_picture"/>
+  <DetailLedger 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="EquipmentAccounts.allSchemas" 
+    :subTabs="subTabList" 
+    :operationRecordList="operationRecordList" 
+    @handleOperationTabsChange="handleOperationTabsChange" 
+    :detailAllSchemas="detailAllSchemas"
+    :apiPage="apiPage"
+    :dialogApiPage="dialogApiPage"
+    :dialogAllSchemas="dialogAllSchemas"
+    funcCode="device_mould_picture"
+    />
   <!-- 主要部件 -->
   <SearchTable ref="searchTableRef" @searchTableSuccess="submitEquipmentMainPartRelation" />
   <!-- 备件 -->
@@ -76,6 +88,25 @@ import { SparePart,SparePartRules } from '../sparePart/sparePart.data'
 import * as SparePartApi from '@/api/eam/sparePart'
 import { EquipmentToolSparePart,EquipmentToolSparePartRules } from '../equipmentToolSparePart/equipmentToolSparePart.data'
 import * as EquipmentToolSparePartApi from '@/api/eam/equipmentToolSparePart'
+import { EquipmentReportRepairRequest,EquipmentReportRepairRequestRules } from '../equipmentReportRepairRequest/equipmentReportRepairRequest.data'
+import * as EquipmentReportRepairRequestApi from '@/api/eam/equipmentReportRepairRequest'
+import { EquipmentSpotCheckRecordMain,EquipmentSpotCheckRecordMainRules } from '../equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data'
+import * as EquipmentSpotCheckRecordMainApi from '@/api/eam/equipmentSpotCheckRecordMain'
+import { EquipmentSpotCheckRecordDetail,EquipmentSpotCheckRecordDetailRules } from '../equipmentSpotCheckRecordDetail/equipmentSpotCheckRecordDetail.data'
+import * as EquipmentSpotCheckRecordDetailApi from '@/api/eam/equipmentSpotCheckRecordDetail'
+import { EquipmentInspectionRecordMain,EquipmentInspectionRecordMainRules } from '../equipmentInspectionRecordMain/equipmentInspectionRecordMain.data'
+import * as EquipmentInspectionRecordMainApi from '@/api/eam/equipmentInspectionRecordMain'
+import { EquipmentInspectionRecordDetail,EquipmentInspectionRecordDetailRules } from '../equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data'
+import * as EquipmentInspectionRecordDetailApi from '@/api/eam/equipmentInspectionRecordDetail'
+import { EquipmentRepairRecordMain,EquipmentRepairRecordMainRules } from '../equipmentRepairRecordMain/equipmentRepairRecordMain.data'
+import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
+import { EquipmentRepairRecordDetail,EquipmentRepairRecordDetailRules } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
+import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } from '../equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data'
+import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
+import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
+
 
 defineOptions({ name: 'EquipmentAccounts' })
 
@@ -89,6 +120,10 @@ routeName.value = route.name
 const tableColumns = ref(EquipmentAccounts.allSchemas.tableColumns)
 const tabs = ref<{ label: string; prop: string; }[]>([])
 const subTabList = ref([]);
+const detailAllSchemas = ref()
+const apiPage = ref()
+const dialogApiPage = ref()
+const dialogAllSchemas = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -98,6 +133,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   })
 }
 
+const operationRecordList = ref([
+  {label:'报修记录',value:'report'},
+  {label:'维修记录',value:'repair'},
+  {label:'保养记录',value:'maintenance'},
+  {label:'巡检记录',value:'inspection'},
+  {label:'点检记录',value:'spot_check'},
+
+])
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -342,6 +386,32 @@ const submitEquipmentMainPartRelation = (formField, searchField, val, formRef, r
     getList()
   })
 }
+const handleOperationTabsChange = (val) => {
+  if(val == 'report'){
+    apiPage.value = EquipmentReportRepairRequestApi.getEquipmentReportRepairRequestPage
+    detailAllSchemas.value = EquipmentReportRepairRequest.allSchemas
+  }else if(val == 'repair'){
+    apiPage.value = EquipmentRepairRecordMainApi.getEquipmentRepairRecordMainPage
+    detailAllSchemas.value = EquipmentRepairRecordMain.allSchemas
+    dialogApiPage.value = EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage
+    dialogAllSchemas.value = EquipmentRepairRecordDetail.allSchemas
+  }else if(val == 'maintenance'){
+    apiPage.value = EquipmentMaintenanceRecordMainApi.getEquipmentMaintenanceRecordMainPage
+    detailAllSchemas.value = EquipmentMaintenanceRecordMain.allSchemas
+    dialogApiPage.value = EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage
+    dialogAllSchemas.value = EquipmentMaintenanceRecordDetail.allSchemas
+  }else if(val == 'inspection'){
+    apiPage.value = EquipmentInspectionRecordMainApi.getEquipmentInspectionRecordMainPage
+    detailAllSchemas.value = EquipmentInspectionRecordMain.allSchemas
+    dialogApiPage.value = EquipmentInspectionRecordDetailApi.getEquipmentInspectionRecordDetailPage
+    dialogAllSchemas.value = EquipmentInspectionRecordDetail.allSchemas
+  }else if(val == 'spot_check'){
+    apiPage.value = EquipmentSpotCheckRecordMainApi.getEquipmentSpotCheckRecordMainPage
+    detailAllSchemas.value = EquipmentSpotCheckRecordMain.allSchemas
+    dialogApiPage.value = EquipmentSpotCheckRecordDetailApi.getEquipmentSpotCheckRecordDetailPage
+    dialogAllSchemas.value = EquipmentSpotCheckRecordDetail.allSchemas
+  }
+}
 
 const submitSparePartRelation = (formField, searchField, val, formRef, rowRef) => { 
   const equipmentToolSparePartRelList = val.map((element) => ({
diff --git a/src/views/eam/equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data.ts b/src/views/eam/equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data.ts
index e13466eed..d4d0eef77 100644
--- a/src/views/eam/equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data.ts
+++ b/src/views/eam/equipmentInspectionRecordDetail/equipmentInspectionRecordDetail.data.ts
@@ -10,12 +10,6 @@ export const EquipmentInspectionRecordDetailRules = reactive({
 })
 
 export const EquipmentInspectionRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
   {
     label: '巡检工单号',
     field: 'number',
@@ -64,21 +58,21 @@ export const EquipmentInspectionRecordDetail = useCrudSchemas(reactive<CrudSchem
     label: '结果枚举',
     field: 'result',
     sort: 'custom',
-      dictType: DICT_TYPE.IS_COMPLETED,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.IS_COMPLETED,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
-    label: '名称来源于巡检项',
+    label: '名称',
     field: 'name',
     sort: 'custom',
     isSearch: true
   },
   {
-    label: '巡检内容来源于巡检项',
+    label: '巡检内容',
     field: 'content',
     sort: 'custom',
     isSearch: true,
@@ -90,94 +84,28 @@ export const EquipmentInspectionRecordDetail = useCrudSchemas(reactive<CrudSchem
       }
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
index dbbd54905..ab704d54f 100644
--- a/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
+++ b/src/views/eam/equipmentInspectionRecordMain/equipmentInspectionRecordMain.data.ts
@@ -15,13 +15,7 @@ export const EquipmentInspectionRecordMainRules = reactive({
 
 export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
-  {
-    label: '巡检工单编号唯一标识',
+    label: '巡检工单编号',
     field: 'number',
     sort: 'custom',
     isSearch: true
@@ -39,22 +33,22 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     isSearch: true
   },
   {
-    label: '类型设备或工装',
+    label: '类型',
     field: 'type',
     sort: 'custom',
-      dictType: DICT_TYPE.DEVICE_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '是否拍照',
     field: 'isPictures',
     sort: 'custom',
-      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
     form: {
       component: 'Radio'
@@ -158,12 +152,12 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     label: '班组',
     field: 'classType',
     sort: 'custom',
-      dictType: DICT_TYPE.BASIC_TEAM_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.BASIC_TEAM_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '验证人',
@@ -265,7 +259,7 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     }
   },
   {
-    label: '流程状态枚举0：待派工1：已逾期2：已退单3：待接单4：待执行5：执行中6：待验证7：已完成8：已作废',
+    label: '流程状态',
     field: 'status',
     sort: 'custom',
       dictType: DICT_TYPE.JOB_STATUS,
@@ -310,9 +304,9 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     field: 'faultType',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '所属厂区编号',
@@ -332,94 +326,28 @@ export const EquipmentInspectionRecordMain = useCrudSchemas(reactive<CrudSchema[
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data.ts b/src/views/eam/equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data.ts
index f648e00bc..ba6b45f63 100644
--- a/src/views/eam/equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data.ts
+++ b/src/views/eam/equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data.ts
@@ -11,12 +11,6 @@ export const EquipmentMaintenanceRecordDetailRules = reactive({
 })
 
 export const EquipmentMaintenanceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
   {
     label: '保养工单号',
     field: 'number',
@@ -101,12 +95,12 @@ export const EquipmentMaintenanceRecordDetail = useCrudSchemas(reactive<CrudSche
     label: '结果枚举',
     field: 'result',
     sort: 'custom',
-      dictType: DICT_TYPE.IS_COMPLETED,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.IS_COMPLETED,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '保养名称',
@@ -133,28 +127,6 @@ export const EquipmentMaintenanceRecordDetail = useCrudSchemas(reactive<CrudSche
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
@@ -162,65 +134,21 @@ export const EquipmentMaintenanceRecordDetail = useCrudSchemas(reactive<CrudSche
     isSearch: true
   },
   {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用默认TRUE',
+    label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
index 639b44cba..c1e9f3d37 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
@@ -13,13 +13,7 @@ export const EquipmentMaintenanceRecordMainRules = reactive({
 
 export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
-  {
-    label: '保养工单编号唯一标识',
+    label: '保养编号',
     field: 'number',
     sort: 'custom',
     isSearch: true
@@ -40,26 +34,26 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     label: '设备类别',
     field: 'category',
     sort: 'custom',
-      dictType: DICT_TYPE.DEVICE_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '班次枚举',
     field: 'classes',
     sort: 'custom',
-      dictType: DICT_TYPE.SHIFT_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.SHIFT_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
-    label: '保养计划工单号',
+    label: '保养计划工单',
     field: 'planNumber',
     sort: 'custom',
     isSearch: true
@@ -68,12 +62,12 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     label: '故障类型枚举',
     field: 'faultType',
     sort: 'custom',
-      dictType: DICT_TYPE.FAILURE_REASON,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '保养周期',
@@ -128,7 +122,7 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     isSearch: true
   },
   {
-    label: '结果枚举临时措施、完成',
+    label: '结果枚举',
     field: 'completeResult',
     sort: 'custom',
     isSearch: true
@@ -190,28 +184,6 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
@@ -219,65 +191,21 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     isSearch: true
   },
   {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用默认TRUE',
+    label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentRepairRecordDetail/equipmentRepairRecordDetail.data.ts b/src/views/eam/equipmentRepairRecordDetail/equipmentRepairRecordDetail.data.ts
index 389383011..bff6d68f5 100644
--- a/src/views/eam/equipmentRepairRecordDetail/equipmentRepairRecordDetail.data.ts
+++ b/src/views/eam/equipmentRepairRecordDetail/equipmentRepairRecordDetail.data.ts
@@ -8,12 +8,6 @@ export const EquipmentRepairRecordDetailRules = reactive({
 })
 
 export const EquipmentRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
   {
     label: '维修工单号',
     field: 'number',
@@ -54,28 +48,6 @@ export const EquipmentRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
@@ -83,65 +55,21 @@ export const EquipmentRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isSearch: true
   },
   {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用默认TRUE',
+    label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
index 17294d58a..145876a38 100644
--- a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
+++ b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
@@ -15,12 +15,6 @@ export const EquipmentRepairRecordMainRules = reactive({
 })
 
 export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
   {
     label: '维修编号',
     field: 'number',
@@ -28,15 +22,15 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '设备或工装字典',
+    label: '类型',
     field: 'type',
     sort: 'custom',
-      dictType: DICT_TYPE.DEVICE_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '报修工单申请号',
@@ -45,7 +39,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '来源字典0：报修工单1：临时工单',
+    label: '来源字典',
     field: 'sources',
     sort: 'custom',
       dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
@@ -59,26 +53,26 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '紧急程度字典0：紧急故障1：重要故障2：一般故障',
+    label: '紧急程度',
     field: 'urgency',
     sort: 'custom',
-      dictType: DICT_TYPE.REPAIR_DEGREE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.REPAIR_DEGREE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
-    label: '维修级别0：大修1：中修2：小修',
+    label: '维修级别',
     field: 'level',
     sort: 'custom',
-      dictType: DICT_TYPE.REPAIR_LEVEL,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.REPAIR_LEVEL,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '设备编号',
@@ -87,18 +81,18 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '是否停机1不停机0停机',
+    label: '是否停机',
     field: 'shutDown',
     sort: 'custom',
-      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
     form: {
       component: 'Radio'
     }
   },
   {
-    label: '维修开始时间手输',
+    label: '维修开始时间',
     field: 'startTime',
     sort: 'custom',
     formatter: dateFormatter,
@@ -120,7 +114,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '维修结束时间手输',
+    label: '维修结束时间',
     field: 'endTime',
     sort: 'custom',
     formatter: dateFormatter,
@@ -142,7 +136,7 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '维修时间自动计算分钟',
+    label: '维修时间',
     field: 'totalMinutes',
     sort: 'custom',
     isSearch: true
@@ -209,15 +203,15 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '结果枚举临时措施、完成',
+    label: '结果枚举',
     field: 'completeResult',
     sort: 'custom',
-      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '完成时间',
@@ -296,18 +290,18 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '故障类型关联基础数据',
+    label: '故障类型',
     field: 'faultType',
     sort: 'custom',
-      dictType: DICT_TYPE.FAILURE_REASON,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
-    label: '流程状态枚举0：待派工1：已逾期2：已退单3：待接单4：待执行5：执行中6：待验证7：已完成8：已作废',
+    label: '流程状态',
     field: 'status',
     sort: 'custom',
     isSearch: true,
@@ -344,9 +338,9 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'classType',
     sort: 'custom',
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '所属厂区编号',
@@ -366,28 +360,6 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门id',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
@@ -395,57 +367,13 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用默认TRUE',
+    label: '是否可用',
     field: 'available',
     sort: 'custom',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true
   },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    }
-  },
-  {
-    label: '删除人id',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
index b7bd02756..4c24acd0d 100644
--- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
+++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
@@ -14,27 +14,21 @@ export const EquipmentReportRepairRequestRules = reactive({
 
 export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
-  {
-    label: '编号唯一标识',
+    label: '报修编号',
     field: 'number',
     sort: 'custom',
     isSearch: true
   },
   {
-    label: '设备或工装字典',
+    label: '类型',
     field: 'type',
     sort: 'custom',
-      dictType: DICT_TYPE.DEVICE_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '设备或工装编号',
@@ -43,23 +37,23 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     isSearch: true
   },
   {
-    label: '紧急程度字典0：紧急故障1：重要故障2：一般故障',
+    label: '紧急程度',
     field: 'urgency',
     sort: 'custom',
-      dictType: DICT_TYPE.FAILURE_DEGREE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.FAILURE_DEGREE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true
   },
   {
     label: '故障类型枚举',
     field: 'faultType',
     sort: 'custom',
-      dictType: DICT_TYPE.FAILURE_REASON,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '故障描述',
@@ -68,18 +62,18 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     isSearch: true
   },
   {
-    label: '是否停机1不停机0停机',
+    label: '是否停机',
     field: 'shutDown',
     sort: 'custom',
-      dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
     form: {
       component: 'Radio'
     }
   },
   {
-    label: '报修图片最多三张',
+    label: '报修图片',
     field: 'images',
     sort: 'custom',
     isSearch: true
@@ -119,7 +113,7 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     isSearch: true
   },
   {
-    label: '报修状态0：待审核1：已撤回2：审核中3：已通过4：已驳回5：已创建6：已确认',
+    label: '报修状态',
     field: 'status',
     sort: 'custom',
     isSearch: true,
@@ -190,28 +184,6 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
@@ -219,57 +191,13 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     isSearch: true
   },
   {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '是否可用默认TRUE',
+    label: '是否可用',
     field: 'available',
     sort: 'custom',
       dictType: DICT_TYPE.TRUE_FALSE,
       dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true
   },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    }
-  },
-  {
-    label: '删除人id',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
index ce50ab39f..34da864f1 100644
--- a/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
+++ b/src/views/eam/equipmentSpotCheckRecordMain/equipmentSpotCheckRecordMain.data.ts
@@ -14,12 +14,6 @@ export const EquipmentSpotCheckRecordMainRules = reactive({
 })
 
 export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isForm: false
-  },
   {
     label: '点检编号',
     field: 'number',
@@ -42,12 +36,12 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     label: '类型设备或工装',
     field: 'type',
     sort: 'custom',
-      dictType: DICT_TYPE.DEVICE_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '计划工单号',
@@ -147,12 +141,12 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     label: '故障类型枚举',
     field: 'faultType',
     sort: 'custom',
-      dictType: DICT_TYPE.FAILURE_REASON,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '验证人',
@@ -265,11 +259,11 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '流程状态枚举0：待派工1：已逾期2：已退单3：待接单4：待执行5：执行中6：待验证7：已完成8：已作废',
+    label: '流程状态',
     field: 'status',
     sort: 'custom',
-      dictType: DICT_TYPE.JOB_STATUS,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
     form: {
       component: 'Radio'
@@ -303,12 +297,12 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     label: '班组类型',
     field: 'classType',
     sort: 'custom',
-      dictType: DICT_TYPE.BASIC_TEAM_TYPE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.BASIC_TEAM_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'SelectV2'
-                }
+    form: {
+      component: 'SelectV2'
+    }
   },
   {
     label: '所属厂区编号',
@@ -322,100 +316,28 @@ export const EquipmentSpotCheckRecordMain = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '工段编号',
-    field: 'workshopSectionCode',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false
-  },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
     isSearch: true
   },
-  {
-    label: '地点',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true
-  },
   {
     label: '是否可用',
     field: 'available',
     sort: 'custom',
-      dictType: DICT_TYPE.TRUE_FALSE,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-                form: {
-                  component: 'Switch',
-                  value: 'TRUE',
-                  componentProps: {
-                    inactiveValue: 'FALSE',
-                    activeValue: 'TRUE'
-                  }
-                }
-  },
-  {
-    label: '删除时间',
-    field: 'deletionTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: 'TRUE',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '删除人',
-    field: 'deleterId',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
   {
     label: '操作',
     field: 'action',