diff --git a/src/api/eam/item/index.ts b/src/api/eam/item/index.ts
new file mode 100644
index 000000000..35d3e1086
--- /dev/null
+++ b/src/api/eam/item/index.ts
@@ -0,0 +1,80 @@
+import request from '@/config/axios'
+
+export interface ItemVO {
+  number : string
+  name : string
+  brand : string
+  specifications : string
+  isConstant : string
+  subject : string
+  classification : string
+  uom : string
+  singlePrice : number
+  reprocurement : number
+  safetyStock : number
+  cost : string
+  purchaser : string
+  financer : string
+  isFramework : string
+  isRadeIn : string
+  siteId : string
+  available : string
+  concurrencyStamp : number
+}
+
+// 查询备件列表
+export const getItemPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/eam/item/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item/page`, params })
+  }
+}
+
+// 生成标签
+export const genDevice = async (data) => {
+  return await request.post({ url: `/eam/item/genDevice`, data })
+}
+
+// 查询备件详情
+export const getItem = async (id : number) => {
+  return await request.get({ url: `/eam/item/get?id=` + id })
+}
+
+// 新增备件
+export const createItem = async (data : ItemVO) => {
+  return await request.post({ url: `/eam/item/create`, data })
+}
+
+// 修改备件
+export const updateItem = async (data : ItemVO) => {
+  return await request.put({ url: `/eam/item/update`, data })
+}
+
+// 删除备件
+export const deleteItem = async (id : number) => {
+  return await request.delete({ url: `/eam/item/delete?id=` + id })
+}
+
+// 导出备件 Excel
+export const exportItem = async (params) => {
+  return await request.download({ url: `/eam/item/export-excel`, params })
+}
+
+// 修改备件
+export const getItemList = async (params) => {
+  return await request.get({ url: `/eam/item/getListByNumber`, params })
+}
+
+// // 删除备件
+// export const getaaa = async () => {
+//   return await request.get({ url: `/eam/producePlan/produce`})
+// }
+
+// 备件不分页
+
+export const getItemNoPage = async (params) => {
+  return await request.get({ url: `/eam/item/noPage`, params })
+}
diff --git a/src/api/eam/itemAccounts/index.ts b/src/api/eam/itemAccounts/index.ts
index 0ddd0da42..88fb3d16f 100644
--- a/src/api/eam/itemAccounts/index.ts
+++ b/src/api/eam/itemAccounts/index.ts
@@ -61,4 +61,3 @@ export const replaceLocation = async (data: Array<ItemAccountsVO>) => {
 export const getItemAccountsNoPage = async (params) => {
   return await request.get({ url: `/eam/item-accounts/noPage`, params })
 }
-
diff --git a/src/api/eam/itemApplyMain/index.ts b/src/api/eam/itemApplyMain/index.ts
new file mode 100644
index 000000000..eeccb6e13
--- /dev/null
+++ b/src/api/eam/itemApplyMain/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface ItemApplyMainVO {
+  number: string
+  name: string
+  type: string
+  applyId: number
+  applyDeptId: number
+  approveId: number
+  approveTime: Date
+  outId: number
+  outTime: Date
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询备件申领记录主列表
+export const getItemApplyMainPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/item-apply-request-main/senior', data })
+  } else {
+    return await request.get({ url: `/eam/item-apply-request-main/page`, params })
+  }
+}
+
+// 查询备件申领记录主详情
+export const getItemApplyMain = async (id: number) => {
+  return await request.get({ url: `/eam/item-apply-request-main/get?id=` + id })
+}
+
+// 新增备件申领记录主
+export const createItemApplyMain = async (data: ItemApplyMainVO) => {
+  return await request.post({ url: `/eam/item-apply-request-main/create`, data })
+}
+
+// 修改备件申领记录主
+export const updateItemApplyMain = async (data: ItemApplyMainVO) => {
+  return await request.put({ url: `/eam/item-apply-request-main/update`, data })
+}
+
+// 删除备件申领记录主
+export const deleteItemApplyMain = async (id: number) => {
+  return await request.delete({ url: `/eam/item-apply-request-main/delete?id=` + id })
+}
+
+// 撤销备件申领记录主
+export const backoutItemApplyMain = async (id: number) => {
+  return await request.get({ url: `/eam/item-apply-request-main/backout?id=` + id })
+}
+
+
+// 导出备件申领记录主 Excel
+export const exportItemApplyMain = async (params) => {
+  return await request.download({ url: `/eam/item-apply-request-main/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/item-apply-request-main/get-import-template' })
+}
diff --git a/src/api/eam/location/index.ts b/src/api/eam/location/index.ts
new file mode 100644
index 000000000..66eab6e12
--- /dev/null
+++ b/src/api/eam/location/index.ts
@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+export interface LocationVO {
+  number: string
+  name: string
+  description: string
+  areaNumber: string
+  type: string
+  isInAccount: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询库位列表
+export const getLocationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/location/senior', data })
+  } else {
+    return await request.get({ url: `/eam/location/page`, params })
+  }
+}
+
+// 查询库位详情
+export const getLocation = async (id: number) => {
+  return await request.get({ url: `/eam/location/get?id=` + id })
+}
+
+// 新增库位
+export const createLocation = async (data: LocationVO) => {
+  return await request.post({ url: `/eam/location/create`, data })
+}
+
+// 修改库位
+export const updateLocation = async (data: LocationVO) => {
+  return await request.put({ url: `/eam/location/update`, data })
+}
+
+// 删除库位
+export const deleteLocation = async (id: number) => {
+  return await request.delete({ url: `/eam/location/delete?id=` + id })
+}
+
+// 导出库位 Excel
+export const exportLocation = async (params) => {
+  return await request.download({ url: `/eam/location/export-excel`, params })
+}
+
+
+// 查询库位列表
+export const getLocationNoPage = async (params) => {
+    return await request.get({ url: `/eam/location/noPage`, params })
+}
diff --git a/src/api/eam/locationArea/index.ts b/src/api/eam/locationArea/index.ts
new file mode 100644
index 000000000..e1dd72ead
--- /dev/null
+++ b/src/api/eam/locationArea/index.ts
@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+
+export interface LocationAreaVO {
+  number: string
+  name: string
+  description: string
+  type: string
+  siteId: string
+  available: string
+  concurrencyStamp: number
+}
+
+// 查询库区列表
+export const getLocationAreaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/location-area/senior', data })
+  } else {
+    return await request.get({ url: `/eam/location-area/page`, params })
+  }
+}
+
+// 查询库区详情
+export const getLocationArea = async (id: number) => {
+  return await request.get({ url: `/eam/location-area/get?id=` + id })
+}
+
+// 新增库区
+export const createLocationArea = async (data: LocationAreaVO) => {
+  return await request.post({ url: `/eam/location-area/create`, data })
+}
+
+// 修改库区
+export const updateLocationArea = async (data: LocationAreaVO) => {
+  return await request.put({ url: `/eam/location-area/update`, data })
+}
+
+// 删除库区
+export const deleteLocationArea = async (id: number) => {
+  return await request.delete({ url: `/eam/location-area/delete?id=` + id })
+}
+
+// 导出库区 Excel
+export const exportLocationArea = async (params) => {
+  return await request.download({ url: `/eam/location-area/export-excel`, params })
+}
+
diff --git a/src/api/eam/maintainExperience/index.ts b/src/api/eam/maintainExperience/index.ts
new file mode 100644
index 000000000..f85ae6eba
--- /dev/null
+++ b/src/api/eam/maintainExperience/index.ts
@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+export interface MaintainExperienceVO {
+  id: number
+  name: string
+  content: string
+  masterId: number
+  orderType: string
+  maintainNumber: string
+}
+
+// 查询保养经验记录列表
+export const getMaintainExperiencePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/record/maintain-experience/senior', data })
+  } else {
+    return await request.get({ url: `/record/maintain-experience/page`, params })
+  }
+}
+
+// 查询保养经验记录详情
+export const getMaintainExperience = async (id: number) => {
+  return await request.get({ url: `/record/maintain-experience/get?id=` + id })
+}
+
+// 新增保养经验记录
+export const createMaintainExperience = async (data: MaintainExperienceVO) => {
+  return await request.post({ url: `/record/maintain-experience/create`, data })
+}
+
+// 修改保养经验记录
+export const updateMaintainExperience = async (data: MaintainExperienceVO) => {
+  return await request.put({ url: `/record/maintain-experience/update`, data })
+}
+
+// 删除保养经验记录
+export const deleteMaintainExperience = async (id: number) => {
+  return await request.delete({ url: `/record/maintain-experience/delete?id=` + id })
+}
+
+// 导出保养经验记录 Excel
+export const exportMaintainExperience = async (params) => {
+  return await request.download({ url: `/record/maintain-experience/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/record/maintain-experience/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsApplyDetail/index.ts b/src/api/eam/sparePartsApplyDetail/index.ts
deleted file mode 100644
index ae94831de..000000000
--- a/src/api/eam/sparePartsApplyDetail/index.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsApplyDetailVO {
-  id: number
-  number: string
-  masterId: number
-  sparePartsCode: string
-  isRadeIn: string
-  applyQty: number
-  currentQty: number
-  type: string
-  currentSinglePrice: number
-  equipmentCode: byte[]
-  jobNumber: byte[]
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件领用申请子列表
-export const getSparePartsApplyDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/eam/spare-parts-apply-detail/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-apply-detail/page`, params })
-  }
-}
-
-// 查询备件领用申请子详情
-export const getSparePartsApplyDetail = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-apply-detail/get?id=` + id })
-}
-
-// 新增备件领用申请子
-export const createSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
-  return await request.post({ url: `/eam/spare-parts-apply-detail/create`, data })
-}
-
-// 修改备件领用申请子
-export const updateSparePartsApplyDetail = async (data: SparePartsApplyDetailVO) => {
-  return await request.put({ url: `/eam/spare-parts-apply-detail/update`, data })
-}
-
-// 删除备件领用申请子
-export const deleteSparePartsApplyDetail = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-apply-detail/delete?id=` + id })
-}
-
-// 导出备件领用申请子 Excel
-export const exportSparePartsApplyDetail = async (params) => {
-  return await request.download({ url: `/eam/spare-parts-apply-detail/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-apply-detail/get-import-template' })
-}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsApplyMain/index.ts b/src/api/eam/sparePartsApplyMain/index.ts
deleted file mode 100644
index 80288a681..000000000
--- a/src/api/eam/sparePartsApplyMain/index.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsApplyMainVO {
-  id: number
-  number: string
-  description: string
-  applyDeptId: string
-  sumVal: number
-  status: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件领用申请列表
-export const getSparePartsApplyMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-apply-main/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-apply-main/page`, params })
-  }
-}
-
-// 查询备件领用申请详情
-export const getSparePartsApplyMain = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-apply-main/get?id=` + id })
-}
-
-// 新增备件领用申请
-export const createSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
-  return await request.post({ url: `/eam/spare-parts-apply-main/create`, data })
-}
-
-// 修改备件领用申请
-export const updateSparePartsApplyMain = async (data: SparePartsApplyMainVO) => {
-  return await request.put({ url: `/eam/spare-parts-apply-main/update`, data })
-}
-
-// 删除备件领用申请
-export const deleteSparePartsApplyMain = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-apply-main/delete?id=` + id })
-}
-
-// 导出备件领用申请 Excel
-export const exportSparePartsApplyMain = async (params) => {
-  return await request.download({ url: `/eam/spare-parts-apply-main/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-apply-main/get-import-template' })
-}
-
-// 撤回
-export const cancelSparePartsApplyMain = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-apply-main/cancel?id=` + id })
-}
-// 审核
-export const submitSparePartsApplyMain = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-apply-main/submitExamine?id=` + id })
-}
-// 审核驳回
-export const rejectSparePartsApplyMain = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-apply-main/reject?id=` + id })
-}
-// 审核通过
-export const approveSparePartsApplyMain = async (data) => {
-  return await request.post({ url: `/eam/spare-parts-apply-main/approve`, data })
-}
-
-// 完成
-export const finishSparePartsApplyMain = async (id) => {
-  return await request.post({ url: `/eam/spare-parts-apply-main/finish?id=` + id })
-}
diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts
deleted file mode 100644
index 827687a36..000000000
--- a/src/api/eam/sparePartsInLocationDetail/index.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsInLocationDetailVO {
-  id: number
-  number: string
-  masterId: number
-  sparePartsCode: string
-  isRadeIn: string
-  applyQty: number
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录子列表
-export const getSparePartsInLocationDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params })
-  }
-}
-
-// 查询备件入库记录子详情
-export const getSparePartsInLocationDetail = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id })
-}
-
-// 新增备件入库记录子
-export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data })
-}
-
-// 修改备件入库记录子
-export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data })
-}
-
-// 删除备件入库记录子
-export const deleteSparePartsInLocationDetail = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id })
-}
-
-// 导出备件入库记录子 Excel
-export const exportSparePartsInLocationDetail = async (params) => {
-  return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' })
-}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationMain/index.ts b/src/api/eam/sparePartsInLocationMain/index.ts
deleted file mode 100644
index 687d99a67..000000000
--- a/src/api/eam/sparePartsInLocationMain/index.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsInLocationMainVO {
-  id: number
-  number: string
-  theme: string
-  status: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  areaCode: string
-  locationCode: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录主列表
-export const getSparePartsInLocationMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params })
-  }
-}
-
-// 查询备件入库记录主详情
-export const getSparePartsInLocationMain = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id })
-}
-
-// 新增备件入库记录主
-export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data })
-}
-
-// 修改备件入库记录主
-export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data })
-}
-
-// 删除备件入库记录主
-export const deleteSparePartsInLocationMain = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id })
-}
-
-// 导出备件入库记录主 Excel
-export const exportSparePartsInLocationMain = async (params) => {
-  if (params.isSearch) {
-    const data = {...params}
-    return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data })
-  }else{
-    return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params })
-  }
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' })
-}
-
-// 撤回
-export const cancelSparePartsInLocation = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main/cancel?id=` + id  })
-}
-// 审核
-export const submitExamineSparePartsInLocation = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main/submitExamine?id=` + id  })
-}
-// 审核驳回
-export const rejectSparePartsInLocation = async (id) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main/reject?id=` + id  })
-}
-// 审核通过
-export const approveSparePartsInLocation = async (data) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main/approve`,data })
-}
-// 完成
-export const finishSparePartsInLocation = async (id) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main/finish?id=` + id  })
-}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts
deleted file mode 100644
index 9e4df6997..000000000
--- a/src/api/eam/sparePartsInLocationRecordDetail/index.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsInLocationDetailRecordVO {
-  id: number
-  number: string
-  masterId: number
-  sparePartsCode: string
-  isRadeIn: string
-  applyQty: number
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录子列表
-export const getSparePartsInLocationRecordDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = {...params}
-    return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params })
-  }
-}
-
-// 查询备件入库记录子详情
-export const getSparePartsInLocationRecordDetail = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id })
-}
-
-// 新增备件入库记录子
-export const createSparePartsInLocationRecordDetail= async (data: SparePartsInLocationDetailRecordVO) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data })
-}
-
-// 修改备件入库记录子
-export const updateSparePartsInLocationRecordDetail = async (data: SparePartsInLocationDetailRecordVO) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data })
-}
-
-// 删除备件入库记录子
-export const deleteSparePartsInLocationRecordDetail = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id })
-}
-
-// 导出备件入库记录子 Excel
-export const exportSparePartsInLocationRecordDetail = async (params) => {
-  return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' })
-}
\ No newline at end of file
diff --git a/src/api/eam/sparePartsInLocationRecordMain/index.ts b/src/api/eam/sparePartsInLocationRecordMain/index.ts
deleted file mode 100644
index 42c7616fe..000000000
--- a/src/api/eam/sparePartsInLocationRecordMain/index.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsInLocationMainRecordVO {
-  id: number
-  number: string
-  theme: string
-  status: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  areaCode: string
-  locationCode: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录主列表
-export const getSparePartsInLocationRecordMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
-  }
-}
-
-// 查询备件入库记录主详情
-export const getSparePartsInLocationRecordMain = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
-}
-
-// 新增备件入库记录主
-export const createSparePartsInLocationRecordMain = async (
-  data: SparePartsInLocationMainRecordVO
-) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
-}
-
-// 修改备件入库记录主
-export const updateSparePartsInLocationRecordMain = async (
-  data: SparePartsInLocationMainRecordVO
-) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
-}
-
-// 删除备件入库记录主
-export const deleteSparePartsInLocationRecordMain= async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
-}
-
-// 导出备件入库记录主 Excel
-export const exportSparePartsInLocationRecordMain = async (params) => {
-  return await request.download({
-    url: `/eam/spare-parts-in-location-main-record/export-excel`,
-    params
-  })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
-}
diff --git a/src/api/eam/sparePartsOutLocationDetail/index.ts b/src/api/eam/sparePartsOutLocationDetail/index.ts
deleted file mode 100644
index 16b9fe4cc..000000000
--- a/src/api/eam/sparePartsOutLocationDetail/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsOutLocationDetailVO {
-  id: number
-  number: string
-  masterId: number
-  sparePartsCode: string
-  isRadeIn: string
-  applyQty: number
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录子列表
-export const getSparePartsOutLocationDetailPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-out-location-detail/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-out-location-detail/page`, params })
-  }
-}
-
-// 查询备件入库记录子详情
-export const getSparePartsOutLocationDetail = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-out-location-detail/get?id=` + id })
-}
-
-// 新增备件入库记录子
-export const createSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
-  return await request.post({ url: `/eam/spare-parts-out-location-detail/create`, data })
-}
-
-// 修改备件入库记录子
-export const updateSparePartsOutLocationDetail = async (data: SparePartsOutLocationDetailVO) => {
-  return await request.put({ url: `/eam/spare-parts-out-location-detail/update`, data })
-}
-
-// 删除备件入库记录子
-export const deleteSparePartsOutLocationDetail = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-out-location-detail/delete?id=` + id })
-}
-
-// 导出备件入库记录子 Excel
-export const exportSparePartsOutLocationDetail = async (params) => {
-  return await request.download({
-    url: `/eam/spare-parts-out-location-detail/export-excel`,
-    params
-  })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-out-location-detail/get-import-template' })
-}
diff --git a/src/api/eam/sparePartsOutLocationMain/index.ts b/src/api/eam/sparePartsOutLocationMain/index.ts
deleted file mode 100644
index 101c1c430..000000000
--- a/src/api/eam/sparePartsOutLocationMain/index.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsOutLocationMainVO {
-  id: number
-  number: string
-  theme: string
-  status: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  areaCode: string
-  locationCode: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录主列表
-export const getSparePartsOutLocationMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-out-location-main/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-out-location-main/page`, params })
-  }
-}
-
-// 查询备件入库记录主详情
-export const getSparePartsOutLocationMain = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-out-location-main/get?id=` + id })
-}
-
-// 新增备件入库记录主
-export const createSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
-  return await request.post({ url: `/eam/spare-parts-out-location-main/create`, data })
-}
-
-// 修改备件入库记录主
-export const updateSparePartsOutLocationMain = async (data: SparePartsOutLocationMainVO) => {
-  return await request.put({ url: `/eam/spare-parts-out-location-main/update`, data })
-}
-
-// 删除备件入库记录主
-export const deleteSparePartsOutLocationMain = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-out-location-main/delete?id=` + id })
-}
-
-// 出库
-export const outSparePartsOutLocationMain = async (data) => {
-  return await request.post({ url: `/eam/spare-parts-out-location-main/out`, data })
-}
-
-// 导出备件入库记录主 Excel
-export const exportSparePartsOutLocationMain = async (params) => {
-  if (params.isSearch) {
-    const data = { ...params }
-    return await request.downloadPost({
-      url: `/eam/spare-parts-out-location-main/export-excel-senior`,
-      data
-    })
-  } else {
-    return await request.download({
-      url: `/eam/spare-parts-out-location-main/export-excel`,
-      params
-    })
-  }
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-out-location-main/get-import-template' })
-}
diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts b/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
deleted file mode 100644
index c4ea46811..000000000
--- a/src/api/eam/sparePartsOutLocationRecordDetail/index.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsOutLocationRecordDetailVO {
-  id: number
-  number: string
-  theme: string
-  status: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  areaCode: string
-  locationCode: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询备件入库记录主列表
-export const getSparePartsOutLocationDetailRecordPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params })
-  }
-}
-
-// 查询备件入库记录主详情
-export const getSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id })
-}
-
-// 新增备件入库记录主
-export const createSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
-) => {
-  return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data })
-}
-
-// 修改备件入库记录主
-export const updateSparePartsOutLocationDetailRecord = async (
-  data: SparePartsInLocationMainRecordVO
-) => {
-  return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data })
-}
-
-// 删除备件入库记录主
-export const deleteSparePartsOutLocationDetailRecord = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id })
-}
-
-// 导出备件入库记录主 Excel
-export const exportSparePartsOutLocationDetailRecord = async (params) => {
-  return await request.download({
-    url: `/eam/spare-parts-in-location-main-record/export-excel`,
-    params
-  })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' })
-}
diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js
deleted file mode 100644
index 4e84a9429..000000000
--- a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/config/axios'
-
-// 创建领用出库记录子
-export function createSparePartsOutLocationRecordDetail(data) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/create',
-    method: 'post',
-    data: data
-  })
-}
-
-// 更新领用出库记录子
-export function updateSparePartsOutLocationRecordDetail(data) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/update',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除领用出库记录子
-export function deleteSparePartsOutLocationRecordDetail(id) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id,
-    method: 'delete'
-  })
-}
-
-// 获得领用出库记录子
-export function getSparePartsOutLocationRecordDetail(id) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/get?id=' + id,
-    method: 'get'
-  })
-}
-
-// 获得领用出库记录子分页
-export function getSparePartsOutLocationRecordDetailPage(query) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 导出领用出库记录子 Excel
-export function exportSparePartsOutLocationRecordDetailExcel(query) {
-  return request({
-    url: '/eam/spare-parts-out-location-detail-record/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
diff --git a/src/api/eam/sparePartsOutLocationRecordMain/index.ts b/src/api/eam/sparePartsOutLocationRecordMain/index.ts
deleted file mode 100644
index 4f075cce1..000000000
--- a/src/api/eam/sparePartsOutLocationRecordMain/index.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import request from '@/config/axios'
-
-export interface SparePartsOutLocationRecordMainVO {
-  id: number
-  number: string
-  theme: string
-  applyer: string
-  approver: number
-  approveContent: string
-  approveTime: Date
-  autoExamine: string
-  autoAgree: string
-  directCreateRecord: string
-  areaCode: string
-  locationCode: string
-  departmentCode: string
-  remark: string
-  siteId: string
-  available: string
-  deletionTime: Date
-  deleterId: byte[]
-  concurrencyStamp: number
-}
-
-// 查询领用出库记录主列表
-export const getSparePartsOutLocationRecordMainPage = async (params) => {
-  if (params.isSearch) {
-    delete params.isSearch
-    const data = { ...params }
-    return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data })
-  } else {
-    return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params })
-  }
-}
-
-// 查询领用出库记录主详情
-export const getSparePartsOutLocationRecordMain = async (id: number) => {
-  return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id })
-}
-
-// 新增领用出库记录主
-export const createSparePartsOutLocationRecordMain = async (
-  data: SparePartsOutLocationRecordMainVO
-) => {
-  return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data })
-}
-
-// 修改领用出库记录主
-export const updateSparePartsOutLocationRecordMain = async (
-  data: SparePartsOutLocationRecordMainVO
-) => {
-  return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data })
-}
-
-// 删除领用出库记录主
-export const deleteSparePartsOutLocationRecordMain = async (id: number) => {
-  return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id })
-}
-
-// 导出领用出库记录主 Excel
-export const exportSparePartsOutLocationRecordMain = async (params) => {
-  return await request.download({
-    url: `/eam/spare-parts-out-location-main-record/export-excel`,
-    params
-  })
-}
-
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' })
-}
diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts
index 0cd21a3f7..0ae3e11c7 100644
--- a/src/api/wms/issueJobMain/index.ts
+++ b/src/api/wms/issueJobMain/index.ts
@@ -89,12 +89,12 @@ export const importTemplate = () => {
 
 // 承接发料任务
 export const acceptIssueMain = async (id) => {
-  return await request.get({ url: `/wms/issue-job-main/accept?id=` + id })
+  return await request.put({ url: `/wms/issue-job-main/accept?id=` + id })
 }
 
 // 放弃发料任务
 export const abandonIssueMain = async (id) => {
-  return await request.get({ url: `/wms/issue-job-main/abandon?id=` + id })
+  return await request.put({ url: `/wms/issue-job-main/abandon?id=` + id })
 }
 
 // 关闭发料任务
diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts
index 4096d39b7..34c3e07bf 100644
--- a/src/api/wms/productionreceiptJobMain/index.ts
+++ b/src/api/wms/productionreceiptJobMain/index.ts
@@ -89,17 +89,17 @@ export const importTemplate = () => {
 
 // 承接发料任务
 export const acceptIssueMain = async (id) => {
-  return await request.get({ url: `/wms/productionreceipt-job-main/accept?id=` + id })
+  return await request.put({ url: `/wms/productionreceipt-job-main/accept?id=` + id })
 }
 
 // 放弃发料任务
 export const abandonIssueMain = async (id) => {
-  return await request.get({ url: `/wms/productionreceipt-job-main/abandon?id=` + id })
+  return await request.put({ url: `/wms/productionreceipt-job-main/abandon?id=` + id })
 }
 
 // 关闭发料任务
 export const closeIssueMain = async (id) => {
-  return await request.get({ url: `/wms/productionreceipt-job-main/close?id=` + id })
+  return await request.put({ url: `/wms/productionreceipt-job-main/close?id=` + id })
 }
 
 // 执行发料任务
diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts
index 40311c5c8..bbbddcbd9 100644
--- a/src/api/wms/productredressJobMain/index.ts
+++ b/src/api/wms/productredressJobMain/index.ts
@@ -75,6 +75,18 @@ export const updateProductredressJobMain = async (data: ProductredressJobMainVO)
 export const deleteProductredressJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/productredress-job-main/delete?id=` + id })
 }
+// 承接制品回收任务主
+export const acceptProductredressJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/productredress-job-main/accept?id=` + id })
+}
+// 关闭制品回收任务主
+export const closeProductredressJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/productredress-job-main/close?id=` + id })
+}
+// 取消承接制品回收任务主
+export const abandonProductredressJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/productredress-job-main/abandon?id=` + id })
+}
 
 // 导出制品回收任务主 Excel
 export const exportProductredressJobMain = async (params) => {
diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
index 6b43ab046..d452888a3 100644
--- a/src/api/wms/purchasereturnJobMain/index.ts
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -98,3 +98,11 @@ export const importTemplate = () => {
 export const closePurchasereturnJobMain = (id: number) => {
   return request.put({ url: '/wms/purchasereturn-job-main/close?id=' + id })
 }
+// 承接采购退货任务主
+export const acceptPurchasereturnJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereturn-job-main/accept?id=' + id })
+}
+// 取消承接采购退货任务主
+export const abandonPurchasereturnJobMain = (id: number) => {
+  return request.put({ url: '/wms/purchasereturn-job-main/abandon?id=' + id })
+}
diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts
index 88959b43f..b6fb266d8 100644
--- a/src/api/wms/putawayJobMain/index.ts
+++ b/src/api/wms/putawayJobMain/index.ts
@@ -91,3 +91,13 @@ export const importTemplate = () => {
 export const closePutawayJobMain = (id: number) => {
   return request.put({ url: '/wms/putaway-job-main/close?id=' + id })
 }
+
+// 承接上架任务主
+export const acceptPutawayJobMain = (id: number) => {
+  return request.put({ url: '/wms/putaway-job-main/accept?id=' + id })
+}
+
+// 取消承接上架任务主
+export const abandonPutawayJobMain = (id: number) => {
+  return request.put({ url: '/wms/putaway-job-main/abandon?id=' + id })
+}
diff --git a/src/api/wms/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts
index b24c424ab..56464584d 100644
--- a/src/api/wms/transferissueJobMain/index.ts
+++ b/src/api/wms/transferissueJobMain/index.ts
@@ -93,15 +93,15 @@ export const importTemplate = () => {
 
 // 关闭-调拨出库任务主
 export const closeTransferissueJobMain = (id: number) => {
-  return request.download({ url: '/wms/transferissue-job-main/close?id=' + id })
+  return request.put({ url: '/wms/transferissue-job-main/close?id=' + id })
 }
 
 // 承接-调拨出库任务主
 export const acceptTransferissueJobMain = (id: number) => {
-  return request.download({ url: '/wms/transferissue-job-main/accept?id=' + id })
+  return request.put({ url: '/wms/transferissue-job-main/accept?id=' + id })
 }
 
 // 放弃-调拨出库任务主
 export const abandonTransferissueJobMain = (id: number) => {
-  return request.download({ url: '/wms/transferissue-job-main/abandon?id=' + id })
+  return request.put({ url: '/wms/transferissue-job-main/abandon?id=' + id })
 }
diff --git a/src/api/wms/transferreceiptJobMain/index.ts b/src/api/wms/transferreceiptJobMain/index.ts
index ab8fe4e41..a86aa1f99 100644
--- a/src/api/wms/transferreceiptJobMain/index.ts
+++ b/src/api/wms/transferreceiptJobMain/index.ts
@@ -73,6 +73,18 @@ export const updateTransferreceiptJobMain = async (data: TransferreceiptJobMainV
 export const deleteTransferreceiptJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/transferreceipt-job-main/delete?id=` + id })
 }
+// 承接调拨入库任务主
+export const acceptTransferreceiptJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/transferreceipt-job-main/accept?id=` + id })
+}
+// 取消承接调拨入库任务主
+export const abandonTransferreceiptJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/transferreceipt-job-main/abandon?id=` + id })
+}
+// 关闭调拨入库任务主
+export const closeTransferreceiptJobMain = async (id: number) => {
+  return await request.put({ url: `/wms/transferreceipt-job-main/close?id=` + id })
+}
 
 // 导出调拨入库任务主 Excel
 export const exportTransferreceiptJobMain = async (params) => {
diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts
index 5a230b649..f02206f8e 100644
--- a/src/api/wms/unplannedissueJobMain/index.ts
+++ b/src/api/wms/unplannedissueJobMain/index.ts
@@ -67,6 +67,18 @@ export const updateUnplannedissueJobMain = async (data: UnplannedissueJobMainVO)
 export const deleteUnplannedissueJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/unplannedissue-job-main/delete?id=` + id })
 }
+// 承接计划外出库任务主
+export const acceptUnplannedissueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-job-main/accept?id=` + id })
+}
+// 取消承接计划外出库任务主
+export const abandonUnplannedissueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-job-main/abandon?id=` + id })
+}
+// 关闭计划外出库任务主
+export const closeUnplannedissueJobMain = async (id: number) => {
+  return await request.delete({ url: `/wms/unplannedissue-job-main/close?id=` + id })
+}
 
 // 导出计划外出库任务主 Excel
 export const exportUnplannedissueJobMain = async (params) => {
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 3fa0c33b6..45ab2b064 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -696,7 +696,6 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
 const updateList = ()=>{
   getList()
 }
-defineExpose({ openDetail, formRef ,updateList}) // 提供 open 方法，用于打开弹窗
 
 // 获取备注列表
 const getRemarkList = async () => {
@@ -859,21 +858,39 @@ const submitForm = async (formType, data) => {
     const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
     if (!rs) return
     if (formType === 'create') {
-      await props.apiCreate(data)
-      message.success(t('common.createSuccess'))
+      if(props.apiCreate){
+        await props.apiCreate(data)
+        message.success(t('common.createSuccess'))
+      }else{
+        emit('handleSubmitForm',formType, data)
+      }
     } else {
-      await props.apiUpdate(data)
-      message.success(t('common.updateSuccess'))
+      if(props.apiUpdate){
+        await props.apiUpdate(data)
+        message.success(t('common.updateSuccess'))
+      }else{
+        emit('handleSubmitForm',formType, data)
+      }
+      
+    }
+    if (formType === 'create'&&props.apiCreate||formType === 'update'&&props.apiUpdate) {
+      emit('handleMainFefresh')
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      await getList()
+      updateKey.value += 1
     }
-    emit('handleMainFefresh')
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    await getList()
-    updateKey.value += 1
   } finally {
     formRef.value.formLoading = false
   }
 }
+//明细--新增，编辑，页面单独处理--用此方法刷新
+const submitUpdateList = async ()=>{
+  formRef.value.dialogVisible = false
+  // 刷新当前列表
+  await getList()
+  updateKey.value += 1
+}
 
 
 const searchTableSuccess1 = (formField, searchField, val, formRef) => {
@@ -904,6 +921,8 @@ const emit = defineEmits([
   'detailBasicFormOnChange',
   'formFormDateChange',
   'buttonBaseClick',
+  'handleMainFefresh',
+  'handleSubmitForm'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -997,6 +1016,8 @@ watch(
     getList()
   }
 )
+defineExpose({ openDetail, formRef ,updateList,submitUpdateList}) // 提供 open 方法，用于打开弹窗
+
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/directives/permission/clientTable.ts b/src/directives/permission/clientTable.ts
index 2a9c7ed82..7db98c0bd 100644
--- a/src/directives/permission/clientTable.ts
+++ b/src/directives/permission/clientTable.ts
@@ -18,6 +18,13 @@ export function clientTable(app: App<Element>) {
       el.firstChild.style.height = '100%'
     })
   })
+  app.directive('clientTable450', (el, binding) => {
+    nextTick(() => {
+      el.style.height =  '450px'
+      el.firstChild.style.height = '100%'
+    })
+  })
+  
   app.directive('clientSearchTable', (el, binding) => {
     nextTick(() => {
       const top = el.getBoundingClientRect().top
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 477b8905b..d74160dc8 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -908,7 +908,7 @@ export function mainListJobCloBtn(option:any) {
 // 主列表-任务流程-放弃按钮
 export function mainListJobAbaBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.放弃`).replace('ts.', ''),
+    label: t(`ts.取消承接`).replace('ts.', ''),
     name: 'mainJobAba',
     hide: false,
     type: 'danger',
@@ -1136,7 +1136,7 @@ export function sparePartBtn(option:any) {
     hasPermi: ''
   })
 }
-// 主列表-备件
+// 主列表-生成维修经验
 export function repairExperienceBtn(option:any) {
   return __defaultBtnOption(option,{
     label: '生成维修经验',
@@ -1148,6 +1148,18 @@ export function repairExperienceBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-生成保养经验
+export function maintainExperienceBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: '生成保养经验',
+    name: 'maintainExperience',
+    hide: false,
+    type: 'primary',
+    color: '',
+    link: true, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 默认按钮规则
 function __defaultBtnOption(option:any,specific:any){
   return {
diff --git a/src/utils/formatter.ts b/src/utils/formatter.ts
index 600e0b724..1bb131e2f 100644
--- a/src/utils/formatter.ts
+++ b/src/utils/formatter.ts
@@ -12,6 +12,7 @@ export const fenToYuanFormat = (
 }
 export const accountantFormart = (row, column, cellValue) => {
   cellValue = cellValue + '' || ''
+  cellValue = Number(cellValue).toFixed(2)
   let x = cellValue.split('.')
   let x1 = x[0]
   let x2  = x.length > 1 ? '.' + x[1] : ''
diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue
deleted file mode 100644
index 35ed57fbc..000000000
--- a/src/views/eam/SparePartsOutLocationRecord/index.vue
+++ /dev/null
@@ -1,374 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="SparePartsOutLocationRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="SparePartsOutLocationRecordMain.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"
-    @success="getList"
-    :rules="SparePartsOutLocationRecordMainRules"
-    :formAllSchemas="SparePartsOutLocationRecordMain.allSchemas"
-    :tableAllSchemas="SparePartsOutLocationRecordDetail.allSchemas"
-    :tableFormRules="SparePartsOutLocationRecordDetailRules"
-    :tableData="tableData"
-    :apiUpdate="SparePartsOutLocationRecordMainApi.updateSparePartsOutLocationRecordMain"
-    :apiCreate="SparePartsOutLocationRecordMainApi.createSparePartsOutLocationRecordMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SparePartsOutLocationRecordMain.allSchemas"
-    :detailAllSchemas="SparePartsOutLocationRecordDetail.allSchemas"
-    :detailAllSchemasRules="SparePartsOutLocationRecordDetailRules"
-    :apiCreate="SparePartsOutLocationRecordDetailApi.createSparePartsOutLocationRecordDetail"
-    :apiUpdate="SparePartsOutLocationRecordDetailApi.updateSparePartsOutLocationRecordDetail"
-    :apiPage="SparePartsOutLocationRecordDetailApi.getSparePartsOutLocationRecordDetailPage"
-    :apiDelete="SparePartsOutLocationRecordDetailApi.deleteSparePartsOutLocationRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-
-  <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/eam/sparePartsOutLocationRecordDetail/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  SparePartsOutLocationRecordMain,
-  SparePartsOutLocationRecordMainRules,
-  SparePartsOutLocationRecordDetail,
-  SparePartsOutLocationRecordDetailRules
-} from './sparePartsOutLocationRecord.data'
-import * as SparePartsOutLocationRecordMainApi from '@/api/eam/sparePartsOutLocationRecordMain/index'
-import * as SparePartsOutLocationRecordDetailApi from '@/api/eam/sparePartsOutLocationRecordDetail/index'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
-// 采购订单
-defineOptions({ name: 'SparePartsOutLocationRecord' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(SparePartsOutLocationRecordMain.allSchemas.tableColumns)
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if (formField == 'sparePartsCode') {
-        row['sparePartsCode'] = val[0].itemNumber
-        row['currentQty'] = val[0].qty
-      }
-      if (formField == 'equipmentCode') {
-        row['equipmentCode'] = val[0].code
-      }
-      formRef.setValues(setV)
-    })
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsOutLocationRecordMainApi.getSparePartsOutLocationRecordMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn(null), // 新增
-  // defaultButtons.defaultImportBtn(null), // 导入
-  // defaultButtons.defaultExportBtn(null), // 导出
-  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 isShowMainButton = (row, val) => {
-  if (val.indexOf(row.available) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    // defaultButtons.mainAdjust(null),// 盘点调整
-  ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  }
-  // else if (val == 'mainOrderClo') {
-  //   // 关闭
-  //   handleClose(row.id)
-  // }
-  else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsOutLocationRecordMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SparePartsOutLocationRecordMainApi.deleteSparePartsOutLocationRecordMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleMainExport = async (id: number) => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(id)
-    download.excel(data, '盘点工单.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 关闭按钮操作 */
-// const handleClose = async (id: number) => {
-//   try {
-//     // 关闭的二次确认
-//     await message.confirm('是否关闭所选中数据？')
-//     // 发起关闭
-//     await SparePartsOutLocationRecordMainApi.closeSparePartsOutLocationRecordMain(id)
-//     message.success(t('关闭成功!'))
-//     // 刷新列表
-//     await getList()
-//   } catch {}
-// }
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsOutLocationRecordMainApi.exportSparePartsOutLocationRecordMain(
-      tableObject.params
-    )
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-SparePartsOutLocationRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-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 // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await SparePartsOutLocationRecordMainApi.createSparePartsOutLocationRecordMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await SparePartsOutLocationRecordMainApi.updateSparePartsOutLocationRecordMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = 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() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await SparePartsOutLocationRecordMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/eam/applicationRecord/applicationRecordMain.data.ts b/src/views/eam/applicationRecord/applicationRecordMain.data.ts
index c7d233246..0160659a8 100644
--- a/src/views/eam/applicationRecord/applicationRecordMain.data.ts
+++ b/src/views/eam/applicationRecord/applicationRecordMain.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
-import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-// import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
+import { ItemAccounts } from '@/views/eam/item/itemAccounts/itemAccounts.data'
+import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
 import { validateHanset, validateEmail } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
@@ -154,30 +154,30 @@ export const ApplicationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
 
 
-  // {
-  //   label: '设备/模具编号',
-  //   field: 'deviceNumber',
-  //   sort: 'custom',
-  //   isSearch: true,
-  //   tableForm: {
-  //     isInpuFocusShow: true,
-  //     searchListPlaceholder: '请选择单号',
-  //     searchField: 'number',
-  //     searchTitle: '单号信息',
-  //     searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
-  //     searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
-  //     searchCondition: [{
-  //       key: 'available',
-  //       value: "TRUE",
-  //       isMainValue: false
-  //     }, {
-  //       key: 'type',
-  //       value: "type",
-  //       isMainValue: true
-  //     }
-  //     ]
-  //   },
-  // },
+  {
+    label: '设备/模具编号',
+    field: 'deviceNumber',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择单号',
+      searchField: 'number',
+      searchTitle: '单号信息',
+      searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
+      searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: "TRUE",
+        isMainValue: false
+      }, {
+        key: 'type',
+        value: "type",
+        isMainValue: true
+      }
+      ]
+    },
+  },
   {
     label: '申领数量',
     field: 'qty',
diff --git a/src/views/eam/applicationRecord/index.vue b/src/views/eam/applicationRecord/index.vue
index f37e311d3..7e81e1ab7 100644
--- a/src/views/eam/applicationRecord/index.vue
+++ b/src/views/eam/applicationRecord/index.vue
@@ -1,371 +1,309 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search
-      :schema="ApplicationRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
+    <Search :schema="ApplicationRecordMain.allSchemas.searchSchema" @search="setSearchParams"
+      @reset="setSearchParams" />
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="ApplicationRecordMain.allSchemas"
-  />
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ApplicationRecordMain.allSchemas" />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
+    <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 }">
+      }" 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)"
-        />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
-    ref="formRef"
-    @success="getList"
-    :rules="ApplicationRecordMainRules"
-    :formAllSchemas="ApplicationRecordMain.allSchemas"
-    :tableAllSchemas="ApplicationRecordDetail.allSchemas"
-    :tableFormRules="ApplicationRecordDetailRules"
-    :tableData="tableData"
+  <BasicForm ref="formRef" @success="getList" :rules="ApplicationRecordMainRules"
+    :formAllSchemas="ApplicationRecordMain.allSchemas" :tableAllSchemas="ApplicationRecordDetail.allSchemas"
+    :tableFormRules="ApplicationRecordDetailRules" :tableData="tableData"
     :apiUpdate="ApplicationRecordMainApi.updateApplicationRecordMain"
-    :apiCreate="ApplicationRecordMainApi.createApplicationRecordMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
+    :apiCreate="ApplicationRecordMainApi.createApplicationRecordMain" :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm" />
 
   <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="ApplicationRecordMain.allSchemas"
-    :detailAllSchemas="ApplicationRecordDetail.allSchemas"
-    :detailAllSchemasRules="ApplicationRecordDetailRules"
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
+    :detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
     :apiCreate="ApplicationRecordDetailApi.createApplicationRecordDetail"
     :apiUpdate="ApplicationRecordDetailApi.updateApplicationRecordDetail"
     :apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
     :apiDelete="ApplicationRecordDetailApi.deleteApplicationRecordDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
     :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
+    :detailButtonIsShow="true" />
   <!-- 审批详情 -->
-  <!-- <approveDetail
-    ref="detailRef1"
-    :isBasic="false"
-    :allSchemas="ApplicationRecordMain.allSchemas"
-    :detailAllSchemas="ApplicationRecordDetail.allSchemas"
-    :detailAllSchemasRules="ApplicationRecordDetailRules"
+  <approveDetail ref="detailRef1" :isBasic="false" :allSchemas="ApplicationRecordMain.allSchemas"
+    :detailAllSchemas="ApplicationRecordDetail.allSchemas" :detailAllSchemasRules="ApplicationRecordDetailRules"
     :apiAgree="ApplicationRecordMainApi.agreeApplicationRecordMain"
     :apiDisAgree="ApplicationRecordMainApi.disAgreeApplicationRecordMain"
     :apiPage="ApplicationRecordDetailApi.getApplicationRecordDetailPage"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    @agree="getList"
-  /> -->
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    @agree="getList"/>
   <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/wms/purchase-main/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-    :isShowOut="true"
-    :updateIsDisable="true"
-    :coverIsDisable="true"
-    :mode="2"
-  />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
-import {
-  ApplicationRecordMain,
-  ApplicationRecordMainRules,
-  ApplicationRecordDetail,
-  ApplicationRecordDetailRules
-} from './applicationRecordMain.data'
-import * as ApplicationRecordMainApi from '@/api/eam/applicationRecordMain'
-import * as ApplicationRecordDetailApi from '@/api/eam/applicationRecordDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import approveDetail from '@/components/Detail/src/approveDetail.vue'
+  import download from '@/utils/download'
+  import { ApplicationRecordMain, ApplicationRecordMainRules, ApplicationRecordDetail, ApplicationRecordDetailRules } from './applicationRecordMain.data'
+  import * as ApplicationRecordMainApi from '@/api/eam/item/applicationRecordMain'
+  import * as ApplicationRecordDetailApi from '@/api/eam/item/applicationRecordDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import approveDetail from '@/components/Detail/src/approveDetail.vue'
 
-// 采购订单
-defineOptions({ name: 'ApplicationRecord' })
+  // 采购订单
+  defineOptions({ name: 'ApplicationRecord' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(ApplicationRecordMain.allSchemas.tableColumns)
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(ApplicationRecordMain.allSchemas.tableColumns)
 
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
 
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(async () => {
-    if (type == 'tableForm') {
-      // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['itemNumber'] = val[0]['number']
-      row['isRadeIn'] = val[0]['isRadeIn']
-      row['available'] = val[0]['available']
-    } else {
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        row[formField] = val[0][searchField]
+        row['itemNumber'] = val[0]['number']
+        row['isRadeIn'] = val[0]['isRadeIn']
+        row['available'] = val[0]['available']
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
       const setV = {}
-      setV[formField] = val[0][searchField]
+      // if(formField == 'itemCode'){
+      //     await ItembasicApi.getItembasicPage({
+      //       code: setV['itemCode']
+      //     }).then(res => {
+      //       setV['uom'] = res.list[0].uom
+      //       setV[formField] = val[0][searchField]
+      //     })
+      //   }
       formRef.setValues(setV)
-    }
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
+    })
+  }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo = []
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
 
-const { tableObject, tableMethods } = useTable({
-  getListApi: ApplicationRecordMainApi.getApplicationRecordMainPage // 分页接口
-})
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ApplicationRecordMainApi.getApplicationRecordMainPage // 分页接口
+  })
 
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn(null), // 新增
-  // defaultButtons.defaultImportBtn(null), // 导入
-  // defaultButtons.defaultExportBtn(null), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
-]
+  // 列表头部按钮
+  const HeadButttondata = [
+    // defaultButtons.defaultAddBtn(null), // 新增
+    // defaultButtons.defaultImportBtn(null), // 导入
+    // defaultButtons.defaultExportBtn(null), // 导出
+    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 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 isShowMainButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
   }
-}
 
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    defaultButtons.approveBtn({
-      hide: isShowMainButton(row, ['0']),
-      hasPermi: 'item:itemApplyMain:approve'
-    }) // 审批
-    // defaultButtons.mainListEditBtn(null), // 编辑
-    // defaultButtons.mainListDeleteBtn(null), // 删除
-  ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  } else if (val == 'approve') {
-    // 审批
-    handleApprove(row, '单据号', row.number)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.approveBtn({ hide: isShowMainButton(row, ['0']) ,hasPermi:'item:itemApplyMain:approve'}), // 审批
+      // defaultButtons.mainListEditBtn(null), // 编辑
+      // defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
   }
-}
 
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'approve') { // 审批
+      handleApprove(row, '单据号', row.number)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
 
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
-}
-const detailRef1 = ref()
-const handleApprove = (row: any, titleName: any, titleValue: any) => {
-  detailRef1.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
-  // 刷新列表
-  getList()
-}
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await ApplicationRecordMainApi.deleteApplicationRecordMain(id)
-    message.success(t('common.delSuccess'))
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
+  }
+  const detailRef1 = ref()
+  const handleApprove = (row : any, titleName : any, titleValue : any) => {
+    detailRef1.value.openDetail(row, titleName, titleValue, 'basicApplicationRecordMain')
     // 刷新列表
-    await getList()
-  } catch {}
-}
+     getList()
+  }
 
-/** 导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ApplicationRecordMainApi.exportApplicationRecordMain(tableObject.params)
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ApplicationRecordMainApi.deleteApplicationRecordMain(id)
+      message.success(t('common.delSuccess'))
+      // 刷新列表
+      await getList()
+    } catch { }
   }
-}
 
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-ApplicationRecordDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
+    try {
+      // 导出的二次确认
+      await message.exportConfirm()
+      // 发起导出
+      exportLoading.value = true
+      const data = await ApplicationRecordMainApi.exportApplicationRecordMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
 
-// 添加明细
-const handleAddTable = () => {
-  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-}
-// 删除明细
-const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
-}
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  ApplicationRecordDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
 
-// 主子数据 提交
-const submitForm = async (formType, data) => {
-  data.subList = tableData.value // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await ApplicationRecordMainApi.createApplicationRecordMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ApplicationRecordMainApi.updateApplicationRecordMain(data)
-      message.success(t('common.updateSuccess'))
+  // 添加明细
+  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 // 拼接子表数据参数
+    try {
+      if (formType === 'create') {
+        await ApplicationRecordMainApi.createApplicationRecordMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ApplicationRecordMainApi.updateApplicationRecordMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = false
     }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = false
   }
-}
 
-/** 导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
 
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: '',
-  templateTitle: '采购订单主导入模版.xlsx'
-})
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '采购订单主导入模版.xlsx'
+  })
 
-// 导入成功之后
-const importSuccess = () => {
-  getList()
-}
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
 
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
   }
-  getList() // 刷新当前列表
-}
 
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await ApplicationRecordMainApi.importTemplate()
-})
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ApplicationRecordMainApi.importTemplate()
+  })
 </script>
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 44f0c2e27..228b3f7e9 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -62,7 +62,16 @@
           :detailButtonIsShowDelete=false
   />
 
-
+ <!-- 生成保养经验表单弹窗：添加/修改 -->
+ <BasicForm
+    ref="maintainExperienceFormRef"
+    @success="maintainExperienceFormsSuccess"
+    :rules="MaintainExperienceRules"
+    :formAllSchemas="MaintainExperience.allSchemas"
+    :apiUpdate="MaintainExperienceApi.updateMaintainExperience"
+    :apiCreate="MaintainExperienceApi.createMaintainExperience"
+    :isBusiness="false"
+  />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/eam/equipment-maintenance-record-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -73,6 +82,8 @@ import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } fr
 import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
 import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
 import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
+import { MaintainExperience,MaintainExperienceRules } from '../maintainExperience/maintainExperience.data'
+import * as MaintainExperienceApi from '@/api/eam/maintainExperience'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -147,6 +158,7 @@ const buttonBaseClick = (val, item) => {
 const butttondata = [
   //defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:update'}), // 编辑
   //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:delete'}), // 删除
+  defaultButtons.maintainExperienceBtn({ hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成保养经验
 ]
 
 // 列表-操作按钮事件
@@ -155,6 +167,9 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'maintainExperience') {
+    //生成保养经验
+    openMaintainExperience('update', row)
   }
 }
 
@@ -163,7 +178,11 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
-
+//打开维修经验坦诚
+const maintainExperienceFormRef = ref()
+const openMaintainExperience = (type: string, row?: any) => {
+  maintainExperienceFormRef.value.open(type, row)
+}
 // form表单提交
 const formsSuccess = async (formType,data) => {
   var isHave =EquipmentMaintenanceRecordMain.allSchemas.formSchema.some(function (item) {
@@ -193,6 +212,26 @@ const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentMaintenanceRecordMain')
 }
+// 新增生成维修经验
+const maintainExperienceFormsSuccess = async (formType, data) => {
+  console.log(data)
+  const data1 = {
+    maintainRecordNumber: data.recordNo,
+    name: data.name,
+    content: data.content,
+    masterId: data.id,
+    orderType: 'MAINTAIN',
+  }
+  console.log(data1)
+  try {
+    await MaintainExperienceApi.createMaintainExperience(data1)
+    message.success(t('common.createSuccess'))
+    maintainExperienceFormRef.value.dialogVisible = false
+    getList()
+  } finally {
+    maintainExperienceFormRef.value.formLoading = false
+  }
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index d9b2fe9bc..91aa00756 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -70,7 +70,7 @@
   <BasicForm
     ref="repairExperienceFormRef"
     @success="repairExperienceFormsSuccess"
-    :rules="EquipmentRepairRecordMainRules"
+    :rules="RepairExperienceRules"
     :formAllSchemas="RepairExperience.allSchemas"
     :apiUpdate="RepairExperienceApi.updateRepairExperience"
     :apiCreate="RepairExperienceApi.createRepairExperience"
@@ -95,7 +95,7 @@ import {
   EquipmentRepairRecordDetail,
   EquipmentRepairRecordDetailRules
 } from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
-import { RepairExperience } from '../repairExperience/repairExperience.data'
+import { RepairExperience,RepairExperienceRules } from '../repairExperience/repairExperience.data'
 import * as EquipmentRepairRecordMainApi from '@/api/eam/equipmentRepairRecordMain'
 import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
 import * as RepairExperienceApi from '@/api/eam/repairExperience'
@@ -244,7 +244,7 @@ const repairExperienceFormsSuccess = async (formType, data) => {
     name: data.name,
     content: data.content,
     masterId: data.id,
-    ooderType: 'REPAIR',
+    orderType: 'REPAIR',
   }
   console.log(data1)
   try {
diff --git a/src/views/eam/item/index.vue b/src/views/eam/item/index.vue
new file mode 100644
index 000000000..7fe83a3a1
--- /dev/null
+++ b/src/views/eam/item/index.vue
@@ -0,0 +1,345 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Item.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Item.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 #action="{ row }">
+        <ButtonBase
+          :Butttondata="butttondata(row)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ItemRules"
+    :formAllSchemas="Item.allSchemas"
+    :apiUpdate="ItemApi.updateItem"
+    :apiCreate="ItemApi.createItem"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <SearchTable ref="searchTableRef" @searchTableSuccess="submitItem" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Item.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>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Item, ItemRules } from './item.data'
+import * as ItemApi from '@/api/eam/item'
+// import { createDeviceItemBatch, getDeviceItemPage, getDeviceItemNoPage } from '@/api/eam/basic/rel'
+// import {
+//   DeviceAccounts,
+//   DeviceAccountsRules
+// } from '@/views/eam/device/deviceAccounts/deviceAccounts.data'
+// import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { SearchTable } from '@/components/SearchTable'
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'Item' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const itemNumber = ref()
+const tableColumns = ref(Item.allSchemas.tableColumns)
+const importFormRef = ref()
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/950552010397122560?token=' + getAccessToken())
+
+const showView = ref(false)
+const viewTitle = ref('图片预览')
+const urls = ref([])
+const viewKey = ref(0)
+
+// 查询页面返回
+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: ItemApi.getItemPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'basic:item:create' }), // 新增
+  defaultButtons.defaultExportBtn({ hasPermi: 'basic:item:export' }), // 导出
+  // defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null) // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'qrCodeBatch') {
+    // 批量生成二维码
+    qrCodeBatch(val, item)
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const qrCodeBatch = async (val, item) => {
+  const qrCodeList = tableObject.tableList.map((item) => `'${item?.number}'`).join(', ')
+  window.open(src.value + '&number=' + qrCodeList)
+}
+
+// 列表-操作按钮
+const butttondataView = (row) => {
+  return [defaultButtons.viewBtn(null)]
+}
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({ hasPermi: 'basic:item:update' }), // 编辑
+    // defaultButtons.chooseDeviceBtn({ hasPermi: 'basic:item:choose' }), //备件
+    defaultButtons.selectQrCodeBtn(null), //二维码
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:item:delete' }), // 删除
+    defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'chooseDevice') {
+    openItem(row.number)
+  } else if (val == 'qrCode') {
+    window.open(src.value + "&number='" + row.number + "'")
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else if (val == 'view') {
+    // 图片预览
+    openForm('view', row)
+  }
+}
+
+// const searchTableRef = ref()
+// /** 绑定备件操作 */
+// const openItem = async (number: String) => {
+//   itemNumber.value = number
+//   await CallBack1()
+//   searchTableRef.value.open(
+//     '选择设备',
+//     DeviceAccounts.allSchemas,
+//     DeviceAccountsApi.getDeviceAccountsPage,
+//     null,
+//     DeviceAccounts.allSchemas.searchSchema,
+//     true,
+//     null,
+//     null,
+//     null,
+//     null,
+//     searchTableSelections.value
+//   )
+// }
+
+// const searchTableSelections = ref([])
+// const CallBack1 = async () => {
+//   await getDeviceItemNoPage({ itemNumber: itemNumber.value }).then(async (res) => {
+//     await DeviceAccountsApi.getDeviceAccountsAllNoPage({}).then((response) => {
+//       searchTableSelections.value = response.filter((element) => {
+//         let flag = false
+//         res.forEach((item) => {
+//           if (element.number == item.deviceNumber) {
+//             flag = true
+//           }
+//         })
+//         return flag
+//       })
+//     })
+//   })
+// }
+
+const submitItem = async (formFieldRef, searchFieldRef, selections, typeRef, rowRef) => {
+  const deviceItemRelList = selections.map((element) => ({
+    itemNumber: itemNumber.value,
+    deviceNumber: element.number
+  }))
+  createDeviceItemBatch(deviceItemRelList).then((res) => {
+    message.success(t('common.createSuccess'))
+  })
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  console.log(row)
+  if (type == 'view') {
+    showView.value = true
+    urls.value = row.filePathList
+    viewKey.value += 1
+  } else {
+    if (row && row.filePathList && row.filePathList.length > 0) {
+      row.filePathListView = row.filePathList.map((item) => {
+        return {
+          name: item,
+          url: item
+        }
+      })
+    }
+    basicFormRef.value.open(type, row)
+  }
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = Item.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.filePathList = []
+  for (let i = 0; i < data.filePathListView.length; i++) {
+    data.filePathList.push(data.filePathListView[i].url)
+  }
+  if (formType === 'create') {
+    await ItemApi.createItem(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItemApi.updateItem(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, 'basicItem')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemApi.deleteItem(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 ItemApi.exportItem(tableObject.params)
+    download.excel(data, '备件.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/eam/item/item.data.ts b/src/views/eam/item/item.data.ts
new file mode 100644
index 000000000..59c5a6f36
--- /dev/null
+++ b/src/views/eam/item/item.data.ts
@@ -0,0 +1,341 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ItemRules = reactive({
+  name: [
+    { required: true, message: '请输入备件名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请选择备件单位', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  classification: [{ required: true, message: '请选择备件分类', trigger: 'blur' }]
+})
+
+export const Item = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '备件编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
+    },
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '规格',
+      field: 'specifications',
+      sort: 'custom'
+    },
+    {
+      label: '是否常储',
+      field: 'isConstant',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 110
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '科目',
+      field: 'subject',
+      sort: 'custom',
+      dictType: DICT_TYPE.SUBJECT,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+
+    {
+      label: '科目代码',
+      field: 'subjectCode',
+      sort: 'custom',
+      isTable: true
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '类别',
+      field: 'category',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_CATEGORY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '备件分类',
+      field: 'classification',
+      sort: 'custom',
+      dictType: DICT_TYPE.PART_CLASS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '区域',
+      field: 'region',
+      sort: 'custom',
+      dictType: DICT_TYPE.REGION,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    // {
+    //   label: '单价',
+    //   field: 'singlePrice',
+    //   sort: 'custom',
+    // },
+    {
+      label: '重采购点',
+      field: 'reprocurement',
+      sort: 'custom',
+      table: {
+        width: 110
+      },
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '安全库存',
+      field: 'safetyStock',
+      sort: 'custom',
+      table: {
+        width: 110
+      },
+      form: {
+        component: 'InputNumber',
+        value: 0
+      }
+    },
+    {
+      label: '成本中心',
+      field: 'cost',
+      sort: 'custom',
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '采购员',
+      field: 'purchaser',
+      sort: 'custom',
+      table: {
+        width: 100
+      }
+    },
+    {
+      label: '财务',
+      field: 'financer',
+      sort: 'custom'
+    },
+    {
+      label: '是否以旧换新',
+      field: 'isRadeIn',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    {
+      label: '是否框架协议',
+      field: 'isFramework',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    // {
+    //   label: '是否可用',
+    //   field: 'available',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isSearch: false,
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     inactiveValue: 'FALSE',
+    //     disabled: true
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      }
+    },
+    {
+      label: '描述',
+      field: 'describes',
+      sort: 'custom'
+    },
+    {
+      label: '图片',
+      field: 'upload',
+      isTable: true
+    },
+    {
+      label: '文件',
+      field: 'filePathListView',
+      sort: 'custom',
+      isTable: false,
+      table: {},
+      form: {
+        component: 'UploadFile',
+        componentProps: {}
+      }
+    },
+    {
+      label: '文件',
+      field: 'filePathList',
+      sort: 'custom',
+      isTable: false,
+      isForm: false,
+      table: {},
+      form: {
+        component: 'UploadFile',
+        componentProps: {}
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'right'
+      }
+    }
+  ])
+)
+
+export const ItemSearchTable = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '备件编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: false,
+      table: {
+        fixed: 'left'
+      }
+    },
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true,
+      table: {}
+    },
+    {
+      label: '数量',
+      field: 'qty',
+      sort: 'custom'
+    }
+  ])
+)
diff --git a/src/views/eam/itemAccounts/index.vue b/src/views/eam/itemAccounts/index.vue
index d3b39e599..c361e4578 100644
--- a/src/views/eam/itemAccounts/index.vue
+++ b/src/views/eam/itemAccounts/index.vue
@@ -92,8 +92,8 @@
 import download from '@/utils/download'
 import { ItemAccounts, ItemAccountsRules } from './itemAccounts.data'
 import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-import { SparePart } from '@/views/eam/sparePart/sparePart.data'
-import * as ItemApi from '@/api/eam/sparePart'
+import { Item } from '@/views/eam/item/item.data'
+import * as ItemApi from '@/api/eam/item'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -118,35 +118,9 @@ const viewKey = ref(0)
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if (formField == 'locationNumber') {
-        setV['locationNumber'] = val[0].code
-        setV['areaNumber'] = val[0].areaCode
-      }
-      if (formField == 'itemNumber') {
-        setV['itemNumber'] = val[0].code
-        setV['name'] = val[0].name
-        setV['brand'] = val[0].brand
-        setV['specifications'] = val[0].specifications
-        setV['isOverall'] = val[0].isOverall
-        setV['subject'] = val[0].subject
-        setV['subjectCode'] = val[0].subjectCode
-        setV['type'] = val[0].type
-        setV['region'] = val[0].region
-        setV['classification'] = val[0].classification
-        setV['uom'] = val[0].uom
-        setV['manufacturer'] = val[0].manufacturer
-        setV['minInventory'] = val[0].minInventory
-        setV['maxInventory'] = val[0].maxInventory
-        setV['replacementCycle'] = val[0].replacementCycle
-        setV['storageLocation'] = val[0].storageLocation
-        setV['remark'] = val[0].remark
-        setV['available'] = val[0].available
-      }
-      formRef.setValues(setV)
-    })
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
   })
 }
 
@@ -213,9 +187,9 @@ const buttonBaseClick = (val, item) => {
 const butttondata = (row) => {
   return [
     defaultButtons.mainListEditBtn({ hasPermi: 'item:itemAccounts:update' }), // 编辑
-    // defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
-    defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }) // 删除
-    // defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
+    defaultButtons.replaceLocation({ hasPermi: 'item:itemAccounts:replaceLocation' }), //更换库位
+    defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemAccounts:delete' }), // 删除
+    defaultButtons.viewBtn({ hide: !(row.filePathList != null && row.filePathList.length != 0) })
     //defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销
   ]
 }
diff --git a/src/views/eam/itemAccounts/itemAccounts.data.ts b/src/views/eam/itemAccounts/itemAccounts.data.ts
index 0f1284160..ba8aa6b17 100644
--- a/src/views/eam/itemAccounts/itemAccounts.data.ts
+++ b/src/views/eam/itemAccounts/itemAccounts.data.ts
@@ -1,19 +1,11 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-
-import * as LocationApi from '@/api/wms/location'
-import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
-
-import * as SparePartApi from '@/api/eam/sparePart'
-import { SparePart } from '@/views/eam/sparePart/sparePart.data'
-
 import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const ItemAccountsRules = reactive({
   itemNumber: [required],
-  singlePrice: [required],
-  locationNumber: [required],
-  qty: [required]
+  areaNumber: [required],
+  concurrencyStamp: [required]
 })
 
 export const ItemAccounts = useCrudSchemas(
@@ -22,323 +14,295 @@ export const ItemAccounts = useCrudSchemas(
       label: '备件编号',
       field: 'itemNumber',
       sort: 'custom',
+      isSearch: true,
       table: {
         width: 180,
         fixed: 'left'
+      }
+    },
+
+    {
+      label: '库位编号',
+      field: 'locationNumber',
+      sort: 'custom',
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '库区编号',
+      field: 'areaNumber',
+      sort: 'custom',
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '备件名称',
+      field: 'name',
+      sort: 'custom',
+      table: {
+        width: 110
       },
+      isSearch: false
+    },
+    {
+      label: '规格',
+      field: 'specifications',
+      sort: 'custom'
+    },
+
+    {
+      label: '库存数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 110
+      }
+    },
+    {
+      label: '是否账内库',
+      field: 'isInAccount',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
       isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 130
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
       form: {
-        // labelMessage: '信息提示说明！！！',
+        component: 'Switch',
+        value: 'TRUE',
         componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '编号信息', // 查询弹窗标题
-          searchAllSchemas: SparePart.allSchemas, // 查询弹窗所需类
-          searchPage: SparePartApi.getSparePartPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            // {
-            //   key: 'warehouseCode',
-            //   value: 'warehouseCode',
-            //   message: '请填写仓库代码！',
-            //   isMainValue: true
-            // },
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
         }
       }
     },
 
     {
-      label: '备件名称',
-      field: 'name',
+      label: '是否常储',
+      field: 'isConstant',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
       sort: 'custom',
-      isSearch: true,
-      isForm: true,
       table: {
-        width: 150
+        width: 110
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
       },
       form: {
+        component: 'Switch',
+        value: 'TRUE',
         componentProps: {
-          disabled: true
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
         }
       }
     },
+    {
+      label: '科目',
+      field: 'subject',
+      sort: 'custom',
+      dictType: DICT_TYPE.SUBJECT,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+
+    {
+      label: '科目代码',
+      field: 'subjectCode',
+      sort: 'custom',
+      isTable: true
+    },
+    {
+      label: '单位',
+      field: 'uom',
+      sort: 'custom',
+      dictType: DICT_TYPE.UOM,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
+    {
+      label: '类别',
+      field: 'category',
+      sort: 'custom',
+      dictType: DICT_TYPE.ITEM_CATEGORY,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      tableForm: {
+        type: 'Select'
+      }
+    },
     {
       label: '备件分类',
       field: 'classification',
       sort: 'custom',
       dictType: DICT_TYPE.PART_CLASS,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      dictClass: 'string',
       isSearch: false,
-      form: {
-        component: 'Select',
-        componentProps: {
-          disabled: true
-        }
+      isTable: true,
+      tableForm: {
+        type: 'Select'
       }
     },
     {
-      label: '单价',
-      field: 'singlePrice',
+      label: '区域',
+      field: 'region',
       sort: 'custom',
-      isTable: false,
+      dictType: DICT_TYPE.REGION,
+      dictClass: 'string',
       isSearch: false,
-      form: {
-        component: 'InputNumber',
-        value: 0
+      isTable: true,
+      tableForm: {
+        type: 'Select'
       }
     },
+    // {
+    //   label: '单价',
+    //   field: 'singlePrice',
+    //   sort: 'custom',
+    // },
     {
-      label: '规格型号',
-      field: 'specifications',
+      label: '重采购点',
+      field: 'reprocurement',
       sort: 'custom',
-      isSearch: false,
+      table: {
+        width: 110
+      },
       form: {
-        componentProps: {
-          disabled: true
-        }
+        component: 'InputNumber',
+        value: 0
       }
     },
     {
-      label: '存放位置',
-      field: 'locationNumber',
+      label: '安全库存',
+      field: 'safetyStock',
       sort: 'custom',
       table: {
-        width: 150
+        width: 110
       },
-      isSearch: true,
       form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-          searchField: 'code', // 查询弹窗赋值字段
-          searchTitle: '库位信息', // 查询弹窗标题
-          searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-          searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            // {
-            //   key: 'warehouseCode',
-            //   value: 'warehouseCode',
-            //   message: '请填写仓库代码！',
-            //   isMainValue: true
-            // },
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
-        }
+        component: 'InputNumber',
+        value: 0
       }
     },
     {
-      label: '库区编号',
-      field: 'areaNumber',
+      label: '成本中心',
+      field: 'cost',
       sort: 'custom',
-      isTable: false,
-      isSearch: true,
       table: {
-        width: 180
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
+        width: 110
       }
     },
     {
-      label: '库存数量',
-      field: 'qty',
+      label: '采购员',
+      field: 'purchaser',
       sort: 'custom',
+      table: {
+        width: 100
+      }
+    },
+    {
+      label: '财务',
+      field: 'financer',
+      sort: 'custom'
+    },
+    {
+      label: '是否以旧换新',
+      field: 'isRadeIn',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
       isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
       form: {
-        component: 'InputNumber',
-        value: 0
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
       }
     },
-
-    // {
-    //   label: '品牌',
-    //   field: 'brand',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-
-    // {
-    //   label: '是否全局',
-    //   field: 'isOverall',
-    //   sort: 'custom',
-    //   dictType: DICT_TYPE.TRUE_FALSE,
-    //   dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    //   isSearch: false,
-    //   form: {
-    //     component: 'Switch',
-    //     value: 'TRUE',
-    //     componentProps: {
-    //       inactiveValue: 'FALSE',
-    //       activeValue: 'TRUE',
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '科目',
-    //   field: 'subject',
-    //   sort: 'custom',
-    //   dictType: DICT_TYPE.SUBJECT,
-    //   dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    //   isSearch: false,
-    //   form: {
-    //     component: 'Select',
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '科目代码',
-    //   field: 'subjectCode',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '类别',
-    //   field: 'type',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '区域',
-    //   field: 'region',
-    //   sort: 'custom',
-    //   dictType: DICT_TYPE.REGION,
-    //   dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-    //   isSearch: false,
-    //   form: {
-    //     component: 'Select',
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-
     {
-      label: '计量单位',
-      field: 'uom',
-      sort: 'custom',
-      dictType: DICT_TYPE.UOM,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+      label: '是否框架协议',
+      field: 'isFramework',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
       isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 140
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
       form: {
+        component: 'Switch',
+        value: 'TRUE',
         componentProps: {
-          disabled: true
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
         }
       }
     },
-
     {
-      label: '生产厂家',
-      field: 'manufacturer',
-      sort: 'custom',
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
       isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
       form: {
+        component: 'Switch',
+        value: 'TRUE',
         componentProps: {
-          disabled: true
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
         }
       }
     },
-    // {
-    //   label: '库存下限',
-    //   field: 'minInventory',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     component: 'InputNumber',
-    //     value: 0,
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '库存上限',
-    //   field: 'maxInventory',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     component: 'InputNumber',
-    //     value: 0,
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '更换周期',
-    //   field: 'replacementCycle',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     component: 'InputNumber',
-    //     value: 0,
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '存放位置描述',
-    //   field: 'storageLocation',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   form: {
-    //     componentProps: {
-    //       disabled: true
-    //     }
-    //   }
-    // },
-    // {
-    //   label: '备注',
-    //   field: 'remark',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   componentProps: {
-    //     disabled: true
-    //   }
-    // },
-    // {
-    //   label: '是否可用',
-    //   field: 'available',
-    //   sort: 'custom',
-    //   isSearch: false,
-    //   isTable: false,
-    //   isForm: false,
-    //   isDetail: false,
-    //   componentProps: {
-    //     disabled: true
-    //   }
-    // },
     {
       label: '操作',
       field: 'action',
diff --git a/src/views/eam/itemApplyMain/index.vue b/src/views/eam/itemApplyMain/index.vue
new file mode 100644
index 000000000..8bbf9d528
--- /dev/null
+++ b/src/views/eam/itemApplyMain/index.vue
@@ -0,0 +1,362 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ItemApplyMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
+    :allSchemas="ItemApplyMain.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" @success="getList" :rules="ItemApplyMainRules" :formAllSchemas="ItemApplyMain.allSchemas"
+    :tableAllSchemas="ItemApplyDetail.allSchemas" :tableFormRules="ItemApplyDetailRules" :tableData="tableData"
+    :apiUpdate="ItemApplyMainApi.updateItemApplyMain" :apiCreate="ItemApplyMainApi.createItemApplyMain"
+    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formSelectChange='formSelectChange' />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="ItemApplyMain.allSchemas"
+    :detailAllSchemas="ItemApplyDetail.allSchemas" :detailAllSchemasRules="ItemApplyDetailRules"
+    :apiCreate="ItemApplyDetailApi.createItemApplyDetail" :apiUpdate="ItemApplyDetailApi.updateItemApplyDetail"
+    :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" @detailSubmitForm='detailSubmitForm'
+    :isShowAddBtn="isShowAddBtn" :detailButtonIsShow="detailButtonIsShow" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :isShowOut="true" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { ItemApplyMain, ItemApplyMainRules, ItemApplyDetail, ItemApplyDetailRules } from './itemApplyMain.data'
+  import * as ItemApplyMainApi from '@/api/eam/item/itemApplyMain'
+  import * as ItemApplyDetailApi from '@/api/eam/item/itemApplyDetail'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+
+  // 采购订单
+  defineOptions({ name: 'ItemApplyMain' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  const isShowAddBtn = ref(true)
+  const detailButtonIsShow = ref(false)
+  routeName.value = route.name
+  const tableColumns = ref(ItemApplyMain.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    nextTick(async () => {
+      if (type == 'tableForm') {
+        // 明细查询页赋值
+        if (formField == 'itemNumber') {
+          let subList = tableData.value
+          let flag = false;
+          if (subList.length > 0) {
+            subList.forEach((item) => {
+              if (item.itemNumber == val[0]['itemNumber'] &&item.isInAccount == val[0]['isInAccount']
+              ) {
+                flag = true;
+              }
+            })
+          }
+          if (flag) {
+            message.warning("物料编号已经存在");
+            return;
+          }
+          row[formField] = val[0][searchField]
+          row['itemNumber'] = val[0]['itemNumber']
+          row['isInAccount'] = val[0]['isInAccount']
+          row['currentQty'] = val[0]['qty']
+          row['available'] = val[0]['available']
+        }
+        if (formField == 'deviceNumber') {
+          row['deviceNumber'] = val[0]['number']
+        }
+      } else {
+        const setV = {}
+        setV[formField] = val[0][searchField]
+        formRef.setValues(setV)
+      }
+    })
+  }
+  // 查询页面返回——详情
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'itemNumber') {
+        setV['itemNumber'] = val[0]['itemNumber']
+        setV['isInAccount'] = val[0]['isInAccount']
+        setV['currentQty'] = val[0]['qty']
+        setV['available'] = val[0]['available']
+      } else if (formField == 'deviceNumber') {
+        setV['deviceNumber'] = val[0]['number']
+      }
+      formRef.setValues(setV)
+    })
+  }
+  const formSelectChange = (field, val, row) => {
+    if (field == 'type') {
+      row['deviceNumber'] = ""
+    }
+  }
+
+  // 子表新增的时候选择表格之后需要会显得字段
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  const Echo = []
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: ItemApplyMainApi.getItemApplyMainPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({hasPermi:'item:itemApplyMain:create'}), // 新增
+    // defaultButtons.defaultImportBtn(null), // 导入
+    // defaultButtons.defaultExportBtn(null), // 导出
+    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') { // 筛选
+    }
+  }
+
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton = (row, val) => {
+    if (val.indexOf(row.status) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = (row) => {
+    return [
+      defaultButtons.backoutBtn({ hide: isShowMainButton(row, ['0']) ,hasPermi:'item:itemApplyMain:backout'}), // 撤回
+      // defaultButtons.mainListEditBtn(null), // 编辑
+      // defaultButtons.mainListDeleteBtn(null), // 删除
+    ]
+  }
+
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    }
+    else if (val == 'backout') { // 提交审批
+      backout(row.id)
+    }
+    else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 撤销按钮操作 */
+  const backout = async (id : number) => {
+    try {
+      // 撤销的二次确认
+      await message.confirm('是否撤销所选中数据？')
+      // 发起撤销
+      await ItemApplyMainApi.backoutItemApplyMain(id)
+      message.success(t('撤销成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 添加/修改操作 */
+  const formRef = ref()
+  const openForm = async (type : string, row ?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    if (row.status != '0') {
+      isShowAddBtn.value = false
+      detailButtonIsShow.value = true
+    } else {
+      isShowAddBtn.value = true
+      detailButtonIsShow.value = false
+    }
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await ItemApplyMainApi.deleteItemApplyMain(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 ItemApplyMainApi.exportItemApplyMain(tableObject.params)
+      download.excel(data, '备件申领记录主.xlsx')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  /**
+    * tableForm方法
+  */
+  const tableFormKeys = {}
+  ItemApplyDetail.allSchemas.tableFormColumns.forEach(item => {
+    tableFormKeys[item.field] = item.default ? item.default : ''
+  })
+  const tableData = ref([])
+
+  // 添加明细
+  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 // 拼接子表数据参数
+    try {
+      for (let item of tableData.value) {
+        if (item.qty > item.currentQty) {
+          message.error('要货计划数量不得大于订单数量-已计划数量')
+          return false;
+        }
+      }
+      if (formType === 'create') {
+        await ItemApplyMainApi.createItemApplyMain(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ItemApplyMainApi.updateItemApplyMain(data)
+        message.success(t('common.updateSuccess'))
+      }
+      formRef.value.dialogVisible = false
+      // 刷新当前列表
+      getList()
+    } finally {
+      formRef.value.formLoading = 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() // 刷新当前列表
+  }
+  const detailSubmitForm = async (formType, data, formRef, tableList) => {
+    try {
+      if (formType === 'create') {
+        await ItemApplyDetailApi.createItemApplyDetail(data)
+        message.success(t('common.createSuccess'))
+        formRef.dialogVisible = false
+        await detailRef.value.getList()
+      } else {
+        await ItemApplyDetailApi.updateItemApplyDetail(data)
+        message.success(t('common.updateSuccess'))
+        formRef.dialogVisible = false
+        await detailRef.value.getList()
+      }
+    } catch {
+    } finally {
+      formRef.formLoading = false
+    }
+
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+    importTemplateData.templateUrl = await ItemApplyMainApi.importTemplate()
+  })
+</script>
diff --git a/src/views/eam/itemApplyMain/itemApplyMain.data.ts b/src/views/eam/itemApplyMain/itemApplyMain.data.ts
new file mode 100644
index 000000000..4a9d03d5d
--- /dev/null
+++ b/src/views/eam/itemApplyMain/itemApplyMain.data.ts
@@ -0,0 +1,337 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { ItemAccounts } from '@/views/eam/item/itemAccounts/itemAccounts.data'
+import * as ItemAccountsApi from '@/api/eam/item/itemAccounts'
+import * as DeviceMoldItemsApi from '@/api/eam/basic/deviceMaintenance'
+import { validateHanset, validateEmail } from '@/utils/validator'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 备件申领主表
+ */
+export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '领用编号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '申领人',
+    field: 'applyId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '审批人',
+    field: 'approveId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  {
+    label: '出库人',
+    field: 'outId',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
+  
+ {
+   label: '状态',
+   field: 'status',
+   sort: 'custom',
+   dictType: DICT_TYPE.ITEM_APPLY_STATUS,
+   dictClass: 'string',
+   isSearch: true,
+   isTable: true,
+   isForm: false,
+   table: {
+     width: 150
+   },
+   tableForm: {
+     type: 'Select',
+     disabled: false
+   }
+ },
+  {
+    label: '描述',
+    field: 'name',
+    sort: 'custom',
+  },
+
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const ItemApplyMainRules = reactive({
+  name: [
+    { required: true, message: '请填写描述', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+})
+
+
+export const DeviceMOLD = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '编号',
+    field: 'number',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '规格型号',
+    field: 'specification',
+    sort: 'custom',
+  },
+
+]))
+
+/**
+ * @returns {Array} 备件申请子表
+ */
+export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '备件编号',
+    field: 'itemNumber',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择备件编号',
+      searchField: 'number',
+      searchTitle: '备件信息',
+      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择备件编号',
+        searchField: 'number',
+        searchTitle: '备件信息',
+        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
+        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },]
+      }
+    }
+  },
+  {
+    label: '类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_MOLD_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: false
+    }
+  },
+  {
+    label: '设备/模具编号',
+    field: 'deviceNumber',
+    sort: 'custom',
+    isSearch: true,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择单号',
+      searchField: 'number',
+      searchTitle: '单号信息',
+      searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
+      searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: "TRUE",
+        isMainValue: false
+      }, {
+        key: 'type',
+        value: "type",
+        isMainValue: true
+      }
+      ]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择单号',
+        searchField: 'number',
+        searchTitle: '单号信息',
+        searchAllSchemas: DeviceMOLD.allSchemas, // 查询弹窗所需类
+        searchPage: DeviceMoldItemsApi.getNumber, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: "TRUE",
+          isMainValue: false
+        }, {
+          key: 'type',
+          value: "type",
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '申领数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'currentQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 2
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 2
+    }
+  },
+  // {
+  //   label: '是否账内库',
+  //   field: 'isInAccount',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true,
+  //     }
+  //   },
+  // },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
+
+//表单校验
+export const ItemApplyDetailRules = reactive({
+  itemNumber: [
+    { required: true, message: '请选择备件编号', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
+  deviceNumber: [
+    { required: true, message: '请选择设备模具编号', trigger: 'change' }
+  ],
+  qty: [
+    { required: true, message: '请输入申领数量', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ],
+
+})
diff --git a/src/views/eam/location/index.vue b/src/views/eam/location/index.vue
new file mode 100644
index 000000000..43ec683de
--- /dev/null
+++ b/src/views/eam/location/index.vue
@@ -0,0 +1,268 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="Location.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Location.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 #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="LocationRules"
+    :formAllSchemas="Location.allSchemas"
+    :apiUpdate="LocationApi.updateLocation"
+    :apiCreate="LocationApi.createLocation"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Location.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm
+    ref="importFormRef"
+    url="/eam/location/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Location, LocationRules } from './location.data'
+import * as LocationApi from '@/api/eam/location'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+import { getAccessToken } from '@/utils/auth'
+
+defineOptions({ name: 'Location' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Location.allSchemas.tableColumns)
+const importFormRef = ref()
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/950537917716037632?token=' + getAccessToken())
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (formField == 'areaNumber') {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['areaNumber'] = val[0]['number']
+      setV['type'] = val[0]['type']
+      formRef.setValues(setV)
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: LocationApi.getLocationPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'basic:location:create' }), // 新增
+  defaultButtons.defaultExportBtn({ hasPermi: 'basic:location:update' }), // 导出
+  // defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
+  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 == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'qrCodeBatch') {
+    // 批量生成二维码
+    qrCodeBatch(val, item)
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+const qrCodeBatch = async (val, item) => {
+  const qrCodeList = tableObject.tableList.map((item) => `'${item?.number}'`).join(', ')
+  window.open(src.value + '&number=' + qrCodeList)
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({ hasPermi: 'basic:location:update' }), // 编辑
+  // defaultButtons.selectQrCodeBtn(null), //二维码
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'basic:location:delete' }) // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'qrCode') {
+    window.open(src.value + "&number='" + row.number + "'")
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  var isHave = Location.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
+  try {
+    if (formType === 'create') {
+      await LocationApi.createLocation(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await LocationApi.updateLocation(data)
+      message.success(t('common.updateSuccess'))
+    }
+    basicFormRef.value.dialogVisible = false
+    getList()
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicLocation')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await LocationApi.deleteLocation(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 LocationApi.exportLocation(tableObject.params)
+    download.excel(data, '库位.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/eam/location/location.data.ts b/src/views/eam/location/location.data.ts
new file mode 100644
index 000000000..319422c2b
--- /dev/null
+++ b/src/views/eam/location/location.data.ts
@@ -0,0 +1,152 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+import * as LocationAreaApi from '@/api/eam/locationArea'
+import { LocationArea } from '../locationArea/locationArea.data'
+
+// 表单校验
+export const LocationRules = reactive({
+  number: [
+    { required: true, message: '请输入库位编号', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入库位名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  areaNumber: [{ required: true, message: '请选择库区编号', trigger: 'blur' }]
+})
+
+export const Location = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '库位编号',
+      field: 'number',
+      sort: 'custom',
+      isSearch: true,
+      isForm: true,
+      table: {
+        width: 180,
+        fixed: 'left'
+      }
+    },
+    {
+      label: '库位名称',
+      field: 'name',
+      sort: 'custom',
+      isSearch: true
+    },
+    {
+      label: '库区编号',
+      field: 'areaNumber',
+      sort: 'custom',
+      isSearch: true,
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择库区编号', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: '库区信息', // 查询弹窗标题
+          searchAllSchemas: LocationArea.allSchemas, // 查询弹窗所需类
+          searchPage: LocationAreaApi.getLocationAreaPage, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            }
+          ]
+        }
+      }
+    },
+    {
+      label: '类型',
+      field: 'type',
+      dictType: DICT_TYPE.LOCATION_AREA_TYPE,
+      dictClass: 'string',
+      sort: 'custom',
+      isSearch: false,
+      form: {
+        component: 'Select'
+      }
+    },
+    {
+      label: '是否为账内',
+      field: 'isInAccount',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      tableForm: {
+        type: 'Select',
+        inactiveValue: 'FALSE',
+        disabled: true
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    },
+    // {
+    //   label: '是否可用',
+    //   field: 'available',
+    //   dictType: DICT_TYPE.TRUE_FALSE,
+    //   dictClass: 'string',
+    //   isSearch: false,
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   tableForm: {
+    //     type: 'Select',
+    //     inactiveValue: 'FALSE',
+    //     disabled: true
+    //   },
+    //   form: {
+    //     component: 'Switch',
+    //     value: 'TRUE',
+    //     componentProps: {
+    //       inactiveValue: 'FALSE',
+    //       activeValue: 'TRUE'
+    //     }
+    //   }
+    // },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      sort: 'custom',
+      formatter: dateFormatter,
+      isForm: false,
+      table: {
+        width: 170
+      }
+    },
+    {
+      label: '描述',
+      field: 'description',
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isForm: false,
+      table: {
+        width: 180,
+        fixed: 'right'
+      }
+    }
+  ])
+)
diff --git a/src/views/eam/locationArea/index.vue b/src/views/eam/locationArea/index.vue
new file mode 100644
index 000000000..55b19d688
--- /dev/null
+++ b/src/views/eam/locationArea/index.vue
@@ -0,0 +1,219 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="LocationArea.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="LocationArea.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 #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm ref="basicFormRef" @success="formsSuccess" :rules="LocationAreaRules"
+    :formAllSchemas="LocationArea.allSchemas" :searchTableParams="searchTableParams"
+    :apiUpdate="LocationAreaApi.updateLocationArea" :apiCreate="LocationAreaApi.createLocationArea"
+    @searchTableSuccess="searchTableSuccess" :isBusiness="false" />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="LocationArea.allSchemas" />
+
+</template>
+
+<script setup lang="ts">
+  import download from '@/utils/download'
+  import { LocationArea, LocationAreaRules } from './locationArea.data'
+  import * as LocationAreaApi from '@/api/eam/locationArea'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import TableHead from '@/components/TableHead/src/TableHead.vue'
+  import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+  import Detail from '@/components/Detail/src/Detail.vue'
+
+  defineOptions({ name: 'LocationArea' })
+
+  const message = useMessage() // 消息弹窗
+  const { t } = useI18n() // 国际化
+
+  const route = useRoute() // 路由信息
+  const routeName = ref()
+  routeName.value = route.name
+  const tableColumns = ref(LocationArea.allSchemas.tableColumns)
+
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
+    tableColumns.value = val
+  }
+
+  // 查询列表页面参数设置
+  const searchTableParams = ref([
+    //{
+    //  formField: 'productItemCode',
+    //  searchTableTitle: '物料信息',
+    //  searchTableAllSchemas: Itembasic.allSchemas,
+    //  searchTablePage: ItembasicApi.getItembasicPage
+    //}
+  ])
+
+  const { tableObject, tableMethods } = useTable({
+    getListApi: LocationAreaApi.getLocationAreaPage // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList, setSearchParams } = tableMethods
+
+  // 列表头部按钮
+  const HeadButttondata = [
+    defaultButtons.defaultAddBtn({hasPermi:'basic:locationArea:create'}), // 新增
+    defaultButtons.defaultExportBtn({hasPermi:'basic:locationArea: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 == 'export') { // 导出
+      handleExport()
+    } else if (val == 'refresh') { // 刷新
+      getList()
+    } else if (val == 'filtrate') { // 筛选
+    } else { // 其他按钮
+      console.log('其他按钮', item)
+    }
+  }
+
+  // 列表-操作按钮
+  const butttondata = [
+    defaultButtons.mainListEditBtn({hasPermi:'basic:locationArea:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({hasPermi:'basic:locationArea:delete'}), // 删除
+  ]
+
+  // 列表-操作按钮事件
+  const buttonTableClick = (val, row) => {
+    if (val == 'edit') { // 编辑
+      openForm('update', row)
+    } else if (val == 'delete') { // 删除
+      handleDelete(row.id)
+    }
+  }
+
+  /** 添加/修改操作 */
+  const basicFormRef = ref()
+  const openForm = (type : string, row ?: any) => {
+    console.log('33333', row )
+    basicFormRef.value.open(type, row)
+  }
+
+  // form表单提交
+  const formsSuccess = async (formType, data) => {
+    var isHave = LocationArea.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;
+    try {
+      if (formType === 'create') {
+        await LocationAreaApi.createLocationArea(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationAreaApi.updateLocationArea(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+    } finally {
+      basicFormRef.value.formLoading = false
+    }
+    
+  }
+
+  // 查询页面返回
+  const searchTableSuccess = (formField, searchField, val, formRef) => {
+    nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    })
+  }
+
+  /** 详情操作 */
+  const detailRef = ref()
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue, 'basicLocationArea')
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (id : number) => {
+    try {
+      // 删除的二次确认
+      await message.delConfirm()
+      // 发起删除
+      await LocationAreaApi.deleteLocationArea(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 LocationAreaApi.exportLocationArea(tableObject.params)
+      download.excel(data, '库区.xls')
+    } catch {
+    } finally {
+      exportLoading.value = false
+    }
+  }
+
+  // 筛选提交
+  const searchFormClick = (searchData) => {
+    tableObject.params = {
+      isSearch: true,
+      filters: searchData.filters
+    }
+    getList() // 刷新当前列表
+  }
+
+  /** 初始化 **/
+  onMounted(async () => {
+    getList()
+  })
+</script>
diff --git a/src/views/eam/locationArea/locationArea.data.ts b/src/views/eam/locationArea/locationArea.data.ts
new file mode 100644
index 000000000..498dfe033
--- /dev/null
+++ b/src/views/eam/locationArea/locationArea.data.ts
@@ -0,0 +1,100 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const LocationAreaRules = reactive({
+  number: [
+    { required: true, message: '请输入库区编号', trigger: 'blur' }, 
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { required: true, message: '请输入库区名称', trigger: 'blur' }, 
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+
+export const LocationArea = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '库区编号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    isForm: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '库区名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+
+  {
+    label: '类型',
+    field: 'type',
+    dictType: DICT_TYPE.LOCATION_AREA_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Select'
+    },
+  },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   isSearch: false,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     inactiveValue: 'FALSE',
+  //     disabled: true
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+      table: {
+        width: 170
+      },
+  },
+
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
new file mode 100644
index 000000000..d1b8c1620
--- /dev/null
+++ b/src/views/eam/maintainExperience/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="MaintainExperience.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="MaintainExperience.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 #name="{row}">
+        <el-button type="primary" link @click="openDetail(row, '经验标题', row.maintainRecoedNumber)">
+          <span>{{ row.name }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="MaintainExperienceRules"
+    :formAllSchemas="MaintainExperience.allSchemas"
+    :apiUpdate="MaintainExperienceApi.updateMaintainExperience"
+    :apiCreate="MaintainExperienceApi.createMaintainExperience"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+<!-- 详情 -->
+<Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="MaintainExperience.allSchemas"
+    :detailAllSchemas="EquipmentMaintenanceRecordDetail.allSchemas"
+    :detailAllSchemasRules="EquipmentMaintenanceRecordDetailRules"
+    :apiPage="EquipmentMaintenanceRecordDetailApi.getEquipmentMaintenanceRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/record/maintain-experience/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { MaintainExperience,MaintainExperienceRules } from './maintainExperience.data'
+import * as MaintainExperienceApi from '@/api/eam/maintainExperience'
+import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
+
+import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MaintainExperience' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(MaintainExperience.allSchemas.tableColumns)
+
+// 查询页面返回
+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: MaintainExperienceApi.getMaintainExperiencePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:maintainExperience:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:maintainExperience:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:maintainExperience:export'}), // 导出
+  defaultButtons.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 = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:maintainExperience:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:maintainExperience:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =MaintainExperience.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;
+  if (formType === 'create') {
+    await MaintainExperienceApi.createMaintainExperience(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await MaintainExperienceApi.updateMaintainExperience(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, 'basicMaintainExperience')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await MaintainExperienceApi.deleteMaintainExperience(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 MaintainExperienceApi.exportMaintainExperience(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() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await MaintainExperienceApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/eam/maintainExperience/maintainExperience.data.ts b/src/views/eam/maintainExperience/maintainExperience.data.ts
new file mode 100644
index 000000000..48c468fbc
--- /dev/null
+++ b/src/views/eam/maintainExperience/maintainExperience.data.ts
@@ -0,0 +1,93 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MaintainExperienceRules = reactive({
+  name: [required],
+  maintainNumber: [required],
+})
+
+export const MaintainExperience = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+    label: '经验标题',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '经验内容',
+    field: 'content',
+    sort: 'custom',
+    isTable:false,
+    form: {
+      componentProps: {
+        type: 'textarea',
+        height: 200
+      }
+    },
+  },
+  
+  {
+    label: '保养工单编号',
+    field: 'maintainNumber',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '工单类型',
+    field: 'orderType',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    form: {
+      component: 'SelectV2'
+    },
+  },
+  {
+    label: '来源字典',
+    field: 'sources',
+    sort: 'custom',
+    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '保养类型',
+    field: 'type',
+    sort: 'custom',
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
+    isForm:false
+  },
+  {
+    label: '设备/工装编号',
+    field: 'equipmentCode',
+    sort: 'custom',
+    isSearch:false,
+    isForm:false
+  },
+  {
+    label: '设备/工装名称',
+    field: 'equipmentName',
+    sort: 'custom',
+    isSearch:false,
+    isForm:false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail:{
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+
+
+
+]))
diff --git a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts b/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
deleted file mode 100644
index 19a1a537a..000000000
--- a/src/views/eam/sparePartsApplyMain/SparePartsApply.data.ts
+++ /dev/null
@@ -1,330 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-
-import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
-
-import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data'
-import * as EquipmentItemApi from '@/api/eam/equipmentAccounts'
-
-import { dateFormatter } from '@/utils/formatTime'
-
-export const SparePartsApplyMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '申请编号',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false
-    },
-    {
-      label: '出库类型',
-      field: 'outType',
-      dictType: DICT_TYPE.EAM_OUT_TYPE,
-      dictClass: 'string',
-      isTable: true,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        type: 'Select'
-      }
-    },
-    {
-      label: '关联工单',
-      field: 'workNumber',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchTitle: '设备信息', // 查询弹窗标题
-          searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
-          searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
-          searchField: 'code', // 查询弹窗赋值字段
-          searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-          multiple: true,
-          searchCondition: [
-            {
-              key: 'status',
-              value: 'NORMAL',
-              action: '==',
-              isSearch: true,
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      tableForm: {
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '备件信息', // 查询弹窗标题
-        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
-        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'status',
-            value: 'NORMAL',
-            action: '==',
-            isSearch: true,
-            isMainValue: false
-          }
-        ]
-      }
-    },
-
-    {
-      label: '出库主题',
-      field: 'theme',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '描述',
-      field: 'description',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '申领备件总价',
-      field: 'sumVal',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '流程状态',
-      field: 'status',
-      sort: 'custom',
-      dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-      dictClass: 'string', // 默认都是字符串类型其他暂不考虑
-      isSearch: true,
-      isTable: true,
-      isForm: false,
-      form: {
-        component: 'Select'
-      }
-    },
-    {
-      label: '申请人',
-      field: 'applyer',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '审核人',
-      field: 'approver',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      }
-    },
-    {
-      label: '审核内容',
-      field: 'approveContent',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '审核时间',
-      field: 'approveTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      }
-    },
-    {
-      label: '自动审核',
-      field: 'autoExamine',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '自动通过',
-      field: 'autoAgree',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '直接生成记录',
-      field: 'directCreateRecord',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      isTable: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      isForm: false
-    },
-    {
-      label: '操作11',
-      field: 'action',
-      isForm: false,
-      table: {
-        width: 180,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const SparePartsApplyMainRules = reactive({
-  outType: [{ required: true, message: '请输入出库类型', trigger: 'blur' }],
-  theme: [{ required: true, message: '请输入出库主题', trigger: 'blur' }]
-})
-/**
- * @returns {Array} 备件申请子表
- */
-export const SparePartsApplyDetail = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '备件编号',
-      field: 'sparePartsCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-          searchField: 'itemNumber', // 查询弹窗赋值字段
-          searchTitle: '备件信息', // 查询弹窗标题
-          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      tableForm: {
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-        searchField: 'itemNumber', // 查询弹窗赋值字段
-        searchTitle: '备件信息', // 查询弹窗标题
-        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-      }
-    },
-
-    {
-      label: '库存数量',
-      field: 'currentQty',
-      sort: 'custom',
-      isSearch: false,
-      tableForm: {
-        disabled: true
-      }
-    },
-    {
-      label: '申领数量',
-      field: 'applyQty',
-      sort: 'custom',
-      isSearch: false
-    },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      isSearch: false
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 150,
-        fixed: 'right'
-      },
-      isTableForm: false
-    }
-  ])
-)
-
-//表单校验
-export const SparePartsApplyDetailRules = reactive({
-  applyQty: [{ required: true, message: '请输入标包数量', trigger: 'blur' }]
-})
-
-// 审核完成字段
-export const SparePartsApplyExamine = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '审核内容',
-      field: 'approveContent',
-      sort: 'custom',
-      isSearch: false,
-      form: {
-        component: 'Input',
-        componentProps: {
-          type: 'textarea'
-        }
-      }
-    }
-  ])
-)
diff --git a/src/views/eam/sparePartsApplyMain/index.vue b/src/views/eam/sparePartsApplyMain/index.vue
deleted file mode 100644
index 526ca9dc1..000000000
--- a/src/views/eam/sparePartsApplyMain/index.vue
+++ /dev/null
@@ -1,502 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="SparePartsApplyMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="SparePartsApplyMain.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"
-    @success="getList"
-    :rules="SparePartsApplyMainRules"
-    :formAllSchemas="SparePartsApplyMain.allSchemas"
-    :tableAllSchemas="SparePartsApplyDetail.allSchemas"
-    :tableFormRules="SparePartsApplyDetailRules"
-    :tableData="tableData"
-    :apiUpdate="SparePartsApplyMainApi.updateSparePartsApplyMain"
-    :apiCreate="SparePartsApplyMainApi.createSparePartsApplyMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-    @onChange="onChange"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SparePartsApplyMain.allSchemas"
-    :detailAllSchemas="SparePartsApplyDetail.allSchemas"
-    :detailAllSchemasRules="SparePartsApplyDetailRules"
-    :apiCreate="SparePartsApplyDetailApi.createSparePartsApplyDetail"
-    :apiUpdate="SparePartsApplyDetailApi.updateSparePartsApplyDetail"
-    :apiPage="SparePartsApplyDetailApi.getSparePartsApplyDetailPage"
-    :apiDelete="SparePartsApplyDetailApi.deleteSparePartsApplyDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-
-  <!-- 审核页面 -->
-  <!-- <AudiForm ref="audiFormRef" @success="handleApprove"/> -->
-  <BasicForm
-    ref="formRefApproved"
-    :rules="SparePartsApplyMainRules"
-    :formAllSchemas="SparePartsApplyExamine.allSchemas"
-    @submitForm="approveSparePartsApplyMain"
-    :isCol="false"
-  />
-
-  <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/eam/sparePartsApplyDetail/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  SparePartsApplyMain,
-  SparePartsApplyMainRules,
-  SparePartsApplyDetail,
-  SparePartsApplyDetailRules,
-  SparePartsApplyExamine
-} from './SparePartsApply.data'
-import * as SparePartsApplyMainApi from '@/api/eam/sparePartsApplyMain'
-import * as SparePartsApplyDetailApi from '@/api/eam/sparePartsApplyDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
-// 采购订单
-defineOptions({ name: 'SparePartsApply' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(SparePartsApplyMain.allSchemas.tableColumns)
-const formRefApproved = ref()
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if (formField == 'sparePartsCode') {
-        row['sparePartsCode'] = val[0].itemNumber
-        row['currentQty'] = val[0].qty
-      }
-      if (formField == 'equipmentCode') {
-        row['equipmentCode'] = val[0].code
-      }
-      formRef.setValues(setV)
-    })
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsApplyMainApi.getSparePartsApplyMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
-  // defaultButtons.defaultImportBtn(null), // 导入
-  // defaultButtons.defaultExportBtn(null), // 导出
-  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 isShowStatusButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    defaultButtons.mainListEditBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:update'
-    }), // 编辑
-    defaultButtons.mainListDeleteBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:delete'
-    }), // 删除
-    defaultButtons.mainListAuditingBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:examine'
-    }), //审核
-    defaultButtons.mainListRevokeBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:cancel'
-    }), // 撤回
-    defaultButtons.mainListTurnDownBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:rejecte'
-    }), //驳回
-    defaultButtons.mainListApproveBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:approve'
-    }), //审批通过
-    defaultButtons.mainListFinishBtn({
-      hide: isShowStatusButton(row, ['4']),
-      hasPermi: 'eam:spare-parts-in-location-main:finish'
-    }) //完成
-  ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  } else if (val == 'auditing') {
-    //审核
-    handleSubmitExamine(row.id)
-  } else if (val == 'mainTurnDown') {
-    //驳回
-    handleRejecte(row.id)
-  } else if (val == 'mainApprove') {
-    //审核通过
-    formRefApproved.value.open('update', row, { masterId: row.id }, 'auditing')
-  } else if (val == 'revoke') {
-    // 撤回
-    handleCancel(row.id)
-  } else if (val == 'finish') {
-    // 完成
-    handleFinish(row.id)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  }
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SparePartsApplyMainApi.deleteSparePartsApplyMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleMainExport = async (id: number) => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(id)
-    download.excel(data, '盘点工单.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 关闭按钮操作 */
-// const handleClose = async (id: number) => {
-//   try {
-//     // 关闭的二次确认
-//     await message.confirm('是否关闭所选中数据？')
-//     // 发起关闭
-//     await SparePartsApplyMainApi.closeSparePartsApplyMain(id)
-//     message.success(t('关闭成功!'))
-//     // 刷新列表
-//     await getList()
-//   } catch {}
-// }
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsApplyMainApi.exportSparePartsApplyMain(tableObject.params)
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-SparePartsApplyDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-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 // 拼接子表数据参数
-  console.log(formRef.value)
-  formRef.value.formLoading = true
-  let isHave = data.subList.some((item) => item.applyQty > item.currentQty)
-  if (isHave) {
-    message.warning('申领数量不能大于库存数量')
-    return
-  }
-  try {
-    if (formType === 'create') {
-      await SparePartsApplyMainApi.createSparePartsApplyMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await SparePartsApplyMainApi.updateSparePartsApplyMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = 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() // 刷新当前列表
-}
-
-const onChange = (field, item) => {
-  if (field == 'outType') {
-    if (item == '3') {
-      SparePartsApplyMain.allSchemas.formSchema.forEach((item) => {
-        if (item.field == 'workNumber') {
-          item.componentProps.disabled = true
-          item.componentProps.isSearchList = false
-        }
-      })
-    } else {
-      SparePartsApplyMain.allSchemas.formSchema.forEach((item) => {
-        if (item.field == 'workNumber') {
-          item.componentProps.disabled = true
-          item.componentProps.isSearchList = true
-        }
-      })
-    }
-  }
-}
-
-// 审核
-const handleSubmitExamine = async (id: number) => {
-  await message.delConfirm(t('ts.是否提交审核？'))
-  try {
-    await SparePartsApplyMainApi.submitSparePartsApplyMain(id)
-    message.success(t('ts.提交审批成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 撤回按钮操作 */
-const handleCancel = async (id: number) => {
-  await message.delConfirm(t('ts.是否撤回所选中数据？'))
-  try {
-    await SparePartsApplyMainApi.cancelSparePartsApplyMain(id)
-    message.success(t('ts.撤回成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-//审核驳回按钮
-const handleRejecte = async (id: number) => {
-  await message.delConfirm(t('ts.是否驳回所选中数据？'))
-  try {
-    await SparePartsApplyMainApi.rejectSparePartsApplyMain(id)
-    message.success(t('ts.驳回成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 审核通过
-const approveSparePartsApplyMain = async (formType, data) => {
-  try {
-    await SparePartsApplyMainApi.approveSparePartsApplyMain(data)
-    message.success(t('ts.审核通过!'))
-    // 刷新列表
-    formRefApproved.value.dialogVisible = false
-    await getList()
-  } finally {
-    formRefApproved.value.formLoading = false
-  }
-}
-
-//审核驳回按钮
-const handleFinish = async (id: number) => {
-  await message.delConfirm(t('ts.是否完成所选中数据？'))
-  try {
-    await SparePartsApplyMainApi.finishSparePartsApplyMain(id)
-    message.success(t('ts.完成成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await SparePartsApplyMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/eam/sparePartsInLocationRecord/index.vue b/src/views/eam/sparePartsInLocationRecord/index.vue
deleted file mode 100644
index 86aefd08e..000000000
--- a/src/views/eam/sparePartsInLocationRecord/index.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="SparePartsInLocationRecordMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="SparePartsInLocationRecordMain.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>
-  
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SparePartsInLocationRecordMain.allSchemas"
-    :detailAllSchemas="SparePartsInLocationRecordDetail.allSchemas"
-    :detailAllSchemasRules="SparePartsInLocationRecordDetailRules"
-    :apiPage="SparePartsInLocationRecordDetailApi.getSparePartsInLocationRecordDetailPage"
-    :isShowAddBtn="false"
-    :detailButtonIsShowAdd="false"
-  />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  SparePartsInLocationRecordMain,
-  SparePartsInLocationRecordDetail,
-  SparePartsInLocationRecordDetailRules
-} from './sparePartsInLocationRecordMain.data'
-import * as SparePartsInLocationRecordMainApi from '@/api/eam/sparePartsInLocationRecordMain'
-import * as SparePartsInLocationRecordDetailApi from '@/api/eam/sparePartsInLocationRecordDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-
-// 采购订单
-defineOptions({ name: 'SparepartsinlocationRecord' })
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(SparePartsInLocationRecordMain.allSchemas.tableColumns)
-// const audiFormRef = ref()
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsInLocationRecordMainApi.getSparePartsInLocationRecordMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  // defaultButtons.defaultAddBtn({ hasPermi: 'eam:spare-parts-in-location-main:create' }), // 新增
-  // defaultButtons.defaultImportBtn({ hasPermi: 'eam:spare-parts-in-location-main:import' }), // 导入
-  // defaultButtons.defaultExportBtn({ hasPermi: 'eam:spare-parts-in-location-main:export' }), // 导出
-  defaultButtons.defaultFreshBtn(null), // 刷新
-  defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null) // 设置
-
-]
-
-// 头部按钮事件
-const buttonBaseClick = (val, item) => {
-if (val == 'refresh') {
-    // 刷新
-    getList()
-  } else if (val == 'filtrate') {
-    // 筛选
-  } else {
-    // 其他按钮
-    console.log('其他按钮', item)
-  }
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
-}
-
-// 筛选提交
-const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
-  }
-  getList() // 刷新当前列表
-}
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-})
-</script>
diff --git a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts b/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
deleted file mode 100644
index c0d7b7b30..000000000
--- a/src/views/eam/sparePartsInLocationRecord/sparePartsInLocationRecordMain.data.ts
+++ /dev/null
@@ -1,258 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
-
-
-// 表单校验
-export const SparePartsInLocationRecordMainRules = reactive({
-  number: [required],
-  theme: [required],
-  type: [required],
-})
-// 备件入库主表
-export const SparePartsInLocationRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '入库主题',
-    field: 'theme',
-    sort: 'custom',
-    isSearch: true,
-  },{
-    label: '入库类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.PUT_IN_TYPE,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '流程状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    
-    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '入库申请人',
-    field: 'applyer',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-  {
-    label: '入库时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-
-  
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-]))
-// 备件入库子表
-export const SparePartsInLocationRecordDetailRules = reactive({
-  number: [required],
-  masterId: [required],
-  locationCode: [required],
-  areaCode: [required],
-  sparePartsCode: [required],
-  applyQty: [required],
-})
-
-export const SparePartsInLocationRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '库位编号',
-    field: 'locationCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-       
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-      searchField: 'itemNumber', // 查询弹窗赋值字段
-      searchTitle: '备件信息', // 查询弹窗标题
-    
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-      searchCondition: [
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }
-      ]
-    }
-  },
-  {
-    label: '库区编号',
-    field: 'areaCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '备件编号',
-    field: 'sparePartsCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '库存数量',
-    field: 'currentQty',
-    sort: 'custom',
-    isSearch: false,
-    tableForm: {
-      disabled: true
-    },
-    form:{
-     componentProps:{
-      disabled: true
-     }
-    },
-    isDetail:false,
-    isTable:false
-  },
-  {
-    label: '申领数量',
-    field: 'applyQty',
-    sort: 'custom',
-    isSearch: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    isTableForm:false
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: true,
-  },
- 
-]))
-
-
diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue
deleted file mode 100644
index 72589ea1b..000000000
--- a/src/views/eam/sparepartsinlocation/index.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="SparePartsInLocationMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="SparePartsInLocationMain.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"
-    @success="getList"
-    :rules="SparePartsInLocationMainRules"
-    :formAllSchemas="SparePartsInLocationMain.allSchemas"
-    :tableAllSchemas="SparePartsInLocationDetail.allSchemas"
-    :tableFormRules="SparePartsInLocationDetailRules"
-    :tableData="tableData"
-    :apiUpdate="SparePartsInLocationMainApi.updateSparePartsApplyMain"
-    :apiCreate="SparePartsInLocationMainApi.createSparePartsApplyMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SparePartsInLocationMain.allSchemas"
-    :detailAllSchemas="SparePartsInLocationDetail.allSchemas"
-    :detailAllSchemasRules="SparePartsInLocationDetailRules"
-    :apiCreate="SparePartsInLocationDetailApi.createSparePartsInLocationDetail"
-    :apiUpdate="SparePartsInLocationDetailApi.updateSparePartsInLocationDetail"
-    :apiPage="SparePartsInLocationDetailApi.getSparePartsInLocationDetailPage"
-    :apiDelete="SparePartsInLocationDetailApi.deleteSparePartsInLocationDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="true"
-    :detailButtonIsShowAdd="true"
-    :detailButtonIsShowAddStatusArray="['0']"
-  />
-  <!-- 审核页面 -->
-  <!-- <AudiForm ref="audiFormRef" @success="handleApprove"/> -->
-  <BasicForm
-    ref="formRefApproved"
-    :rules="SparePartsInLocationMainRules"
-    :formAllSchemas="SparePartsInLocationExamine.allSchemas"
-    @submitForm="approveSparePartsInLocation"
-    :isCol="false"
-  />
-  <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/eam/spare-parts-in-location-main/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  SparePartsInLocationMain,
-  SparePartsInLocationMainRules,
-  SparePartsInLocationDetail,
-  SparePartsInLocationDetailRules,
-  SparePartsInLocationExamine
-} from './sparePartsInLocationMain.data'
-import * as SparePartsInLocationMainApi from '@/api/eam/sparePartsInLocationMain'
-import * as SparePartsInLocationDetailApi from '@/api/eam/sparePartsInLocationDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-// import AudiForm from '@/views/eam/sparepartsinlocation/audiForm.vue'
-
-// 采购订单
-defineOptions({ name: 'SparePartsApply' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const formRef = ref()
-const formRefApproved = ref()
-const tableColumns = ref(SparePartsInLocationMain.allSchemas.tableColumns)
-// const audiFormRef = ref()
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      console.log(11, val[0])
-      if (type == 'tableForm') {
-        if (formField == 'locationCode') {
-          row['locationCode'] = val[0].locationNumber
-          row['areaCode'] = val[0].areaNumber
-          row['sparePartsCode'] = val[0].itemNumber
-          row['currentQty'] = val[0].qty
-          row['isRadeIn'] = val[0].isRadeIn
-        }
-      } else {
-        if (formField == 'locationCode') {
-          setV['locationCode'] = val[0].locationNumber
-          setV['areaCode'] = val[0].areaNumber
-          setV['sparePartsCode'] = val[0].itemNumber
-          setV['currentQty'] = val[0].qty
-          setV['isRadeIn'] = val[0].isRadeIn
-        }
-      }
-      formRef.setValues(setV)
-    })
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    if (formField == 'locationCode') {
-      setV['locationCode'] = val[0].locationNumber
-      setV['areaCode'] = val[0].areaNumber
-      setV['sparePartsCode'] = val[0].itemNumber
-      setV['currentQty'] = val[0].qty
-      setV['isRadeIn'] = val[0].isRadeIn
-    }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsInLocationMainApi.getSparePartsInLocationMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'eam:spare-parts-in-location-main:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'eam:spare-parts-in-location-main:import' }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'eam:spare-parts-in-location-main: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 isShowMainButton = (row, val) => {
-  if (val.indexOf(row.available) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    defaultButtons.mainListEditBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:update'
-    }), // 编辑
-    defaultButtons.mainListDeleteBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:delete'
-    }), // 删除
-    defaultButtons.mainListAuditingBtn({
-      hide: isShowStatusButton(row, ['0']),
-      hasPermi: 'eam:spare-parts-in-location-main:examine'
-    }), //审核
-    defaultButtons.mainListRevokeBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:cancel'
-    }), // 撤回
-    defaultButtons.mainListTurnDownBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:rejecte'
-    }), //驳回
-    defaultButtons.mainListApproveBtn({
-      hide: isShowStatusButton(row, ['3']),
-      hasPermi: 'eam:spare-parts-in-location-main:approve'
-    }), //审批通过
-    defaultButtons.mainListFinishBtn({
-      hide: isShowStatusButton(row, ['4']),
-      hasPermi: 'eam:spare-parts-in-location-main:finish'
-    }) //完成
-  ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  } else if (val == 'auditing') {
-    //审核
-    handleSubmitExamine(row.id)
-  } else if (val == 'mainTurnDown') {
-    //驳回
-    handleRejecte(row.id)
-  } else if (val == 'mainApprove') {
-    //审核通过
-    formRefApproved.value.open('update', row, { masterId: row.id }, 'auditing')
-  } else if (val == 'revoke') {
-    // 撤回
-    handleCancel(row.id)
-  } else if (val == 'finish') {
-    // 完成
-    handleFinish(row.id)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  }
-}
-
-const isShowStatusButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-/** 添加/修改操作 */
-const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsApplyMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SparePartsInLocationMainApi.deleteSparePartsInLocationMain(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 SparePartsInLocationMainApi.exportSparePartsInLocationMain(
-      tableObject.params
-    )
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-SparePartsInLocationDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-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 // 拼接子表数据参数
-  console.log(formRef.value)
-  formRef.value.formLoading = true
-  let isHave = data.subList.some(item=>item.applyQty>item.currentQty)
-  if(isHave){
-    message.warning('申领数量不能大于库存数量')
-    return
-  }
-  try {
-    if (formType === 'create') {
-      await SparePartsInLocationMainApi.createSparePartsInLocationMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await SparePartsInLocationMainApi.updateSparePartsInLocationMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = 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() // 刷新当前列表
-}
-// 审核
-const handleSubmitExamine = async (id: number) => {
-  await message.delConfirm(t('ts.是否提交审核？'))
-  try {
-    await SparePartsInLocationMainApi.submitExamineSparePartsInLocation(id)
-    message.success(t('ts.提交审批成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-/** 撤回按钮操作 */
-const handleCancel = async (id: number) => {
-  await message.delConfirm(t('ts.是否撤回所选中数据？'))
-  try {
-    await SparePartsInLocationMainApi.cancelSparePartsInLocation(id)
-    message.success(t('ts.撤回成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-//审核驳回按钮
-const handleRejecte = async (id: number) => {
-  await message.delConfirm(t('ts.是否驳回所选中数据？'))
-  try {
-    await SparePartsInLocationMainApi.rejectSparePartsInLocation(id)
-    message.success(t('ts.驳回成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-// 审核通过
-const approveSparePartsInLocation = async (formType, data) => {
-  try {
-    await SparePartsInLocationMainApi.approveSparePartsInLocation(data)
-    message.success(t('ts.审核通过!'))
-    // 刷新列表
-    formRefApproved.value.dialogVisible = false
-    await getList()
-  } finally {
-    formRefApproved.value.formLoading = false
-  }
-}
-
-//审核驳回按钮
-const handleFinish = async (id: number) => {
-  await message.delConfirm(t('ts.是否完成所选中数据？'))
-  try {
-    await SparePartsInLocationMainApi.finishSparePartsInLocation(id)
-    message.success(t('ts.完成成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await SparePartsInLocationMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
deleted file mode 100644
index eef186df0..000000000
--- a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
-
-
-// 表单校验
-export const SparePartsInLocationMainRules = reactive({
-  number: [required],
-  theme: [required],
-  type: [required],
-})
-// 备件入库主表
-export const SparePartsInLocationMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isSearch: false,
-    isTable: false,
-    isForm: false,
-    isDetail:false,
-  },
-  {
-    label: '编号',
-    field: 'number',
-    sort: 'custom',
-    isSearch: true,
-    isForm: false,
-  },
-  {
-    label: '入库主题',
-    field: 'theme',
-    sort: 'custom',
-    isSearch: true,
-  },{
-    label: '入库类型',
-    field: 'type',
-    sort: 'custom',
-    dictType: DICT_TYPE.PUT_IN_TYPE,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '流程状态',
-    field: 'status',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    
-    dictType: DICT_TYPE.SPAREPARTS_APPLY_STATUS_ENUM,
-    dictClass: 'string',
-   
-  },
-  {
-    label: '入库申请人',
-    field: 'applyer',
-    sort: 'custom',
-    isSearch: false,
-  },
-  {
-    label: '审核人',
-    field: 'approver',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false
-  },
-  {
-    label: '审核时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    isForm:false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-  {
-    label: '入库时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: false,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-
-  
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: false,
-  },
-
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 220,
-      fixed: 'right'
-    },
-    isDetail:false
-  }
-]))
-// 备件入库子表
-export const SparePartsInLocationDetailRules = reactive({
-  number: [required],
-  masterId: [required],
-  locationCode: [required],
-  areaCode: [required],
-  sparePartsCode: [required],
-  applyQty: [required],
-})
-
-export const SparePartsInLocationDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '库位编号',
-    field: 'locationCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-       
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-      searchField: 'itemNumber', // 查询弹窗赋值字段
-      searchTitle: '备件信息', // 查询弹窗标题
-    
-      searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-      searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-      searchCondition: [
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }
-      ]
-    }
-  },
-  {
-    label: '库区编号',
-    field: 'areaCode',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '备件编号',
-    field: 'sparePartsCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
-  {
-    label: '库存数量',
-    field: 'currentQty',
-    sort: 'custom',
-    isSearch: false,
-    tableForm: {
-      disabled: true
-    },
-    form:{
-     componentProps:{
-      disabled: true
-     }
-    },
-    isDetail:false,
-    isTable:false
-  },
-  {
-    label: '申领数量',
-    field: 'applyQty',
-    sort: 'custom',
-    isSearch: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    isTableForm:false
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    isSearch: true,
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    },
-    isTableForm:false,
-    
-  }
-]))
-export const SparePartsInLocationExamineRules = reactive({
-  approver: [required],
-  approveContent: [required],
-  sparePartsCode: [required],
-})
-// 审核完成字段
-export const SparePartsInLocationExamine = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '审核内容',
-    field: 'approveContent',
-    sort: 'custom',
-    isSearch: false,
-    form:{
-      component: 'Input',
-      componentProps: {
-        type: 'textarea'
-      }
-    }
-  },
-]))
-
diff --git a/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts b/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts
deleted file mode 100644
index 4c6785760..000000000
--- a/src/views/eam/sparepartsoutlocation/SparePartsOutLocation.data.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-
-import * as ItemAccountsApi from '@/api/eam/itemAccounts'
-import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data'
-
-import { EquipmentAccounts } from '@/views/eam/equipmentAccounts/equipmentAccounts.data'
-import * as EquipmentItemApi from '@/api/eam/equipmentAccounts'
-
-import { dateFormatter } from '@/utils/formatTime'
-
-export const SparePartsOutLocationMain = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '编号',
-      field: 'number',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false
-    },
-    {
-      label: '申请编号',
-      field: 'applyNumber',
-      sort: 'custom',
-      isSearch: true,
-      isForm: false
-    },
-    {
-      label: '出库类型',
-      field: 'outType',
-      dictType: DICT_TYPE.EAM_OUT_TYPE,
-      dictClass: 'string',
-      isTable: true,
-      sort: 'custom',
-      isSearch: false,
-      table: {
-        width: 150
-      },
-      tableForm: {
-        type: 'Select'
-      }
-    },
-    {
-      label: '关联工单',
-      field: 'workNumber',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchTitle: '设备信息', // 查询弹窗标题
-          searchListPlaceholder: '请选择 设备编号', // 输入框占位文本
-          searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
-          searchField: 'code', // 查询弹窗赋值字段
-          searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-          multiple: true,
-          searchCondition: [
-            {
-              key: 'status',
-              value: 'NORMAL',
-              action: '==',
-              isSearch: true,
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      tableForm: {
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '备件信息', // 查询弹窗标题
-        searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类
-        searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'status',
-            value: 'NORMAL',
-            action: '==',
-            isSearch: true,
-            isMainValue: false
-          }
-        ]
-      }
-    },
-
-    {
-      label: '出库主题',
-      field: 'theme',
-      sort: 'custom',
-      isSearch: true
-    },
-    {
-      label: '流程状态',
-      field: 'status',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-
-      dictType: DICT_TYPE.EAM_OUT_STATUS,
-      dictClass: 'string'
-    },
-    {
-      label: '申请人',
-      field: 'applyer',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '审核人',
-      field: 'approver',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      form: {
-        component: 'InputNumber',
-        value: 0
-      }
-    },
-    {
-      label: '审核内容',
-      field: 'approveContent',
-      sort: 'custom',
-      isSearch: true,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '审核时间',
-      field: 'approveTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      isTable: false,
-      isForm: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      }
-    },
-    {
-      label: '自动审核',
-      field: 'autoExamine',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '自动通过',
-      field: 'autoAgree',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '直接生成记录',
-      field: 'directCreateRecord',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      isForm: false
-    },
-    {
-      label: '创建时间',
-      field: 'createTime',
-      sort: 'custom',
-      formatter: dateFormatter,
-      isSearch: false,
-      isTable: false,
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      isForm: false
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isForm: false,
-      table: {
-        width: 150,
-        fixed: 'right'
-      }
-    }
-  ])
-)
-
-//表单校验
-export const SparePartsOutLocationMainRules = reactive({
-  description: [{ required: true, message: '描述不能为空', trigger: 'change' }]
-})
-/**
- * @returns {Array} 备件申请子表
- */
-export const SparePartsOutLocationDetail = useCrudSchemas(
-  reactive<CrudSchema[]>([
-    {
-      label: '备件编号',
-      field: 'sparePartsCode',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-          searchField: 'itemNumber', // 查询弹窗赋值字段
-          searchTitle: '备件信息', // 查询弹窗标题
-          searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-          searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            }
-          ]
-        }
-      },
-      tableForm: {
-        isInpuFocusShow: true,
-        searchListPlaceholder: '请选择备件编号', // 输入框占位文本
-        searchField: 'itemNumber', // 查询弹窗赋值字段
-        searchTitle: '备件信息', // 查询弹窗标题
-        searchAllSchemas: ItemAccounts.allSchemas, // 查询弹窗所需类
-        searchPage: ItemAccountsApi.getItemAccountsPage, // 查询弹窗所需分页方法
-        searchCondition: [
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-      }
-    },
-
-    {
-      label: '库存数量',
-      field: 'currentQty',
-      sort: 'custom',
-      isSearch: false,
-      tableForm: {
-        disabled: true
-      }
-    },
-    {
-      label: '申领数量',
-      field: 'applyQty',
-      sort: 'custom',
-      isSearch: false
-    },
-    {
-      label: '流程状态',
-      field: 'status',
-      sort: 'custom',
-      isSearch: false,
-      isForm: false,
-
-      dictType: DICT_TYPE.EAM_OUT_STATUS,
-      dictClass: 'string'
-    },
-    {
-      label: '备注',
-      field: 'remark',
-      sort: 'custom',
-      isSearch: false
-    },
-    {
-      label: '操作',
-      field: 'action',
-      isDetail: false,
-      isForm: false,
-      table: {
-        width: 150,
-        fixed: 'right'
-      },
-      isTableForm: false
-    }
-  ])
-)
-
-//表单校验
-export const SparePartsOutLocationDetailRules = reactive({
-  applyQty: [{ required: true, message: '请输入标包数量', trigger: 'blur' }]
-})
diff --git a/src/views/eam/sparepartsoutlocation/index.vue b/src/views/eam/sparepartsoutlocation/index.vue
deleted file mode 100644
index 79c398022..000000000
--- a/src/views/eam/sparepartsoutlocation/index.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <Search
-      :schema="SparePartsOutLocationMain.allSchemas.searchSchema"
-      @search="setSearchParams"
-      @reset="setSearchParams"
-    />
-  </ContentWrap>
-
-  <!-- 列表头部 -->
-  <TableHead
-    :HeadButttondata="HeadButttondata"
-    @button-base-click="buttonBaseClick"
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="SparePartsOutLocationMain.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"
-    @success="getList"
-    :rules="SparePartsOutLocationMainRules"
-    :formAllSchemas="SparePartsOutLocationMain.allSchemas"
-    :tableAllSchemas="SparePartsOutLocationDetail.allSchemas"
-    :tableFormRules="SparePartsOutLocationDetailRules"
-    :tableData="tableData"
-    :apiUpdate="SparePartsOutLocationMainApi.updateSparePartsOutLocationMain"
-    :apiCreate="SparePartsOutLocationMainApi.createSparePartsOutLocationMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
-
-  <!-- 详情 -->
-  <Detail
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SparePartsOutLocationMain.allSchemas"
-    :detailAllSchemas="SparePartsOutLocationDetail.allSchemas"
-    :detailAllSchemasRules="SparePartsOutLocationDetailRules"
-    :apiCreate="SparePartsOutLocationDetailApi.createSparePartsOutLocationDetail"
-    :apiUpdate="SparePartsOutLocationDetailApi.updateSparePartsOutLocationDetail"
-    :apiPage="SparePartsOutLocationDetailApi.getSparePartsOutLocationDetailPage"
-    :apiDelete="SparePartsOutLocationDetailApi.deleteSparePartsOutLocationDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
-    :isShowAddBtn="false"
-    :detailButtonIsShow="true"
-  />
-
-  <!-- 导入 -->
-  <ImportForm
-    ref="importFormRef"
-    url="/eam/sparePartsOutLocationDetail/import"
-    :importTemplateData="importTemplateData"
-    @success="importSuccess"
-  />
-</template>
-
-<script setup lang="ts">
-import download from '@/utils/download'
-import {
-  SparePartsOutLocationMain,
-  SparePartsOutLocationMainRules,
-  SparePartsOutLocationDetail,
-  SparePartsOutLocationDetailRules
-} from './SparePartsOutLocation.data.ts'
-import * as SparePartsOutLocationMainApi from '@/api/eam/sparePartsOutLocationMain'
-import * as SparePartsOutLocationDetailApi from '@/api/eam/sparePartsOutLocationDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-
-// 采购订单
-defineOptions({ name: 'SparePartsOutLocation' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
-const routeName = ref()
-routeName.value = route.name
-const tableColumns = ref(SparePartsOutLocationMain.allSchemas.tableColumns)
-
-// 字段设置 更新主列表字段
-const updataTableColumns = (val) => {
-  tableColumns.value = val
-}
-
-// 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-  nextTick(() => {
-    nextTick(() => {
-      const setV = {}
-      setV[formField] = val[0][searchField]
-      if (formField == 'sparePartsCode') {
-        row['sparePartsCode'] = val[0].itemNumber
-        row['currentQty'] = val[0].qty
-      }
-      if (formField == 'equipmentCode') {
-        row['equipmentCode'] = val[0].code
-      }
-      formRef.setValues(setV)
-    })
-  })
-}
-// 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-  nextTick(async () => {
-    const setV = {}
-    // if(formField == 'itemCode'){
-    //     await ItembasicApi.getItembasicPage({
-    //       code: setV['itemCode']
-    //     }).then(res => {
-    //       setV['uom'] = res.list[0].uom
-    //       setV[formField] = val[0][searchField]
-    //     })
-    //   }
-    formRef.setValues(setV)
-  })
-}
-
-// 子表新增的时候选择表格之后需要会显得字段
-const Echo = []
-const { tableObject, tableMethods } = useTable({
-  getListApi: SparePartsOutLocationMainApi.getSparePartsOutLocationMainPage // 分页接口
-})
-
-// 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
-
-// 列表头部按钮
-const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
-  // defaultButtons.defaultImportBtn(null), // 导入
-  // defaultButtons.defaultExportBtn(null), // 导出
-  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 isShowMainButton = (row, val) => {
-  if (val.indexOf(row.available) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-const isShowStatusButton = (row, val) => {
-  if (val.indexOf(row.status) > -1) {
-    return false
-  } else {
-    return true
-  }
-}
-
-// 列表-操作按钮
-const butttondata = (row) => {
-  return [
-    // defaultButtons.mainAdjust(null),// 盘点调整
-    defaultButtons.mainListApproveBtn({
-      hide: isShowStatusButton(row, ['未出库']),
-      hasPermi: 'request:spare-parts-out-location-main:out'
-    }) //审批通过
-  ]
-}
-
-// 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
-  if (val == 'edit') {
-    // 编辑
-    openForm('update', row)
-  }
-  // else if (val == 'mainOrderClo') {
-  //   // 关闭
-  //   handleClose(row.id)
-  // }
-  else if (val == 'mainTurnDown') {
-    //出库
-    handleOut(row.id)
-  } else if (val == 'delete') {
-    // 删除
-    handleDelete(row.id)
-  }
-}
-
-//审核驳回按钮
-const handleOut = async (id: number) => {
-  await message.delConfirm(t('ts.是否出库所选中数据？'))
-  try {
-    await SparePartsOutLocationMainApi.outSparePartsInLocation(id)
-    message.success(t('ts.出库成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = async (type: string, row?: number) => {
-  tableData.value = [] // 重置明细数据
-  formRef.value.open(type, row)
-}
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSparePartsOutLocationMain')
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SparePartsOutLocationMainApi.deleteSparePartsOutLocationMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 列表导出按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
-const handleMainExport = async (id: number) => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(id)
-    download.excel(data, '盘点工单.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 关闭按钮操作 */
-// const handleClose = async (id: number) => {
-//   try {
-//     // 关闭的二次确认
-//     await message.confirm('是否关闭所选中数据？')
-//     // 发起关闭
-//     await SparePartsOutLocationMainApi.closeSparePartsOutLocationMain(id)
-//     message.success(t('关闭成功!'))
-//     // 刷新列表
-//     await getList()
-//   } catch {}
-// }
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await SparePartsOutLocationMainApi.exportSparePartsOutLocationMain(
-      tableObject.params
-    )
-    download.excel(data, '备件申领记录主.xlsx')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/**
- * tableForm方法
- */
-const tableFormKeys = {}
-SparePartsOutLocationDetail.allSchemas.tableFormColumns.forEach((item) => {
-  tableFormKeys[item.field] = item.default ? item.default : ''
-})
-const tableData = ref([])
-
-// 添加明细
-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 // 拼接子表数据参数
-  try {
-    if (formType === 'create') {
-      await SparePartsOutLocationMainApi.createSparePartsOutLocationMain(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await SparePartsOutLocationMainApi.updateSparePartsOutLocationMain(data)
-      message.success(t('common.updateSuccess'))
-    }
-    formRef.value.dialogVisible = false
-    // 刷新当前列表
-    getList()
-  } finally {
-    formRef.value.formLoading = 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() // 刷新当前列表
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  getList()
-  importTemplateData.templateUrl = await SparePartsOutLocationMainApi.importTemplate()
-})
-</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 0499f5144..4f25372ad 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -177,6 +177,10 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.disabled = true
               item.componentProps.isSearchList = false
             }
+            if (item.field == 'packUnit') {
+              item.componentProps.disabled = true
+              item.componentProps.isSearchList = false
+            }
           })       
   }else {
     Itempackaging.allSchemas.formSchema.forEach((item) => {
@@ -184,6 +188,10 @@ const openForm = (type: string, row?: any) => {
         item.componentProps.disabled = false
         item.componentProps.isSearchList = true
       }
+      if (item.field == 'packUnit') {
+        item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
+      }
     })  
   }
   basicFormRef.value.open(type, row)
diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
index 7893d5885..a4c1cbe2a 100644
--- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts
@@ -85,6 +85,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         // isSearchList: true,
+        filterable:true,
         placeholder:'请选择库位代码',
         searchField: 'code',
         // searchTitle: '生产线信息',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
index 27bca0a16..a8dc7be9c 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -185,9 +185,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -304,14 +304,16 @@ const buttonTableClick = async (val, row) => {
 }
     handleHandle(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    await message.confirm('确认要放弃吗？')
-    console.log('列表-操作按钮事件-放弃')
-    CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      getList()
-    }).catch(err => {
-      console.log(err)
-    })
+    await CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId)
+    getList()
+    // await message.confirm('确认要放弃吗？')
+    // console.log('列表-操作按钮事件-放弃')
+    // CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => {
+    //   message.success(t('common.updateSuccess'))
+    //   getList()
+    // }).catch(err => {
+    //   console.log(err)
+    // })
   } else if (val == 'mainJobClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     console.log('列表-操作按钮事件-关闭')
@@ -322,14 +324,16 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainJobAcc') { // 承接
-    await message.confirm('确认要承接吗？')
-    console.log('列表-操作按钮事件-承接')
-    CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
-      message.success(t('common.updateSuccess'))
-      getList()
-    }).catch(err => {
-      console.log(err)
-    })
+    await CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId)
+    getList()
+    // await message.confirm('确认要承接吗？')
+    // console.log('列表-操作按钮事件-承接')
+    // CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => {
+    //   message.success(t('common.updateSuccess'))
+    //   getList()
+    // }).catch(err => {
+    //   console.log(err)
+    // })
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index b9fbf6ca5..4250a70f8 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -624,7 +624,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 150,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index d684f7788..925840fa2 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -206,9 +206,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -312,11 +312,14 @@ const buttonTableClick = async (val, row) => {
     handleHandle(aaa)
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
-    DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
+    await DeliverJobMainApi.abandonDeliverJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    DeliverJobMainApi.closeDeliverJobMain(row.masterId)
+    await DeliverJobMainApi.closeDeliverJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
+    await DeliverJobMainApi.acceptDeliverJobMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index c567a0cc0..4b4687f4a 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -186,9 +186,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -198,11 +198,14 @@ const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     handleHandle
   } else if (val == 'mainJobAba') { // 放弃
-    StockupJobMainApi.abandonStockupMainJob(row.masterId)
+    await StockupJobMainApi.abandonStockupMainJob(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    StockupJobMainApi.closeStockupMainJob(row.masterId)
+    await StockupJobMainApi.closeStockupMainJob(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    StockupJobMainApi.acceptStockupMainJob(row.masterId)
+    await StockupJobMainApi.acceptStockupMainJob(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index e69dd5416..eaf67f99a 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -485,15 +485,23 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage,
+      searchPage: BalanceApi.getBalanceItemPage,
       searchCondition: [{
         key: 'warehouseCode',
         value: 'fromWarehouseCode',
         message: '请填写从仓库代码！',
         isMainValue: true
       },{
-        key: 'inventoryStatus',
-        value: 'SCRAP',
+        key: 'businessType',
+        value: 'Scrap',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'inOrOut',
+        value: 'out',
+        action: '==',
+        isSearch: true,
         isMainValue: false
       }]
     },
@@ -505,15 +513,23 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage,
+        searchPage: BalanceApi.getBalanceItemPage,
         searchCondition: [{
           key: 'warehouseCode',
           value: 'fromWarehouseCode',
           message: '请填写从仓库代码！',
           isMainValue: true
         },{
-          key: 'inventoryStatus',
-          value: 'SCRAP',
+          key: 'businessType',
+          value: 'Scrap',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'inOrOut',
+          value: 'out',
+          action: '==',
+          isSearch: true,
           isMainValue: false
         }]
       }
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
index f71761eaf..714ac4696 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
@@ -198,10 +198,16 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
index d3ceb3ad8..c0c5472e6 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/sparepartsrequisitionJobMain.data.ts
@@ -1,6 +1,15 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 
 /**
  * @returns {Array} 计划外出库任务主表
@@ -78,6 +87,138 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '要求截止时间',
     field: 'requestDueTime',
@@ -585,6 +726,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -641,6 +783,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -690,6 +833,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -697,6 +841,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '项目代码',
     field: 'projectCode',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
index 6a0e8b1c3..103ae41fa 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts
@@ -2,6 +2,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 /**
  * @returns {Array} 计划外出库记录主表
  */
@@ -29,6 +38,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '任务单号',
     field: 'jobNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -42,6 +52,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return cellValue
     },
+    isTable:false,
     table: {
       width: 150
     },
@@ -115,6 +126,138 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '生效日期',
     field: 'activeDate',
@@ -207,8 +350,11 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -218,6 +364,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -337,6 +484,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true, 
     table: {
       width: 180
     },
@@ -393,6 +541,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -463,6 +615,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '货主代码',
     field: 'ownerCode',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -488,6 +644,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -496,8 +656,11 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 8dd499624..98eaf0c31 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
@@ -41,6 +41,8 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     ref="formRef"
     @success="getList"
     :rules="UnplannedissueRequestMainRules"
@@ -111,17 +113,34 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      row[formField] = val[0][searchField]
-      row['packingNumber'] = val[0]['packingNumber']
-      row['containerNumber'] = val[0]['containerNumber']
-      row['batch'] = val[0]['batch']
-      row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['locationCode']
-      row['itemCode'] = val[0]['itemCode']
-      row['uom'] = val[0]['uom']
+      let newRow = JSON.parse(JSON.stringify(tableFormKeys))
+      val.forEach(item=>{
+        newRow['packingNumber'] = item['packingNumber']
+        newRow['containerNumber'] = item['containerNumber']
+        newRow['batch'] = item['batch']
+        newRow['inventoryStatus'] = item['inventoryStatus']
+        newRow['fromLocationCode'] = item['locationCode']
+        newRow['itemCode'] = item['itemCode']
+        newRow['uom'] = item['uom']
+        tableData.value.push(newRow)
+      })
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
+      if(formField === 'usageDescription'){
+        setV['usageDescription'] = val[0]['usageDescription']
+        setV['usageCode'] = val[0]['code']
+      }
+      if(formField === 'costCenterCode'){
+        setV['costcentreCode'] = val[0]['costcentreCode']
+        setV['costCenterType'] = val[0]['costcentreType']
+      }
+      if(formField === 'reasonCodeRequisition'){
+        setV['reasonCodeRequisition'] = val[0]['code']
+      }
+      if(formField === 'projectCode'){
+        setV['projectCode'] = val[0]['projectCode']
+      }
       formRef.setValues(setV)
     }
   })
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
index ffceadcb4..91a2ea81c 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts
@@ -5,6 +5,15 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -89,13 +98,145 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '领用原因',
-    field: 'reason',
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:1001
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
   },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '领用原因',
+  //   field: 'reason',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:1001
+  // },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -366,6 +507,18 @@ export const UnplannedissueRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  usageDescription:[
+    { required: true, message: '请选择领用描述', trigger: 'blur' }
+  ],
+  costCenterCode: [
+    { required: true, message: '请输入成本中心代码', trigger: 'blur' }
+  ],
+  costCenterType: [
+    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+  ],
+  reasonCodeRequisition: [
+    { required: true, message: '请输入领用原因代码', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -395,12 +548,32 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePageSpare
+      searchPage: BalanceApi.getBalancePageSpare,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'businessType',
+        value: 'UnplannedDeliverSpare',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'inOrOut',
+        value: 'out',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -410,7 +583,26 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePageSpare
+        searchPage: BalanceApi.getBalancePageSpare,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'businessType',
+          value: 'UnplannedDeliverSpare',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'inOrOut',
+          value: 'out',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
       }
     }
   },
@@ -474,6 +666,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     isTableForm: false,
     isForm: false,
+    isTable:false,
   },
   {
     label: '数量',
@@ -508,6 +701,11 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     tableForm: {
       type: 'Select',
       disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
     }
   },
   {
@@ -521,9 +719,15 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     },
-    isTableForm: false,
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    },
+    isTableForm: true,
     isForm: false,
   },
   {
@@ -533,6 +737,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true,
+      }
+    }
   },
   {
     label: '项目代码',
@@ -543,12 +755,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
+    isTable:false,
     isForm: false,
   },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
     hiddenInMain:true,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -621,7 +835,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable:false,
   },
   {
     label: '最后更新者',
@@ -632,7 +847,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable:false,
   },
   {
     label: '操作',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
index 1b63100c5..9697f55f1 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
@@ -188,9 +188,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -201,13 +201,17 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
-    handleAbandon(row.masterId)
+    // handleAbandon(row.masterId)
+    await TransferissueJobMainApi.abandonTransferissueJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
-    handleAccept(row.masterId)
+    // handleAccept(row.masterId)
+    await TransferissueJobMainApi.acceptTransferissueJobMain(row.masterId)
+    getList()
   }
 }
 
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
index 4d759307d..95e5f8989 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
@@ -185,9 +185,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -198,10 +198,16 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    await TransferreceiptJobMainApi.abandonTransferreceiptJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    await TransferreceiptJobMainApi.closeTransferreceiptJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    await TransferreceiptJobMainApi.acceptTransferreceiptJobMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index 865b0b2a8..791637252 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -2,6 +2,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 /**
  * @returns {Array} 计划外出库任务主表
  */
@@ -95,6 +104,138 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '过期时间',
     field: 'expiredTime',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index d9bdbbbf8..0952ec3d1 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -2,6 +2,15 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import { TableColumn } from '@/types/table'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
+import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
+import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
+
 /**
  * @returns {Array} 计划外出库记录主表
  */
@@ -136,6 +145,138 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -355,6 +496,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -411,6 +553,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -482,6 +628,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '成本中心代码',
     field: 'costcentreCode',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -490,6 +640,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '科目代码',
     field: 'qadProjectCode',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -498,6 +652,10 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isDetail:false,
+    isTableForm:false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 4befdd5ec..e1d9ef743 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="UnplannedissueRequestMainRules"
     :formAllSchemas="UnplannedissueRequestMain.allSchemas"
@@ -112,14 +114,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       if(formField === 'itemCode'){
-        row[formField] = val[0][searchField]
-        row['packingNumber'] = val[0]['packingNumber']
-        row['containerNumber'] = val[0]['containerNumber']
-        row['batch'] = val[0]['batch']
-        row['inventoryStatus'] = val[0]['inventoryStatus']
-        row['fromLocationCode'] = val[0]['locationCode']
-        row['itemCode'] = val[0]['itemCode']
-        row['uom'] = val[0]['uom']
+        let newRow = JSON.parse(JSON.stringify(tableFormKeys))
+        val.forEach(item=>{
+          newRow[formField] =item[searchField]
+          newRow['packingNumber'] = item['packingNumber']
+          newRow['containerNumber'] = item['containerNumber']
+          newRow['batch'] = item['batch']
+          newRow['inventoryStatus'] = item['inventoryStatus']
+          newRow['fromLocationCode'] = item['locationCode']
+          newRow['itemCode'] = item['itemCode']
+          newRow['uom'] = item['uom']
+          newRow['qty'] = item['qty']
+          tableData.value.push(newRow)
+        })
       }
       if(formField === 'costcentreCode'){
         row['costcentreCode'] = val[0]['costcentreCode']
@@ -133,6 +140,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['usageDescription'] = val[0]['usageDescription']
         setV['usageCode'] = val[0]['code']
       }
+      if(formField === 'costCenterCode'){
+        setV['costcentreCode'] = val[0]['costcentreCode']
+        setV['costCenterType'] = val[0]['costcentreType']
+      }
+      if(formField === 'reasonCodeRequisition'){
+        setV['reasonCodeRequisition'] = val[0]['code']
+      }
+      if(formField === 'projectCode'){
+        setV['projectCode'] = val[0]['projectCode']
+      }
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index 9de1cdcfb..745856d85 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -5,6 +5,12 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import { QadCostcentre } from '@/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data'
+import * as QadCostcentreApi from '@/api/wms/qadCostcentre/index'
+
+import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadProject.data'
+import * as QadProjectApi from '@/api/wms/qadProject'
+
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data'
 
@@ -69,6 +75,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm: false,
     isTable:false,
   },
@@ -76,6 +83,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '领用描述',
     field: 'usageDescription',
     sort: 'custom',
+    isTableForm:false,
+    isForm: false,
+    isTable:false,
     table: {
       width: 150
     },
@@ -99,6 +109,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return cellValue
     },
+    isTableForm:false,
+    isForm: false,
+    isTable:false,
     table: {
       width: 150
     },
@@ -112,6 +125,138 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       filterable: true
     }
   },
+  {
+    label: '成本中心代码',
+    field: 'costCenterCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成本中心代码',
+      searchField: 'costcentreCode',
+      searchTitle: '成本中心代码',
+      searchAllSchemas: QadCostcentre.allSchemas,
+      searchPage: QadCostcentreApi.getQadCostcentrePage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'costcentreCode', // 查询弹窗赋值字段
+        searchTitle: '成本中心代码', // 查询弹窗标题
+        searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类
+        searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '成本中心类型',
+    field: 'costCenterType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
+  {
+    label: '领用原因代码',
+    field: 'reasonCodeRequisition',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择成领用原因代码',
+      searchField: 'code',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: SubjectAccount.allSchemas,
+      searchPage: SubjectAccountApi.getSubjectAccountPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'costcentreType',
+        value: 'costCenterType',
+        message: '成本中心类型不能为空!',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
+        searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'costcentreType',
+          value: 'costCenterType',
+          message: '成本中心类型不能为空!',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择QAD项目信息',
+      searchField: 'projectCode',
+      searchTitle: '领用原因代码',
+      searchAllSchemas: QadProject.allSchemas,
+      searchPage: QadProjectApi.getQadProjectPage
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
+        searchField: 'projectCode', // 查询弹窗赋值字段
+        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
+        searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '工作中心',
+    field: 'workCenter',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请时间',
     field: 'requestTime',
@@ -119,6 +264,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTableForm:false,
+    isForm: false,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 180
@@ -140,6 +288,9 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTableForm:false,
+    isForm: false,
+    isTable:false,
     sort: 'custom',
     table: {
       width: 180
@@ -173,7 +324,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     isForm: false,
   },
   {
@@ -183,7 +334,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     isForm: false,
   },
   {
@@ -290,12 +441,21 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
   {
     label: '直接生成记录',
     field: 'directCreateRecord',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isForm: false,
+    isForm: true,
     isTable: false,
     sort: 'custom',
     table: {
@@ -306,20 +466,10 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: requestsettingData.directCreateRecord,
       componentProps: {
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
+        activeValue: 'TRUE'
       }
     }
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -427,6 +577,15 @@ export const UnplannedissueRequestMainRules = reactive({
   usageDescription:[
     { required: true, message: '请选择领用描述', trigger: 'blur' }
   ],
+  costCenterCode: [
+    { required: true, message: '请输入成本中心代码', trigger: 'blur' }
+  ],
+  costCenterType: [
+    { required: true, message: '请输入成本中心类型', trigger: 'blur' }
+  ],
+  reasonCodeRequisition: [
+    { required: true, message: '请输入领用原因代码', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -456,12 +615,32 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm:{
+      multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请输入包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage
+      searchPage: BalanceApi.getBalanceItemPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'businessType',
+        value: 'UnplannedDeliver',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      },{
+        key: 'inOrOut',
+        value: 'out',
+        action: '==',
+        isSearch: true,
+        isMainValue: false
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -471,7 +650,26 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalanceItemPage
+        searchPage: BalanceApi.getBalanceItemPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'businessType',
+          value: 'UnplannedDeliver',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'inOrOut',
+          value: 'out',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
       }
     }
   },
@@ -512,6 +710,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled:true
+    }
   },
   {
     label: '包装号',
@@ -520,6 +726,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm: {
+      disabled:true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '器具号',
@@ -563,7 +777,13 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled:true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -577,7 +797,13 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
     }
   },
   {
@@ -587,6 +813,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled:true
+    }
   },
   {
     label: '成本中心代码',
@@ -595,6 +829,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    isDetail:false,
+    isTableForm:false,
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '选择成本中心',
@@ -634,6 +871,9 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTable:false,
+    isDetail:false,
+    isTableForm:false,
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '选择科目代码',
@@ -792,14 +1032,14 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
 
 //表单校验
 export const UnplannedissueRequestDetailRules = reactive({
-  packingNumber: [
-    { required: true, message: '请输入包装号', trigger: 'change' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
-  ],
+  // packingNumber: [
+  //   { required: true, message: '请输入包装号', trigger: 'change' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
+  // batch: [
+  //   { required: true, message: '请输入批次', trigger: 'blur' },
+  //   { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  // ],
   containerNumber:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
@@ -823,4 +1063,4 @@ export const UnplannedissueRequestDetailRules = reactive({
   qadProjectCode:[
     { required: true, message: '请选择科目代码', trigger: 'change' }
   ]
-})
\ No newline at end of file
+})
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index d923bcaa8..94435be74 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -687,6 +687,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '科目代码',
@@ -695,6 +696,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '原因',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 5f0dc22e8..eefa7e5c4 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -42,6 +42,8 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
     ref="formRef"
+    :isOpenSearchTable="true"
+    fieldTableColumn="itemCode"
     @success="getList"
     :rules="UnplannedreceiptRequestMainRules"
     :formAllSchemas="UnplannedreceiptRequestMain.allSchemas"
@@ -69,20 +71,22 @@
   </BasicForm>
 
   <!-- 详情 -->
+  <!-- :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail" -->
+  <!-- :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail" -->
   <Detail
     ref="detailRef"
     :isBasic="false"
     :allSchemas="UnplannedreceiptRequestMain.allSchemas"
     :detailAllSchemas="UnplannedreceiptRequestDetail.allSchemas"
     :detailAllSchemasRules="UnplannedreceiptRequestDetailRules"
-    :apiCreate="UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail"
-    :apiUpdate="UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail"
+    @handleSubmitForm="handleDetailSubmitForm"
     :apiPage="UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage"
     :apiDelete="UnplannedreceiptRequestDetailApi.deleteUnplannedreceiptRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
     @detailBasicFormOnChange="qtyOnChange"
+    @detailOpenForm="detailOpenForm"
     @onBlur="onBlur"
   />
 
@@ -195,19 +199,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if(formField == 'toLocationCode'){
         row['toLocationCode'] = val[0]['code']
       } else if(formField == 'itemCode'){
-        const isType = await isItemType(val[0]['code'], labelType.value)
-        if(!isType){
-          message.warning('当前物料可制造与其他数据不一致，请重新选择！')
-        } else {
-          row['itemCode'] = val[0]['code']
-          row['uom'] = val[0]['uom']
-          // 有效期 \ 过期日期
-          row['validityDays'] = val[0]['validityDays']
-          // StdcostpriceApi.queryStdcostpriceByItemCode({"itemCode":val[0]['code']})
-          // .then(res => {
-          //   row['singlePrice'] = res.price
-          // })
+        if(val.length==0){
+          return
         }
+        const enableBuy = val[0]['enableBuy']
+        let newVal = val.filter(item=>item.enableBuy==enableBuy)
+        if(newVal.length<val.length){
+          message.warning('不能同时选择可制造和可采购的物料')
+        }
+        newVal.forEach(item=>{
+          let tfk = JSON.parse(JSON.stringify(tableFormKeys))
+          tfk.batch = formatTime(new Date(), 'yyyyMMdd')
+          //生产日期 到货日期 默认当天
+          tfk['produceDate'] = dayjs().valueOf()
+          tfk['arriveDate'] = dayjs().valueOf()
+          tfk['itemCode'] = item['code']
+          tfk['uom'] = item['uom']
+          tfk['validityDays'] = item['validityDays']
+          tableData.value.push(tfk)
+        })
       } else if(formField === 'costcentreCode'){
         row['costcentreCode'] = val[0]['costcentreCode']
       } else if(formField === 'qadProjectCode'){
@@ -236,6 +246,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     }
   })
 }
+const handleDetailSubmitForm = async (formType, data) => {
+  let mydata = {...data}
+  mydata['expireDate'] = data['expireDate'].valueOf()
+  if (formType === 'create') {
+    await UnplannedreceiptRequestDetailApi.createUnplannedreceiptRequestDetail(data)
+    message.success(t('common.createSuccess'))
+      
+  } else {
+    await UnplannedreceiptRequestDetailApi.updateUnplannedreceiptRequestDetail(data)
+    message.success(t('common.updateSuccess'))
+  }
+  detailRef.value.submitUpdateList()
+
+}
 // 查询页面返回——详情
 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
@@ -247,6 +271,12 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
     if(formField == 'itemCode'){
       setV['itemCode'] = val[0]['code']
       setV['uom'] = val[0]['uom']
+      setV['validityDays'] = val[0]['validityDays']
+      setV['expireDate'] =  val[0]['validityDays']?addDay(val[0]['produceDate'],val[0]['validityDays']).valueOf():''
+      setV['batch'] = formatTime(new Date(), 'yyyyMMdd')      //生产日期 到货日期 默认当天
+      setV['produceDate'] = dayjs().valueOf()
+      setV['arriveDate'] = dayjs().valueOf()
+      
     }
     if(formField === 'costcentreCode'){
       setV['costcentreCode'] = val[0]['costcentreCode']
@@ -710,7 +740,39 @@ const inputNumberChange = (field, index, row, val) => {
     row.amount = row.qty * row.singlePrice
   }
 }
+
+
+let validityDays = 0
+const detailOpenForm = (type, row)=>{
+  console.log('detailOpenForm',row)
+  if(type=='update'){
+    //有效期
+    ItembasicApi.getItembasicPage({
+      code:row.itemCode
+    }).then((res)=>{
+      res.list.forEach((item,index)=>{
+        const findItem = tableData.value.find(item1=>item1['itemCode']==row['code'])
+        if(findItem){
+          validityDays = findItem['expireTime']
+        }
+      })
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,validityDays).valueOf()
+    })
+  }else{
+    validityDays = 0
+  }
+  
+}
 const qtyOnChange = (field,val) =>{
+  console.log('qtyOnChange',field,val)
+  console.log(detailRef.value.formRef.formRef.formModel)
+  if(field=='produceDate'){
+    if(detailRef.value.formRef.formRef.formModel.validityDays){
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,detailRef.value.formRef.formRef.formModel.validityDays).valueOf()
+    }else{
+      detailRef.value.formRef.formRef.formModel.expireDate = addDay(detailRef.value.formRef.formRef.formModel.produceDate,validityDays).valueOf()
+    }
+  }
   if(field == 'qty' || field == 'singlePrice'){
     detailRef.value.formRef.formRef.formModel.amount = detailRef.value.formRef.formRef.formModel.qty * detailRef.value.formRef.formRef.formModel.singlePrice
   }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index a6d0e49f4..b6f713a24 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -451,7 +451,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isForm: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -461,7 +461,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       value: requestsettingData.directCreateRecord,
       componentProps: {
         inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
+        activeValue: 'TRUE'
       }
     }
   },
@@ -615,6 +615,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
     tableForm:{
+      multiple:true,//多选
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择物料代码',// 输入框占位文本
       searchField: 'code',// 查询弹窗赋值字段
@@ -705,6 +706,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'packingNumber',
     sort: 'custom',
     isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -717,6 +719,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'containerNumber',
     sort: 'custom',
     isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -757,6 +760,11 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     tableForm: {
       type: 'Select',
       disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true
+      }
     }
   },
   {
@@ -885,6 +893,12 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
+    form:{
+      component: 'Select',
+      componentProps:{
+        options: UnplannedReceipt.inInventoryStatusList
+      }
+    },
     tableForm: {
       show:true,
       type: 'Select',
@@ -961,6 +975,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
+        disabled:true
       }
     },
     // tableForm: {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index b14c8534e..3b178cb82 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -271,11 +271,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductionreceiptJobMainApi.executeIssueMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
+    await ProductionreceiptJobMainApi.abandonIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
+    await ProductionreceiptJobMainApi.closeIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
+    await ProductionreceiptJobMainApi.acceptIssueMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index c2f3e38f5..1a13bd3ec 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -551,16 +551,16 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index d8c3b9889..fc7c9400a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -165,7 +165,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
@@ -243,11 +243,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductionreturnJobMainApi.executeProductionreturnMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
+    await ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
+    await ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
+    await ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index 519b6ff30..63eb8641c 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -535,16 +535,16 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index 4ed66d5b7..e9c5c7b07 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -171,9 +171,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -302,12 +302,14 @@ const buttonTableClick = async (val, row) => {
 }
     RepleinshJobMainApi.executeRepleinshMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
+    await RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     await RepleinshJobMainApi.closeRepleinshMain(row.masterId)
     getList()
   } else if (val == 'mainJobAcc') { // 承接
-    RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
+    await RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
+    getList()
   }
 }
 
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 85a40e7db..9ca0bd98f 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -159,7 +159,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
@@ -236,11 +236,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index a3ce47a92..62b863095 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -537,16 +537,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
index cf54ae171..109f6000b 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
@@ -73,7 +73,7 @@ import * as ProductputawayJobMainApi from '@/api/wms/productputawayJobMain'
 import * as ProductputawayJobDetailApi from '@/api/wms/productputawayJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-// 制品上架任务主
+// 装配制品上架任务主
 defineOptions({ name: 'ProductputawayJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -236,11 +236,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductputawayJobMainApi.executeProductputawayMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.closeProductputawayMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
+    await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
index 3cc62e8f5..6513811fa 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts
@@ -539,16 +539,16 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 057858d69..209c2b91b 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -225,9 +225,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -321,12 +321,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
     getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 183f15541..339d7bde1 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -82,6 +82,8 @@
         v-model:sort="detatableDataBom.sort"
       />
     </Dialog>
+    <!-- 标签打印 -->
+    <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
 </template>
 
 <script setup lang="ts">
@@ -92,6 +94,12 @@ import * as ProductreceiptRecordDetailApi from '@/api/wms/productreceiptRecordDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as PackageApi from '@/api/wms/package'
+import {
+  SupplierdeliverRequestPackage
+} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
+import * as ProductreceiptRequestDetailApi from '@/api/wms/productreceiptRequestDetail'
+import { getAccessToken } from '@/utils/auth'
 
 // 制品收货记录主
 // 预生产收货记录主
@@ -169,6 +177,14 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 
 // 列表-操作按钮
 const butttondata = (row,$index) => {
@@ -179,6 +195,7 @@ const butttondata = (row,$index) => {
   return [
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+  defaultButtons.mainListPointBtn(null), // 标签打印
 ]
 }
 
@@ -186,7 +203,63 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if(val == 'inspectRequest'){//生成到货检验申请
     handleCreateInspectRequest(row.number)
+  } else if (val == 'point') { // 标签打印
+    labelPrint(row)
+  }
+}
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const searchTableRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  //获取类型
+  let resType = await PackageApi.getPackagePage({
+    requestNumber: row.requestNumber
+  })
+  if(resType.list.length > 0){
+    if (resType.list[0].productionLineCode != null) {
+      labelType.value = 'zz'
+    } else {
+      labelType.value = 'cg'
+    }
+  }
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.requestNumber}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+// 批量打印--预生产收货
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+ 
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
   }
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
index e72644dfd..195d84712 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
@@ -168,7 +168,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
@@ -261,11 +261,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
index 9d561de4e..b5ffc30ab 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts
@@ -555,9 +555,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false,
-    isTable:false,
+    isTable:true,
     table: {
-      width: 120,
+      width: 150,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
index 2d6991f09..b2d7a55b0 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
@@ -68,9 +68,9 @@
       v-model="mesModelVisible"
       width="80%"
       :scroll="true"
-      max-height="450px"
+      max-height="500px"
     >
-      <Table
+      <Table v-clientTable450
         :columns="ProductreceiptDetailb.allSchemas.tableColumns"
         :data="detatableDataMes.tableList"
         :loading="detatableDataMes.loading"
@@ -103,6 +103,8 @@
         v-model:sort="detatableDataBom.sort"
       />
     </Dialog>
+    <!-- 标签打印 -->
+    <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
 
 <script setup lang="ts">
@@ -114,6 +116,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductreceiptDetailbApi from '@/api/wms/productreceiptDetailb'
 import * as BackflushRecordDetailbApi from '@/api/wms/backflushRecordDetailb'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
+import {
+  SupplierdeliverRequestPackage
+} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 
 // 装配收货记录主
 defineOptions({ name: 'ProductreceiptRecordMainA' })
@@ -209,6 +216,14 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -217,12 +232,78 @@ const butttondata = (row,$index) => {
   }
   return [
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+  defaultButtons.mainListPointBtn(null), // 标签打印
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'point') { // 标签打印
+    labelPrint(row)
+  }
+}
+const searchTableRef = ref()
+const labelType = ref('') // 标签类别 采购还是制造等 
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  //获取类型
+  let resType = await PackageApi.getPackagePage({
+    requestNumber: row.requestNumber
+  })
+  if(resType.list.length > 0) {
+    if (resType.list[0].productionLineCode != null) {
+      labelType.value = 'zz'
+    } else {
+      labelType.value = 'cg'
+    }
+  }
+  const defaultParams = {'moduleName':'productreceipt_assemble','recordNumber':row.requestNumber}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 批量打印--装配收货申请
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
 }
+
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
index 25e7aba92..345042c99 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
@@ -67,6 +67,7 @@
 </template>
 
 <script setup lang="ts">
+//报废收货任务
 import download from '@/utils/download'
 import { ProductreceiptJobMain,ProductreceiptJobMainRules,ProductreceiptJobDetail,ProductreceiptJobDetailRules } from './productreceiptscrapJobMain.data'
 import * as ProductreceiptJobMainApi from '@/api/wms/productreceiptJobMain'
@@ -167,7 +168,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
@@ -257,11 +258,14 @@ const buttonTableClick = async (val, row) => {
     }
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
index 8e9809929..1c13b442b 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/productreceiptscrapJobMain.data.ts
@@ -543,16 +543,16 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
index 677a14754..51e97a100 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue
@@ -102,7 +102,14 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -110,8 +117,11 @@ const butttondata = (row,$index) => {
     return []
   }
   return[
-    defaultButtons.mainListEditBtn({hasPermi:'wms:productredress-job-main:update'}), // 编辑
-    defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredress-job-main:delete'}), // 删除
+    // defaultButtons.mainListEditBtn({hasPermi:'wms:productredress-job-main:update'}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productredress-job-main:delete'}), // 删除
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
   ]
 }
 
@@ -121,6 +131,15 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  } else if (val == 'mainJobAba') { // 放弃
+    await ProductredressJobMainApi.abandonProductredressJobMain(row.masterId)
+    getList()
+  } else if (val == 'mainJobClo') { // 关闭
+    await ProductredressJobMainApi.closeProductredressJobMain(row.masterId)
+    getList()
+  } else if (val == 'mainJobAcc') { // 承接
+    await ProductredressJobMainApi.acceptProductredressJobMain(row.masterId)
+    getList()
   }
 }
 
diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
index 9629bcc5a..dc21a639b 100644
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@@ -435,6 +435,17 @@ export const ProductredressJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    isTable:true,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 
 // 表单校验
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 3019c6e03..a0b3851d6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -212,9 +212,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
     {
       label: '拒收',
@@ -236,15 +236,20 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 拒收
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    await PurchasereceiptJobMainApi.acceptPurchasereceiptJobMain(row.masterId)
+    getList()
   } else if(val == 'mainPlanCheckQualityReport'){
     // 查看质检报告
     checkQualityReport(row)
   } else if(val == 'mainJobRefusal'){
     handleRefusal(row.masterId)
+    getList()
   }
 }
 // 查看质检报告
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 76c37a9c7..275882287 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -610,7 +610,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 200,
+      width: 250,
       fixed: 'right'
     },
   },
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 2ffe84607..d2bd5a7e6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -186,9 +186,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -199,10 +199,14 @@ const buttonTableClick = async (val, row) => {
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
+    await PurchasereturnJobMainApi.abandonPurchasereturnJobMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    await PurchasereturnJobMainApi.acceptPurchasereturnJobMain(row.masterId)
+    getList()
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index cc1f0ae6b..cfaf6ee4f 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -256,9 +256,9 @@ const butttondata = (row,$index) => {
   }
   return [
     defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -268,11 +268,15 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainJobExe') { // 执行
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
+    await PutawayJobMainApi.abandonPutawayJobMain(row.masterId)
+    await getList()
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+    await PutawayJobMainApi.acceptPutawayJobMain(row.masterId)
+    await getList()
   } else if (val == 'documentPrint') {
     // 单据打印
     handleDocumentPrint(row)
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
index 33851cb6d..73aee42a4 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -74,7 +74,7 @@ import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import {exportSparereceiptJobMain} from "@/api/wms/purchasereceiptJobMain";
-// 采购收货任务主
+// 备件收货任务主
 defineOptions({ name: 'PurchasereceiptJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -178,9 +178,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:accept'}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-job-main:abandon'}), // 放弃
     defaultButtons.mainListJobRecBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:execute'}), // 收货
   ]
 }
@@ -214,7 +214,7 @@ const handleExecuteSpare = async (id: number) => {
 /** 放弃按钮操作 */
 const handleAbandon = async (id: number) => {
   try {
-    await message.confirm("是否确认放弃任务!")
+    await message.confirm("是否确认取消承接!")
     await PurchasereceiptJobMainApi.abandonPurchasereceiptJobMainSpare(id)
     message.success("放弃成功")
     await getList()
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3eb368a79..d1c733701 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -54,10 +54,10 @@
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
     :sumFormDataByForm ="(formRef,formModel)=>{
-      const {taxRate=0,amount=0} = formModel
+      const {taxRate=0,amount=0,taxAmount=0,adjustingTaxAmount=0} = formModel
       formRef.value.setValues({
-        taxAmount:taxRate*amount*0.01,
-        afterTaxAmount:amount+taxRate*amount*0.01
+        taxAmount:taxRate*amount*0.01+adjustingTaxAmount,
+        afterTaxAmount:amount+taxAmount
       })
     }"
     :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{