diff --git a/nginx.conf b/nginx.conf
index d5aa0a2..1b3fb61 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -32,7 +32,7 @@ http {
 	server {
 		listen       25200;
 		server_name_in_redirect off;
-		server_name    dev.ccwin-in.com;
+		server_name    _;
 		location /api/ {
 			proxy_pass http://eam/;
 			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
@@ -57,4 +57,4 @@ http {
 			index index.html index.htm;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/nginx_prod.conf b/nginx_prod.conf
index 8cb1610..c358f63 100644
--- a/nginx_prod.conf
+++ b/nginx_prod.conf
@@ -32,7 +32,7 @@ http {
 	server {
 		listen       80;
 		server_name_in_redirect off;
-		server_name    dev.ccwin-in.com;
+		server_name    _;
 		location /api/ {
 			proxy_pass http://eam/;
 			proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
diff --git a/src/api/eam/basic/fixedAssets/index.ts b/src/api/eam/basic/fixedAssets/index.ts
index 6911147..aaa2a02 100644
--- a/src/api/eam/basic/fixedAssets/index.ts
+++ b/src/api/eam/basic/fixedAssets/index.ts
@@ -1,7 +1,7 @@
 import request from '@/config/axios'
 import { getStrDictOptions } from '@/utils/dict'
 import { useUserStore } from '@/store/modules/user'
-
+import { checkPermi } from '@/utils/permission'
 export interface FixedAssetsVO {
   number: string
   name: string
@@ -30,14 +30,7 @@ export const getFixedAssetsPage = async (params) => {
     deviceMoldTypeList.some(deviceMold => deviceMold.value === role)
   );
 
-  const admin = userStore.roles.find(role => {
-    if (role == 'gdzc_admin') {
-      return true;
-    } else {
-      return false;
-    }
-  });
-
+  const admin = checkPermi(['gdzc_admin']);
   // 如果找到了匹配的角色，将它作为manageDept的值加入到params中
   if (matchingRole) {
     params.manageDept = matchingRole; // 这里只添加第一个匹配的角色
diff --git a/src/api/eam/basic/inspection/index.ts b/src/api/eam/basic/inspection/index.ts
index 4931600..a422e70 100644
--- a/src/api/eam/basic/inspection/index.ts
+++ b/src/api/eam/basic/inspection/index.ts
@@ -55,7 +55,6 @@ export const createDeviceMoldItems = async (data: DeviceMoldItemsVO) => {
 }
 //新增模具
 export const creatMoldItems = async (data: DeviceMoldItemsVO) => {
-  debugger
   data.type="MOLD"
   data.status="INSPECTION"
   return await request.post({ url: `/eam/device-mold-items/create`, data })
diff --git a/src/api/eam/device/deviceAccounts/index.ts b/src/api/eam/device/deviceAccounts/index.ts
index cba18c7..7476910 100644
--- a/src/api/eam/device/deviceAccounts/index.ts
+++ b/src/api/eam/device/deviceAccounts/index.ts
@@ -13,6 +13,7 @@ export interface DeviceAccountsVO {
   productionDate: Date
   purchasePrice: number
   siteId: string
+  status: string
   available: string
   concurrencyStamp: number
 }
@@ -70,3 +71,4 @@ export const getDeviceAccountsAllNoPage = async (data: DeviceAccountsVO) => {
   return await request.post({ url: `/eam/device-accounts/noPage`,data })
 }
 
+
diff --git a/src/api/eam/device/deviceMaintenanceDetail/index.ts b/src/api/eam/device/deviceMaintenanceDetail/index.ts
index b3b9c78..b2aa8e6 100644
--- a/src/api/eam/device/deviceMaintenanceDetail/index.ts
+++ b/src/api/eam/device/deviceMaintenanceDetail/index.ts
@@ -12,7 +12,7 @@ export const getDeviceMaintenanceDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/purchasereceipt-request-detail/senior', data })
+    return await request.post({ url: '/eam/device-maintenance-job-detail/senior', data })
   } else {
     return await request.get({ url: `/eam/device-maintenance-job-detail/page`, params })
   }
@@ -42,10 +42,10 @@ export const deleteDeviceMaintenanceDetail = async (id: number) => {
 
 // 导出维修工单子 Excel
 export const exportPurchasereceiptRequestDetail = async (params) => {
-  return await request.download({ url: `/wms/purchasereceipt-request-detail/export-excel`, params })
+  return await request.download({ url: `/eam/device-maintenance-job-detail/export-excel`, params })
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/purchasereceipt-request-detail/get-import-template' })
+  return request.download({ url: '/eam/device-maintenance-job-detail/get-import-template' })
 }
diff --git a/src/api/eam/device/deviceMaintenanceMain/index.ts b/src/api/eam/device/deviceMaintenanceMain/index.ts
index 8684350..8547c06 100644
--- a/src/api/eam/device/deviceMaintenanceMain/index.ts
+++ b/src/api/eam/device/deviceMaintenanceMain/index.ts
@@ -16,7 +16,7 @@ export interface DeviceMaintenanceMainVO {
   concurrencyStamp: number
 }
 
-// 查询维修工单主列表
+// 查询设备维修工单主列表
 export const getDeviceMaintenanceMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
diff --git a/src/api/eam/device/techMaintenanceDetail/index.ts b/src/api/eam/device/techMaintenanceDetail/index.ts
new file mode 100644
index 0000000..e1342a9
--- /dev/null
+++ b/src/api/eam/device/techMaintenanceDetail/index.ts
@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+export interface DeviceMaintenanceDetailVO {
+  describes: string
+  describes1: string
+  workOut: string
+  maintenances: string
+}
+
+// 查询维修工单子列表
+export const getDeviceMaintenanceDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/tech-maintenance-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/eam/tech-maintenance-job-detail/page`, params })
+  }
+}
+
+// 查询维修工单子详情
+export const getPurchasereceiptRequestDetail = async (id) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-detail/selectListByNumber?id=` + id })
+}
+
+// 新增维修工单子
+export const createDeviceMaintenanceDetail = async (data: DeviceMaintenanceDetailVO) => {
+  return await request.post({ url: `/eam/tech-maintenance-job-detail/create`, data })
+}
+
+// 修改维修工单子
+export const updateDeviceMaintenanceDetail = async (data: DeviceMaintenanceDetailVO) => {
+  return await request.put({ url: `/eam/tech-maintenance-job-detail/update`, data })
+}
+
+// 删除维修工单子
+export const deleteDeviceMaintenanceDetail = async (id: number) => {
+  return await request.delete({ url: `/eam/tech-maintenance-job-detail/delete?id=` + id })
+}
+
+
+
+// 导出维修工单子 Excel
+export const exportPurchasereceiptRequestDetail = async (params) => {
+  return await request.download({ url: `/eam/tech-maintenance-job-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/tech-maintenance-job-detail/get-import-template' })
+}
diff --git a/src/api/eam/device/techMaintenanceMain/index.ts b/src/api/eam/device/techMaintenanceMain/index.ts
new file mode 100644
index 0000000..b735af8
--- /dev/null
+++ b/src/api/eam/device/techMaintenanceMain/index.ts
@@ -0,0 +1,94 @@
+import request from '@/config/axios'
+
+export interface DeviceMaintenanceMainVO {
+  id: number
+  number: string
+  requestNumber: string
+  describe: string
+  deviceNumber: string
+  factoryAreaNumber: string
+  maintenance: number
+  maintenancePhone: string
+  status: string
+  type: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询工艺维修工单主列表
+export const getTechMaintenanceMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/tech-maintenance-job-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/tech-maintenance-job-main/page`, params })
+  }
+}
+
+// 查询维修工单主详情
+export const getDeviceMaintenanceMain = async (id: number) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/get?id=` + id })
+}
+
+// 新增维修工单主
+export const createDeviceMaintenanceMain = async (data: DeviceMaintenanceMainVO) => {
+  return await request.post({ url: `/eam/tech-maintenance-job-main/createPC`, data })
+}
+
+// 修改维修工单主
+export const updateDeviceMaintenanceMain = async (data: DeviceMaintenanceMainVO) => {
+  return await request.put({ url: `/eam/tech-maintenance-job-main/update`, data })
+}
+// 删除维修工单主
+export const deleteDeviceMaintenanceMain = async (id: number) => {
+  return await request.delete({ url: `/eam/tech-maintenance-job-main/delete?id=` + id })
+}
+
+// 导出维修工单主 Excel
+export const exportDeviceMaintenanceMain = async (params) => {
+  return await request.download({ url: `/eam/tech-maintenance-job-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/tech-maintenance-job-main/get-import-template' })
+}
+
+// 修改维修工单主
+export const orderStepChange = async (data: DeviceMaintenanceMainVO) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/orderClick?number=`+data.number+`&status=`+data.status+`&id=`+data.id+`&requestNumber=`+data.requestNumber })
+}
+
+// 修改维修工单主
+export const orderTurnTo = async (data: DeviceMaintenanceMainVO) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/turnTo?deviceNumber=`+data.deviceNumber +`&id=`+data.id + `&receiverType=`+ data.type +`&receiverUserId=` + data.maintenance })
+}
+
+
+// 查询维修工单主列表不分页
+export const getDeviceMainTempList = async (type: String) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/getList?type=` + type })
+}
+
+
+
+// 完成维修工单
+export const finishOrder = async (params) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/orderClickFinish`, params})
+}
+
+
+
+// 校验维修工单
+export const verifyOrder = async (params) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/orderClickVerify`, params})
+}
+
+
+// 确认维修工单
+export const confirmOrder = async (params) => {
+  return await request.get({ url: `/eam/tech-maintenance-job-main/orderClickConfirm`, params})
+}
+
diff --git a/src/api/eam/device/techRepair/index.ts b/src/api/eam/device/techRepair/index.ts
new file mode 100644
index 0000000..ce1d3a9
--- /dev/null
+++ b/src/api/eam/device/techRepair/index.ts
@@ -0,0 +1,68 @@
+import request from '@/config/axios'
+
+export interface DeviceRepairVO {
+  id: number
+  number: string
+  describe: string
+  deviceNumber: string
+  factoryAreaNumber: string
+  declarer: number
+  declarerPhone: string
+  faultType: string
+  type: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询报修申请列表
+export const getDeviceRepairPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/tech-repair-request/senior', data })
+  } else {
+    return await request.get({ url: `/eam/tech-repair-request/page`, params })
+  }
+}
+
+// 查询报修申请详情
+export const getDeviceRepair = async (id: number) => {
+  return await request.get({ url: `/eam/tech-repair-request/get?id=` + id })
+}
+
+// 新增报修申请
+export const createDeviceRepair = async (data: DeviceRepairVO) => {
+  return await request.post({ url: `/eam/tech-repair-request/create`, data })
+}
+
+// 修改报修申请
+export const updateDeviceRepair = async (data: DeviceRepairVO) => {
+  return await request.put({ url: `/eam/tech-repair-request/update`, data })
+}
+
+// 删除报修申请
+export const deleteDeviceRepair = async (id: number) => {
+  return await request.delete({ url: `/eam/tech-repair-request/delete?id=` + id })
+}
+
+// 导出报修申请 Excel
+export const exportDeviceRepair = async (params) => {
+  return await request.download({ url: `/eam/tech-repair-request/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/tech-repair-request/get-import-template' })
+}
+
+// 撤销申请
+export const cancel = (id: Number) => {
+  return request.delete({ url: '/eam/tech-repair-request/cancel?id=' + id })
+}
+
+
+// 根据单号查询申请工单信息
+export const getOrderByNumber = (number: Number) => {
+  return request.get({ url: '/eam/tech-repair-request/getOrderByNumber?number=' + number })
+}
diff --git a/src/api/eam/mold/moldInspectionMain/index.ts b/src/api/eam/mold/moldInspectionMain/index.ts
index 10190c7..59f633f 100644
--- a/src/api/eam/mold/moldInspectionMain/index.ts
+++ b/src/api/eam/mold/moldInspectionMain/index.ts
@@ -58,6 +58,12 @@ export const importTemplate = () => {
 }
 
 
+// 检修完成
+export const finishInspection = (id: number) => {
+  return request.get({ url: `/eam/mold-inspection-job-main/orderClickFinish?id=` + id })
+}
+
+
 // 查询检修工单主列表
 export const getMoldInspectionMainNoPage = async (params) => {
     return await request.get({ url: `/eam/mold-inspection-job-main/noPage`, params })
@@ -66,5 +72,5 @@ export const getMoldInspectionMainNoPage = async (params) => {
 
 //验证
 export const verifyOrder = async (id: number,verifyContent: string) => {
-  return await request.get({ url: `/eam/mold-inspection-job-main/onVerify?id=`+id+`&verifyContent=` + verifyContent })
+  return await request.get({ url: `/eam/mold-inspection-job-main/orderClickVerify?id=`+id+`&verifyContent=` + verifyContent })
 }
diff --git a/src/api/eam/mold/moldMaintenanceMain/index.ts b/src/api/eam/mold/moldMaintenanceMain/index.ts
index 9adbda2..fce98be 100644
--- a/src/api/eam/mold/moldMaintenanceMain/index.ts
+++ b/src/api/eam/mold/moldMaintenanceMain/index.ts
@@ -18,7 +18,6 @@ export interface MoldMaintenanceMainVO {
 
 // 查询维修工单主列表
 export const getMoldMaintenanceMainPage = async (params) => {
-  params.type = 'MOLD'
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
diff --git a/src/api/eam/mold/moldRepair/index.ts b/src/api/eam/mold/moldRepair/index.ts
index 028f2b4..0af3d79 100644
--- a/src/api/eam/mold/moldRepair/index.ts
+++ b/src/api/eam/mold/moldRepair/index.ts
@@ -16,7 +16,6 @@ export interface MoldRepairVO {
 
 // 查询报修申请列表
 export const getMoldRepairPage = async (params) => {
-  params.type = 'MOLD'
   if (params.isSearch) {
     delete params.isSearch
     const data = { ...params }
diff --git a/src/components/Detail/src/DetailDeviceLedger.vue b/src/components/Detail/src/DetailDeviceLedger.vue
index c2cc3a7..18a2490 100644
--- a/src/components/Detail/src/DetailDeviceLedger.vue
+++ b/src/components/Detail/src/DetailDeviceLedger.vue
@@ -912,8 +912,8 @@ const setBeiJian = () => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListEditBtn({ hide: !hasmMilestoneRight(row)}), // 编辑
-    defaultButtons.uploadFileBtn({ hide: !hasmMilestoneRight(row)}),//上传
+    defaultButtons.mainListEditBtn({ hasPermi: 'eam:mold-milestone:edit'}), // 编辑
+    defaultButtons.uploadFileBtn({ hasPermi: 'eam:mold-milestone:upload'}),//上传
   ]
 } 
 
@@ -984,8 +984,8 @@ const getDialogUpload = (row) => {
 function dialogUploadFile() {
   let data = {
     number: dialogUploadNumber.value,
-    filePathList: fileDialogUploadData.value.filePathList.map((item) => item.url),
-    fileInfoList: fileDialogUploadData.value.filePathList,
+    filePathList: fileDialogUploadData.value.filePathList?fileDialogUploadData.value.filePathList.map((item) => item.url):null,
+    fileInfoList: fileDialogUploadData.value.filePathList?fileDialogUploadData.value.filePathList:[],
     funcCode: props.milestoneFuncCode,
     fileBusiType: dialogUploadBusiCode.value
   }
@@ -996,17 +996,6 @@ function dialogUploadFile() {
   })
 }
 
-const hasmMilestoneRight = (row) => {
-  const rolesOk = userStore.roles.find(item => {
-    return item == 'mold_Engineer_role'
-  })
-  if (rolesOk != undefined && rolesOk != null) {
-    return true
-  } else {
-    return false
-  }
-}
-
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 94b8dee..bcff084 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -145,11 +145,12 @@ const excelUploadError: UploadProps['onError'] = (): void => {
 }
 // 删除上传文件
 const handleRemove = (file) => {
-  const findex = fileList.value.map((f) => f.name).indexOf(file.name)
-  if (findex > -1) {
-    fileList.value.splice(findex, 1)
-    emit('update:modelValue', listToString(fileList.value))
-  }
+  // const findex = fileList.value.map((f) => f.name).indexOf(file.name)
+  // console.log(findex)
+  // if (findex > -1) {
+  //   fileList.value.splice(findex, 1)
+  //   emit('update:modelValue', listToString(fileList.value))
+  // }
 }
 const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
   console.log(uploadFile)
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 96b5b39..45b375e 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -67,7 +67,8 @@ export default {
     confirmRefused: '确认审批驳回吗？',
     confirmHandle: '确认处理吗？',
     confirmSubmit: '确认提交吗？',
-    finishSuccess:'操作成功'
+    finishSuccess: '操作成功',
+    verifySuccess: '验证成功'
   },
   error: {
     noPermission: `抱歉，您无权访问此页面。`,
diff --git a/src/views/eam/basic/classType/classType.data.ts b/src/views/eam/basic/classType/classType.data.ts
index 605c18b..dd8b0df 100644
--- a/src/views/eam/basic/classType/classType.data.ts
+++ b/src/views/eam/basic/classType/classType.data.ts
@@ -3,6 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as deptApi from '@/api/system/dept'
 import * as roleApi from '@/api/system/role'
 import { Role } from '@/views/system/role/role.data'
+import { selectAllFactoryArea } from '@/api/system/dept'
 // 表单校验
 export const ClassTypeRules = reactive({
   workerRoleId: [required],
@@ -12,6 +13,7 @@ export const ClassTypeRules = reactive({
 })
 const FactoryAreaNoPage = await deptApi.getDeptPage({'deptGroup':'factory'})
 const roleList = await roleApi.getSimpleRoleList({})
+const factoryList = await selectAllFactoryArea()
 console.log('FactoryAreaNoPage',FactoryAreaNoPage);
 console.log('roleList',roleList);
 
@@ -51,14 +53,14 @@ console.log('roleList',roleList);
  ]))
 export const ClassType = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '维修工角色id',
+    label: '维修工角色',
     field: 'workerRoleId',
     sort: 'custom',
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchListPlaceholder: '请选择角色', // 输入框占位文本
         searchField: 'id', // 查询弹窗赋值字段
         searchTitle: '维修工角色', // 查询弹窗标题
         searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
@@ -77,18 +79,18 @@ export const ClassType = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '工程师角色id',
+    label: '工程师角色',
     field: 'engineerRoleId',
     sort: 'custom',
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchListPlaceholder: '请选择角色', // 输入框占位文本
         searchField: 'id', // 查询弹窗赋值字段
         searchTitle: '工程师角色', // 查询弹窗标题
         searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
-        searchPage: roleApi.getRolePage, // 查询弹窗所需分页方法
+        searchPage: roleApi.getRolePages, // 查询弹窗所需分页方法
         searchCondition: [
           // {
           //   key: 'deptGroup',
@@ -119,15 +121,27 @@ export const ClassType = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },
   {
-    label: '所属厂区编号',
+    label: '所属厂区',
     field: 'factoryAreaNumber',
     isSearch: true,
     sort: 'custom',
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchListPlaceholder: '请选择厂区', // 输入框占位文本
         searchField: 'id', // 查询弹窗赋值字段
         searchTitle: '厂区信息', // 查询弹窗标题
         searchAllSchemas: FactoryAreaNumbers.allSchemas, // 查询弹窗所需类
diff --git a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts
index fe6876c..8179ccf 100644
--- a/src/views/eam/basic/fixedAssets/fixedAssets.data.ts
+++ b/src/views/eam/basic/fixedAssets/fixedAssets.data.ts
@@ -3,9 +3,13 @@ import { dateFormatter } from '@/utils/formatTime'
 import { validateHanset,validateNumDot, validateEmail } from '@/utils/validator'
 import * as LocationApi from '@/api/eam/basic/location'
 import * as SupplierApi from '@/api/eam/basic/supplier'
+import { useUserStore } from '@/store/modules/user'
+import { checkPermi } from '@/utils/permission'
 
 const localtionList = await LocationApi.getLocationNoPage()
 const supplierList = await SupplierApi.getSupplierNoPage()
+const userStore = useUserStore() // 用户信息
+const admin = checkPermi(['gdzc_admin']);
 
 // 表单校验
 export const FixedAssetsRules = reactive({
@@ -151,7 +155,7 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
     label: '管理部门',
     field: 'manageDept',
     sort: 'custom',
-    isForm: false,
+    isForm: admin,
     dictType: DICT_TYPE.SPECIAL_DEPT_ROLE,
     dictClass: 'string',
     table: {
diff --git a/src/views/eam/basic/fixedAssets/index.vue b/src/views/eam/basic/fixedAssets/index.vue
index 6b61ea1..7d86c5d 100644
--- a/src/views/eam/basic/fixedAssets/index.vue
+++ b/src/views/eam/basic/fixedAssets/index.vue
@@ -64,6 +64,7 @@ import download from '@/utils/download'
 import { FixedAssets,FixedAssetsRules } from './fixedAssets.data'
 import * as FixedAssetsApi from '@/api/eam/basic/fixedAssets'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { checkPermi } from '@/utils/permission'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
 // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 // import Detail from '@/components/Detail/src/Detail.vue'
@@ -179,12 +180,16 @@ const formsSuccess = async (formType,data) => {
       matchingRole = userStore.getUser.id
     }
   if (formType === 'create') {
-    data.manageDept = matchingRole
+    if(!checkPermi(['gdzc_admin'])){
+      data.manageDept = matchingRole
+    }
     await FixedAssetsApi.createFixedAssets(data)
 
     message.success(t('common.createSuccess'))
   } else {
-    data.manageDept = matchingRole
+    if(!checkPermi(['gdzc_admin'])){
+      data.manageDept = matchingRole
+    }
     await FixedAssetsApi.updateFixedAssets(data)
     message.success(t('common.updateSuccess'))
   }
diff --git a/src/views/eam/basic/moldMaintenance/index.vue b/src/views/eam/basic/moldMaintenance/index.vue
index e82ade8..9258146 100644
--- a/src/views/eam/basic/moldMaintenance/index.vue
+++ b/src/views/eam/basic/moldMaintenance/index.vue
@@ -239,14 +239,12 @@ const formsSuccess = async (formType,data) => {
     openDataNew.value = data
     if(judgeSame()){
       basicFormRef.value.dialogVisible = false
-      getList()
     }else{
       updateData.value = data
       dialogVisible.value = true
     }
   }
   basicFormRef.value.dialogVisible = false
-  getList()
 }
 
 /** 详情操作 */
@@ -309,6 +307,7 @@ const onSubmit = async () => {
       message.success(t('common.delSuccess'))
       dialogVisible.value = false; 
     }
+    getList()
   } catch (error) {
     console.error(error);
     // 假设这里是操作失败，不关闭basicFormRef窗口
diff --git a/src/views/eam/device/deviceAccounts/index.vue b/src/views/eam/device/deviceAccounts/index.vue
index 4e973b5..4dd5854 100644
--- a/src/views/eam/device/deviceAccounts/index.vue
+++ b/src/views/eam/device/deviceAccounts/index.vue
@@ -129,8 +129,8 @@
   const HeadButttondata = [
     defaultButtons.defaultAddBtn({hasPermi:'eam:device-accounts:create'}), // 新增
     defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
-    defaultButtons.defaultImportBtn({hasPermi:'eam:device-accounts:import'}), // 导入
-    defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出
+    // defaultButtons.defaultImportBtn({hasPermi:'eam:device-accounts:import'}), // 导入
+    // defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null) // 设置
diff --git a/src/views/eam/device/deviceRepair/deviceRepair.data.ts b/src/views/eam/device/deviceRepair/deviceRepair.data.ts
index c23b0cd..8a01957 100644
--- a/src/views/eam/device/deviceRepair/deviceRepair.data.ts
+++ b/src/views/eam/device/deviceRepair/deviceRepair.data.ts
@@ -72,16 +72,6 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'id'
         },
         filterable: true,
-        onChange: (val) => {
-          DeviceAccountsApi.getDeviceAccountsNoPage({
-            isSearch: false,
-            factoryAreaNumber: val
-          }).then((res) => {
-            deviceList.value = res
-          }).catch((e) => {
-            console.log(e)
-          })
-        }
       },
     }
   },
@@ -99,22 +89,25 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
     search: {
       component: 'Select',
       componentProps: {
-        options: deviceTypeList,
+        options: deviceMoldTypeList,
         optionsAlias: {
           labelField: 'label',
           valueField: 'value'
         },
+        // disabled: true,
         filterable: true,
-      },
+        placeholder: "请选择类型"
+      }
     },
     form: {
       component: 'Select',
       componentProps: {
-        options: deviceTypeList,
+        options: deviceMoldTypeList,
         optionsAlias: {
           labelField: 'label',
           valueField: 'value'
         },
+        // disabled: true,
         filterable: true,
         placeholder: "请选择设备"
       }
@@ -148,7 +141,7 @@ export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Select',
       componentProps: {
-        options: deviceList,
+        options: deviceListNoPage,
         optionsAlias: {
           labelField: 'name',
           valueField: 'number'
diff --git a/src/views/eam/device/deviceRepair/index.vue b/src/views/eam/device/deviceRepair/index.vue
index 0e57df8..8410890 100644
--- a/src/views/eam/device/deviceRepair/index.vue
+++ b/src/views/eam/device/deviceRepair/index.vue
@@ -66,6 +66,7 @@ import { DeviceRepair, DeviceRepairRules } from './deviceRepair.data'
 import * as DeviceRepairApi from '@/api/eam/device/deviceRepair'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as DeviceAccountApi from '@/api/eam/device/deviceAccounts'
+import * as MoldAccountApi from '@/api/eam/mold/moldAccounts'
 import { DeviceAccounts } from '../deviceAccounts/deviceAccounts.data'
 import { useUserStore } from '@/store/modules/user'
 // import TableHead from '@/components/TableHead/src/TableHead.vue'
@@ -88,7 +89,8 @@ const urls = ref([])
 const viewKey = ref(0)
 routeName.value = route.name
 const tableColumns = ref(DeviceRepair.allSchemas.tableColumns)
-
+const factoryAreaNumber = ref('');
+const type = ref('');
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -113,8 +115,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'eam:device-repair-request:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:device-repair-request:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:device-repair-request:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:device-repair-request:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:device-repair-request:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -180,6 +182,11 @@ const buttonTableClick = async (val, row) => {
 const basicFormRef = ref()
 const basicFormViewRef = ref()
 const openForm = (type: string, row?: any) => {
+  // if(type == 'create'){
+  //   DeviceRepair.allSchemas.formSchema.find(item => {
+  //       return item.field == 'type'
+  //     }).value = 'DEVICE'
+  // }
   if (type == 'view') {
     showView.value = true
     urls.value = row.filePathList
@@ -303,6 +310,61 @@ const onChange = (field, cur, item,formRef) => {
       setV['deviceNumber'] = ''
       formRef.setValues(setV)
     })
+    factoryAreaNumber.value = cur
+    if(type.value != 'MOLD'){
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+       MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }
+  }
+
+  if (field == 'type') {
+    nextTick(() => {
+      const setV = {}
+      setV['deviceNumber'] = ''
+      formRef.setValues(setV)
+    })
+    type.value = cur
+    if(cur != 'MOLD'){
+      type.value = 'DEVICE'
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'DEVICE',
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+      type.value = 'MOLD'
+      MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'MOLD',
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }
+    
   }
  
   // if (field == 'factoryAreaNumber') {
diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
index 5bc90b2..ccf6cfe 100644
--- a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue
@@ -218,8 +218,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:device-spot-inspection-record-main:import'}),
-  defaultButtons.defaultExportBtn({hasPermi:'eam:device-spot-inspection-record-main:export'}),
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:device-spot-inspection-record-main:import'}),
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:device-spot-inspection-record-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
diff --git a/src/views/eam/device/deviceinspectionjob/index.vue b/src/views/eam/device/deviceinspectionjob/index.vue
index 58856c4..1dcd565 100644
--- a/src/views/eam/device/deviceinspectionjob/index.vue
+++ b/src/views/eam/device/deviceinspectionjob/index.vue
@@ -195,8 +195,8 @@ const judgeHasAddFunc = () => {
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi:'eam:device-inspection-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi:'eam:device-inspection-job-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi:'eam:device-inspection-job-main:export'}), // 导出
+  // defaultButtons.defaultImportBtn({ hasPermi:'eam:device-inspection-job-main:import'}), // 导入
+  // defaultButtons.defaultExportBtn({ hasPermi:'eam:device-inspection-job-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
diff --git a/src/views/eam/device/devicemaintainjob/index.vue b/src/views/eam/device/devicemaintainjob/index.vue
index 52de514..cc0e8d5 100644
--- a/src/views/eam/device/devicemaintainjob/index.vue
+++ b/src/views/eam/device/devicemaintainjob/index.vue
@@ -221,8 +221,8 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn({
   // }), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintain-job-main:import'}),
-  defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintain-job-main:export'}),
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintain-job-main:import'}),
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintain-job-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -647,9 +647,11 @@ const onCancel = () => {
 }
 
 const onSubmit = () => {
-  DeviceMaintainOrderMainApi.orderClickApprove(dialogRowData.value.id,'VERIFIED',updateFormValue.value.verifyContent) 
-  dialogVisible.value = false
-  getList()
+  DeviceMaintainOrderMainApi.orderClickApprove(dialogRowData.value.id,'VERIFIED',updateFormValue.value.verifyContent).then(res => {
+    message.success(t('common.verifySuccess'))
+    dialogVisible.value = false
+    getList()
+  })
 }
 
 const orderPrint = (row) => {
diff --git a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts
index 6c56755..dc0d9cb 100644
--- a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts
+++ b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts
@@ -216,17 +216,6 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     // dictType: DICT_TYPE.APP_DEVICE_MOLD_TYPE,
     isSearch: true,
-    search: {
-      component: 'Select',
-      componentProps: {
-        options: deviceTypeList,
-        optionsAlias: {
-          labelField: 'label',
-          valueField: 'value'
-        },
-        filterable: true,
-      },
-    },
     form: {
       component: 'Select',
       componentProps: {
@@ -238,7 +227,8 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true,
         filterable: true,
         placeholder: "请选择设备"
-      }
+      },
+      value: 'DEVICE'
     },
   },
   {
@@ -715,7 +705,9 @@ export const DeviceMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
           labelField: 'label',
           valueField: 'value'
         },
+        disabled: false,
         filterable: true,
+        placeholder: "请选择类型"
       },
     },
     form: {
@@ -727,7 +719,7 @@ export const DeviceMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
           valueField: 'value'
         },
         filterable: true,
-        placeholder: "请选择设备"
+        placeholder: "请选择类型"
       }
     },
   },
diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue
index 9831cfb..a90272a 100644
--- a/src/views/eam/device/devicemaintenancejob/index.vue
+++ b/src/views/eam/device/devicemaintenancejob/index.vue
@@ -361,38 +361,22 @@ const judgeIsTheClass = (row) => {
   }
 }
 
-const judgeIsTheFactory = (row) => {
-  return userStore.userSelfInfo.deptId == row.factoryAreaNumber
-}
-
-
-const judgeIsTheClassEngineer = (row) => {
-  const rolesOk = userStore.roles.find(item => {
-    if (row.type == 'DEVICE') {
-      return item == 'device_class_Engineer_role'
-    }else if (row.type == 'TECH') {
-      return item == 'tech_class_Engineer_role'
-    }
-  })
-  if (rolesOk != undefined && rolesOk != null) {
-    return true
-  } else {
-    return false
-  }
-}
-
 const judgeIsTheClassEngineerAndApply = (row,type) => {
   // 根据不同的状态进行判断
-  // if (row.status === 'COMPLETED' && type == 'CONFIRM') {
-  if (row.status === 'COMPLETED') {
+  if (row.status === 'COMPLETED' && type == 'CONFIRM') {
     // COMPLETED状态下，需要额外判断requestNumber和declarer
     if(row.requestNumber != null && row.requestNumber !== '' && row.declarer === userStore.getUser.id){
       return true
     }else{
       return false
     }
+  }else if(row.status === 'APPLYPASS' && type == 'VERIFY'){
+    return true
+  }else if(row.requestNumber == null || row.requestNumber == ''){
+    if(row.status === 'COMPLETED' && type == 'VERIFY'){
+      return true
+    }
   }
-
   // 如果不是COMPLETED或APPLYPASS状态，或者COMPLETED状态下条件不满足，则默认返回false
   return false;
 }
@@ -400,8 +384,8 @@ const judgeIsTheClassEngineerAndApply = (row,type) => {
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi:'eam:device-maintenance-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintenance-job-main:import'}),
-  defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintenance-job-main:export'}),
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:device-maintenance-job-main:import'}),
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:device-maintenance-job-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -452,7 +436,7 @@ const butttondata = (row) => {
     defaultButtons.acceptOrderBtn({
       hasPermi:'eam:device-maintenance-job-main:orderClick',
       hide: !(
-        row.status == 'PENDING' && judgeIsTheFactory(row)
+        row.status == 'PENDING' && row.type == 'DEVICE'
       )
     }), // 接单
     defaultButtons.turnOrderBtn({
@@ -466,7 +450,7 @@ const butttondata = (row) => {
     defaultButtons.verifyOrderBtn({
       hasPermi:'eam:device-maintenance-job-main:orderClickVerify',
       hide: !(
-        judgeIsTheClassEngineerAndApply(row,'VERIFY') && judgeIsTheFactory(row)
+        judgeIsTheClassEngineerAndApply(row,'VERIFY')
       )
     }), // 验证
     defaultButtons.finishOrderBtn({
@@ -491,11 +475,11 @@ const onChange = (field, cur, item) => {
     // console.log(item)
     // console.log(item.componentProps.options)
     formRef.value.formRef.formModel.maintenance = Number(userStore?.getUser?.id)
-    if (judgeIfDeviceRole()) {
-      formRef.value.formRef.formModel.type = 'DEVICE'
-    } else {
-      formRef.value.formRef.formModel.type = 'TECH'
-    }
+    // if (judgeIfDeviceRole()) {
+    //   formRef.value.formRef.formModel.type = 'DEVICE'
+    // } else {
+    //   formRef.value.formRef.formModel.type = 'TECH'
+    // }
 
   }
 }
@@ -620,7 +604,7 @@ const onChangeSec = (field, cur, item,formRefSec) => {
       setV['factoryAreaNumber'] = newRow.value.factoryAreaNumber
       setV['maintenance'] = newRow.value.maintenance
       formRefSec.setValues(setV)
-      DeviceMaintenanceMainSecRules.maintenance = [{ required: true }]
+      DeviceMaintenanceMainSecRules.maintenance = [{ required: true,message:'请选择维修人' }]
       DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
             return item.field == 'type'
           }).componentProps.disabled = true
@@ -1186,16 +1170,16 @@ const getActorClass = () => {
    
 }
 
-const judgeIfDeviceRole = () => {
-  const rolesOk = userStore.roles.find(item => {
-    return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
-  })
-  if (rolesOk != undefined && rolesOk != null) {
-    return true
-  } else {
-    return false
-  }
-}
+// const judgeIfDeviceRole = () => {
+//   const rolesOk = userStore.roles.find(item => {
+//     return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+//   })
+//   if (rolesOk != undefined && rolesOk != null) {
+//     return true
+//   } else {
+//     return false
+//   }
+// }
 
 const validateRow = (row) => {
   let flag = true;
diff --git a/src/views/eam/device/techRepair/index.vue b/src/views/eam/device/techRepair/index.vue
new file mode 100644
index 0000000..9b0f879
--- /dev/null
+++ b/src/views/eam/device/techRepair/index.vue
@@ -0,0 +1,391 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="DeviceRepair.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="DeviceRepair.allSchemas" />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #code="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #upload="{ row }">
+        <ButtonBase v-if="row.filePathList != null && row.filePathList.length != 0" :Butttondata="butttondataView(row)" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+     
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="DeviceRepairRules"
+    :formAllSchemas="DeviceRepair.allSchemas" 
+    :apiUpdate="DeviceRepairApi.updateDeviceRepair"
+    :apiCreate="DeviceRepairApi.createDeviceRepair" 
+    @searchTableSuccess="searchTableSuccess" 
+    :isBusiness="false" 
+    @onChange="onChange"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceRepair.allSchemas" />
+
+  <Dialog 
+    ref="basicFormViewRef"
+    v-model="showView" 
+    :key="viewKey"
+    :closeOnClickModal="true"
+    :title="viewTitle" 
+  >
+    <el-image v-for="url in urls" :key="url" :src="url" lazy />
+  </Dialog>
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/eam/tech-repair-request/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { DeviceRepair, DeviceRepairRules } from './techRepair.data'
+import * as DeviceRepairApi from '@/api/eam/device/techRepair'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as DeviceAccountApi from '@/api/eam/device/deviceAccounts'
+import * as MoldAccountApi from '@/api/eam/mold/moldAccounts'
+import { DeviceAccounts } from '../deviceAccounts/deviceAccounts.data'
+import { useUserStore } from '@/store/modules/user'
+// import TableHead from '@/components/TableHead/src/TableHead.vue'
+// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'TechRepair' })
+
+
+const userStore = useUserStore()
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+const showView = ref(false)
+const viewTitle = ref('图片预览')
+const urls = ref([])
+const viewKey = ref(0)
+routeName.value = route.name
+const tableColumns = ref(DeviceRepair.allSchemas.tableColumns)
+const factoryAreaNumber = ref('');
+const type = ref('');
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeviceRepairApi.getDeviceRepairPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:tech-repair-request:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:tech-repair-request:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:tech-repair-request:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListEditBtn({hasPermi:'eam:deviceRepair:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:deviceRepair:delete' }), // 删除
+    
+    defaultButtons.backoutBtn({hasPermi:'eam:tech-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销
+
+  ]
+}
+
+// 列表-操作按钮
+const butttondataView = (row) => {
+  return [
+    defaultButtons.viewBtn(null),
+
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'backout') { //撤销
+    handleBackout(row)
+  } else if (val == 'view') { //预览
+    openForm('view', row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const basicFormViewRef = ref()
+const openForm = (type: string, row?: any) => {
+  // if(type == 'create'){
+  //   DeviceRepair.allSchemas.formSchema.find(item => {
+  //       return item.field == 'type'
+  //     }).value = 'TECH'
+  // }
+  if (type == 'view') {
+    showView.value = true
+    urls.value = row.filePathList
+    viewKey.value += 1
+  } else {
+    basicFormRef.value.open(type, row)
+  }
+  
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = DeviceRepair.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if (isHave) {
+    if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if (data.activeTime == 0) data.activeTime = null;
+  if (data.expireTime == 0) data.expireTime = null;
+  data.result = 'PENDING';
+  if (data.upload != null && data.upload != "") {
+    data.filePathList = data?.upload?.map((item: any) => {
+      return item.url
+    })
+  }
+  if (formType === 'create') {
+    await DeviceRepairApi.createDeviceRepair(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await DeviceRepairApi.updateDeviceRepair(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicDeviceRepair')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeviceRepairApi.deleteDeviceRepair(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeviceRepairApi.exportDeviceRepair(tableObject.params)
+    download.excel(data, '报修申请.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '报修申请导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// function getAllFactoryAreaList() {
+//   selectAllFactoryArea().then(res => {
+//     factoryAreaList.value = res.data
+//   })
+// }
+
+function handleBackout(row) {
+  if (row.result != 'PENDING') {
+    message.error('该报修单正在处理中，不能撤销！')
+  }
+  DeviceRepairApi.cancel(row.id).then(res => {
+    console.log("撤销成功！")
+    getList() // 刷新当前列表
+  })
+
+}
+
+const onChange = (field, cur, item,formRef) => {
+  if (field == 'factoryAreaNumber') {
+    nextTick(() => {
+      const setV = {}
+      setV['deviceNumber'] = ''
+      formRef.setValues(setV)
+    })
+    factoryAreaNumber.value = cur
+    if(type.value != 'MOLD'){
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+       MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }
+  }
+
+  if (field == 'type') {
+    nextTick(() => {
+      const setV = {}
+      setV['deviceNumber'] = ''
+      formRef.setValues(setV)
+    })
+    type.value = cur
+    if(cur != 'MOLD'){
+      type.value = 'DEVICE'
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'DEVICE',
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+      type.value = 'MOLD'
+      MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'MOLD',
+        status: '0'
+      }).then((res) => {
+        DeviceRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }
+    
+  }
+ 
+  // if (field == 'factoryAreaNumber') {
+  //   // 获取当前的工厂区域编号
+  //   debugger
+  //   delete DeviceRepair.allSchemas.formSchema.find(item => {
+  //     return item.field == 'deviceNumber'
+  //   }).value
+  // }
+ 
+}
+
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DeviceRepairApi.importTemplate()
+})
+
+
+</script>
+
+
diff --git a/src/views/eam/device/techRepair/techRepair.data.ts b/src/views/eam/device/techRepair/techRepair.data.ts
new file mode 100644
index 0000000..c6af868
--- /dev/null
+++ b/src/views/eam/device/techRepair/techRepair.data.ts
@@ -0,0 +1,248 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { selectAllFactoryArea } from '@/api/system/dept'
+import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { validateHanset,validateNumDot, validateEmail } from '@/utils/validator'
+import * as UserApi from '@/api/system/user'
+const userListAll = await UserApi.getSimpleUserList()
+// 邮箱账号的列表
+const factoryList = await selectAllFactoryArea()
+const deviceList = ref([]);
+const deviceListNoPage = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
+const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD')
+const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
+// 表单校验
+export const DeviceRepairRules = reactive({
+  number: [required],
+  deviceNumber: [required],
+  factoryAreaNumber: [required],
+  declarer: [required],
+  faultType: [required],
+  type: [required],
+  available: [required],
+  declarerPhone: [
+    required,
+    { validator:validateHanset, message: '输入手机号格式不正确', trigger: 'blur'}
+  ]
+  // result: [required],
+})
+
+export const DeviceRepair = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '报修工单编号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: '150',
+      fixed: 'left',
+    },
+    isSearch: false,
+    isForm: false
+  },
+  {
+    label: '厂区',
+    field: 'factoryAreaNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    api: () => factoryList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return factoryList.find((account) => account.id == cellValue)?.name
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      },
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
+    },
+    isSearch: true,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        // disabled: true,
+        filterable: true,
+        placeholder: "请选择类型"
+      }
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        // disabled: true,
+        filterable: true,
+        placeholder: "请选择类型"
+      }
+    },
+  },
+  {
+    label: '设备',
+    field: 'deviceNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: true,
+    api: () => DeviceAccountsApi.getDeviceAccountsNoPage({
+      isSearch: false
+    }),
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceListNoPage.find((account) => account.number == cellValue)?.name
+    },
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: deviceListNoPage,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      },
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: deviceListNoPage,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      },
+    }
+  },
+  {
+    label: '报修人电话',
+    field: 'declarerPhone',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+  },
+  {
+    label: '报修人',
+    field: 'declarer',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isForm: false,
+    isDetail: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userListAll.find((account) => account.id == cellValue)?.nickname
+    },
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: userListAll,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        filterable: true,
+      },
+    },
+  },
+  // {
+  //   label: '故障类型',
+  //   field: 'faultType',
+  //   sort: 'custom',
+  //   table: {
+  //     width: '150',
+  //   },
+  //   dictType: DICT_TYPE.FAULT_TYPE,
+  //   dictClass: 'string',
+  //   form: {
+  //     component: 'Select'
+  //   },
+  // },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '维修状态',
+    field: 'result',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isForm: false,
+    form: {
+      component: 'Select',
+    },
+  },
+  {
+    label: '图片',
+    field: 'upload',
+    isForm: true,
+    form: {
+      component: 'UploadImgs',
+      componentProps: {
+        limit:3,
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/device/techmaintenancejob/index.vue b/src/views/eam/device/techmaintenancejob/index.vue
new file mode 100644
index 0000000..432b48a
--- /dev/null
+++ b/src/views/eam/device/techmaintenancejob/index.vue
@@ -0,0 +1,1195 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="DeviceMaintenanceMain.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DeviceMaintenanceMain.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{ row }">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    :rules="DeviceMaintenanceMainRules"
+    :formAllSchemas="DeviceMaintenanceMain.allSchemas"
+    :tableAllSchemas="DeviceMaintenanceDetail.allSchemas"
+    :tableFormRules="DeviceMaintenanceDetailRules"
+    :tableData="tableData"
+    :apiUpdate="DeviceMaintenanceMainApi.updateDeviceMaintenanceMain"
+    :apiCreate="DeviceMaintenanceMainApi.createDeviceMaintenanceMain"
+    :isBusiness="false"
+    @onChange="onChange"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @success="submitForm"
+      :isSearchTableItem="true"
+  />
+  
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRefSec"
+    :rules="DeviceMaintenanceMainSecRules"
+    :formAllSchemas="DeviceMaintenanceMainSec.allSchemas"
+    :tableAllSchemas="DeviceMaintenanceDetail.allSchemas"
+    :tableFormRules="DeviceMaintenanceDetailRules"
+    :tableData="tableData"
+    :apiUpdate="DeviceMaintenanceMainApi.updateDeviceMaintenanceMain"
+    :apiCreate="DeviceMaintenanceMainApi.createDeviceMaintenanceMain"
+    :isBusiness="false"
+    @onChange="onChangeSec"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitFormSec"
+    @success="submitFormSec"
+    :isSearchTableItem="true"
+  />
+
+  <!-- 详情 -->
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceMaintenanceMain.allSchemas" /> -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeviceMaintenanceMain.allSchemas"
+    :detailAllSchemas="DeviceMaintenanceDetail.allSchemas"
+    :detailAllSchemasRules="DeviceMaintenanceDetailRules"
+    :apiCreate="DeviceMaintenanceDetailApi.createDeviceMaintenanceDetail"
+    :apiUpdate="DeviceMaintenanceDetailApi.updateDeviceMaintenanceDetail"
+    :apiPage="DeviceMaintenanceDetailApi.getDeviceMaintenanceDetailPage"
+    :apiDelete="DeviceMaintenanceDetailApi.deleteDeviceMaintenanceDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @detailOpenForm="detailOpenForm"
+    :detailValidate="detailValidate"
+    @detailSubmitForm="detailSubmitForm"
+    :isSearchTableItem="true"
+    :openFormCallBack="openFormCallBack"
+    :buttonControllFunction="buttonControllFunction"
+    @deleteDetail="getList"
+  />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/tech-maintenance-job-main/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+
+
+  <Dialog 
+    ref="basicFormViewRef"
+    v-model="showView" 
+    :key="viewKey"
+    :closeOnClickModal="true"
+    :title="viewTitle" 
+  >
+    <el-image v-for="url in urls" :key="url" :src="url" lazy />
+  </Dialog>
+
+  <Dialog 
+    ref="confirmIfTempIdeaRef"
+    v-model="showTempIdeaRefView" 
+    :key="tempIdeaRefViewKey"
+    :closeOnClickModal="true"
+    :title="tempIdeaRefViewTitle" 
+    :vLoading="tempDialogLoading"
+    
+  >
+    <div style="text-align: center;">
+      <el-checkbox ref="checkBoxTempDue" v-model="isTemporary">临时措施</el-checkbox>
+    </div>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirmIsTemporary">确定</el-button>
+    </template>
+  </Dialog>
+
+  <Dialog 
+    ref="confirmDialog"
+    title="确认意见" 
+    v-model="confirmDialogVisible"
+    :width="600"
+    :maxHeight="760"
+    :style="{height:'500px'}"
+    :before-close="handleBeforeConfirmClose"
+    :vLoading="confirmDialogLoading"
+  >
+    <el-form class="demo-form-inline">
+      <el-form-item label="确认意见">
+        <!-- 确保@change事件绑定在el-radio-group上 -->
+        <el-radio-group v-model="confirmFormValue.confirmStatus">
+          <el-radio :label="'APPLYPASS'">通过</el-radio>
+          <el-radio :label="'APPLYREJECTED'">驳回</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="意见">
+        <el-input
+          type="textarea"
+          v-model="confirmFormValue.confirmContent"
+          placeholder="请填写意见"
+          clearable
+          :rows="12"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div style="text-align: center;">
+        <el-button type="primary" @click="confirmCancel">取消</el-button>
+        <el-button type="primary" @click="confirmSubmit">提交</el-button>
+      </div>
+    </template>
+  </Dialog>
+
+  <Dialog 
+    ref="verifyDialog"
+    title="验证意见" 
+    v-model="verifyDialogVisible"
+    :width="600"
+    :maxHeight="700"
+    :style="{height:'450px'}"
+    :before-close="handleBeforeVerifyClose"
+    :vLoading="formLoading"
+  >
+    <el-form :model="verifyFormValue" class="demo-form-inline">
+      <el-form-item label="验证意见">
+        <el-input
+          type="textarea"
+          v-model="verifyFormValue.verifyContent"
+          placeholder="请填写验证意见"
+          clearable
+          :rows="12"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div style="text-align: center;">
+        <el-button type="primary" @click="verifyCancel">取消</el-button>
+        <el-button type="primary" @click="verifySubmit">提交</el-button>
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import {
+  DeviceMaintenanceMain,
+  DeviceMaintenanceMainRules,
+  DeviceMaintenanceDetail,
+  DeviceMaintenanceDetailRules,
+  DeviceMaintenanceMainSec,
+  DeviceMaintenanceMainSecRules,
+} from './techMaintenanceMain.data'
+import * as DeviceMaintenanceMainApi from '@/api/eam/device/techMaintenanceMain'
+import * as DeviceMaintenanceDetailApi from '@/api/eam/device/techMaintenanceDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import * as MoldAccountsApi from '@/api/eam/mold/moldAccounts'
+import { useUserStore } from '@/store/modules/user'
+import { selecUserByType } from '@/api/system/dept'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as UserApi from '@/api/system/user'
+import { selectAllFactoryArea } from '@/api/system/dept'
+import { ItemSearchTable } from '../../basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+import { emit } from 'process'
+import { verify } from 'crypto'
+import { watch } from 'vue';
+const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
+const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD')
+defineOptions({ name: 'TechMaintenanceMain' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const userStore = useUserStore() // 用户信息
+const route = useRoute() // 路由信息
+const routeName = ref()
+const formRef = ref()
+const formRefSec = ref()
+routeName.value = route.name
+const tableColumns = ref(DeviceMaintenanceMain.allSchemas.tableColumns)
+const tableData = ref([])
+const showView = ref(false)
+const viewTitle = ref('图片预览')
+const urls = ref([])
+const viewKey = ref(0)
+const operatRecord = ref()
+const newRow = ref()
+const deviceList = ref()
+const moldList = ref()
+const repairUser = ref()
+const showTempIdeaRefView = ref(false)
+const tempIdeaRefViewKey = ref(0)
+const tempIdeaRefViewTitle = ref('是否临时措施')
+const isTemporary = ref(false)
+const tempIdeaRefViewData = ref()
+const confirmDialogVisible = ref(false)
+const verifyDialogVisible = ref(false)
+const confirmFormValue = ref({
+  confirmStatus: 'APPLYPASS',
+  confirmContent: '',
+})
+const verifyFormValue = ref({
+  verifyContent: '',
+})
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+const openRowValue = ref()
+const formLoading = ref(false)
+const tempDialogLoading = ref(false)
+const confirmDialogLoading = ref(false)
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      if (formField == 'itemNumbers1') {
+        let str = ''
+        val.forEach((element) => {
+          str += element.name + ':' + element.qty + ','
+        })
+        str = str.substring(0, str.length - 1)
+        row['itemNumbers1'] = str
+        row['itemNumbers'] = val 
+        console.log(row)
+      }
+    } else {
+      // const setV = {}
+      // setV[formField] = val[0][searchField]
+      // setV['supplierCode'] = val[0]['code']
+      // formRef.setValues(setV)
+    }
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if (formField == 'itemNumbers1') {
+      let str = ''
+        val.forEach((element) => {
+          str += element.name + ':' + element.qty + ','
+        })
+        str = str.substring(0, str.length - 1)
+        setV['itemNumbers'] = val
+        setV['itemNumbers1'] = str
+    } 
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo = []
+
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeviceMaintenanceMainApi.getTechMaintenanceMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+
+const judgeIsTheClassEngineerAndApply = (row,type) => {
+  // 根据不同的状态进行判断
+  if (row.status === 'COMPLETED' && type == 'CONFIRM') {
+    // COMPLETED状态下，需要额外判断requestNumber和declarer
+    if(row.requestNumber != null && row.requestNumber !== '' && row.declarer === userStore.getUser.id){
+      return true
+    }else{
+      return false
+    }
+  }else if(row.status === 'APPLYPASS' && type == 'VERIFY'){
+    return true
+  }else if(row.requestNumber == null || row.requestNumber == ''){
+    if(row.status === 'COMPLETED' && type == 'VERIFY'){
+      return true
+    }
+  }
+  // 如果不是COMPLETED或APPLYPASS状态，或者COMPLETED状态下条件不满足，则默认返回false
+  return false;
+}
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi:'eam:tech-maintenance-job-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:tech-maintenance-job-main:import'}),
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:tech-maintenance-job-main:export'}),
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.disabled = false
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'type'
+    }).value = 'DEVICE'
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'type'
+    }).componentProps.options = deviceTypeList
+    openForm('create')
+  } else if (val == 'import') {
+    // 导入
+    handleImport()
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({hasPermi:'eam:tech-maintenance-job-main:update', hide: !(row.status != 'COMPLETED' && row.status != 'VERIFIED' && row.status != 'REJECTED' && row.status != 'APPLYPASS' && isReceiver(row.maintenance) )}), // 编辑
+    defaultButtons.acceptOrderBtn({
+      hasPermi:'eam:tech-maintenance-job-main:orderClick',
+      hide: !(
+        row.status == 'PENDING' && row.type == 'TECH'
+      )
+    }), // 接单
+    defaultButtons.turnOrderBtn({
+      hasPermi:'eam:tech-maintenance-job-main:turnTo',
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id  && !row.hasDetails )
+    }), // 转办
+    defaultButtons.repairBtn({
+      hasPermi:'eam:tech-maintenance-job-main:repair',
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id)
+    }), // 维修
+    defaultButtons.verifyOrderBtn({
+      hasPermi:'eam:tech-maintenance-job-main:orderClickVerify',
+      hide: !(
+        judgeIsTheClassEngineerAndApply(row,'VERIFY')
+      )
+    }), // 验证
+    defaultButtons.finishOrderBtn({
+      hasPermi:'eam:tech-maintenance-job-main:orderClickFinish',
+      hide: !(row.status == 'PECEIVED' && row.maintenance == userStore.getUser.id && row.hasDetails)
+    }), // 完成
+    defaultButtons.confirmOrderBtn({
+      hasPermi:'eam:tech-maintenance-job-main:orderClickConfirm',
+      hide: !(
+        judgeIsTheClassEngineerAndApply(row,'CONFIRM')
+      )
+    }), // 确认
+    defaultButtons.pictureBtn({
+      hide: !(row.filePathList != null && row.filePathList.length > 0)
+    }) // 预览报修图片
+  ]
+}
+const onChange = (field, cur, item) => {
+  if (field == 'deviceNumber') {
+    formRef.value.formRef.formModel.factoryAreaNumber =String(item.componentProps.options.find((item) => item.number == cur).factoryAreaNumber)
+    console.log(typeof formRef.value.formRef.formModel.factoryAreaNumber)
+    // console.log(item)
+    // console.log(item.componentProps.options)
+    formRef.value.formRef.formModel.maintenance = Number(userStore?.getUser?.id)
+    // if (judgeIfDeviceRole()) {
+    //   formRef.value.formRef.formModel.type = 'DEVICE'
+    // } else {
+    //   formRef.value.formRef.formModel.type = 'TECH'
+    // }
+
+  }
+}
+
+const onChangeSec = (field, cur, item,formRefSec) => {
+  if (field == 'type') {
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.optionsAlias = {
+          labelField: 'name',
+          valueField: 'id'
+        }
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.disabled = false
+    if (cur == 'MOLD') {
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'deviceNumber'
+      }).componentProps.options = moldList.value
+      MoldAccountsApi.getMoldAccountsNoPage({}).then(res => {
+        const setV = {}
+        setV['deviceNumber'] = ''
+        setV['maintenance'] = ''
+        formRefSec.setValues(setV)
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.disabled = true
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    } else if (cur == 'TECH') {
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'deviceNumber'
+      }).componentProps.options = deviceList.value
+      DeviceAccountsApi.getDeviceAccountsNoPage({}).then(res => {
+        const setV = {}
+        setV['deviceNumber'] = ''
+        setV['maintenance'] = ''
+        formRefSec.setValues(setV)
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.disabled = true
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    } else if(cur == 'DEVICE'){
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'deviceNumber'
+      }).componentProps.options = deviceList.value
+      DeviceAccountsApi.getDeviceAccountsNoPage({}).then(res => {
+        const setV = {}
+        setV['deviceNumber'] = ''
+        setV['maintenance'] = ''
+        formRefSec.setValues(setV)
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.disabled = true
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    } 
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'maintenance'
+    }).componentProps.disabled = false
+  }
+  if (field == 'turnType') {
+    if (cur == '0') {
+      const setV = {}
+      setV['factoryAreaNumber'] = newRow.value.factoryAreaNumber
+      setV['maintenance'] = newRow.value.maintenance
+      setV['deviceNumber'] = newRow.value.deviceNumber
+      setV['type'] = newRow.value.type
+      formRefSec.setValues(setV)
+      DeviceMaintenanceMainSecRules.maintenance = [{ required: false }]
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'type'
+          }).componentProps.disabled = false
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'deviceNumber'
+          }).componentProps.disabled = true
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'factoryAreaNumber'
+          }).componentProps.disabled = true
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'maintenance'
+      }).componentProps.disabled = true
+      if (formRefSec.formModel.type == 'MOLD') {
+        MoldAccountsApi.getMoldAccountsAllNoPage({})
+        .then(res => {
+          moldList.value = res
+          DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'deviceNumber'
+          }).componentProps.options = moldList.value
+        })
+      } else {
+        DeviceAccountsApi.getDeviceAccountsAllNoPage({})
+            .then(res => {
+              deviceList.value = res
+              DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+                return item.field == 'deviceNumber'
+              }).componentProps.options = deviceList.value 
+            })
+      }
+      UserApi.getSimpleUserList().then(res => {
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.options = res
+      })
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.optionsAlias = {
+          labelField: 'nickname',
+          valueField: 'id'
+        }
+    } else if (cur == '1') {
+      const setV = {}
+      setV['deviceNumber'] = newRow.value.deviceNumber
+      setV['type'] = newRow.value.type
+      setV['factoryAreaNumber'] = newRow.value.factoryAreaNumber
+      setV['maintenance'] = newRow.value.maintenance
+      formRefSec.setValues(setV)
+      DeviceMaintenanceMainSecRules.maintenance = [{ required: true,message:'请选择维修人' }]
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'type'
+          }).componentProps.disabled = true
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'deviceNumber'
+          }).componentProps.disabled = true
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'factoryAreaNumber'
+          }).componentProps.disabled = false
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+            return item.field == 'maintenance'
+      }).componentProps.disabled = true
+      UserApi.getSimpleUserList().then(res => {
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+          return item.field == 'maintenance'
+        }).componentProps.options = res
+      })
+      DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'maintenance'
+      }).componentProps.optionsAlias = {
+        labelField: 'nickname',
+        valueField: 'id'
+      }
+    }
+  }
+
+  if (field == 'factoryAreaNumber') {
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'maintenance'
+    }).componentProps.optionsAlias = {
+      labelField: 'name',
+      valueField: 'id'
+    }
+    if (formRefSec.formModel.type == 'DEVICE') {
+      selecUserByType({ classType: 'DEVICE', factoryAreaNumber: cur, flag: null }).then(res => {
+        repairUser.value = res
+        const setV = {}
+        setV['maintenance'] = ''
+        formRefSec.setValues(setV)
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+              return item.field == 'maintenance'
+        }).componentProps.options = res
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+              return item.field == 'maintenance'
+            }).componentProps.disabled = false
+      })
+    } else if (formRefSec.formModel.type == 'TECH') {
+      selecUserByType({ classType: 'TECH', factoryAreaNumber: cur, flag: null }).then(res => {
+        repairUser.value = res
+        const setV = {}
+        setV['maintenance'] = ''
+        formRefSec.setValues(setV)
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+              return item.field == 'maintenance'
+        }).componentProps.options = res
+        DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+              return item.field == 'maintenance'
+            }).componentProps.disabled = false
+      })
+    }
+    
+  }
+}
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.disabled = false
+  if (val == 'edit') {
+    // 编辑
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.disabled = true
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+      return item.field == 'type'
+    }).componentProps.options = deviceTypeList
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else if (val == 'acceptOrder') {
+    acceptOrder(row)
+  } else if (val == 'repair') {
+    openDetail(row, '代码', row.number)
+  } else if (val == 'turnOrder') {
+    turnOrder('turnOrder', row)
+  } else if (val == 'finishOrder') {
+    finishOrder(row)
+  } else if (val == 'verifyOrder') {
+    verifyOrder(row)
+  } else if (val == 'confirmOrder') {
+    confirmOrder(row)
+  } else if (val == 'picture') {
+    showView.value = true
+    urls.value = row.filePathList
+    viewKey.value += 1
+  }
+}
+
+/** 添加/修改操作 */
+
+const openForm = async (type: string, row?: any) => {
+  if(type == 'create'){
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+        return item.field == 'type'
+      }).value = 'TECH'
+  }
+  tableData.value = [] // 重置明细数据
+  await DeviceAccountsApi.getDeviceAccountsNoPage({}).then(res => {
+    DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
+        return item.field == 'deviceNumber'
+      }).componentProps.options = res
+  })
+  formRef.value.open(type, row)
+}
+const openFormSec =  async (type: string, row?: any) => {
+  tableData.value = [] // 重置明细数据
+  newRow.value = { ...row }
+  newRow.value.turnType = '0'
+  DeviceMaintenanceMainSecRules.classes = [{ required: false }]
+  DeviceMaintenanceMainSecRules.faultType = [{ required: false }]
+  DeviceMaintenanceMainSecRules.describes = [{ required: false }]
+  DeviceMaintenanceMainSecRules.maintenance = [{ required: false }]
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'type'
+      }).componentProps.disabled = false
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'deviceNumber'
+      }).componentProps.disabled = true
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'factoryAreaNumber'
+      }).componentProps.disabled = true
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+        return item.field == 'maintenance'
+  }).componentProps.disabled = true
+  await MoldAccountsApi.getMoldAccountsAllNoPage({})
+        .then(res => {
+          moldList.value = res
+        })
+  await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
+        .then(res => {
+          deviceList.value = res
+        })
+  if (row.type == 'MOLD') {
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.options = moldList.value
+  } else {
+    DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'deviceNumber'
+    }).componentProps.options = deviceList.value 
+  }
+  const userListAll = await UserApi.getSimpleUserList()
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+      return item.field == 'maintenance'
+  }).componentProps.options = userListAll
+  DeviceMaintenanceMainSec.allSchemas.formSchema.find(item => {
+    return item.field == 'maintenance'
+  }).componentProps.optionsAlias = {
+    labelField: 'nickname',
+    valueField: 'id'
+  }
+  formRefSec.value.open(type, newRow.value)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any) => {
+  const userListAll = await UserApi.getSimpleUserList()
+  const factoryList = await selectAllFactoryArea()
+const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
+  const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
+  row.typeDetail = deviceMoldTypeList.find((account) => account.value == row.type)?.label
+  row.deviceNumberDetail = deviceListAll.find((account) => account.number == row.deviceNumber)?.name
+  row.factoryAreaNumberDetail = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name
+  row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname
+  row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname
+  row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname
+  row.classes = row.classes+''
+  operatRecord.value = row;
+  detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DeviceMaintenanceMainApi.deleteDeviceMaintenanceMain(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await DeviceMaintenanceMainApi.exportDeviceMaintenanceMain(tableObject.params)
+    download.excel(data, '维修工单主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '维修工单主导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+// 接单
+function acceptOrder(row) {
+  DeviceMaintenanceMainApi.orderStepChange(row).then(item => {
+    message.success('接单成功')
+    getList()
+  })
+  getList()
+}
+// 转办
+function turnOrder(type, row) {
+  openFormSec(type,row)
+}
+
+// 完成
+function finishOrder(row) {
+  if (validateRow(row)) {
+    showTempIdeaRefView.value = true
+    tempIdeaRefViewData.value = row
+  }
+}
+
+function confirmFinish(row) {
+  tempDialogLoading.value = true
+  let param = {
+    id: row.id,
+    number: row.number,
+    status: row.status,
+    result:isTemporary.value && isTemporary.value != ''?'TEMPORARILY':'COMPLETED',
+    requestNumber: row.requestNumber,
+  }
+  DeviceMaintenanceMainApi.finishOrder(param).then(res => {
+    tempDialogLoading.value = false
+    getList()
+    showTempIdeaRefView.value = false;
+    message.success('操作成功')
+  })
+}
+
+// 验证
+function verifyOrder(row) {
+  openRowValue.value = row
+  verifyFormValue.value.verifyContent = ''
+  verifyDialogVisible.value = true
+}
+
+// 验证
+function verifySubmit() {
+  formLoading.value = true
+  const row = openRowValue.value
+  let param = {
+    id: row.id,
+    number: row.number,
+    status: row.status,
+    requestNumber: row.requestNumber,
+    content: verifyFormValue.value.verifyContent
+  }
+  DeviceMaintenanceMainApi.verifyOrder(param).then(res => {
+    formLoading.value = false
+    verifyDialogVisible.value = false
+    getList()
+    message.success('操作成功')
+  })
+}
+
+// 验证取消
+function verifyCancel(row) {
+  verifyDialogVisible.value = false
+}
+
+// 确认
+function confirmOrder(row) {
+  openRowValue.value = row
+  confirmFormValue.value.confirmContent = ''
+  confirmFormValue.value.confirmStatus = 'APPLYPASS'
+  confirmDialogVisible.value = true
+}
+
+// 确认
+function confirmSubmit() {
+  confirmDialogLoading.value = true
+  const row = openRowValue.value
+  let param = {
+    id: row.id,
+    number: row.number,
+    status: row.status,
+    result: confirmFormValue.value.confirmStatus,
+    requestNumber: row.requestNumber,
+    content: confirmFormValue.value.confirmContent,
+  }
+  DeviceMaintenanceMainApi.confirmOrder(param).then(res => {
+    confirmDialogLoading.value = false
+    confirmDialogVisible.value = false
+    getList()
+    message.success('操作成功')
+  })
+}
+
+// 确认取消
+function confirmCancel(row) {
+  confirmDialogVisible.value = false
+}
+
+// 维修
+function repair() {}
+
+// 详情
+function mainListDetail() {}
+/**
+ * tableForm方法
+ */
+const tableFormKeys = {}
+DeviceMaintenanceDetail.allSchemas.tableFormColumns.forEach((item) => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value.map((item) => {
+    return {
+      describes: item.describes,
+      describes1: item.describes1,
+      itemNumbers: item.itemNumbers,
+      maintenances: item.maintenances.join(','),
+      workOut: item.workOut,
+    }
+  }) // 拼接子表数据参数
+  console.log(data.subList)
+  try {
+    if (formType === 'create') {
+      await DeviceMaintenanceMainApi.createDeviceMaintenanceMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeviceMaintenanceMainApi.updateDeviceMaintenanceMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+
+// 主子数据 提交
+const submitFormSec = async (formType, data) => {
+  const data1 = {
+    status: data.turnType,
+    deviceNumber: data.deviceNumber,
+    type: data.type,
+    maintenance: data.maintenance,
+    id: data.id
+  }
+  console.log(data.subList)
+  try {
+    await DeviceMaintenanceMainApi.orderTurnTo(data1)
+    message.success(t('common.updateSuccess'))
+    formRefSec.value.dialogVisible = false
+    // 刷新当前列表
+    getList()
+  } finally {
+    formRefSec.value.formLoading = false
+  }
+}
+
+
+const detailOpenForm = (type, row) =>{
+  row.maintenances =  row.maintenances.split(',').map(item=>Number(item))
+ 
+  console.log(row.maintenances)
+  DeviceMaintenanceDetail.allSchemas.tableFormColumns.map((item) => {
+    // if(purchaseReceiptRecordNumberRef.value == ''){
+    //   if (item.field == 'itemCode') {
+    //     item.form.componentProps.disabled = true
+    //     item.form.componentProps.isSearchList = true
+    //   }
+    //   if(item.field == 'poLine'){
+    //     item.form.componentProps.disabled = true
+    //     item.form.componentProps.isSearchList = false
+    //   }
+    // }else{
+    //   if (item.field == 'itemCode') {
+    //     item.form.componentProps.disabled = true
+    //     item.form.componentProps.isSearchList = false
+    //   }
+    //   if(item.field == 'poLine'){
+    //     item.form.componentProps.disabled = true
+    //     item.form.componentProps.isSearchList = true
+    //   }
+    // }
+  })
+}
+// 子表新增/编辑校验
+const detailValidate = (data) => {
+  return true;
+  // let tag = false;
+  // if(data.qty <= 0){
+  //   message.warning('数量必须大于0')
+  //   tag = false;
+  //   return tag;
+  // }else {
+  //   tag = true;
+  //   return tag;
+  // }
+}
+// 子表提交
+const detailSubmitForm = async (formType, data, formRef, tableList) => {
+  try {
+    let data1 = {
+      id:data.id,
+      number:data.number,
+      describes:data.describes,
+      describes1:data.describes1,
+      itemNumbers:data.itemNumbers,
+      maintenances:data.maintenances?.join(','),
+      workOut:data.workOut,
+    }
+    console.log(data1)
+  if (formType === 'create') {
+      await DeviceMaintenanceDetailApi.createDeviceMaintenanceDetail(data1)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DeviceMaintenanceDetailApi.updateDeviceMaintenanceDetail(data1)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.dialogVisible = false
+    await detailRef.value.getList()
+    // 刷新当前列表
+    detailRef.value.tableObject.tableList.forEach(item=>{
+      if (item.itemNumbers?.length>0) {
+        let str = ''
+        item.itemNumbers.forEach(element => {
+          str += element.name + ':' + element.qty + ','
+        })
+        item.itemNumbers1 = str.substring(0, str.length - 1)
+      }
+    })
+    await getList()
+      
+  } finally {
+    formRef.formLoading = false
+  }
+}
+
+const openFormCallBack = (type, row, masterParmas, callback) => {
+  if (operatRecord.value.type == 'TECH') {
+    DeviceMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'maintenances') {
+        selecUserByType({ classType: 'TECH', factoryAreaNumber: operatRecord.value.factoryAreaNumber, flag: null }).then(response => {
+          item.componentProps.options = response
+          callback();
+        });
+      }
+    })
+  } else if (operatRecord.value.type == 'DEVICE') {
+    DeviceMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'maintenances') {
+        selecUserByType({ classType: 'DEVICE', factoryAreaNumber: operatRecord.value.factoryAreaNumber, flag: null }).then(response => {
+          item.componentProps.options = response
+          callback();
+        });
+      }
+    })
+  } else if (operatRecord.value.type == 'MOLD') {
+    DeviceMaintenanceDetail.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'maintenances') {
+        selecUserByType({ classType: 'MOLD', factoryAreaNumber: operatRecord.value.factoryAreaNumber, flag: null }).then(response => {
+          item.componentProps.options = response
+          callback();
+        });
+      }
+    })
+  }
+}
+
+function buttonControllFunction(row, val) {
+  if (val == 'delete') {
+    if (row.status == 'COMPLETED' || row.status == 'VERIFIED' ||  row.status == 'REJECTED' || !isReceiver(row.maintenance)  ) {
+      return false
+    } else {
+      return true
+    }
+  } else if (val == 'edit') { 
+    if (row.status == 'COMPLETED' || row.status == 'VERIFIED' ||  row.status == 'REJECTED' || !isReceiver(row.maintenance)  ) {
+      return false
+    } else {
+      return true
+    }
+  } else if(val == 'add') {
+    if (row.status == 'COMPLETED' || row.status == 'VERIFIED' ||  row.status == 'REJECTED' || !isReceiver(row.maintenance) ) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return true
+  }
+}
+
+
+
+function isReceiver(orderPerson) {
+  if (orderPerson == userStore?.getUser?.id) {
+    return true
+  } else {
+    return false
+  }
+}
+
+
+const confirmIsTemporary = () => {
+    confirmFinish(tempIdeaRefViewData.value)
+}
+
+
+const cancel = () => {
+  showTempIdeaRefView.value = false;
+};
+
+const getActorClass = () => {
+   
+}
+
+// const judgeIfDeviceRole = () => {
+//   const rolesOk = userStore.roles.find(item => {
+//     return item == 'device_class_worker_role' || item == 'device_class_Engineer_role'
+//   })
+//   if (rolesOk != undefined && rolesOk != null) {
+//     return true
+//   } else {
+//     return false
+//   }
+// }
+
+const validateRow = (row) => {
+  let flag = true;
+  const validateResult = ref([]);
+  for (const [key, rules] of Object.entries(DeviceMaintenanceMainRules)) {
+    for (const rule of rules) {
+      if (rule.required) {
+        const schemaItem = DeviceMaintenanceMain.allSchemas.formSchema.find(item => item.field == key);
+        if (schemaItem && (row[key] === undefined || row[key] === null || row[key] === '')) {
+          validateResult.value.push({
+            msg: '[' + schemaItem.label + ']'
+          });
+          flag = false;
+        }
+      }
+    }
+  }
+  if (!flag) {
+    // 如果验证失败，将错误信息转换为HTML字符串并弹窗提示
+    const errorMessage = validateResult.value.map(error => error.msg).join(',  ');
+    message.alert('请填写以下必填项：'+errorMessage); // 使用支持HTML的弹窗显示所有错误信息
+    return false; // 验证失败，立即返回
+  }
+  // 所有规则验证通过
+  return true;
+};
+
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await DeviceMaintenanceMainApi.importTemplate()
+})
+</script>
diff --git a/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts b/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts
new file mode 100644
index 0000000..60e6d02
--- /dev/null
+++ b/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts
@@ -0,0 +1,950 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { selectAllFactoryArea } from '@/api/system/dept'
+import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import { useUserStore } from '@/store/modules/user'
+import { ItemSearchTable } from '../../basic/item/item.data'
+import * as ItemApi from '@/api/eam/basic/item'
+import * as UserApi from '@/api/system/user'
+import { getStrDictOptions } from '@/utils/dict'
+import { selecUserByType } from '@/api/system/dept'
+const userStore = useUserStore()
+const factoryList = await selectAllFactoryArea()
+const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
+const userListAll = await UserApi.getSimpleUserList()
+const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
+const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: null })
+const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD')
+const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
+// 表单校验
+export const DeviceMaintenanceMainRules = reactive({
+  number: [required],
+  requestNumber: [required],
+  deviceNumber: [required],
+  factoryAreaNumber: [required],
+  maintenance: [required],
+  type: [required],
+  classes: [required],
+  faultType: [required],
+  describes: [
+    required,
+    { max: 200, message: '不得超过200个字符', trigger: 'blur' },
+  ],
+})
+
+export const DeviceMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '维修工单编号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: '150',
+      fixed: 'left',
+    },
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '报修工单编号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isForm: false,
+    isSearch: false,
+    isTable: true,
+  },
+  {
+    label: '设备',
+    field: 'deviceNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isDetail: false,
+    api: () => deviceList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceListAll.find((account) => account.number == cellValue)?.name
+    },
+    search: {
+      show: false,
+      component: 'Input',
+      api: () => deviceList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => deviceList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      },
+    }
+  },
+  {
+    label: '设备',
+    field: 'deviceNumberDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+  },
+  {
+    label: '厂区',
+    field: 'factoryAreaNumber',
+    sort: 'custom',
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => factoryList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return factoryList.find((account) => account.id == cellValue)?.name
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请先选择设备"
+      },
+    }
+  },
+  {
+    label: '厂区',
+    field: 'factoryAreaNumberDetail',
+    sort: 'custom',etail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '维修人',
+    field: 'maintenance',
+    sort: 'custom',
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => userListAll,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userListAll.find((account) => account.id == cellValue)?.nickname
+    },
+    form: {
+      component: 'Select',
+      api: () => userListAll,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请先选择设备"
+      },
+    },
+    isSearch: true,
+    search: {
+      component: 'Select',
+      api: () => userListAll,
+      componentProps: {
+        collapseTags: true,
+        collapseTagsTooltip: true,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
+  },
+  {
+    label: '维修人',
+    field: 'maintenanceDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isDetail: false,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
+    },
+    // dictType: DICT_TYPE.APP_DEVICE_MOLD_TYPE,
+    isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: deviceTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        disabled: true,
+        filterable: true,
+        placeholder: "请选择设备"
+      },
+    },
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        disabled: false,
+        filterable: true,
+        placeholder: "请选择设备"
+      },
+    },
+  },
+  {
+    label: '类型',
+    field: 'typeDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+  },
+  {
+    label: '班次',
+    field: 'classes',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: true,
+    dictType: DICT_TYPE.MAINTENANCE_SHIFT,
+    dictClass: 'string',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '故障类型',
+    field: 'faultType',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isDetail: false,
+    isSearch: false,
+    dictType: DICT_TYPE.FAULT_TYPE,
+    dictClass: 'string',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '是否完成',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: false,
+    isTable: true,
+    isForm: false,
+    dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      componentProps: {
+        disabled: false,
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      componentProps: {
+        disabled: false,
+      }
+    },
+  },
+  {
+    label: '完成方式',
+    field: 'result',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: false,
+    isTable: true,
+    isForm: false,
+    dictType: DICT_TYPE.ORDER_COMPLETE_RESULT,
+    dictClass: 'string',
+  },
+  {
+    label: '报修人',
+    field: 'declarer',
+    sort: 'custom',
+    isDetail: false,
+    isForm: false,
+    isSearch: true,
+    table: {
+      width: '150',
+    },
+    api: () => userListAll,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userListAll.find((account) => account.id == cellValue)?.nickname
+    },
+    search: {
+      component: 'Select',
+      api: () => userListAll,
+      componentProps: {
+        collapseTags: true,
+        collapseTagsTooltip: true,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
+  },
+  {
+    label: '报修人',
+    field: 'declarerDetail',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '报修人意见',
+    field: 'applyContent',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '验证人',
+    field: 'verifyer',
+    sort: 'custom',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: '150',
+    },
+    api: () => userListAll,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userListAll.find((account) => account.id == cellValue)?.nickname
+    },
+    isSearch: true,
+    search: {
+      component: 'Select',
+      api: () => userListAll,
+      componentProps: {
+        collapseTags: true,
+        collapseTagsTooltip: true,
+        optionsAlias: {
+          labelField: 'nickname',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
+  },
+  {
+    label: '验证人',
+    field: 'verifyerDetail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isDetail: true,
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isTableForm: false,
+  },
+  {
+    label: '验证人意见',
+    field: 'verifyContent',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    }
+  },
+  
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+    isDetail: false
+  }
+]))
+
+export const DeviceMaintenanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '维修编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Input',
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '故障描述',
+    field: 'describes',
+    sort: 'custom',
+    table: {
+    },
+    isSearch: false,
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '故障真因',
+    field: 'describes1',
+    sort: 'custom',
+    table: {
+    },
+    isSearch: false,
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '解决措施',
+    field: 'workOut',
+    sort: 'custom',
+    table: {
+    },
+    isSearch: false,
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '维修人',
+    field: 'maintenances',
+    sort: 'custom',
+    isDetail: false,
+    // formatter: (_: Recordable, __: TableColumn, cellValue) => {
+    //   let cellValueList = []
+    //   if (Array.isArray(cellValue)) {
+    //     cellValueList = cellValue
+    //   } else {
+    //     cellValueList = cellValue ? cellValue.split(',') : [];
+    //   }
+    //   // const cellValueList = cellValue  ? cellValue.split(',') : [];
+    //   return userListAll
+    //     .filter(item => cellValueList.includes(item.id.toString()))
+    //     .map(item => item.nickname)
+    //     .join(',');
+    // },
+    isTable:true,
+    tableForm: {
+      type: 'Select',
+      initOptions: userListAll,
+      multiple: true,
+      collapseTags: true,
+      collapseTagsTooltip: true,
+      optionsAlias: {
+        labelField: 'nickname',
+        valueField: 'id'
+      },
+      filterable: true,
+    },
+    form: {
+      component: 'Select',
+      // api: () => dutyUserList,
+      componentProps: {
+        multiple: true,
+        collapseTags: true,
+        collapseTagsTooltip: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
+  },
+  {
+    label: '维修人',
+    field: 'maintenancesName',
+    sort: 'custom',
+    isForm:false,
+    isDetail:true,
+    isTable:false,
+    isTableForm:false
+  },
+  {
+    label: '备件',
+    field: 'itemNumbers1',
+    sort: 'custom',
+    table: {
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择备件',
+      searchField: 'itemNumbers1',
+      searchTitle: '备件',
+      multiple: true,
+      searchAllSchemas: ItemSearchTable.allSchemas,
+      searchPage: ItemApi.getItemList,
+      searchCondition: [{
+        key: 'number',
+        value: 'deviceNumber',
+        message: '请选择设备模具编号！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择备件', // 输入框占位文本
+        searchField: 'itemNumbers1', // 查询弹窗赋值字段
+        searchTitle: '备件', // 查询弹窗标题
+        multiple: true,
+        searchAllSchemas: ItemSearchTable.allSchemas, // 查询弹窗所需类
+        searchPage: ItemApi.getItemList, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'number',
+          value: 'deviceNumber',
+          message: '请选择设备模具编号！',
+          isMainValue: true
+        }]
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '备件1',
+    field: 'itemNumbers',
+    sort: 'custom',
+    table: {
+    },
+    isForm: false,
+    isDetail: false,
+    isTable: false,
+    isSearch: false,
+    isTableForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+    isDetail: false,
+    isTableForm: false,
+  }
+]))
+// 表单校验
+export const DeviceMaintenanceDetailRules = reactive({
+  describes: [
+    required,
+    { max: 200, message: '不得超过200个字符', trigger: 'blur' },
+  ],
+  describes1: [
+    required,
+    { max: 200, message: '不得超过200个字符', trigger: 'blur' },
+  ],
+  workOut: [
+    required,
+    { max: 200, message: '不得超过200个字符', trigger: 'blur' },
+  ],
+  maintenances: [required],
+})
+
+
+
+// 表单校验
+export const DeviceMaintenanceMainSecRules = reactive({
+  number: [required],
+  requestNumber: [required],
+  deviceNumber: [required],
+  factoryAreaNumber: [required],
+  maintenance: [required],
+  turnType: [required],
+  type: [required],
+  classes: [required],
+  faultType: [required],
+  describes: [
+    required,
+    { max: 200, message: '不得超过200个字符', trigger: 'blur' },
+  ],
+})
+
+export const DeviceMaintenanceMainSec = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '维修工单编号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: false,
+    isForm: false,
+  },
+  {
+    label: '报修工单编号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isForm: false,
+    isSearch: false,
+    isTable: true,
+  },
+  {
+    label: '转办类型',
+    field: 'turnType',
+    sort: 'custom',
+    isDetail: false,
+    isTable: false,
+    isSearch: false,
+    isForm: true,
+    dictType: DICT_TYPE.TURN_TYPE,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
+    },
+    isSearch: true,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        filterable: true,
+      },
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        filterable: true,
+        placeholder: "请选择设备"
+      }
+    },
+  },
+  {
+    label: '厂区',
+    field: 'factoryAreaNumber',
+    sort: 'custom',
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => factoryList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return factoryList.find((account) => account.id == cellValue)?.name
+    },
+    search: {
+      show: true,
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => factoryList,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请先选择设备"
+      },
+    }
+  },
+  {
+    label: '厂区',
+    field: 'factoryAreaNumber1',
+    sort: 'custom',
+    isDetail: true,
+    isSearch: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '设备模具',
+    field: 'deviceNumber',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    api: () => deviceList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceListAll.find((account) => account.number == cellValue)?.name
+    },
+    search: {
+      show: false,
+      component: 'Input',
+      api: () => deviceList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      }
+    },
+    form: {
+      component: 'Select',
+      api: () => deviceList,
+      componentProps: {
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'number'
+        },
+        filterable: true,
+      },
+    }
+  },
+  {
+    label: '维修人',
+    field: 'maintenance',
+    sort: 'custom',
+    isDetail: false,
+    table: {
+      width: '150',
+    },
+    api: () => dutyUserList,
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return dutyUserList.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      component: 'Select',
+      api: () => dutyUserList,
+      componentProps: {
+        disabled: false,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+        placeholder: "请先选择设备"
+      },
+    }
+  },
+  {
+    label: '维修人',
+    field: 'maintenance1',
+    sort: 'custom',
+    isDetail: true,
+    isSearch: false,
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '班次',
+    field: 'classes',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: true,
+    dictType: DICT_TYPE.MAINTENANCE_SHIFT,
+    dictClass: 'string',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '故障类型',
+    field: 'faultType',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: true,
+    dictType: DICT_TYPE.FAULT_TYPE,
+    dictClass: 'string',
+    form: {
+      component: 'Select'
+    },
+  },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    form: {
+      component: 'Input',
+      componentProps: {
+        type: 'textarea',
+      }
+
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    isSearch: false,
+    isTable: true,
+    isForm: false,
+    dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
+    dictClass: 'string',
+    form: {
+      component: 'Select',
+      componentProps: {
+        disabled: false,
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      componentProps: {
+        disabled: false,
+      }
+    },
+  },
+  // {
+  //   label: '完成方式',
+  //   field: 'result',
+  //   sort: 'custom',
+  //   table: {
+  //     width: '150',
+  //   },
+  //   isSearch: false,
+  //   isTable: true,
+  //   isForm: false,
+  //   dictType: DICT_TYPE.ORDER_COMPLETE_RESULT,
+  //   dictClass: 'string',
+  // },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+    isDetail: false
+  }
+]))
\ No newline at end of file
diff --git a/src/views/eam/mold/moldAccounts/index.vue b/src/views/eam/mold/moldAccounts/index.vue
index 3d166b2..633dc55 100644
--- a/src/views/eam/mold/moldAccounts/index.vue
+++ b/src/views/eam/mold/moldAccounts/index.vue
@@ -178,8 +178,8 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'eam:mold-accounts:create'}), // 新增
   defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
-  defaultButtons.defaultImportBtn({hasPermi:'eam:mold-accounts:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:mold-accounts:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-accounts:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-accounts:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
diff --git a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
index 747a512..8d1ffb6 100644
--- a/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
+++ b/src/views/eam/mold/moldAccounts/moldAccounts.data.ts
@@ -165,6 +165,9 @@ export const MoldAccounts = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     isForm: true,
     isTable: true,
+    table: {
+      width: '150',
+    },
     form: {
       component: 'Input',
     }
diff --git a/src/views/eam/mold/moldRepair/index.vue b/src/views/eam/mold/moldRepair/index.vue
index bb6396f..234a847 100644
--- a/src/views/eam/mold/moldRepair/index.vue
+++ b/src/views/eam/mold/moldRepair/index.vue
@@ -64,7 +64,8 @@ import download from '@/utils/download'
 import { MoldRepair, MoldRepairRules } from './moldRepair.data'
 import * as MoldRepairApi from '@/api/eam/mold/moldRepair'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as MoldAccountApi from '@/api/eam/mold/moldAccount'
+import * as MoldAccountApi from '@/api/eam/mold/moldAccounts'
+import * as DeviceAccountApi from '@/api/eam/device/deviceAccounts'
 
 defineOptions({ name: 'MoldRepair' })
 
@@ -80,6 +81,8 @@ const viewKey = ref(0)
 routeName.value = route.name
 const tableColumns = ref(MoldRepair.allSchemas.tableColumns)
 
+const factoryAreaNumber = ref('');
+const type = ref('');
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -104,8 +107,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'eam:mold-repair-request:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:mold-repair-request:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'eam:mold-repair-request:export'}), // 导出
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-repair-request:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-repair-request:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -182,7 +185,6 @@ const formsSuccess = async (formType, data) => {
   }
   if (data.activeTime == 0) data.activeTime = null;
   if (data.expireTime == 0) data.expireTime = null;
-  data.type = 'MOLD';
   data.result = 'PENDING';
   if (data.upload != null && data.upload != "") {
     data.filePathList = data?.upload?.map((item: any) => {
@@ -289,13 +291,68 @@ onMounted(async () => {
   importTemplateData.templateUrl = await MoldRepairApi.importTemplate()
 })
 
-const onChange = (field, cur, item, formRef) => {
+
+const onChange = (field, cur, item,formRef) => {
   if (field == 'factoryAreaNumber') {
     nextTick(() => {
       const setV = {}
       setV['deviceNumber'] = ''
       formRef.setValues(setV)
     })
+    factoryAreaNumber.value = cur
+    if(type.value != 'MOLD'){
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        MoldRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+       MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: cur,
+        type: type.value,
+        status: '0'
+      }).then((res) => {
+        MoldRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }
+  }
+
+  if (field == 'type') {
+    nextTick(() => {
+      const setV = {}
+      setV['deviceNumber'] = ''
+      formRef.setValues(setV)
+    })
+    
+    if(cur != 'MOLD'){
+      type.value = 'DEVICE'
+      DeviceAccountApi.getDeviceAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'DEVICE',
+        status: '0'
+      }).then((res) => {
+        MoldRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    }else{
+      type.value = 'MOLD'
+      MoldAccountApi.getMoldAccountsAllNoPage({
+        factoryAreaNumber: factoryAreaNumber.value,
+        type: 'MOLD',
+        status: '0'
+      }).then((res) => {
+        MoldRepair.allSchemas.formSchema.find(item => {
+          return item.field == 'deviceNumber'
+        }).componentProps.options = res
+      })
+    } 
   }
 }
 
diff --git a/src/views/eam/mold/moldRepair/moldRepair.data.ts b/src/views/eam/mold/moldRepair/moldRepair.data.ts
index f4a1692..579e79c 100644
--- a/src/views/eam/mold/moldRepair/moldRepair.data.ts
+++ b/src/views/eam/mold/moldRepair/moldRepair.data.ts
@@ -2,9 +2,11 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { selectAllFactoryArea } from '@/api/system/dept'
 import * as MoldAccountsApi from '@/api/eam/mold/moldAccounts'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { validateHanset,validateNumDot, validateEmail } from '@/utils/validator'
 import * as UserApi from '@/api/system/user'
 const userListAll = await UserApi.getSimpleUserList()
+const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE)
 
 
 // 邮箱账号的列表
@@ -73,19 +75,47 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
           labelField: 'name',
           valueField: 'id'
         },
-        onChange: (val) => {
-          MoldAccountsApi.getMoldAccountsNoPage({
-            isSearch: false,
-            factoryAreaNumber: val
-          }).then((res) => {
-            moldList.value = res
-          }).catch((e) => {
-            console.log(e)
-          })
-        }
       },
     }
   },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    table: {
+      width: '150',
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
+    },
+    isSearch: true,
+    search: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        // disabled: true,
+        filterable: true,
+        placeholder: "请选择类型"
+      }
+    },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: deviceMoldTypeList,
+        optionsAlias: {
+          labelField: 'label',
+          valueField: 'value'
+        },
+        // disabled: true,
+        filterable: true,
+        placeholder: "请选择类型"
+      }
+    },
+  },
   {
     label: '模具',
     field: 'deviceNumber',
@@ -101,7 +131,7 @@ export const MoldRepair = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'Select',
       componentProps: {
-        options: moldList,
+        options: moldListNoPage,
         optionsAlias: {
           labelField: 'name',
           valueField: 'number'
diff --git a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
index 1784027..b485ad3 100644
--- a/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
+++ b/src/views/eam/mold/moldSpotInspectionRecordMain/index.vue
@@ -217,8 +217,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:import'}),
-  defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:export'}),
+  // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:import'}),
+  // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-spot-inspection-record-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
diff --git a/src/views/eam/mold/moldinspectionjob/index.vue b/src/views/eam/mold/moldinspectionjob/index.vue
index deef944..6f86379 100644
--- a/src/views/eam/mold/moldinspectionjob/index.vue
+++ b/src/views/eam/mold/moldinspectionjob/index.vue
@@ -207,8 +207,8 @@ const judgeHasAddFunc = () => {
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi:'eam:mold-inspection-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-inspection-job-main:import'}),
-  defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-inspection-job-main:export'}),
+  // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-inspection-job-main:import'}),
+  // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-inspection-job-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -404,7 +404,7 @@ function handleFinishOrder(row) {
   let param = {
     masterId : row.id
   }
-  DeviceInspectionDetailApi.getDeviceInspectionDetailPage(param
+  MoldInspectionDetailApi.getMoldInspectionDetailPage(param
   ).then(response => {
     if (response != null) {
       if (response.list.length == 0) {
@@ -417,7 +417,7 @@ function handleFinishOrder(row) {
         //   message.error(t('请先完成各检修明细内容！'))
         //   return
         // } else {
-          DeviceInspectionMainApi.finishInspection(row.id).then(res => {
+          MoldInspectionMainApi.finishInspection(row.id).then(res => {
             message.success(t('common.finishSuccess'))
             getList()
           })
diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue
index 1d4f5e7..13d8ba9 100644
--- a/src/views/eam/mold/moldmaintainjob/index.vue
+++ b/src/views/eam/mold/moldmaintainjob/index.vue
@@ -222,8 +222,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   // defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'eam:mold-maintain-job-main:import'}),
-  defaultButtons.defaultExportBtn({hasPermi:'eam:mold-maintain-job-main:export'}),
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:mold-maintain-job-main:import'}),
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:mold-maintain-job-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -631,9 +631,11 @@ const onCancel = () => {
 }
 
 const onSubmit = (val) => {
-  MoldMaintainOrderMainApi.orderClickApprove(dialogRowData.value.id,'VERIFIED',updateFormValue.value.verifyContent) 
-  dialogVisible.value = false
-  getList()
+  MoldMaintainOrderMainApi.orderClickApprove(dialogRowData.value.id,'VERIFIED',updateFormValue.value.verifyContent).then(res => {
+    message.success(t('common.verifySuccess'))
+    dialogVisible.value = false
+    getList()
+  })
 }
 
 const orderPrint = (row) => {
diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue
index b67985e..6d88880 100644
--- a/src/views/eam/mold/moldmaintenancejob/index.vue
+++ b/src/views/eam/mold/moldmaintenancejob/index.vue
@@ -357,10 +357,6 @@ const judgeIsTheClass = (row) => {
   }
 }
 
-const judgeIsTheFactory = (row) => {
-  return userStore.userSelfInfo.deptId == row.factoryAreaNumber
-}
-
 const judgeIsTheClassEngineer = (row) => {
   const rolesOk = userStore.roles.find(item => {
     if (row.type == 'MOLD') {
@@ -392,8 +388,8 @@ const judgeIsTheClassWorker = (row) => {
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi:'eam:mold-maintenance-job-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-maintenance-job-main:import'}),
-  defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-maintenance-job-main:export'}),
+  // defaultButtons.defaultImportBtn({ hasPermi:'eam:mold-maintenance-job-main:import'}),
+  // defaultButtons.defaultExportBtn({ hasPermi:'eam:mold-maintenance-job-main:export'}),
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -449,7 +445,7 @@ const butttondata = (row) => {
     defaultButtons.acceptOrderBtn({
       hasPermi:'eam:mold-maintenance-job-main:orderClick',
       hide: !(
-        row.status == 'PENDING' && judgeIsTheFactory(row)
+        row.status == 'PENDING' && row.type == 'MOLD'
       )
     }), // 接单
     defaultButtons.turnOrderBtn({
@@ -463,7 +459,7 @@ const butttondata = (row) => {
     defaultButtons.verifyOrderBtn({
       hasPermi:'eam:mold-maintenance-job-main:orderClickVerify',
       hide: !(
-        judgeIsTheClassEngineerAndApply(row,'VERIFY') && judgeIsTheFactory(row)
+        judgeIsTheClassEngineerAndApply(row,'VERIFY')
       )
     }), // 验证
     defaultButtons.finishOrderBtn({
@@ -1163,21 +1159,24 @@ const validateRow = (row) => {
   return true;
 };
 
-
-
 const judgeIsTheClassEngineerAndApply = (row,type) => {
   // 根据不同的状态进行判断
-  if (row.status === 'COMPLETED') {
+  if (row.status === 'COMPLETED' && type == 'CONFIRM') {
     // COMPLETED状态下，需要额外判断requestNumber和declarer
     if(row.requestNumber != null && row.requestNumber !== '' && row.declarer === userStore.getUser.id){
       return true
     }else{
       return false
     }
+  }else if(row.status === 'APPLYPASS' && type == 'VERIFY'){
+    return true
+  }else if(row.requestNumber == null || row.requestNumber == ''){
+    if(row.status === 'COMPLETED' && type == 'VERIFY'){
+      return true
+    }
   }
   // 如果不是COMPLETED或APPLYPASS状态，或者COMPLETED状态下条件不满足，则默认返回false
   return false;
- 
 }
 
 /** 初始化 **/
diff --git a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts
index fcaf71a..9ab1c4a 100644
--- a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts
+++ b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts
@@ -116,16 +116,18 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
     },
-    isSearch: false,
+    isSearch: true,
     search: {
       component: 'Select',
       componentProps: {
-        options: deviceTypeList,
+        options: deviceMoldTypeList,
         optionsAlias: {
           labelField: 'label',
           valueField: 'value'
         },
+        disabled: false,
         filterable: true,
+        placeholder: "请选择类型"
       },
     },
     form: {