diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index d3f2f9de3..bee45f6c3 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -354,7 +354,8 @@ export enum DICT_TYPE {
   REPAIR_LEVEL = 'repair_level', //维修级别
   IS_COMPLETED = 'is_completed', //是否完成
   MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期
-  EAM_ORDER_STATUS = 'eam_order_status',
-  EAM_PLAN_STATUS = 'eam_plan_status',
+  EAM_ORDER_STATUS = 'eam_order_status',// 保养工单状态
+  EAM_PLAN_STATUS = 'eam_plan_status', // 保养计划状态
+  EAM_REPAIR_STATUS = 'eam_repair_status', // 报修状态
   OFF_BACK_STATUS = 'off_back_status'
 }
diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
index 4c24acd0d..21b9f9dbb 100644
--- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
+++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts
@@ -1,5 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
+import * as WorkshopApi from "@/api/wms/workshop";
 
 // 表单校验
 export const EquipmentReportRepairRequestRules = reactive({
@@ -9,7 +13,9 @@ export const EquipmentReportRepairRequestRules = reactive({
   urgency: [required],
   repairmaner: [required],
   status: [required],
-  concurrencyStamp: [required]
+  shutDown:[required],
+  repairPhone:[required],
+  available:[required],
 })
 
 export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]>([
@@ -17,7 +23,9 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     label: '报修编号',
     field: 'number',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: false,
+    isDetail:true,
   },
   {
     label: '类型',
@@ -25,16 +33,32 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.DEVICE_TYPE,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
+    isSearch: false,
   },
   {
-    label: '设备或工装编号',
+    label: '设备工装编号',
     field: 'equipmentCode',
     sort: 'custom',
-    isSearch: true
+    isSearch: true,
+    isForm: true,
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchTitle: '设备信息', // 查询弹窗标题
+        searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
+        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
+        searchField: 'code', // 查询弹窗赋值字段
+        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
+        multiple:true,
+        searchCondition: [{
+          key: 'status',
+          value: 'NORMAL',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
   },
   {
     label: '紧急程度',
@@ -51,15 +75,12 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     dictType: DICT_TYPE.FAILURE_REASON,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
     isSearch: true,
-    form: {
-      component: 'SelectV2'
-    }
   },
   {
     label: '故障描述',
     field: 'describing',
     sort: 'custom',
-    isSearch: true
+    isSearch: false
   },
   {
     label: '是否停机',
@@ -76,119 +97,115 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive<CrudSchema[]
     label: '报修图片',
     field: 'images',
     sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '所属厂区编号',
-    field: 'factoryAreaCode',
-    sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
+  // {
+  //   label: '所属厂区编号',
+  //   field: 'factoryAreaCode',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
   {
     label: '车间编号',
     field: 'workshopCode',
     sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '工段编号',
-    field: 'workshopSectionCode',
-    sort: 'custom',
-    isSearch: true
+    isSearch: false,
+    required: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '车间', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '车间信息', // 查询弹窗标题
+        searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类
+        searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
   },
   {
     label: '报修人',
     field: 'repairmaner',
     sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
+    isSearch: false,
   },
   {
     label: '报修人联系电话',
     field: 'repairPhone',
     sort: 'custom',
-    isSearch: true
+    isSearch: false
   },
   {
     label: '报修状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Radio'
-    }
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'Editor',
-      componentProps: {
-        valueHtml: '',
-        height: 200
-      }
-    }
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    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: '自动审核',
-    field: 'autoExamine',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '自动通过',
-    field: 'autoAgree',
-    sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '自动确认',
-    field: 'autoVerify',
-    sort: 'custom',
-    isSearch: true
+    dictType: DICT_TYPE.EAM_REPAIR_STATUS,
+    dictClass: 'string',
+    isSearch: false,
+    isForm: false,
   },
+  // {
+  //   label: '审核人',
+  //   field: 'approver',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
+  // {
+  //   label: '审核内容',
+  //   field: 'approveContent',
+  //   sort: 'custom',
+  //   isSearch: false,
+  // },
+  // {
+  //   label: '审核时间',
+  //   field: 'approveTime',
+  //   sort: 'custom',
+  //   formatter: dateFormatter,
+  //   isSearch: false,
+  //   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: '自动审核',
+  //   field: 'autoExamine',
+  //   sort: 'custom',
+  //   isSearch: true
+  // },
+  // {
+  //   label: '自动通过',
+  //   field: 'autoAgree',
+  //   sort: 'custom',
+  //   isSearch: true
+  // },
+  // {
+  //   label: '自动确认',
+  //   field: 'autoVerify',
+  //   sort: 'custom',
+  //   isSearch: true
+  // },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true
+    isSearch: false,
   },
   {
     label: '是否可用',
diff --git a/src/views/eam/equipmentReportRepairRequest/index.vue b/src/views/eam/equipmentReportRepairRequest/index.vue
index fa2a2bfd4..cce779b96 100644
--- a/src/views/eam/equipmentReportRepairRequest/index.vue
+++ b/src/views/eam/equipmentReportRepairRequest/index.vue
@@ -48,6 +48,7 @@
     :apiCreate="EquipmentReportRepairRequestApi.createEquipmentReportRepairRequest"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onChange="onChange"
   />
 
   <!-- 详情 -->
@@ -65,6 +66,11 @@ 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 {Maintenance} from "@/views/eam/maintenance/maintenance.data";
+import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data";
+import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
+import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
+import * as ToolItemApi from "@/api/eam/toolAccounts";
 
 defineOptions({ name: 'EquipmentReportRepairRequest' })
 
@@ -99,9 +105,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentReportRepairRequest:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentReportRepairRequest:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentReportRepairRequest:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentReportRepairRequest:create'}), // 新增
+  //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentReportRepairRequest:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentReportRepairRequest:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +139,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentReportRepairRequest:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentReportRepairRequest:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentReportRepairRequest:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentReportRepairRequest:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -149,6 +155,17 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
+  if(type == "create"){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'status'){
+      }
+    })
+  }else{
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'status'){
+      }
+    })
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -226,6 +243,34 @@ const importSuccess = () => {
   getList()
 }
 
+
+const onChange = (field, item) => {
+  //设备
+  if(field == 'type' && item == 'DEVICE'){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'equipmentCode') {
+        basicFormRef.value.formRef.setValues({
+          equipmentCode:''
+        })
+        items.componentProps.searchAllSchemas = EquipmentAccounts.allSchemas
+        items.componentProps.searchPage = EquipmentItemApi.getEquipmentAccountsPage
+      }
+    })
+  }
+  //工装
+  if(field == 'type' && item == 'EQUIPMENT'){
+    EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => {
+      if (items.field == 'equipmentCode') {
+        basicFormRef.value.formRef.setValues({
+          equipmentCode:''
+        })
+        items.componentProps.searchAllSchemas = ToolAccounts.allSchemas
+        items.componentProps.searchPage = ToolItemApi.getToolAccountsPage
+      }
+    })
+  }
+}
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {