diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
index 33839e0b6..a0573e9e3 100644
--- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts
@@ -99,7 +99,10 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '故障类型',
     field: 'faultType',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
@@ -151,6 +154,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -173,6 +179,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -195,7 +204,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isForm:false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -218,7 +229,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isForm:false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -369,6 +382,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '所属厂区编号',
@@ -382,6 +398,9 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
@@ -597,26 +616,38 @@ export const EquipmentMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '人数',
     field: 'peoples',
     sort: 'custom',
-    isSearch: true,
-    isForm: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '预计分钟',
     field: 'estimatedMinutes',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
+
   },
   {
     label: '实际分钟',
     field: 'actualMinutes',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '责任人多选',
     field: 'chargePeoples',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '完成时间',
diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue
index 08c0f18ec..1950e07be 100644
--- a/src/views/eam/equipmentMaintenanceMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceMain/index.vue
@@ -198,14 +198,14 @@ const isShowEditStatusButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 执行
     defaultButtons.mainListCancelBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), //作废
     defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 完成保养
     defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 验证
-    defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
-    defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
+    //defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
+    //defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMaintenanceMain:update'}),
   ]
 }
 
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
index 3541eeece..699400b36 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
+++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts
@@ -273,6 +273,14 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive<CrudSchema
     dictType: DICT_TYPE.EAM_ORDER_STATUS,
     dictClass: 'string',
   },
+  {
+    label: '保养经验',
+    field: 'isExperience',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
   // {
   //   label: '自动接单',
   //   field: 'autoOrder',
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 1495f5c68..230d20ae4 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -32,8 +32,8 @@
           <span>{{ row.recordNo }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -88,6 +88,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import {maintainExperienceBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentMaintenanceRecordMain' })
 
@@ -154,21 +155,16 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-    defaultButtons.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成维修经验
-    ]
+const butttondata = (row) => {
+  return [
+    defaultButtons.maintainExperienceBtn({ hide:isShowMainButton(row),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成保养经验
+  ]
 }
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  console.log(row.isExperience)
-  if (val.indexOf(row.isExperience) > -1) {
+// 根据经验状态返回该按钮是否显示
+const isShowMainButton = (row) => {
+  if (row.isExperience === 'FALSE') {
     return false
-  } else {
+  } else{
     return true
   }
 }
@@ -189,7 +185,7 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-//打开维修经验坦诚
+//打开维修经验弹窗
 const maintainExperienceFormRef = ref()
 const openMaintainExperience = (type: string, row?: any) => {
   maintainExperienceFormRef.value.open(type, row)
@@ -225,7 +221,6 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 }
 // 新增生成维修经验
 const maintainExperienceFormsSuccess = async (formType, data) => {
-  console.log(data)
   const data1 = {
     maintainRecordNumber: data.recordNo,
     name: data.name,
@@ -233,7 +228,6 @@ const maintainExperienceFormsSuccess = async (formType, data) => {
     masterId: data.id,
     orderType: 'MAINTAIN',
   }
-  console.log(data1)
   try {
     await MaintainExperienceApi.createMaintainExperience(data1)
     message.success(t('common.createSuccess'))
diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
index 076dc0a7b..cccee5da7 100644
--- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
+++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts
@@ -90,7 +90,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.EAM_MAINTENANCE_LEVEL,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '设备编号',
@@ -123,7 +126,10 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
@@ -407,6 +413,12 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '故障描述',
+    field: 'faultDesc',
+    sort: 'custom',
+    isSearch: false
+  },
   {
     label: '流程状态',
     field: 'status',
@@ -438,12 +450,18 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '班组类型',
     field: 'classType',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   // {
   //   label: '所属厂区编号',
@@ -456,6 +474,9 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
diff --git a/src/views/eam/equipmentRepairJobMain/finishForm2.vue b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
index 324b31d7d..dec383f38 100644
--- a/src/views/eam/equipmentRepairJobMain/finishForm2.vue
+++ b/src/views/eam/equipmentRepairJobMain/finishForm2.vue
@@ -45,11 +45,11 @@
 <!--            <el-input v-model="formData.maintenancer" placeholder="请输入执行人"/>-->
 <!--          </el-form-item>-->
 <!--        </el-col>-->
-        <el-col :span="12">
-          <el-form-item label="维修人电话" prop="maintenancePhone">
-            <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="维修人电话" prop="maintenancePhone">-->
+<!--            <el-input v-model="formData.maintenancePhone" placeholder="请输入维修人电话" />-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -101,9 +101,8 @@ const formData = ref({
   level: '',
   startTime:'',
   endTime:'',
-  maintenancePhone:'',
   completeResult:'',
-  status:'6'
+  status:'5'
 })
 const formRules = reactive({
   maintenanceDesc: [
@@ -118,9 +117,6 @@ const formRules = reactive({
   endTime: [
     { required: true, message: '结束时间不能为空', trigger: 'blur' },
   ],
-  maintenancePhone: [
-    { required: true, message: '维修人电话不能为空', trigger: 'blur' },
-  ],
   completeResult: [
     { required: true, message: '结果不能为空', trigger: 'blur' },
   ],
diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue
index 193bd4644..f8746d3d6 100644
--- a/src/views/eam/equipmentRepairJobMain/index.vue
+++ b/src/views/eam/equipmentRepairJobMain/index.vue
@@ -184,7 +184,7 @@ const isShowBaoXiuButton = (row) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return[
-    defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
+    //defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['3','4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑
     defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单
     defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行
     defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办
@@ -486,14 +486,6 @@ const getClosed2=(val)=> {
 //finishForm2 提交按钮回传
 const getData2=(val)=> {
   nextTick?.(async () => {
-    // const params = ref({
-    //   id: '',
-    //   status: '',
-    // })
-    // params.value.id = val
-    // params.value.status = '5'
-    // // 发起
-    // await EquipmentRepairJobMainApi.executeEquipmentRepairJobMain(params.value)
     message.success(t('工单已完成'))
     // 刷新列表
     await getList()
diff --git a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
index c21187fa8..31ac33e65 100644
--- a/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
+++ b/src/views/eam/equipmentRepairRecordMain/equipmentRepairRecordMain.data.ts
@@ -316,6 +316,14 @@ export const EquipmentRepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
   },
+  {
+    label: '维修经验',
+    field: 'isExperience',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+  },
   {
     label: '自动接单',
     field: 'autoOrder',
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index 811f65fea..981a8f384 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -36,8 +36,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row,$index }">
-        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event, row)" />
+      <template #action="{row}">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -103,6 +103,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import {repairExperienceBtn} from "@/utils/disposition/defaultButtons";
 
 defineOptions({ name: 'EquipmentRepairRecordMain' })
 
@@ -176,23 +177,17 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-
-const butttondata = (row,$index) => {
-  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
-  if(findIndex>-1&&findIndex<$index){
-    return []
-  }
-    return [
-    defaultButtons.repairExperienceBtn({ hide:isShowMainButton(row,['0']),hasPermi: 'eam:equipmentRepairRecordMain:repairExperience' }) // 生成维修经验
-    ]
+const butttondata = (row) => {
+  return [
+    defaultButtons.repairExperienceBtn({ hide:isShowMainButton(row),hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成维修经验
+  ]
 }
 
-// 根据状态返回该按钮是否显示
-const isShowMainButton = (row,val) => {
-  console.log(row.isExperience)
-  if (val.indexOf(row.isExperience) > -1) {
+// 根据经验状态返回该按钮是否显示
+const isShowMainButton = (row) => {
+  if (row.isExperience === 'FALSE') {
     return false
-  } else {
+  } else{
     return true
   }
 }
@@ -252,7 +247,6 @@ const openRepairExperience = (type: string, row?: any) => {
 }
 // 新增生成维修经验
 const repairExperienceFormsSuccess = async (formType, data) => {
-  console.log(data)
   const data1 = {
     repairRecordNumber: data.recordNo,
     name: data.name,
@@ -260,7 +254,6 @@ const repairExperienceFormsSuccess = async (formType, data) => {
     masterId: data.id,
     orderType: 'REPAIR',
   }
-  console.log(data1)
   try {
     await RepairExperienceApi.createRepairExperience(data1)
     message.success(t('common.createSuccess'))
diff --git a/src/views/eam/equipmentReportRepairRequest/audiForm.vue b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
index fc2b0a742..cdbeb226f 100644
--- a/src/views/eam/equipmentReportRepairRequest/audiForm.vue
+++ b/src/views/eam/equipmentReportRepairRequest/audiForm.vue
@@ -2,29 +2,24 @@
   <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
     <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
       <el-row>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="审核人" prop="approver">-->
-<!--            <el-input v-model="formData.approver" placeholder="请输入审核人" :disabled="isDisabled"/>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="审核内容" prop="approveContent">
-            <el-input v-model="formData.approveContent" placeholder="请输入审核内容" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核时间" prop="approveTime">
-            <el-date-picker
-              v-model="formData.approveTime"
-              type="datetime"
-              value-format="x"
-              placeholder="选择审核时间">
-            </el-date-picker>
+            <el-input v-model="formData.approveContent" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入审核内容" />
           </el-form-item>
         </el-col>
       </el-row>
+<!--      <el-row>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="审核时间" prop="approveTime">-->
+<!--            <el-date-picker-->
+<!--              v-model="formData.approveTime"-->
+<!--              type="datetime"-->
+<!--              value-format="x"-->
+<!--              placeholder="选择审核时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
@@ -40,7 +35,6 @@
 import { SearchTable } from '@/components/SearchTable'
 import {ElInput} from "element-plus";
 import * as EquipmentReportRepairRequestApi from "@/api/eam/equipmentReportRepairRequest";
-import {audiEquipmentReportRepairOrder} from "@/api/eam/equipmentReportRepairRequest";
 
 defineOptions({ name: 'TeamForm' })
 
@@ -50,7 +44,7 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formType = ref('') // 表单的类型：passed - 通过；noPassed - 不通过
 const tags=ref([])
 
 const inputValue = ref('')
@@ -62,22 +56,17 @@ const InputRef = ref<InstanceType<typeof ElInput>>()
 const formData = ref({
   id:'',
   number:'',
-  //approver: '',
   approveContent: '',
-  approveTime: '',
+  status:'',
 })
 const formRules = reactive({
-  // approver: [
-  //   { required: true, message: '审核人不能为空', trigger: 'blur' },
-  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  // ],
   approveContent: [
     { required: true, message: '审核内容不能为空', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  approveTime: [
-    { required: true, message: '审核时间不能为空', trigger: 'blur' },
-  ],
+  // approveTime: [
+  //   { required: true, message: '审核时间不能为空', trigger: 'blur' },
+  // ],
 })
 const basicFormRef = ref() // 表单 Ref
 
@@ -85,7 +74,7 @@ const basicFormRef = ref() // 表单 Ref
 /** 初始化弹窗 */
 const open = async (type: string, row?: object) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  dialogTitle.value = t('编辑')
   formType.value = type
   //初始化数据
   formData.value.id = row.id
@@ -95,16 +84,29 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const submitForm = async (val) => {
-   //把success函数传递到父页面
-   emit('success',formData.value.id)
    // 校验表单
    if (!basicFormRef) return
    const valid = await basicFormRef.value.validate()
    if (!valid) return
 
-   //发送数据
-   await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
-   dialogVisible.value = false
+
+   if(formType.value == 'passed'){
+     formData.value.status = '3'
+     //发送数据
+     await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
+     dialogVisible.value = false
+   }else if(formType.value == 'noPassed'){
+     formData.value.status  = '4'
+     //发送数据
+     await EquipmentReportRepairRequestApi.audiEquipmentReportRepairOrder(formData.value)
+     dialogVisible.value = false
+   }else{
+     console.log("error")
+   }
+
+  //把success函数传递到父页面
+  emit('success')
+
 }
 
 const handleClose=(val)=>{
diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
index 538e9e130..6973d7943 100644
--- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
+++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
@@ -105,7 +105,10 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Radio'
     }
@@ -140,6 +143,9 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     required: true,
     form: {
       componentProps: {
@@ -162,12 +168,14 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     field: 'repairmaner',
     sort: 'custom',
     isSearch: false,
+    isForm: false,
   },
   {
     label: '报修人联系电话',
     field: 'repairPhone',
     sort: 'custom',
-    isSearch: false
+    isSearch: false,
+    isForm: false,
   },
   {
     label: '报修状态',
diff --git a/src/views/eam/equipmentReportRepairRequest/index.vue b/src/views/eam/equipmentReportRepairRequest/index.vue
index c36ce19fb..7cabe2eab 100644
--- a/src/views/eam/equipmentReportRepairRequest/index.vue
+++ b/src/views/eam/equipmentReportRepairRequest/index.vue
@@ -162,7 +162,7 @@ const butttondata = (row) => {
     defaultButtons.mainListAuditedBtn({ hide: isShowStatusButton(row, ['2']), hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 审核完成
     defaultButtons.mainListRevokeBtn({ hide: isShowStatusButton(row, ['0']), hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 撤回
     defaultButtons.mainListFinishBtn({ hide: isShowStatusButton(row, ['3']), hasPermi: 'eam:equipmentReportRepairRequest:update' }),
-    defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 删除
+    //defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:equipmentReportRepairRequest:update' }), // 删除
   ]
 }
 
@@ -281,20 +281,12 @@ const handleFinish = async (id: number) => {
 //审核完成按钮
 const handleAudited = async (row) => {
   message.confirmAudi(t('')).then(async () => {
-    //打开提交表单
-    audiFormRef.value.open('update', row);
+    //审核通过打开提交表单
+    audiFormRef.value.open('passed', row);
   }).catch(async (action: Action) => {
+    //审核不通过打开提交表单
     if (action === 'cancel') {
-      const params = ref({
-        id: '',
-        status: '',
-      })
-      params.value.id = row.id
-      params.value.status = '4'
-      await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
-      message.success(t('common.updateSuccess'))
-      // 刷新列表
-      await getList()
+      audiFormRef.value.open('noPassed', row);
     }
   })
 }
@@ -387,23 +379,9 @@ const getClosed = (val) => {
 
 //audiForm 提交按钮回传
 const getData = (val) => {
-  nextTick?.(async () => {
-
-    try {
-      const params = ref({
-        id: '',
-        status: '',
-      })
-      params.value.id = val
-      params.value.status = '3'
-      await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value)
-      message.success(t('工单已流转'))
-      // 刷新列表
-      await getList()
-    } catch { }
-
-  }
-  )
+  nextTick?.(() => {
+    getList()
+  })
 }
 
 
diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts
index 42ae531b2..225954fe1 100644
--- a/src/views/eam/inspectionItem/inspectionItem.data.ts
+++ b/src/views/eam/inspectionItem/inspectionItem.data.ts
@@ -74,7 +74,10 @@ export const InspectionItem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Select'
     }
diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
index 5b77720e4..458f528f6 100644
--- a/src/views/eam/maintainExperience/index.vue
+++ b/src/views/eam/maintainExperience/index.vue
@@ -111,9 +111,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:maintainExperience:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:maintainExperience:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:maintainExperience:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:maintainExperience:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:maintainExperience:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:maintainExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -145,8 +145,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:maintainExperience:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:maintainExperience:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'eam:maintainExperience:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:maintainExperience:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/maintainExperience/maintainExperience.data.ts b/src/views/eam/maintainExperience/maintainExperience.data.ts
index 48c468fbc..bb30f7e2c 100644
--- a/src/views/eam/maintainExperience/maintainExperience.data.ts
+++ b/src/views/eam/maintainExperience/maintainExperience.data.ts
@@ -8,7 +8,11 @@ export const MaintainExperienceRules = reactive({
 })
 
 export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
-
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+  },
   {
     label: '经验标题',
     field: 'name',
@@ -19,7 +23,7 @@ export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '经验内容',
     field: 'content',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
     form: {
       componentProps: {
         type: 'textarea',
diff --git a/src/views/eam/planInspection/planInspection.data.ts b/src/views/eam/planInspection/planInspection.data.ts
index 84bd0d6b6..5befab5e2 100644
--- a/src/views/eam/planInspection/planInspection.data.ts
+++ b/src/views/eam/planInspection/planInspection.data.ts
@@ -222,6 +222,9 @@ export const PlanInspection = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'directCreateRecord',
     sort: 'custom',
     isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
   },
   {
     label: '所属厂区编号',
@@ -237,7 +240,10 @@ export const PlanInspection = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'workshopCode',
     sort: 'custom',
     isSearch: false,
-    required: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       componentProps: {
         isSearchList: true, // 开启查询弹窗
diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue
index 9fefecd19..94a9d463b 100644
--- a/src/views/eam/repairExperience/index.vue
+++ b/src/views/eam/repairExperience/index.vue
@@ -114,9 +114,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:repairExperience:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:repairExperience:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:repairExperience:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:repairExperience:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'eam:repairExperience:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:repairExperience:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -148,8 +148,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:repairExperience:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:repairExperience:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'eam:repairExperience:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:repairExperience:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/eam/repairExperience/repairExperience.data.ts b/src/views/eam/repairExperience/repairExperience.data.ts
index 87237d404..3f0e48465 100644
--- a/src/views/eam/repairExperience/repairExperience.data.ts
+++ b/src/views/eam/repairExperience/repairExperience.data.ts
@@ -8,7 +8,12 @@ export const RepairExperienceRules = reactive({
 })
 
 export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
- 
+
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+  },
   {
     label: '经验标题',
     field: 'name',
@@ -27,7 +32,6 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '经验内容',
     field: 'content',
     sort: 'custom',
-    isTable:false,
     isSearch:false,
     form: {
       component: 'Input',
@@ -86,8 +90,6 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     label: '故障类型',
     field: 'faultType',
     sort: 'custom',
-    dictType: DICT_TYPE.FAILURE_REASON,
-    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: false,
     isForm:false
   },
@@ -96,7 +98,9 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     isSearch:false,
-    isForm:false
+    isForm:false,
+    isTable:false,
+    isDetail:false
   },
   {
     label: '创建时间',
diff --git a/src/views/eam/spotCheckItem/spotCheckItem.data.ts b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
index 9f9cd7278..7ed9e583d 100644
--- a/src/views/eam/spotCheckItem/spotCheckItem.data.ts
+++ b/src/views/eam/spotCheckItem/spotCheckItem.data.ts
@@ -67,7 +67,10 @@ export const SpotCheckItem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
+    isSearch: false,
+    isTable: false,
+    isForm: false,
+    isDetail:false,
     form: {
       component: 'Select'
     }