diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 012f7c534..58dc31c42 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -104,7 +104,12 @@ export const deleteBalance = async (id: number) => {
 
 // 导出库存余额 Excel
 export const exportBalance = async (params) => {
-  return await request.download({ url: `/wms/balance/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/balance/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/balance/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/businesstype/index.ts b/src/api/wms/businesstype/index.ts
index 58d9723f3..09f9dddef 100644
--- a/src/api/wms/businesstype/index.ts
+++ b/src/api/wms/businesstype/index.ts
@@ -6,8 +6,8 @@ export interface BusinesstypeVO {
   description: string
   itemTypes: string
   itemStatuses: string
-  outLocationTypes: string
-  inLocationTypes: string
+  outAreaTypes: string
+  inAreaTypes: string
   outAreaCodes: string
   inAreaCodes: string
   outInventoryStatuses: string
diff --git a/src/api/wms/containerBindRecordMain/index.ts b/src/api/wms/containerBindRecordMain/index.ts
index 7fa35ac2d..be7cca676 100644
--- a/src/api/wms/containerBindRecordMain/index.ts
+++ b/src/api/wms/containerBindRecordMain/index.ts
@@ -21,8 +21,8 @@ export interface ContainerBindRecordMainVO {
   extraProperties: string
   siteId: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
 }
diff --git a/src/api/wms/containerInitRecordMain/index.ts b/src/api/wms/containerInitRecordMain/index.ts
index 0c9c565f1..9bcb441d4 100644
--- a/src/api/wms/containerInitRecordMain/index.ts
+++ b/src/api/wms/containerInitRecordMain/index.ts
@@ -20,8 +20,8 @@ export interface ContainerInitRecordMainVO {
   extraProperties: string
   siteId: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
 }
diff --git a/src/api/wms/containerRepairRecordMain/index.ts b/src/api/wms/containerRepairRecordMain/index.ts
index 82fbc5501..8754af5fd 100644
--- a/src/api/wms/containerRepairRecordMain/index.ts
+++ b/src/api/wms/containerRepairRecordMain/index.ts
@@ -21,8 +21,8 @@ export interface ContainerRepairRecordMainVO {
   extraProperties: string
   siteId: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
 }
diff --git a/src/api/wms/containerUnbindRecordMain/index.ts b/src/api/wms/containerUnbindRecordMain/index.ts
index 4e6849cd6..1dc49d431 100644
--- a/src/api/wms/containerUnbindRecordMain/index.ts
+++ b/src/api/wms/containerUnbindRecordMain/index.ts
@@ -21,8 +21,8 @@ export interface ContainerUnbindRecordMainVO {
   extraProperties: string
   siteId: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
 }
diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts
index 48ce99185..3d9c2a5e8 100644
--- a/src/api/wms/countJobMain/index.ts
+++ b/src/api/wms/countJobMain/index.ts
@@ -20,8 +20,8 @@ export interface CountJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -73,7 +73,13 @@ export const deleteCountJobMain = async (id: number) => {
 
 // 导出盘点任务主 Excel
 export const exportCountJobMain = async (params) => {
-  return await request.download({ url: `/wms/count-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts
index b62d13077..0e3bc85fb 100644
--- a/src/api/wms/countPlanMain/index.ts
+++ b/src/api/wms/countPlanMain/index.ts
@@ -60,7 +60,13 @@ export const deleteCountPlanMain = async (id: number) => {
 
 // 导出盘点计划主 Excel
 export const exportCountPlanMain = async (params) => {
-  return await request.download({ url: `/wms/count-plan-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-plan-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-plan-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts
index e4b43a074..35d2ef3db 100644
--- a/src/api/wms/countRecordMain/index.ts
+++ b/src/api/wms/countRecordMain/index.ts
@@ -56,7 +56,13 @@ export const deleteCountRecordMain = async (id: number) => {
 
 // 导出盘点记录主 Excel
 export const exportCountRecordMain = async (params) => {
-  return await request.download({ url: `/wms/count-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts
index cf6c52242..b353bf0f9 100644
--- a/src/api/wms/countRequestMain/index.ts
+++ b/src/api/wms/countRequestMain/index.ts
@@ -55,7 +55,13 @@ export const deleteCountRequestMain = async (id: number) => {
 
 // 导出盘点申请主 Excel
 export const exportCountRequestMain = async (params) => {
-  return await request.download({ url: `/wms/count-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/count-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/count-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts
index c07af7fe8..02dc4ed60 100644
--- a/src/api/wms/countadjustRecordMain/index.ts
+++ b/src/api/wms/countadjustRecordMain/index.ts
@@ -54,7 +54,13 @@ export const deleteCountadjustRecordMain = async (id: number) => {
 
 // 导出盘点调整记录主 Excel
 export const exportCountadjustRecordMain = async (params) => {
-  return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts
index 57ae5ee0e..4cc19ee4d 100644
--- a/src/api/wms/countadjustRequestMain/index.ts
+++ b/src/api/wms/countadjustRequestMain/index.ts
@@ -54,7 +54,13 @@ export const deleteCountadjustRequestMain = async (id: number) => {
 
 // 导出盘点调整申请主 Excel
 export const exportCountadjustRequestMain = async (params) => {
-  return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data })
+  } else {
+   return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/customerreceiptRecordMain/index.ts b/src/api/wms/customerreceiptRecordMain/index.ts
index 77dbc2637..73e8e3475 100644
--- a/src/api/wms/customerreceiptRecordMain/index.ts
+++ b/src/api/wms/customerreceiptRecordMain/index.ts
@@ -25,8 +25,8 @@ export interface CustomerreceiptRecordMainVO {
   createTime: Date
   creator: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   available: string
diff --git a/src/api/wms/customerreceiptRequestMain/index.ts b/src/api/wms/customerreceiptRequestMain/index.ts
index bc61e21be..a933b873c 100644
--- a/src/api/wms/customerreceiptRequestMain/index.ts
+++ b/src/api/wms/customerreceiptRequestMain/index.ts
@@ -21,8 +21,8 @@ export interface CustomerreceiptRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   autoCommit: string
diff --git a/src/api/wms/customerreturnJobMain/index.ts b/src/api/wms/customerreturnJobMain/index.ts
index ae00479d0..cc2ca4f54 100644
--- a/src/api/wms/customerreturnJobMain/index.ts
+++ b/src/api/wms/customerreturnJobMain/index.ts
@@ -26,8 +26,8 @@ export interface CustomerreturnJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/customerreturnRecordMain/index.ts b/src/api/wms/customerreturnRecordMain/index.ts
index 233d37ab7..7dc032395 100644
--- a/src/api/wms/customerreturnRecordMain/index.ts
+++ b/src/api/wms/customerreturnRecordMain/index.ts
@@ -26,8 +26,8 @@ export interface CustomerreturnRecordMainVO {
   createTime: Date
   creatorId: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   toDockCode: string
   available: string
diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts
index df34747a2..35a99a1fc 100644
--- a/src/api/wms/customerreturnRequestMain/index.ts
+++ b/src/api/wms/customerreturnRequestMain/index.ts
@@ -21,10 +21,10 @@ export interface CustomerreturnRequestMainVO {
   updateTime: Date
   updater: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   toDockCode: string
   autoCommit: string
diff --git a/src/api/wms/customersettleRecordMain/index.ts b/src/api/wms/customersettleRecordMain/index.ts
index 2e03ae027..daaa33fce 100644
--- a/src/api/wms/customersettleRecordMain/index.ts
+++ b/src/api/wms/customersettleRecordMain/index.ts
@@ -20,7 +20,7 @@ export interface CustomersettleRecordMainVO {
   creator: string
   remark: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   available: string
 }
diff --git a/src/api/wms/customersettleRequestMain/index.ts b/src/api/wms/customersettleRequestMain/index.ts
index 06d9f50ee..a291458e3 100644
--- a/src/api/wms/customersettleRequestMain/index.ts
+++ b/src/api/wms/customersettleRequestMain/index.ts
@@ -5,7 +5,7 @@ export interface CustomersettleRequestMainVO {
   deliverPlanNumber: string
   customerCode: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
diff --git a/src/api/wms/deliverJobMain/index.ts b/src/api/wms/deliverJobMain/index.ts
index a539279c8..5be903729 100644
--- a/src/api/wms/deliverJobMain/index.ts
+++ b/src/api/wms/deliverJobMain/index.ts
@@ -26,8 +26,8 @@ export interface DeliverJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts
index 4ab528802..405efa539 100644
--- a/src/api/wms/deliverRecordMain/index.ts
+++ b/src/api/wms/deliverRecordMain/index.ts
@@ -26,9 +26,9 @@ export interface DeliverRecordMainVO {
   createTime: Date
   creator: string
   code: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   fromDockCode: string
   available: string
diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts
index 350a1f20b..03f544ed9 100644
--- a/src/api/wms/deliverRequestMain/index.ts
+++ b/src/api/wms/deliverRequestMain/index.ts
@@ -10,7 +10,7 @@ export interface DeliverRequestMainVO {
   vehiclePlateNumber: string
   fromWarehouseCode: string
   toWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
@@ -23,7 +23,7 @@ export interface DeliverRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   fromDockCode: string
   autoCommit: string
diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts
index 16cda3e7a..38b2e1f9e 100644
--- a/src/api/wms/demandforecastingMain/index.ts
+++ b/src/api/wms/demandforecastingMain/index.ts
@@ -50,7 +50,13 @@ export const deleteDemandforecastingMain = async (id: number) => {
 
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
-  return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts
index 1b3a9ee82..54e95146c 100644
--- a/src/api/wms/inspectJobMain/index.ts
+++ b/src/api/wms/inspectJobMain/index.ts
@@ -19,8 +19,8 @@ export interface InspectJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/inspectRecordMain/index.ts b/src/api/wms/inspectRecordMain/index.ts
index 381950a0c..3de2e0b1f 100644
--- a/src/api/wms/inspectRecordMain/index.ts
+++ b/src/api/wms/inspectRecordMain/index.ts
@@ -37,7 +37,8 @@ export interface InspectRecordMainVO {
   ownerCode: string
   available: string
   sampleQty: number
-  fromLocationTypes: string
+  fromAreaTypes: string
+  putawayRequestFlag: boolean
 }
 
 // 查询检验记录主列表
@@ -85,3 +86,9 @@ export const exportInspectRecordMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/inspect-record-main/get-import-template' })
 }
+
+
+// 创建上架申请
+export const createPutAwayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/inspect-record-main/createPutAwayRequestPC?number=`+number })
+}
\ No newline at end of file
diff --git a/src/api/wms/inspectRequestMain/index.ts b/src/api/wms/inspectRequestMain/index.ts
index 699ee6ccf..c4f71cc48 100644
--- a/src/api/wms/inspectRequestMain/index.ts
+++ b/src/api/wms/inspectRequestMain/index.ts
@@ -7,7 +7,7 @@ export interface InspectRequestMainVO {
   businessType: string
   fromWarehouseCode: string
   fromAreaCodes: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   remark: string
   createTime: Date
   creator: string
diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts
index 5d16c26f6..c789ca497 100644
--- a/src/api/wms/inventoryinitRecordDetail/index.ts
+++ b/src/api/wms/inventoryinitRecordDetail/index.ts
@@ -13,8 +13,8 @@ export interface InventoryinitRecordDetailVO {
   locationCode: string
   locationGroupCode: string
   areaCode: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   qty: number
   singlePrice: number
   amount: number
diff --git a/src/api/wms/inventoryinitRequestDetail/index.ts b/src/api/wms/inventoryinitRequestDetail/index.ts
index 70a7d1148..8962c3a06 100644
--- a/src/api/wms/inventoryinitRequestDetail/index.ts
+++ b/src/api/wms/inventoryinitRequestDetail/index.ts
@@ -13,8 +13,8 @@ export interface InventoryinitRequestDetailVO {
   locationCode: string
   locationGroupCode: string
   areaCode: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   qty: number
   number: string
   remark: string
diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts
index 14262e35a..83eb4f4e5 100644
--- a/src/api/wms/inventorymoveJobMain/index.ts
+++ b/src/api/wms/inventorymoveJobMain/index.ts
@@ -18,8 +18,8 @@ export interface InventorymoveJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts
index bd278e955..2f351b719 100644
--- a/src/api/wms/inventorymoveRecordMain/index.ts
+++ b/src/api/wms/inventorymoveRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface InventorymoveRecordMainVO {
   createTime: Date
   creator: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts
index 3844cc96b..55e3537bc 100644
--- a/src/api/wms/inventorymoveRequestMain/index.ts
+++ b/src/api/wms/inventorymoveRequestMain/index.ts
@@ -13,10 +13,10 @@ export interface InventorymoveRequestMainVO {
   updateTime: Date
   updater: string
   fromWarehouseOde: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   useOnTheWayLocation: string
   autoCommit: string
diff --git a/src/api/wms/issueJobDetail/index.ts b/src/api/wms/issueJobDetail/index.ts
index 1d9974af6..ab43085f0 100644
--- a/src/api/wms/issueJobDetail/index.ts
+++ b/src/api/wms/issueJobDetail/index.ts
@@ -14,8 +14,8 @@ export interface IssueJobDetailVO {
   itemName: string
   itemDesc1: string
   itemDesc2: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierQty: number
   supplierUom: string
   projectCode: string
diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts
index 0c4f54292..d47210412 100644
--- a/src/api/wms/issueJobMain/index.ts
+++ b/src/api/wms/issueJobMain/index.ts
@@ -19,8 +19,8 @@ export interface IssueJobMainVO {
   acceptTime: Date
   completeUserName: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/issueRecordMain/index.ts b/src/api/wms/issueRecordMain/index.ts
index 3d5a553f3..634893289 100644
--- a/src/api/wms/issueRecordMain/index.ts
+++ b/src/api/wms/issueRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface IssueRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   useOnTheWayLocation: string
   available: string
diff --git a/src/api/wms/issueRequestMain/index.ts b/src/api/wms/issueRequestMain/index.ts
index 11bec6a23..efaf03d24 100644
--- a/src/api/wms/issueRequestMain/index.ts
+++ b/src/api/wms/issueRequestMain/index.ts
@@ -4,8 +4,8 @@ export interface IssueRequestMainVO {
   workshopCode: string
   fromWarehouseCode: string
   toWarehouseCode: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   number: string
diff --git a/src/api/wms/itemarea/index.ts b/src/api/wms/itemarea/index.ts
new file mode 100644
index 000000000..bf4973755
--- /dev/null
+++ b/src/api/wms/itemarea/index.ts
@@ -0,0 +1,69 @@
+import request from '@/config/axios'
+
+export interface ItemareaVO {
+  id: number
+  itemCode: string
+  areaCode: string
+  inPackUnit: string
+  outPackUnit: string
+  maxQty: number
+  minQty: number
+  safeQty: number
+  autoRepleinsh: string
+  repleinshFromArea: string
+  repleinshQty: number
+  needReceive: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  manageMode: string
+  newlyToOutpackunit: string
+  surplusToOutpackunit: string
+}
+
+// 查询物料库区配置列表
+export const getItemareaPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemarea/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemarea/page`, params })
+  }
+}
+
+// 查询物料库区配置详情
+export const getItemarea = async (id: number) => {
+  return await request.get({ url: `/wms/itemarea/get?id=` + id })
+}
+
+// 新增物料库区配置
+export const createItemarea = async (data: ItemareaVO) => {
+  return await request.post({ url: `/wms/itemarea/create`, data })
+}
+
+// 修改物料库区配置
+export const updateItemarea = async (data: ItemareaVO) => {
+  return await request.put({ url: `/wms/itemarea/update`, data })
+}
+
+// 删除物料库区配置
+export const deleteItemarea = async (id: number) => {
+  return await request.delete({ url: `/wms/itemarea/delete?id=` + id })
+}
+
+// 导出物料库区配置 Excel
+export const exportItemarea = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itemarea/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itemarea/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemarea/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/itemareaDetail/index.ts b/src/api/wms/itemareaDetail/index.ts
new file mode 100644
index 000000000..1b0cfcdd4
--- /dev/null
+++ b/src/api/wms/itemareaDetail/index.ts
@@ -0,0 +1,50 @@
+import request from '@/config/axios'
+
+export interface ItemareaDetailVO {
+  id: number
+  masterId: number
+  remark: string
+  locationGroup: string
+  locationCode: string
+}
+
+// 查询物料库区配置表子列表
+export const getItemareaDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemarea-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemarea-detail/page`, params })
+  }
+}
+
+// 查询物料库区配置表子详情
+export const getItemareaDetail = async (id: number) => {
+  return await request.get({ url: `/wms/itemarea-detail/get?id=` + id })
+}
+
+// 新增物料库区配置表子
+export const createItemareaDetail = async (data: ItemareaDetailVO) => {
+  return await request.post({ url: `/wms/itemarea-detail/create`, data })
+}
+
+// 修改物料库区配置表子
+export const updateItemareaDetail = async (data: ItemareaDetailVO) => {
+  return await request.put({ url: `/wms/itemarea-detail/update`, data })
+}
+
+// 删除物料库区配置表子
+export const deleteItemareaDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/itemarea-detail/delete?id=` + id })
+}
+
+// 导出物料库区配置表子 Excel
+export const exportItemareaDetail = async (params) => {
+  return await request.download({ url: `/wms/itemarea-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemarea-detail/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/itempackaging/index.ts b/src/api/wms/itempackage/index.ts
similarity index 51%
rename from src/api/wms/itempackaging/index.ts
rename to src/api/wms/itempackage/index.ts
index 523423101..5d4a850fa 100644
--- a/src/api/wms/itempackaging/index.ts
+++ b/src/api/wms/itempackage/index.ts
@@ -3,8 +3,8 @@ import request from '@/config/axios'
 export interface ItempackagingVO {
   itemCode: string
   uom: string
-  stdPackUnit: string
-  stdPackQty: number
+  packUnit: string
+  packQty: number
   altPackUnit1: string
   altPackQty1: number
   altPackUnit2: string
@@ -24,42 +24,54 @@ export const getItempackagingPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return request.post({ url: '/wms/itempackaging/senior', data })
+    return request.post({ url: '/wms/itempackage/senior', data })
   } else {
-    return await request.get({ url: `/wms/itempackaging/page`, params })
+    return await request.get({ url: `/wms/itempackage/page`, params })
   }
 }
 
+// 查询物料包装信息 列表--供应商发货申请
+export const getItempackagingPageBySupplierdeliver = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/itempackage/seniorBySupplierdeliver', data })
+  } else {
+    return await request.get({ url: `/wms/itempackage/pageBySupplierdeliver`, params })
+  }
+}
+
+
 // 查询物料包装信息 详情
 export const getItempackaging = async (id: number) => {
-  return await request.get({ url: `/wms/itempackaging/get?id=` + id })
+  return await request.get({ url: `/wms/itempackage/get?id=` + id })
 }
 
 // 新增物料包装信息 
 export const createItempackaging = async (data: ItempackagingVO) => {
-  return await request.post({ url: `/wms/itempackaging/create`, data })
+  return await request.post({ url: `/wms/itempackage/create`, data })
 }
 
 // 修改物料包装信息 
 export const updateItempackaging = async (data: ItempackagingVO) => {
-  return await request.put({ url: `/wms/itempackaging/update`, data })
+  return await request.put({ url: `/wms/itempackage/update`, data })
 }
 
 // 删除物料包装信息 
 export const deleteItempackaging = async (id: number) => {
-  return await request.delete({ url: `/wms/itempackaging/delete?id=` + id })
+  return await request.delete({ url: `/wms/itempackage/delete?id=` + id })
 }
 
 // 导出物料包装信息  Excel
 export const exportItempackaging = async (params) => {
   if (params.isSearch) {
     const data = {...params}
-    return await request.downloadPost({ url: `/wms/itempackaging/export-excel-senior`, data })
+    return await request.downloadPost({ url: `/wms/itempackage/export-excel-senior`, data })
   } else {
-    return await request.download({ url: `/wms/itempackaging/export-excel`, params })
+    return await request.download({ url: `/wms/itempackage/export-excel`, params })
   }
 }
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/itempackaging/get-import-template' })
+  return request.download({ url: '/wms/itempackage/get-import-template' })
 }
diff --git a/src/api/wms/itemwarehouse/index.ts b/src/api/wms/itemwarehouse/index.ts
new file mode 100644
index 000000000..85ea4ba9c
--- /dev/null
+++ b/src/api/wms/itemwarehouse/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface ItemwarehouseVO {
+  id: number
+  itemCode: string
+  warehouseCode: string
+  manageMode: string
+  packUnit: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+}
+
+// 查询物料仓库默认配置列表
+export const getItemwarehousePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/itemwarehouse/senior', data })
+  } else {
+    return await request.get({ url: `/wms/itemwarehouse/page`, params })
+  }
+}
+
+// 查询物料仓库默认配置详情
+export const getItemwarehouse = async (id: number) => {
+  return await request.get({ url: `/wms/itemwarehouse/get?id=` + id })
+}
+
+// 新增物料仓库默认配置
+export const createItemwarehouse = async (data: ItemwarehouseVO) => {
+  return await request.post({ url: `/wms/itemwarehouse/create`, data })
+}
+
+// 修改物料仓库默认配置
+export const updateItemwarehouse = async (data: ItemwarehouseVO) => {
+  return await request.put({ url: `/wms/itemwarehouse/update`, data })
+}
+
+// 删除物料仓库默认配置
+export const deleteItemwarehouse = async (id: number) => {
+  return await request.delete({ url: `/wms/itemwarehouse/delete?id=` + id })
+}
+
+// 导出物料仓库默认配置 Excel
+export const exportItemwarehouse = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/itemwarehouse/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/itemwarehouse/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/itemwarehouse/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/offlinesettlementRecordMain/index.ts b/src/api/wms/offlinesettlementRecordMain/index.ts
index f93eabe92..da771ba9a 100644
--- a/src/api/wms/offlinesettlementRecordMain/index.ts
+++ b/src/api/wms/offlinesettlementRecordMain/index.ts
@@ -53,7 +53,13 @@ export const deleteOfflinesettlementRecordMain = async (id: number) => {
 
 // 导出下线结算记录主 Excel
 export const exportOfflinesettlementRecordMain = async (params) => {
-  return await request.download({ url: `/wms/offlinesettlement-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/offlinesettlement-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/offlinesettlementRequestMain/index.ts b/src/api/wms/offlinesettlementRequestMain/index.ts
index ccdeb8d2d..0dcbb20bc 100644
--- a/src/api/wms/offlinesettlementRequestMain/index.ts
+++ b/src/api/wms/offlinesettlementRequestMain/index.ts
@@ -53,7 +53,13 @@ export const deleteOfflinesettlementRequestMain = async (id: number) => {
 
 // 导出下线结算申请主 Excel
 export const exportOfflinesettlementRequestMain = async (params) => {
-  return await request.download({ url: `/wms/offlinesettlement-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/offlinesettlement-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/offlinesettlement-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/onlinesettlementRecordMain/index.ts b/src/api/wms/onlinesettlementRecordMain/index.ts
index bacbd72d4..31018c0e9 100644
--- a/src/api/wms/onlinesettlementRecordMain/index.ts
+++ b/src/api/wms/onlinesettlementRecordMain/index.ts
@@ -53,7 +53,13 @@ export const deleteOnlinesettlementRecordMain = async (id: number) => {
 
 // 导出上线结算记录主 Excel
 export const exportOnlinesettlementRecordMain = async (params) => {
-  return await request.download({ url: `/wms/onlinesettlement-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/onlinesettlement-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/onlinesettlementRequestMain/index.ts b/src/api/wms/onlinesettlementRequestMain/index.ts
index 119078788..6f6238f40 100644
--- a/src/api/wms/onlinesettlementRequestMain/index.ts
+++ b/src/api/wms/onlinesettlementRequestMain/index.ts
@@ -53,7 +53,13 @@ export const deleteOnlinesettlementRequestMain = async (id: number) => {
 
 // 导出上线结算申请主 Excel
 export const exportOnlinesettlementRequestMain = async (params) => {
-  return await request.download({ url: `/wms/onlinesettlement-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/onlinesettlement-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/onlinesettlement-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 9de36a25a..d43f45766 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -16,8 +16,8 @@ export interface PackageVO {
   altUom: string
   altQty: number
   convertRate: number
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   toWarehouseCode: string
   toDockCode: string
   toLocationCode: string
diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts
new file mode 100644
index 000000000..ae9b04f92
--- /dev/null
+++ b/src/api/wms/packageunit/index.ts
@@ -0,0 +1,71 @@
+import request from '@/config/axios'
+
+export interface PackageunitVO {
+  id: number
+  code: string
+  name: string
+  length: number
+  width: number
+  height: number
+  weight: number
+  unit: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+  desc: string
+  reuse: string
+  manageBalance: string
+}
+
+// 查询物品包装规格信息 列表
+export const getPackageunitPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/senior', data })
+  } else {
+    return await request.get({ url: `/wms/packageunit/page`, params })
+  }
+}
+
+// 查询物品包装规格信息 详情
+export const getPackageunit = async (id: number) => {
+  return await request.get({ url: `/wms/packageunit/get?id=` + id })
+}
+
+// 新增物品包装规格信息 
+export const createPackageunit = async (data: PackageunitVO) => {
+  return await request.post({ url: `/wms/packageunit/create`, data })
+}
+
+// 修改物品包装规格信息 
+export const updatePackageunit = async (data: PackageunitVO) => {
+  return await request.put({ url: `/wms/packageunit/update`, data })
+}
+
+// 删除物品包装规格信息 
+export const deletePackageunit = async (id: number) => {
+  return await request.delete({ url: `/wms/packageunit/delete?id=` + id })
+}
+
+// 导出物品包装规格信息  Excel
+export const exportPackageunit = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/packageunit/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/packageunit/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/packageunit/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/pickJobDetail/index.ts b/src/api/wms/pickJobDetail/index.ts
index 152833738..b15045502 100644
--- a/src/api/wms/pickJobDetail/index.ts
+++ b/src/api/wms/pickJobDetail/index.ts
@@ -22,7 +22,7 @@ export interface PickJobDetailVO {
   toOwnerCode: string
 }
 
-// 查询拣料任务子列表
+// 查询备货任务子列表
 export const getPickJobDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -33,27 +33,27 @@ export const getPickJobDetailPage = async (params) => {
   }
 }
 
-// 查询拣料任务子详情
+// 查询备货任务子详情
 export const getPickJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/pick-job-detail/get?id=` + id })
 }
 
-// 新增拣料任务子
+// 新增备货任务子
 export const createPickJobDetail = async (data: PickJobDetailVO) => {
   return await request.post({ url: `/wms/pick-job-detail/create`, data })
 }
 
-// 修改拣料任务子
+// 修改备货任务子
 export const updatePickJobDetail = async (data: PickJobDetailVO) => {
   return await request.put({ url: `/wms/pick-job-detail/update`, data })
 }
 
-// 删除拣料任务子
+// 删除备货任务子
 export const deletePickJobDetail = async (id: number) => {
   return await request.delete({ url: `/wms/pick-job-detail/delete?id=` + id })
 }
 
-// 导出拣料任务子 Excel
+// 导出备货任务子 Excel
 export const exportPickJobDetail = async (params) => {
   return await request.download({ url: `/wms/pick-job-detail/export-excel`, params })
 }
diff --git a/src/api/wms/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts
index 3f52ed878..20722e557 100644
--- a/src/api/wms/pickJobMain/index.ts
+++ b/src/api/wms/pickJobMain/index.ts
@@ -16,8 +16,8 @@ export interface PickJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -39,7 +39,7 @@ export interface PickJobMainVO {
   allowModifyPackingNumber: string
 }
 
-// 查询拣料任务主列表
+// 查询备货任务主列表
 export const getPickJobMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -50,29 +50,35 @@ export const getPickJobMainPage = async (params) => {
   }
 }
 
-// 查询拣料任务主详情
+// 查询备货任务主详情
 export const getPickJobMain = async (id: number) => {
   return await request.get({ url: `/wms/pick-job-main/get?id=` + id })
 }
 
-// 新增拣料任务主
+// 新增备货任务主
 export const createPickJobMain = async (data: PickJobMainVO) => {
   return await request.post({ url: `/wms/pick-job-main/create`, data })
 }
 
-// 修改拣料任务主
+// 修改备货任务主
 export const updatePickJobMain = async (data: PickJobMainVO) => {
   return await request.put({ url: `/wms/pick-job-main/update`, data })
 }
 
-// 删除拣料任务主
+// 删除备货任务主
 export const deletePickJobMain = async (id: number) => {
   return await request.delete({ url: `/wms/pick-job-main/delete?id=` + id })
 }
 
-// 导出拣料任务主 Excel
+// 导出备货任务主 Excel
 export const exportPickJobMain = async (params) => {
-  return await request.download({ url: `/wms/pick-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/pickRecordDetail/index.ts b/src/api/wms/pickRecordDetail/index.ts
index f18fb3fbf..7bec0331e 100644
--- a/src/api/wms/pickRecordDetail/index.ts
+++ b/src/api/wms/pickRecordDetail/index.ts
@@ -32,7 +32,7 @@ export interface PickRecordDetailVO {
   toBatch: string
 }
 
-// 查询拣料记录子列表
+// 查询备货记录子列表
 export const getPickRecordDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -43,27 +43,27 @@ export const getPickRecordDetailPage = async (params) => {
   }
 }
 
-// 查询拣料记录子详情
+// 查询备货记录子详情
 export const getPickRecordDetail = async (id: number) => {
   return await request.get({ url: `/wms/pick-record-detail/get?id=` + id })
 }
 
-// 新增拣料记录子
+// 新增备货记录子
 export const createPickRecordDetail = async (data: PickRecordDetailVO) => {
   return await request.post({ url: `/wms/pick-record-detail/create`, data })
 }
 
-// 修改拣料记录子
+// 修改备货记录子
 export const updatePickRecordDetail = async (data: PickRecordDetailVO) => {
   return await request.put({ url: `/wms/pick-record-detail/update`, data })
 }
 
-// 删除拣料记录子
+// 删除备货记录子
 export const deletePickRecordDetail = async (id: number) => {
   return await request.delete({ url: `/wms/pick-record-detail/delete?id=` + id })
 }
 
-// 导出拣料记录子 Excel
+// 导出备货记录子 Excel
 export const exportPickRecordDetail = async (params) => {
   return await request.download({ url: `/wms/pick-record-detail/export-excel`, params })
 }
diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts
index 97ea9cea6..bf291181c 100644
--- a/src/api/wms/pickRecordMain/index.ts
+++ b/src/api/wms/pickRecordMain/index.ts
@@ -18,15 +18,15 @@ export interface PickRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
 
-// 查询拣料记录主列表
+// 查询备货记录主列表
 export const getPickRecordMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -37,29 +37,35 @@ export const getPickRecordMainPage = async (params) => {
   }
 }
 
-// 查询拣料记录主详情
+// 查询备货记录主详情
 export const getPickRecordMain = async (id: number) => {
   return await request.get({ url: `/wms/pick-record-main/get?id=` + id })
 }
 
-// 新增拣料记录主
+// 新增备货记录主
 export const createPickRecordMain = async (data: PickRecordMainVO) => {
   return await request.post({ url: `/wms/pick-record-main/create`, data })
 }
 
-// 修改拣料记录主
+// 修改备货记录主
 export const updatePickRecordMain = async (data: PickRecordMainVO) => {
   return await request.put({ url: `/wms/pick-record-main/update`, data })
 }
 
-// 删除拣料记录主
+// 删除备货记录主
 export const deletePickRecordMain = async (id: number) => {
   return await request.delete({ url: `/wms/pick-record-main/delete?id=` + id })
 }
 
-// 导出拣料记录主 Excel
+// 导出备货记录主 Excel
 export const exportPickRecordMain = async (params) => {
-  return await request.download({ url: `/wms/pick-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/pickRequestDetail/index.ts b/src/api/wms/pickRequestDetail/index.ts
index 143edf18d..4f41d5e05 100644
--- a/src/api/wms/pickRequestDetail/index.ts
+++ b/src/api/wms/pickRequestDetail/index.ts
@@ -20,7 +20,7 @@ export interface PickRequestDetailVO {
   toOwnerCode: string
 }
 
-// 查询拣料申请子列表
+// 查询备货申请子列表
 export const getPickRequestDetailPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -31,27 +31,27 @@ export const getPickRequestDetailPage = async (params) => {
   }
 }
 
-// 查询拣料申请子详情
+// 查询备货申请子详情
 export const getPickRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/pick-request-detail/get?id=` + id })
 }
 
-// 新增拣料申请子
+// 新增备货申请子
 export const createPickRequestDetail = async (data: PickRequestDetailVO) => {
   return await request.post({ url: `/wms/pick-request-detail/create`, data })
 }
 
-// 修改拣料申请子
+// 修改备货申请子
 export const updatePickRequestDetail = async (data: PickRequestDetailVO) => {
   return await request.put({ url: `/wms/pick-request-detail/update`, data })
 }
 
-// 删除拣料申请子
+// 删除备货申请子
 export const deletePickRequestDetail = async (id: number) => {
   return await request.delete({ url: `/wms/pick-request-detail/delete?id=` + id })
 }
 
-// 导出拣料申请子 Excel
+// 导出备货申请子 Excel
 export const exportPickRequestDetail = async (params) => {
   return await request.download({ url: `/wms/pick-request-detail/export-excel`, params })
 }
diff --git a/src/api/wms/pickRequestMain/index.ts b/src/api/wms/pickRequestMain/index.ts
index 5344d4df3..b11d5593b 100644
--- a/src/api/wms/pickRequestMain/index.ts
+++ b/src/api/wms/pickRequestMain/index.ts
@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 export interface PickRequestMainVO {
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreas: string
   number: string
   businessType: string
@@ -16,7 +16,7 @@ export interface PickRequestMainVO {
   updateTime: Date
   updater: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
@@ -24,7 +24,7 @@ export interface PickRequestMainVO {
   directCreateRecord: string
 }
 
-// 查询拣料申请主列表
+// 查询备货申请主列表
 export const getPickRequestMainPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -35,29 +35,35 @@ export const getPickRequestMainPage = async (params) => {
   }
 }
 
-// 查询拣料申请主详情
+// 查询备货申请主详情
 export const getPickRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/pick-request-main/get?id=` + id })
 }
 
-// 新增拣料申请主
+// 新增备货申请主
 export const createPickRequestMain = async (data: PickRequestMainVO) => {
   return await request.post({ url: `/wms/pick-request-main/create`, data })
 }
 
-// 修改拣料申请主
+// 修改备货申请主
 export const updatePickRequestMain = async (data: PickRequestMainVO) => {
   return await request.put({ url: `/wms/pick-request-main/update`, data })
 }
 
-// 删除拣料申请主
+// 删除备货申请主
 export const deletePickRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/pick-request-main/delete?id=` + id })
 }
 
-// 导出拣料申请主 Excel
+// 导出备货申请主 Excel
 export const exportPickRequestMain = async (params) => {
-  return await request.download({ url: `/wms/pick-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/pick-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/pick-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/plansetting/index.ts b/src/api/wms/plansetting/index.ts
new file mode 100644
index 000000000..1b703dadc
--- /dev/null
+++ b/src/api/wms/plansetting/index.ts
@@ -0,0 +1,63 @@
+import request from '@/config/axios'
+
+export interface PlansettingVO {
+  id: number
+  code: string
+  requestMode: string
+  autoCommit: string
+  autoAgree: string
+  autoExecute: string
+  directCreateRecord: string
+  available: string
+  activeTime: Date
+  expireTime: Date
+  remark: string
+  concurrencyStamp: number
+}
+
+// 查询计划设置列表
+export const getPlansettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/plansetting/senior', data })
+  } else {
+    return await request.get({ url: `/wms/plansetting/page`, params })
+  }
+}
+
+// 查询计划设置详情
+export const getPlansetting = async (id: number) => {
+  return await request.get({ url: `/wms/plansetting/get?id=` + id })
+}
+
+// 新增计划设置
+export const createPlansetting = async (data: PlansettingVO) => {
+  return await request.post({ url: `/wms/plansetting/create`, data })
+}
+
+// 修改计划设置
+export const updatePlansetting = async (data: PlansettingVO) => {
+  return await request.put({ url: `/wms/plansetting/update`, data })
+}
+
+// 删除计划设置
+export const deletePlansetting = async (id: number) => {
+  return await request.delete({ url: `/wms/plansetting/delete?id=` + id })
+}
+
+// 导出计划设置 Excel
+export const exportPlansetting = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/plansetting/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/plansetting/export-excel`, params })
+  }
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/plansetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/wms/productdismantleJobDetail/index.ts b/src/api/wms/productdismantleJobDetail/index.ts
index 8f9289f2d..bdd27c66f 100644
--- a/src/api/wms/productdismantleJobDetail/index.ts
+++ b/src/api/wms/productdismantleJobDetail/index.ts
@@ -10,8 +10,8 @@ export interface ProductdismantleJobDetailVO {
   produceDate: Date
   expireDate: Date
   inventoryStatus: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   itemCode: string
   itemName: string
   itemDesc1: string
diff --git a/src/api/wms/productdismantleJobMain/index.ts b/src/api/wms/productdismantleJobMain/index.ts
index 353653c77..0459b0d62 100644
--- a/src/api/wms/productdismantleJobMain/index.ts
+++ b/src/api/wms/productdismantleJobMain/index.ts
@@ -20,8 +20,8 @@ export interface ProductdismantleJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -73,7 +73,13 @@ export const deleteProductdismantleJobMain = async (id: number) => {
 
 // 导出制品拆解任务主 Excel
 export const exportProductdismantleJobMain = async (params) => {
-  return await request.download({ url: `/wms/productdismantle-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productdismantle-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productdismantleRecordMain/index.ts b/src/api/wms/productdismantleRecordMain/index.ts
index b5de74274..6cf740a06 100644
--- a/src/api/wms/productdismantleRecordMain/index.ts
+++ b/src/api/wms/productdismantleRecordMain/index.ts
@@ -20,7 +20,7 @@ export interface ProductdismantleRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   available: string
 }
@@ -58,7 +58,13 @@ export const deleteProductdismantleRecordMain = async (id: number) => {
 
 // 导出制品拆解记录主 Excel
 export const exportProductdismantleRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productdismantle-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productdismantle-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productdismantle-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productdismantleRequestDetaila/index.ts b/src/api/wms/productdismantleRequestDetaila/index.ts
index 6e079cdb5..edb9652c8 100644
--- a/src/api/wms/productdismantleRequestDetaila/index.ts
+++ b/src/api/wms/productdismantleRequestDetaila/index.ts
@@ -10,8 +10,8 @@ export interface ProductdismantleRequestDetailaVO {
   produceDate: Date
   expireDate: Date
   inventoryStatus: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   number: string
   itemCode: string
   remark: string
diff --git a/src/api/wms/productdismantleRequestMain/index.ts b/src/api/wms/productdismantleRequestMain/index.ts
index 1319d18ea..e4af1dd06 100644
--- a/src/api/wms/productdismantleRequestMain/index.ts
+++ b/src/api/wms/productdismantleRequestMain/index.ts
@@ -5,7 +5,7 @@ export interface ProductdismantleRequestMainVO {
   team: string
   shift: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
diff --git a/src/api/wms/productionMain/index.ts b/src/api/wms/productionMain/index.ts
index 58d6ff613..a2e2fb76e 100644
--- a/src/api/wms/productionMain/index.ts
+++ b/src/api/wms/productionMain/index.ts
@@ -108,6 +108,11 @@ export const resetting = (id) => {
   return request.put({ url: '/wms/production-main/resetting?id=' + id })
 }
 
+// 创建备料计划/制品收货申请
+export const generateRequest = (number) => {
+  return request.post({ url: '/wms/production-main/generateRequest?number=' + number })
+}
+
 
 
 
diff --git a/src/api/wms/productionreceiptJobMain/index.ts b/src/api/wms/productionreceiptJobMain/index.ts
index 471ddba7c..4096d39b7 100644
--- a/src/api/wms/productionreceiptJobMain/index.ts
+++ b/src/api/wms/productionreceiptJobMain/index.ts
@@ -19,8 +19,8 @@ export interface ProductionreceiptJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/productionreceiptRecordMain/index.ts b/src/api/wms/productionreceiptRecordMain/index.ts
index ebc176e93..cd2002af1 100644
--- a/src/api/wms/productionreceiptRecordMain/index.ts
+++ b/src/api/wms/productionreceiptRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface ProductionreceiptRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   useOnTheWayLocation: string
   available: string
diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts
index 79c2f9605..0848605bd 100644
--- a/src/api/wms/productionreturnJobMain/index.ts
+++ b/src/api/wms/productionreturnJobMain/index.ts
@@ -19,8 +19,8 @@ export interface ProductionreturnJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts
index 2615d1a32..328415e2c 100644
--- a/src/api/wms/productionreturnRecordMain/index.ts
+++ b/src/api/wms/productionreturnRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface ProductionreturnRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
diff --git a/src/api/wms/productionreturnRequestMain/index.ts b/src/api/wms/productionreturnRequestMain/index.ts
index e6e47d953..04a6c8ad8 100644
--- a/src/api/wms/productionreturnRequestMain/index.ts
+++ b/src/api/wms/productionreturnRequestMain/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface ProductionreturnRequestMainVO {
   workshopCode: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
@@ -17,7 +17,7 @@ export interface ProductionreturnRequestMainVO {
   updateTime: Date
   updater: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/productionreturnRequestMainNo/index.ts b/src/api/wms/productionreturnRequestMainNo/index.ts
index 8f369cd96..af389c559 100644
--- a/src/api/wms/productionreturnRequestMainNo/index.ts
+++ b/src/api/wms/productionreturnRequestMainNo/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface ProductionreturnRequestMainVO {
   workshopCode: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
@@ -17,7 +17,7 @@ export interface ProductionreturnRequestMainVO {
   updateTime: Date
   updater: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
@@ -70,7 +70,7 @@ export const exportProductionreturnRequestMain = async (params) => {
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/productionreturn-request-main/get-import-template' })
+  return request.download({ url: '/wms/productionreturn-request-main/get-import-template-hold' })
 }
 
 // 关闭
diff --git a/src/api/wms/productputawayJobMain/index.ts b/src/api/wms/productputawayJobMain/index.ts
index c70270ac4..9789444e8 100644
--- a/src/api/wms/productputawayJobMain/index.ts
+++ b/src/api/wms/productputawayJobMain/index.ts
@@ -7,8 +7,8 @@ export interface ProductputawayJobMainVO {
   toWarehouseCode: string
   fromAreaCodes: string
   toAreaCodes: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   completetime: Date
   requestTime: Date
   requestDueTime: Date
diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts
index ea3fcb63d..ef29d16f6 100644
--- a/src/api/wms/productputawayRecordMain/index.ts
+++ b/src/api/wms/productputawayRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface ProductputawayRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   ruleUserId: number
   available: string
@@ -61,7 +61,13 @@ export const deleteProductputawayRecordMain = async (id: number) => {
 
 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productputawayRequestMain/index.ts b/src/api/wms/productputawayRequestMain/index.ts
index 72640c600..7975d1ea5 100644
--- a/src/api/wms/productputawayRequestMain/index.ts
+++ b/src/api/wms/productputawayRequestMain/index.ts
@@ -5,8 +5,8 @@ export interface ProductputawayRequestMainVO {
   supplierCode: string
   fromWarehouseCode: string
   toWarehouseCode: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   number: string
diff --git a/src/api/wms/productreceiptJobDetail/index.ts b/src/api/wms/productreceiptJobDetail/index.ts
index 5b864f758..df00da6fa 100644
--- a/src/api/wms/productreceiptJobDetail/index.ts
+++ b/src/api/wms/productreceiptJobDetail/index.ts
@@ -13,8 +13,8 @@ export interface ProductreceiptJobDetailVO {
   toLocationCode: string
   woNumber: string
   woLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   itemCode: string
   itemName: string
   itemDesc1: string
diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts
index b22dae6b4..234af4f77 100644
--- a/src/api/wms/productreceiptJobMain/index.ts
+++ b/src/api/wms/productreceiptJobMain/index.ts
@@ -23,8 +23,8 @@ export interface ProductreceiptJobMainVO {
   completeTime: Date
   toWarehouseCode: string
   toAreaCodes: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/productreceiptRecordDetail/index.ts b/src/api/wms/productreceiptRecordDetail/index.ts
index 766ae089f..8dafd938a 100644
--- a/src/api/wms/productreceiptRecordDetail/index.ts
+++ b/src/api/wms/productreceiptRecordDetail/index.ts
@@ -16,8 +16,8 @@ export interface ProductreceiptRecordDetailVO {
   toOwnerCode: string
   woNumber: string
   woLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   number: string
   itemCode: string
   remark: string
diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts
index acd866722..cde04ee6b 100644
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@@ -22,7 +22,7 @@ export interface ProductreceiptRecordMainVO {
   creator: string
   code: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
@@ -60,7 +60,13 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 
 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts
index 6f11ce799..f832fb50d 100644
--- a/src/api/wms/productreceiptRequestDetail/index.ts
+++ b/src/api/wms/productreceiptRequestDetail/index.ts
@@ -12,8 +12,8 @@ export interface ProductreceiptRequestDetailVO {
   inventoryStatus: string
   woNumber: string
   woLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   number: string
   itemCode: string
   remark: string
diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index 3934a8155..dbb1cc187 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -6,7 +6,7 @@ export interface ProductreceiptRequestMainVO {
   team: string
   shift: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   number: string
   businessType: string
diff --git a/src/api/wms/productrepairRecordMain/index.ts b/src/api/wms/productrepairRecordMain/index.ts
index 6f3e66ad5..3469be295 100644
--- a/src/api/wms/productrepairRecordMain/index.ts
+++ b/src/api/wms/productrepairRecordMain/index.ts
@@ -20,7 +20,7 @@ export interface ProductrepairRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   available: string
 }
@@ -58,7 +58,13 @@ export const deleteProductrepairRecordMain = async (id: number) => {
 
 // 导出制品返修记录主 Excel
 export const exportProductrepairRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts
index 17eb6d660..0a5fb8315 100644
--- a/src/api/wms/productrepairRequestMain/index.ts
+++ b/src/api/wms/productrepairRequestMain/index.ts
@@ -16,7 +16,7 @@ export interface ProductrepairRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/productscrapJobMain/index.ts b/src/api/wms/productscrapJobMain/index.ts
index 49f77589c..d4c094196 100644
--- a/src/api/wms/productscrapJobMain/index.ts
+++ b/src/api/wms/productscrapJobMain/index.ts
@@ -17,8 +17,8 @@ export interface ProductscrapJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/productscrapRecordMain/index.ts b/src/api/wms/productscrapRecordMain/index.ts
index 7d415eadf..de4020cac 100644
--- a/src/api/wms/productscrapRecordMain/index.ts
+++ b/src/api/wms/productscrapRecordMain/index.ts
@@ -18,7 +18,7 @@ export interface ProductscrapRecordMainVO {
   createTime: Date
   creator: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   ruleUserId: number
   available: string
@@ -57,7 +57,13 @@ export const deleteProductscrapRecordMain = async (id: number) => {
 
 // 导出制品报废记录主 Excel
 export const exportProductscrapRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts
index 3a468e448..dfed6c9f7 100644
--- a/src/api/wms/productscrapRequestMain/index.ts
+++ b/src/api/wms/productscrapRequestMain/index.ts
@@ -13,7 +13,7 @@ export interface ProductscrapRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   autoCommit: string
   autoAgree: string
@@ -54,7 +54,13 @@ export const deleteProductscrapRequestMain = async (id: number) => {
 
 // 导出制品报废申请主 Excel
 export const exportProductscrapRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts
index 23e754226..f85c46731 100644
--- a/src/api/wms/purchaseDetail/index.ts
+++ b/src/api/wms/purchaseDetail/index.ts
@@ -4,8 +4,8 @@ export interface PurchaseDetailVO {
   lineNumber: string
   erpLocationCode: string
   projectCode: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierQty: number
   supplierUom: string
   convertRate: number
diff --git a/src/api/wms/purchasePlanMain/index.ts b/src/api/wms/purchasePlanMain/index.ts
index 614cd6a95..167e3ffd6 100644
--- a/src/api/wms/purchasePlanMain/index.ts
+++ b/src/api/wms/purchasePlanMain/index.ts
@@ -90,3 +90,8 @@ export const exportPurchasePlanMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchase-plan-main/get-import-template' })
 }
+
+// 查询要货计划策略根据供应商
+export const queryPurchasePlan = async (supplierCode: string) => {
+  return await request.get({ url: `/wms/purchase-plan-main/queryPurchasePlan?supplierCode=` + supplierCode })
+}
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts
index 6201fbe0c..17ea24a60 100644
--- a/src/api/wms/purchasereceiptJobDetail/index.ts
+++ b/src/api/wms/purchasereceiptJobDetail/index.ts
@@ -13,8 +13,8 @@ export interface PurchasereceiptJobDetailVO {
   toLocationCode: string
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierQty: number
   supplierUom: string
   convertRate: number
diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts
index 3e2f9a27d..67b1e982a 100644
--- a/src/api/wms/purchasereceiptJobMain/index.ts
+++ b/src/api/wms/purchasereceiptJobMain/index.ts
@@ -26,8 +26,8 @@ export interface PurchasereceiptJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -58,6 +58,18 @@ export const getPurchasereceiptJobMainPage = async (params) => {
   }
 }
 
+// 查询备件收货任务主列表
+export const getPurchasereceiptJobMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-job-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-job-main/pageSpare`, params })
+  }
+}
+
+
 // 查询采购收货任务主详情
 export const getPurchasereceiptJobMain = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-job-main/get?id=` + id })
diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index 569de2b18..482b2ce57 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -19,8 +19,8 @@ export interface PurchasereceiptRecordDetailVO {
   toAreaCodes: string
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   qty: number
   uom: string
   supplierQty: number
diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts
index 7c61327e9..b3eccfdf4 100644
--- a/src/api/wms/purchasereceiptRecordMain/index.ts
+++ b/src/api/wms/purchasereceiptRecordMain/index.ts
@@ -26,11 +26,15 @@ export interface PurchasereceiptRecordMainVO {
   createTime: Date
   creator: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   available: string
+  putawayRequestFlag: boolean
+  putawayRequestNumber: string
+  inspectRequestFlag: boolean
+  inspectRequestNumber: string
 }
 
 // 查询采购收货记录主列表
@@ -44,6 +48,17 @@ export const getPurchasereceiptRecordMainPage = async (params) => {
   }
 }
 
+// 查询备件收货记录主列表
+export const getPurchasereceiptRecordMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-main/pageSpare`, params })
+  }
+}
+
 // 查询采购收货记录主详情
 export const getPurchasereceiptRecordMain = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-record-main/get?id=` + id })
@@ -77,4 +92,14 @@ export const exportPurchasereceiptRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' })
+}
+
+// 创建上架申请
+export const createPutawayRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createPutawayRequest?number=`+number })
+}
+
+// 创建检验申请
+export const createInspectRequest = async (number:string) => {
+  return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts
index 20f40f658..0a59972a8 100644
--- a/src/api/wms/purchasereceiptRequestDetail/index.ts
+++ b/src/api/wms/purchasereceiptRequestDetail/index.ts
@@ -12,8 +12,8 @@ export interface PurchasereceiptRequestDetailVO {
   fromLocationCode: string
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierPackQty: number
   supplierPackUnit: string
   convertRate: number
diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts
index 4aa84e577..58d866b5f 100644
--- a/src/api/wms/purchasereceiptRequestMain/index.ts
+++ b/src/api/wms/purchasereceiptRequestMain/index.ts
@@ -8,8 +8,8 @@ export interface PurchasereceiptRequestMainVO {
   transferMode: string
   fromWarehouseCode: string
   toWarehouseCode: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   toDockCode: string
@@ -42,6 +42,17 @@ export const getPurchasereceiptRequestMainPage = async (params) => {
   }
 }
 
+// 查询备件收货申请主列表
+export const getPurchasereceiptRequestMainPageSpare = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-request-main/seniorSpare', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-request-main/pageSpare`, params })
+  }
+}
+
 // 查询采购收货申请主详情
 export const getPurchasereceiptRequestMain = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-request-main/get?id=` + id })
@@ -106,3 +117,8 @@ export const refusedPurchasereceiptRequestMain = async (id) => {
 export const handlePurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/handle?id=` + id })
 }
+
+// 生成标签
+export const genLabel = async (id) => {
+  return await request.post({ url: `/wms/purchasereceipt-request-main/genLabel?id=` + id })
+}
diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
index 0c093ba40..6b43ab046 100644
--- a/src/api/wms/purchasereturnJobMain/index.ts
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -26,8 +26,8 @@ export interface PurchasereturnJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts
index 5cd951cf8..b08fddfe7 100644
--- a/src/api/wms/purchasereturnRecordMain/index.ts
+++ b/src/api/wms/purchasereturnRecordMain/index.ts
@@ -27,8 +27,8 @@ export interface PurchasereturnRecordMainVO {
   createTime: Date
   creator: string
   code: string
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   toAreaCodes: string
   available: string
diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts
index a521cf627..d6b4a3b7c 100644
--- a/src/api/wms/purchasereturnRequestMain/index.ts
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@@ -21,10 +21,10 @@ export interface PurchasereturnRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   fromDockCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts
index adc2cadfc..88959b43f 100644
--- a/src/api/wms/putawayJobMain/index.ts
+++ b/src/api/wms/putawayJobMain/index.ts
@@ -19,8 +19,8 @@ export interface PutawayJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/putawayRecordMain/index.ts b/src/api/wms/putawayRecordMain/index.ts
index c8b1cda50..36507e3d6 100644
--- a/src/api/wms/putawayRecordMain/index.ts
+++ b/src/api/wms/putawayRecordMain/index.ts
@@ -19,10 +19,10 @@ export interface PutawayRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
diff --git a/src/api/wms/putawayRequestMain/index.ts b/src/api/wms/putawayRequestMain/index.ts
index af4ba1618..7db4cc062 100644
--- a/src/api/wms/putawayRequestMain/index.ts
+++ b/src/api/wms/putawayRequestMain/index.ts
@@ -3,7 +3,7 @@ import request from '@/config/axios'
 export interface PutawayRequestMainVO {
   supplierCode: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
@@ -17,7 +17,7 @@ export interface PutawayRequestMainVO {
   updateTime: Date
   updater: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/repleinshJobMain/index.ts b/src/api/wms/repleinshJobMain/index.ts
index 7be585cda..2869a7745 100644
--- a/src/api/wms/repleinshJobMain/index.ts
+++ b/src/api/wms/repleinshJobMain/index.ts
@@ -16,8 +16,8 @@ export interface RepleinshJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
diff --git a/src/api/wms/repleinshRecordMain/index.ts b/src/api/wms/repleinshRecordMain/index.ts
index b1557d57d..654f84618 100644
--- a/src/api/wms/repleinshRecordMain/index.ts
+++ b/src/api/wms/repleinshRecordMain/index.ts
@@ -18,10 +18,10 @@ export interface RepleinshRecordMainVO {
   creator: string
   code: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
diff --git a/src/api/wms/repleinshRequestMain/index.ts b/src/api/wms/repleinshRequestMain/index.ts
index 5a30d78cc..78ad4d484 100644
--- a/src/api/wms/repleinshRequestMain/index.ts
+++ b/src/api/wms/repleinshRequestMain/index.ts
@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 export interface RepleinshRequestMainVO {
   fomWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   number: string
   businessType: string
@@ -16,7 +16,7 @@ export interface RepleinshRequestMainVO {
   updateTime: Date
   updater: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/saleDetail/index.ts b/src/api/wms/saleDetail/index.ts
index a197299b1..79c182062 100644
--- a/src/api/wms/saleDetail/index.ts
+++ b/src/api/wms/saleDetail/index.ts
@@ -3,8 +3,8 @@ import request from '@/config/axios'
 export interface SaleDetailVO {
   lineNumber: string
   projectCode: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   customerPackQty: number
   customerPackUnit: string
   convertRate: number
diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts
index 3cc50a9a2..e4b0dfa1e 100644
--- a/src/api/wms/scrapJobMain/index.ts
+++ b/src/api/wms/scrapJobMain/index.ts
@@ -17,8 +17,8 @@ export interface ScrapJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -70,7 +70,13 @@ export const deleteScrapJobMain = async (id: number) => {
 
 // 导出报废出库任务主 Excel
 export const exportScrapJobMain = async (params) => {
-  return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/scrapRecordMain/index.ts b/src/api/wms/scrapRecordMain/index.ts
index 57f2a8b76..1efab607d 100644
--- a/src/api/wms/scrapRecordMain/index.ts
+++ b/src/api/wms/scrapRecordMain/index.ts
@@ -18,7 +18,7 @@ export interface ScrapRecordMainVO {
   createTime: Date
   creator: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   available: string
 }
@@ -56,7 +56,13 @@ export const deleteScrapRecordMain = async (id: number) => {
 
 // 导出报废出库记录主 Excel
 export const exportScrapRecordMain = async (params) => {
-  return await request.download({ url: `/wms/scrap-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/scrapRequestMain/index.ts b/src/api/wms/scrapRequestMain/index.ts
index 6a6ef1f40..b4ca02457 100644
--- a/src/api/wms/scrapRequestMain/index.ts
+++ b/src/api/wms/scrapRequestMain/index.ts
@@ -13,7 +13,7 @@ export interface ScrapRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/strategy/index.ts b/src/api/wms/strategy/index.ts
index a4e235bb1..d10cd5108 100644
--- a/src/api/wms/strategy/index.ts
+++ b/src/api/wms/strategy/index.ts
@@ -12,7 +12,13 @@ export interface StrategyVO {
 
 // 查询策略列表
 export const getStrategyPage = async (params) => {
-  return await request.get({ url: `/wms/strategy/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/senior', data })
+  } else {
+    return await request.get({ url: `/wms/strategy/page`, params })
+  }
 }
 
 // 查询策略详情
@@ -37,5 +43,11 @@ export const deleteStrategy = async (id: number) => {
 
 // 导出策略 Excel
 export const exportStrategy = async (params) => {
-  return await request.download({ url: `/wms/strategy/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/strategy/export-excel`, params })
+  }
 }
diff --git a/src/api/wms/supplierUser/index.ts b/src/api/wms/supplierUser/index.ts
index bdb7c5b75..a7d284e80 100644
--- a/src/api/wms/supplierUser/index.ts
+++ b/src/api/wms/supplierUser/index.ts
@@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => {
 
 // 导出供应商用户关联信息 Excel
 export const exportSupplierUser = async (params) => {
-  return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts
index d346cbbd9..ec852973c 100644
--- a/src/api/wms/supplierdeliverRecordDetail/index.ts
+++ b/src/api/wms/supplierdeliverRecordDetail/index.ts
@@ -12,8 +12,8 @@ export interface SupplierdeliverRecordDetailVO {
   expireDate: Date
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierQty: number
   supplierUom: string
   convertRate: number
diff --git a/src/api/wms/supplierdeliverRecordMain/index.ts b/src/api/wms/supplierdeliverRecordMain/index.ts
index c205031cc..e67f3b5a6 100644
--- a/src/api/wms/supplierdeliverRecordMain/index.ts
+++ b/src/api/wms/supplierdeliverRecordMain/index.ts
@@ -31,6 +31,8 @@ export interface SupplierdeliverRecordMainVO {
   creator: string
   serialNumber: string
   available: string
+  purchasereceiptRequestFlag: boolean
+  purchasereceiptRequestNumber: string
 }
 
 // 查询供应商发货记录主列表
@@ -77,4 +79,9 @@ export const exportSupplierdeliverRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierdeliver-record-main/get-import-template' })
+}
+
+// 创建采购申请
+export const createPurchasereceiptRequest = async (number:string) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })
 }
\ No newline at end of file
diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts
index e029b8883..214db6c78 100644
--- a/src/api/wms/supplierdeliverRequestDetail/index.ts
+++ b/src/api/wms/supplierdeliverRequestDetail/index.ts
@@ -10,8 +10,8 @@ export interface SupplierdeliverRequestDetailVO {
   expireDate: Date
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierPackQty: number
   supplierPackUnit: string
   convertRate: number
diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts
index 676a7200c..b6f9f4bc8 100644
--- a/src/api/wms/supplierdeliverRequestMain/index.ts
+++ b/src/api/wms/supplierdeliverRequestMain/index.ts
@@ -83,10 +83,18 @@ export const appSupplierdeliverRequestMain = async (id: number) => {
 export const rejSupplierdeliverRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/rej?id=` + id })
 }
+
+// 校验是否上传自检报告
+export const selfCheckReport = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/selfCheckReport?id=` + id })
+}
+
 // 生成标签
 export const genLabel = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
 }
+
+
 // 生成记录
 export const genRecordsSupplierdeliverRequestMain = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })
diff --git a/src/api/wms/supplierinvoiceRecordDeatil/index.ts b/src/api/wms/supplierinvoiceRecordDeatil/index.ts
index f797d2f44..5c55d7a40 100644
--- a/src/api/wms/supplierinvoiceRecordDeatil/index.ts
+++ b/src/api/wms/supplierinvoiceRecordDeatil/index.ts
@@ -8,8 +8,8 @@ export interface SupplierinvoiceRecordDeatilVO {
   altBatch: string
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierQty: number
   supplierUom: string
   convertRate: number
diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts
index 8633e63b6..d256011f2 100644
--- a/src/api/wms/supplierinvoiceRequestDetail/index.ts
+++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts
@@ -9,8 +9,8 @@ export interface SupplierinvoiceRequestDetailVO {
   altBatch: string
   poNumber: string
   poLine: string
-  stdPackQty: number
-  stdPackUnit: string
+  packQty: number
+  packUnit: string
   supplierPackQty: number
   supplierPackUnit: string
   convertRate: number
diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
index 3c31a8d25..448b6b108 100644
--- a/src/api/wms/supplieritem/index.ts
+++ b/src/api/wms/supplieritem/index.ts
@@ -73,5 +73,9 @@ export const selectItembasicTypeToSupplieritem = async (params) => {
     return await request.post({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritemSenior`, data })
   } else {
     return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params })
+  }
 }
+
+export const getDefaultLocationCode = async(data: SupplieritemVO)=> {
+  return await request.post({ url: `/wms/supplieritem/getDefaultLocationCode`, data })
 }
\ No newline at end of file
diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts
index e4b38fc46..98b4a8aea 100644
--- a/src/api/wms/transaction/index.ts
+++ b/src/api/wms/transaction/index.ts
@@ -62,7 +62,13 @@ export const deleteTransaction = async (id: number) => {
 
 // 导出库存事务 Excel
 export const exportTransaction = async (params) => {
-  return await request.download({ url: `/wms/transaction/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transaction/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transaction/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transactiontype/index.ts b/src/api/wms/transactiontype/index.ts
index 88c259be4..56d65f367 100644
--- a/src/api/wms/transactiontype/index.ts
+++ b/src/api/wms/transactiontype/index.ts
@@ -46,7 +46,13 @@ export const deleteTransactiontype = async (id: number) => {
 
 // 导出事务类型 Excel
 export const exportTransactiontype = async (params) => {
-  return await request.download({ url: `/wms/transactiontype/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.downloadPost({ url: '/wms/transactiontype/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transactiontype/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts
index 53e7e3293..b24c424ab 100644
--- a/src/api/wms/transferissueJobMain/index.ts
+++ b/src/api/wms/transferissueJobMain/index.ts
@@ -27,8 +27,8 @@ export interface TransferissueJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   fromAreaCodes: string
   fromDockCode: string
   toAreaCodes: string
@@ -77,7 +77,13 @@ export const deleteTransferissueJobMain = async (id: number) => {
 
 // 导出调拨出库任务主 Excel
 export const exportTransferissueJobMain = async (params) => {
-  return await request.download({ url: `/wms/transferissue-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferissue-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferissueRecordMain/index.ts b/src/api/wms/transferissueRecordMain/index.ts
index 7433ba3ce..fc4124135 100644
--- a/src/api/wms/transferissueRecordMain/index.ts
+++ b/src/api/wms/transferissueRecordMain/index.ts
@@ -23,9 +23,9 @@ export interface TransferissueRecordMainVO {
   createTime: Date
   creator: string
   fromDockCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
@@ -63,7 +63,13 @@ export const deleteTransferissueRecordMain = async (id: number) => {
 
 // 导出调拨出库记录主 Excel
 export const exportTransferissueRecordMain = async (params) => {
-  return await request.download({ url: `/wms/transferissue-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferissue-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferissueRequestDetail/index.ts b/src/api/wms/transferissueRequestDetail/index.ts
index 06092fb23..fc8fde3ca 100644
--- a/src/api/wms/transferissueRequestDetail/index.ts
+++ b/src/api/wms/transferissueRequestDetail/index.ts
@@ -22,6 +22,7 @@ export interface TransferissueRequestDetailVO {
   updater: string
   fromOwnerCode: string
   fromLocationCode: string
+  reason: string
 }
 
 // 查询调拨出库申请子列表
diff --git a/src/api/wms/transferissueRequestMain/index.ts b/src/api/wms/transferissueRequestMain/index.ts
index 28425411a..5e08ee1cd 100644
--- a/src/api/wms/transferissueRequestMain/index.ts
+++ b/src/api/wms/transferissueRequestMain/index.ts
@@ -17,10 +17,10 @@ export interface TransferissueRequestMainVO {
   updater: string
   fromWarehouseCode: string
   fromDockCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
@@ -61,7 +61,13 @@ export const deleteTransferissueRequestMain = async (id: number) => {
 
 // 导出-调拨出库申请主 Excel
 export const exportTransferissueRequestMain = async (params) => {
-  return await request.download({ url: `/wms/transferissue-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferissue-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferissue-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferlog/index.ts b/src/api/wms/transferlog/index.ts
index 43d8cbe43..f24fc1e3b 100644
--- a/src/api/wms/transferlog/index.ts
+++ b/src/api/wms/transferlog/index.ts
@@ -71,7 +71,13 @@ export const deleteTransferlog = async (id: number) => {
 
 // 导出库存转移日志 Excel
 export const exportTransferlog = async (params) => {
-  return await request.download({ url: `/wms/transferlog/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/transferlog/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferlog/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferreceiptJobMain/index.ts b/src/api/wms/transferreceiptJobMain/index.ts
index d2538c3b8..ab8fe4e41 100644
--- a/src/api/wms/transferreceiptJobMain/index.ts
+++ b/src/api/wms/transferreceiptJobMain/index.ts
@@ -22,8 +22,8 @@ export interface TransferreceiptJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -76,7 +76,13 @@ export const deleteTransferreceiptJobMain = async (id: number) => {
 
 // 导出调拨入库任务主 Excel
 export const exportTransferreceiptJobMain = async (params) => {
-  return await request.download({ url: `/wms/transferreceipt-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferreceiptRecordMain/index.ts b/src/api/wms/transferreceiptRecordMain/index.ts
index ec41b4208..ad358f00f 100644
--- a/src/api/wms/transferreceiptRecordMain/index.ts
+++ b/src/api/wms/transferreceiptRecordMain/index.ts
@@ -23,10 +23,10 @@ export interface TransferreceiptRecordMainVO {
   remark: string
   createTime: Date
   creator: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toDockCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
@@ -64,7 +64,13 @@ export const deleteTransferreceiptRecordMain = async (id: number) => {
 
 // 导出调拨入库记录主 Excel
 export const exportTransferreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/transferreceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/transferreceiptRequestMain/index.ts b/src/api/wms/transferreceiptRequestMain/index.ts
index dcf0e539d..69f1c5114 100644
--- a/src/api/wms/transferreceiptRequestMain/index.ts
+++ b/src/api/wms/transferreceiptRequestMain/index.ts
@@ -17,10 +17,10 @@ export interface TransferreceiptRequestMainVO {
   updater: string
   fromWarehouseCode: string
   toDockCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
@@ -61,7 +61,13 @@ export const deleteTransferreceiptRequestMain = async (id: number) => {
 
 // 导出调拨入库申请主 Excel
 export const exportTransferreceiptRequestMain = async (params) => {
-  return await request.download({ url: `/wms/transferreceipt-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/transferreceipt-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/transferreceipt-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts
index ce835fe53..5a230b649 100644
--- a/src/api/wms/unplannedissueJobMain/index.ts
+++ b/src/api/wms/unplannedissueJobMain/index.ts
@@ -17,8 +17,8 @@ export interface UnplannedissueJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -70,7 +70,13 @@ export const deleteUnplannedissueJobMain = async (id: number) => {
 
 // 导出计划外出库任务主 Excel
 export const exportUnplannedissueJobMain = async (params) => {
-  return await request.download({ url: `/wms/unplannedissue-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedissue-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedissue-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts
index c0544e0c0..41c4cac1b 100644
--- a/src/api/wms/unplannedissueRecordMain/index.ts
+++ b/src/api/wms/unplannedissueRecordMain/index.ts
@@ -18,7 +18,7 @@ export interface UnplannedissueRecordMainVO {
   createTime: Date
   creatorId: string
   fromWarehouseCode: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   fromDockCode: string
   available: string
@@ -57,7 +57,13 @@ export const deleteUnplannedissueRecordMain = async (id: number) => {
 
 // 导出计划外出库记录主 Excel
 export const exportUnplannedissueRecordMain = async (params) => {
-  return await request.download({ url: `/wms/unplannedissue-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedissue-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedissue-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/unplannedissueRequestMain/index.ts b/src/api/wms/unplannedissueRequestMain/index.ts
index b0a4f096e..62738b340 100644
--- a/src/api/wms/unplannedissueRequestMain/index.ts
+++ b/src/api/wms/unplannedissueRequestMain/index.ts
@@ -14,7 +14,7 @@ export interface UnplannedissueRequestMainVO {
   updateTime: Date
   updater: string
   concurrencyStamp: string
-  fromLocationTypes: string
+  fromAreaTypes: string
   fromAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/unplannedreceiptJobMain/index.ts b/src/api/wms/unplannedreceiptJobMain/index.ts
index 88e2f8e66..0868c7db4 100644
--- a/src/api/wms/unplannedreceiptJobMain/index.ts
+++ b/src/api/wms/unplannedreceiptJobMain/index.ts
@@ -17,8 +17,8 @@ export interface UnplannedreceiptJobMainVO {
   acceptTime: Date
   completeUserId: string
   completeTime: Date
-  fromLocationTypes: string
-  toLocationTypes: string
+  fromAreaTypes: string
+  toAreaTypes: string
   number: string
   businessType: string
   remark: string
@@ -70,7 +70,13 @@ export const deleteUnplannedreceiptJobMain = async (id: number) => {
 
 // 导出计划外入库任务主 Excel
 export const exportUnplannedreceiptJobMain = async (params) => {
-  return await request.download({ url: `/wms/unplannedreceipt-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedreceipt-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedreceipt-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/unplannedreceiptRecordMain/index.ts b/src/api/wms/unplannedreceiptRecordMain/index.ts
index e54a19f47..bf684d705 100644
--- a/src/api/wms/unplannedreceiptRecordMain/index.ts
+++ b/src/api/wms/unplannedreceiptRecordMain/index.ts
@@ -18,7 +18,7 @@ export interface UnplannedreceiptRecordMainVO {
   createTime: Date
   creator: string
   toWarehouseCode: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   available: string
 }
@@ -56,7 +56,13 @@ export const deleteUnplannedreceiptRecordMain = async (id: number) => {
 
 // 导出计划外入库记录主 Excel
 export const exportUnplannedreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/unplannedreceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/unplannedreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/unplannedreceipt-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/unplannedreceiptRequestMain/index.ts b/src/api/wms/unplannedreceiptRequestMain/index.ts
index 30b024382..67966664e 100644
--- a/src/api/wms/unplannedreceiptRequestMain/index.ts
+++ b/src/api/wms/unplannedreceiptRequestMain/index.ts
@@ -13,7 +13,7 @@ export interface UnplannedreceiptRequestMainVO {
   status: string
   updateTime: Date
   updater: string
-  toLocationTypes: string
+  toAreaTypes: string
   toAreaCodes: string
   autoCommit: string
   autoAgree: string
diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts
index 40e5dd648..5eef9a588 100644
--- a/src/api/wms/workstation/index.ts
+++ b/src/api/wms/workstation/index.ts
@@ -61,7 +61,13 @@ export const importWorkstationTemplate = () => {
   return request.download({ url: '/wms/workstation/get-import-template' })
 }
 
-// 下载用户导入模板
-export const importTemplate = () => {
-  return request.download({ url: '/wms/workstation/get-import-template' })
-}
+// 根据库区筛选出的库位分页
+export const selectAreaTypeToLocation = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/workstation/pageAreaToLocationSenior', data })
+  } else {
+    return await request.get({ url: `/wms/workstation/pageAreaToLocation`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index e747f5763..91fa42e04 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -2,7 +2,7 @@
   <Dialog
     :title="dialogTitle"
     v-model="dialogVisible"
-    :width="isBusiness ? '60%' : '40%'"
+    :width="dialogWidth"
     :close-on-click-modal="false"
   >
   <div 
@@ -15,6 +15,7 @@
       :is-col="true"
       @opensearchTable="opensearchTable"
       @onChange="onChange"
+      @onBlur="onBlur"
     >
       <template #crontab="formSchema" v-if="fromeWhere == 'countPlan'">
         <crontab v-model="formSchema.crontab" />
@@ -85,6 +86,8 @@
         @buttonOperationClick="buttonOperationClick"
         @inputStringBlur="inputStringBlur"
         @inputNumberChange="inputNumberChange"
+        @tableFormSelectOnBlur="tableFormSelectOnBlur"
+        @formFormDateChange="formFormDateChange"
       />
     </div>
     <div v-if="isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
@@ -115,6 +118,11 @@ import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCou
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 
 const props = defineProps({
+  // 显示窗口宽度设置
+  basicFormWidth: {
+    type: String,
+    default: ''
+  },
   // 是否显示TableForm 新增/删除按钮
   isShowButton: {
     type: Boolean,
@@ -236,6 +244,13 @@ const props = defineProps({
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const dialogWidth = ref()
+if (props.basicFormWidth) {
+  console.log('111111111111111')
+  dialogWidth.value = props.basicFormWidth
+} else {
+  dialogWidth.value = props.isBusiness ? '60%' : '40%'
+}
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
@@ -344,9 +359,13 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, row?: any, masterParmas?: any) => {
+const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  if (titleName) {
+    dialogTitle.value = t('action.' + titleName)
+  } else {
+    dialogTitle.value = t('action.' + type)
+  }
   formType.value = type
   resetForm()
   // 修改时，设置数据
@@ -450,6 +469,7 @@ const resetForm = () => {
 const emit = defineEmits([
   'success',
   'tableSelectionChange',
+  'tableFormSelectOnBlur',
   'extendedButtonsClick',
   'formSelectChange',
   'formSelectvVisibleChange',
@@ -468,12 +488,18 @@ const emit = defineEmits([
   'buttonOperationClick',
   'inputStringBlur',
   'onChange',
-  'inputNumberChange'
+  'onBlur',
+  'inputNumberChange',
+  'formFormDateChange'
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val, row) => {
   emit('formSelectChange', field, val, row)
 }
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
 const formSelectvVisibleChange = (field, val, row) => {
   emit('formSelectvVisibleChange', field, val, row)
 }
@@ -481,6 +507,10 @@ const formSelectvVisibleChange = (field, val, row) => {
 const tableSelectionChange = (val) => {
   emit('tableSelectionChange', val)
 }
+// tableform select bulr
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  emit('tableFormSelectOnBlur', field, val, row, index)
+}
 // 列表排序
 const tableSortChange = (column, prop, order) => {
   emit('tableSortChange', column, prop, order)
@@ -527,10 +557,19 @@ const inpuFocus = (headerItem, row, index) => {
  * @param field 当前操作字段
  * @param cur 改变后值
  */
-  const onChange = (field, cur) => {
+const onChange = (field, cur) => {
   emit('onChange', field, cur)
 }
 
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
 // 修改盘点类型
 const selectChange = (field, val) => {
   emit('selectChange', field, val)
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 88d886787..899d5fc31 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -135,6 +135,8 @@
       :formTypeDetail="formTypeDetail"
       :countPlanAllList="countPlanAllList"
       @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
     />
   </div>
 </template>
@@ -583,7 +585,9 @@ const emit = defineEmits([
   'detailOpenForm',
   'tableFormButton',
   'openImage',
-  'detailBasicFormOnChange'
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -642,6 +646,20 @@ const openImage=(item)=>{
  const detailBasicFormOnChange = (field, cur) => {
   emit('detailBasicFormOnChange', field, cur)
 }
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e 
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
 //监视属性
 watch(
   () => props.apiPage,
diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index e3e2a36ec..f11599fc8 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -54,7 +54,7 @@ export default defineComponent({
     vLoading: propTypes.bool.def(false),
     labelPosition: propTypes.string.def('left'),
   },
-  emits: ['register','opensearchTable', 'onChange'],
+  emits: ['register','opensearchTable', 'onChange', 'onBlur'],
   setup(props, { slots, expose, emit }) {
     // element form 实例
     const elFormRef = ref<ComponentRef<typeof ElForm>>()
@@ -188,6 +188,14 @@ export default defineComponent({
     const onChange = (field, cur) => {
       emit('onChange', field, cur)
     }
+    /**
+     * 监听失去焦点
+     * @param field 当前操作字段
+     * @param e 改变后值
+     */
+    const onBlur = (field, e) => {
+      emit('onBlur', field, e)
+    }
     // 渲染formItem
     const renderFormItem = (item: FormSchema) => {
       // 单独给只有options属性的组件做判断
@@ -291,6 +299,7 @@ export default defineComponent({
                       {...setComponentProps(item)}
                       style={item.componentProps?.style}
                       onChange={(e)=>{onChange(item.field, e)}}
+                      onBlur={(e)=>{onBlur(item.field, e)}}
                       {...(notRenderOptions.includes(item?.component as string) &&
                       item?.componentProps?.options
                         ? { options: item?.componentProps?.options || [] }
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 15369c6ea..d7dcd44d0 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -248,7 +248,9 @@ const submitFormSuccess = (response: any) => {
       } else {
         message.success('导入成功')
       }
-    }
+    }else if(response.data == null){
+        message.error(response.msg)
+      }
   }
 
   // if (response.code !== 0) {
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 4a38c18ca..ee1a8b6c2 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -114,7 +114,8 @@
               :allow-create="headerItem?.tableForm.allowCreate"
               style="width: 100%" 
               :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(headerItem.field, $event,row)">
+              @change="formSelectChange(headerItem.field, $event,row)"
+              @blur="tableFormSelectOnBlur(headerItem.field, $event,row, $index)">
               <el-option 
                 v-for="op in initSelectOptions(headerItem)" 
                 :label="op.label" 
@@ -145,7 +146,8 @@
               :disabled="itemIsDisabled(headerItem, row)" 
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'" />
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
+              @change="formFormDateChange(headerItem.field, $event,row, $index)" />
           </el-form-item>
           <!-- 日期时间选择器 -->
           <el-form-item 
@@ -346,7 +348,9 @@ const emit = defineEmits([
   'handleAddTable',
   'inpuFocus',
   'buttonOperationClick',
-  'inputStringBlur'
+  'inputStringBlur',
+  'tableFormSelectOnBlur',
+  'formFormDateChange'
 ])
 // 获取下拉列表 | type = radio | type = select
 const initSelectOptions = (item) => {
@@ -356,6 +360,14 @@ const initSelectOptions = (item) => {
 const formSelectChange = (field, val,row) => {
   emit('formSelectChange', field, val,row)
 }
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+// 普通下拉失焦事件
+const tableFormSelectOnBlur = (field, val,row,index) => {
+  emit('tableFormSelectOnBlur', field, val,row,index)
+}
 // 数字输入-改变事件
 const inputNumberChange = (field, index, row, e) => {
   emit('inputNumberChange', field, index, row, e)
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 75bd2a270..754c51198 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -310,7 +310,8 @@ export default {
     typeUpdate: 'Dict Type Eidt',
     dataCreate: 'Dict Data Create',
     dataUpdate: 'Dict Data Eidt',
-    fileUpload: 'File Upload'
+    fileUpload: 'File Upload',
+    createLabel: 'create label'
   },
   dialog: {
     dialog: 'Dialog',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 6f253a896..4f308a7cb 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -309,7 +309,8 @@ export default {
     typeCreate: '字典类型新增',
     typeUpdate: '字典类型编辑',
     dataCreate: '字典数据新增',
-    dataUpdate: '字典数据编辑'
+    dataUpdate: '字典数据编辑',
+    createLabel: '创建标签'
   },
   dialog: {
     dialog: '弹窗',
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 1418edfc1..4dc76cd96 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -274,4 +274,6 @@ export enum DICT_TYPE {
   CONTAINER_STATUS = 'container_status', // 容器状态
   PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型
   PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型
+  TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因
+  PURCHASERECEIPT_SOURCE_TYPE="purchasereceipt_source_type",//采购收货数据来源
 }
diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts
index 91475875f..941ce69fa 100644
--- a/src/utils/disposition/formFields.ts
+++ b/src/utils/disposition/formFields.ts
@@ -265,7 +265,7 @@
   { label: "库区代码", prop: "areaCode", },
   { type: "filter", label: "类型", prop: "groupType", filters: "locationType", },
   { type: "filter", label: "状态", prop: "defaultInventoryStatus", filters: "inventoryStage", },
-  { label: "拣料优先级", prop: "pickPriority", },
+  { label: "备货优先级", prop: "pickPriority", },
   { label: "编号", prop: "code", },
   { label: "名称", prop: 'name', },
   { label: "描述", prop: "description", },
@@ -312,8 +312,8 @@
   { label: "行号", prop: "rowCode", },
   { label: "列号", prop: "columnCode", },
   { type: "filter", label: "默认库存状态", prop: "defaultInventoryStatus", filters: "inventoryStage", },
-  { label: "拣料优先级", prop: "pickPriority", },
-  { label: "拣料顺序", prop: "pickOrder", },
+  { label: "备货优先级", prop: "pickPriority", },
+  { label: "备货顺序", prop: "pickOrder", },
   { label: "货架号", prop: "shelfCode", },
   { label: "ERP系统库位编号", prop: "erpLocationCode", },
   { type: "objectFilter", label: "是否混物料", prop: "locSwitch", showProp: "enableMixItem", filters: "whetherOrNot", },
@@ -1745,7 +1745,7 @@ export const OuterPillarDeliverNote = [
   { label: "版本", prop: 'version' },
   { label: "工程变更通知单", prop: 'eco' },
   { label: "标包计量单位", prop: 'stdPackUm' },
-  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "包装数量", prop: 'packQty' },
   { label: "替代计量单位", prop: 'extPackUm' },
   { label: "替代包装数量", prop: 'extPackQty' },
   { label: "备注", prop: 'remark' },
@@ -1940,7 +1940,7 @@ export const labelInfo =  [
   { label: "批次", prop: "lot" },
   { label: "数量", prop: "qty", showProp: 'qty', type:'object' },
   { label: "单位", prop: "qty", showProp: 'uom', type:'object' },
-  { label: "标包数量", prop: "planQty", showProp: 'qty', type:'object' },
+  { label: "包装数量", prop: "planQty", showProp: 'qty', type:'object' },
   { label: "完整条码文本", prop: "fullBarcodeString" },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts
index c3d90a00e..7db984905 100644
--- a/src/utils/disposition/tableDetailsColumns.ts
+++ b/src/utils/disposition/tableDetailsColumns.ts
@@ -10,8 +10,8 @@
     { label: "订单行", prop: "poLine", },
     { type:"object", label: "数量", prop: "qty", showProp:"qty", },
     { type:"object", label: "单位", prop: "qty", showProp:"uom", },
-    { type:"object", label: "标包数量", prop: "stdPack", showProp:"packQty", },
-    { type:"object", label: "标包单位", prop: "stdPack", showProp:"packUom", },
+    { type:"object", label: "包装数量", prop: "stdPack", showProp:"packQty", },
+    { type:"object", label: "包装规格", prop: "stdPack", showProp:"packUom", },
     { label: "转换率", prop: 'convertRate', },
     { type: "filter", label: "是否寄存订单", prop: "isConsignment", filters: "whetherOrNot" },
     { label: "备注", prop: 'remark', },
@@ -47,7 +47,7 @@
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", width: "200px" },
     { label: "E-LEVEL等级", prop: "itemEqLevel", width: "200px" },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", width: "200px" },
-    { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", width: "200px" },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", width: "200px" },
     { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", width: "200px" },
   ]
 /**
@@ -67,7 +67,7 @@
     { label: "批次", prop: "lot", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "object", label: "生产日期", prop: "batch", showProp: "produceDate", },
-    { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
     { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", },
   ]
 /**
@@ -77,7 +77,7 @@
     { label: "itemCode", prop: "itemCode",fixed:"left", },
     { type: "object", label: "物料名称",  prop: "item", showProp: "name", },
     { type: "object", valueType: Number, label: "到货数量",  prop: "qty", showProp: "qty", },
-    { type: "object", valueType: Number, label: "标包数量",  prop: "stdPack", showProp: "packQty", },
+    { type: "object", valueType: Number, label: "包装数量",  prop: "stdPack", showProp: "packQty", },
     { label: "每托数量",  prop: "qtyPerPallet", },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
     { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
@@ -99,7 +99,7 @@
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { label: "订单号", prop: "poNumber", },
       { label: "订单行", prop: "poLine", },
       { label: "箱标签", prop: "packingCode", },
@@ -108,7 +108,7 @@
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "E-LEVEL等级", prop: "labelEqLevel" },
       { label: "备注", prop: 'remark', },
   ]
@@ -120,12 +120,12 @@
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -142,9 +142,9 @@
       { type: "object", label: "退货数量", prop: "qty", showProp: "qty", },
       { label: "批次", prop: "lot" },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       // { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       // { label: "备注", prop: 'remark', },
   ]
 /**
@@ -154,7 +154,7 @@
      { label: "itemCode", prop: "itemCode", fixed: "left", },
       { label: "箱标签", prop: "toPackingCode", },
       { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
@@ -172,7 +172,7 @@
     { label: "itemCode", prop: "itemCode",fixed: "left", },
     { type: "object", valueType: Number, label: "要料数量", prop: "qty", showProp: "qty", },
     { type: "object", label: "要料单位", prop: "qty", showProp: "uom", },
-    { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
     { type: "object", label: "计量单位", prop: "stdPack", showProp: "packQty", },
     { label: "请求库位", prop: "requestLocationCode", },
     { label: "目标库位", prop: "toLocationCode",  },
@@ -189,7 +189,7 @@
       { label: "itemCode", prop: "itemCode",fixed: "left", },
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       { type: "object", label: "发料单位", prop: "qty", showProp: "uom", },
       { label: "请求库位", prop: "fromRequestLocationCode", },
@@ -212,7 +212,7 @@
       { label: "itemCode", prop: "itemCode",fixed: "left", },
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       { type: "object", label: "入库单位", prop: "qty", showProp: "uom", },
       { label: "库位编号", prop: "locationCode", },
@@ -233,7 +233,7 @@
     { label: "itemCode", prop: "itemCode",fixed: "left", },
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", },
-    { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
     { type: "object", label: "出库单位", prop: "qty", showProp: "uom", },
     { label: "库位编号", prop: "locationCode", },
@@ -254,7 +254,7 @@
     { label: "itemCode", prop: "itemCode",fixed: "left", },
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", },
-    { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
     { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
@@ -276,7 +276,7 @@
     { label: "itemCode", prop: "itemCode",fixed: "left", },
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", },
-    { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+    { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
     { type: "object", label: "报废单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
@@ -299,9 +299,9 @@
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { label: "项目", prop: "project", },
@@ -315,7 +315,7 @@
  export const DeliverRequest =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       { label: "目标库位", prop: "toLocationCode", },
       { type: "dateTime", label: "过期时间", prop: "expiredTime", },
@@ -330,7 +330,7 @@
       { label: "itemCode", prop: "itemCode", fixed: "left",},
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "物料名称", prop: "item", showProp: "name", },
       { type: "object", label: "发货单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
@@ -491,8 +491,8 @@
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", label: "备料数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "qty", },
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "uom", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", },
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "工作中心", prop: "workStation", },
       { type: "dateTime", label: "最晚时间", prop: "latestTime", },
@@ -509,7 +509,7 @@
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位", prop: "rawLocation", width: "100px" },
       { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", width: "100px" },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", width: "100px" },
       { type: "object", label: "完工收货单位", prop: "qty", showProp: "uom", width: "100px" },
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "containerCode", },
@@ -548,7 +548,7 @@
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", },
-      { type: "object", label: "标包单位", prop: "rawQty", showProp: "uom", },
+      { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", },
       { label: "来源库位代码", prop: "rawLocation", },
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "rawContainerCode", },
@@ -568,7 +568,7 @@
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位编号", prop: "rawLocation", },
       { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { label: "批次", prop: "lot", },
       { type: "object", label: "成品回收单位", prop: "qty", showProp: "uom", },
       { label: "箱标签", prop: "packingCode", },
@@ -588,7 +588,7 @@
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退库单位", prop: "qty", showProp: "uom", },
       { label: "来源库位", prop: "fromLocationCode", },
       { label: "目标库位", prop: "toLocationCode", },
@@ -611,7 +611,7 @@
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", },
-      { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退货单位", prop: "qty", showProp: "uom", },
       { label: "来源库位", prop: "fromLocationCode", },
       { label: "目标库位", prop: "toLocationCode", },
@@ -632,7 +632,7 @@
   { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
   { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
-  { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标库位", prop: "toLocationCode", },
   { label: "来源库位", prop: "fromLocationCode", },
   { label: "目标仓库", prop: "toWarehouseCode", },
@@ -680,8 +680,8 @@
       { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
       { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",},
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
       { label: "订单号", prop: "poNumber",},
       // { label: "订单行", prop: "poLine",},
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
@@ -703,8 +703,8 @@
       { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
       { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",},
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",},
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
       { label: "库位代码", prop: "locationCode",},
       { label: "箱标签", prop: "packingCode",},
       { label: "托标签", prop: "containerCode",},
@@ -722,7 +722,7 @@
       { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
       { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
       { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", },
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", },
       { label: "异常类型", prop: "abnormalType", },
       { label: "箱标签", prop: "packingCode",},
@@ -742,8 +742,8 @@
       { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
       { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",},
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
       { label: "实际库位", prop: "handledLocationCode",},
       { label: "推荐库位", prop: "recommendLocationCode",},
       { label: "实际箱标签", prop: "handledPackingCode", },
@@ -1073,7 +1073,7 @@ export const ReceivingRecords = [
   { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
   { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
-  { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "箱标签", prop: "packingCode"},
   { label: "托标签", prop: "containerCode"},
   { label: "仓库", prop: "warehouseCode"},
@@ -1094,7 +1094,7 @@ export const ReceivingRecords = [
   { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
   { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
-  // { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+  // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "产品号", prop: "productNo" },
   { label: "项目号", prop: "projectCode" },
   { label: "原因", prop: "reason" },
@@ -1266,7 +1266,7 @@ export const SingleDoorPanelDeliverNote =  [
   { label: "来源托标签", prop: "toContainerCode" },
   { type: "object", label: "发货数量", prop: "qty", showProp: "qty" },
   { type: "object", label: "发货单位", prop: "qty", showProp: "uom" },
-  { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
   { label: "目标库位", prop: "toLocationCode" },
   { label: "来源库位", prop: "fromLocationCode" },
   { label: "目标仓库", prop: "toWarehouseCode" },
@@ -1298,8 +1298,8 @@ export const SingleDoorPanelProductReceiptNote =  [
   { label: "托标签", prop: "containerCode" },
   { type: "object", label: "完工收货数量", prop: "qty", showProp: "qty" },
   { type: "object", label: "完工单位", prop: "qty", showProp: "uom" },
-  { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" },
-  { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom" },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
+  { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" },
   { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch" },
   { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" },
   { label: "库位", prop: "locationCode" },
@@ -1325,8 +1325,8 @@ export const SingleDoorPanelProductAdjust =  [
   { label: "仓库代码", prop: 'warehouseCode',},
   { label: "数量", prop: 'qty', showProp: 'qty', type: 'object'},
   { label: "单位", prop: 'qty', showProp: 'uom', type: 'object'},
-  { label: "标包数量", prop: 'stdPack', showProp: 'packQty', type: 'object'},
-  { label: "标包单位", prop: 'stdPack', showProp: 'packUom', type: 'object'},
+  { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object'},
+  { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object'},
   { label: "库位代码", prop: 'locationCode',},
 ]
 
@@ -1343,8 +1343,8 @@ export const SingleDoorPanelProductAdjust =  [
     { label: "托标签", prop: "containerCode" },
     { type: "object", label: "数量", prop: "qty", showProp: "qty" },
     { type: "object", label: "单位", prop: "qty", showProp: "uom" },
-    { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" },
-    { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom" },
+    { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" },
+    { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" },
     { label: "目标仓库", prop: "toWarehouseCode" },
     { label: "来源仓库", prop: "fromWarehouseCode" },
     { label: "产品号", prop: "productNo" },
@@ -1365,8 +1365,8 @@ export const SingleDoorPanelCustomerReturnNote =  [
   { label: "仓库代码", prop: 'warehouseCode' },
   { label: "数量", prop: 'qty', showProp: 'qty', type: 'object' },
   { label: "单位", prop: 'qty', showProp: 'uom', type: 'object' },
-  { label: "标包数量", prop: 'stdPack', showProp: 'packQty', type: 'object' },
-  { label: "标包单位", prop: 'stdPack', showProp: 'packUom', type: 'object' },
+  { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object' },
+  { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object' },
   { label: "库位代码", prop: 'locationCode' },
   // { label: "生产线", prop: 'prodLine' },
   // { label: "Bom版本", prop: "bomVersion" },
@@ -1384,7 +1384,7 @@ export const SingleDoorPanelCustomerReturnNote =  [
   { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
   { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
-  { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+  { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标批次", prop: "toLot", },
   { label: "来源批次", prop: "fromLot", },
   { label: "目标库位", prop: "toLocationCode", },
diff --git a/src/utils/disposition/tableSummaryColumns.ts b/src/utils/disposition/tableSummaryColumns.ts
index 580b2f7e0..98d55dc91 100644
--- a/src/utils/disposition/tableSummaryColumns.ts
+++ b/src/utils/disposition/tableSummaryColumns.ts
@@ -72,8 +72,8 @@
       { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",},
       { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",},
-      { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",},
-      { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",},
+      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
+      { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",},
       { label: "批次", prop: "lot", },
   ]
   
@@ -87,14 +87,14 @@
      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
      { label: "总数", prop: "summary" },
      { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
-     { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", },
+     { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
      { label: "订单号", prop: "poNumber", },
      { label: "订单行", prop: "poLine", },
      { label: "箱标签", prop: "packingCode", },
      { label: "托标签", prop: "containerCode", },
      { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
      { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
-     { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", },
+     { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
      { label: "E-LEVEL等级", prop: "labelEqLevel" },
      { label: "备注", prop: 'remark', },
  ]
\ No newline at end of file
diff --git a/src/views/home/components/produce.vue b/src/views/home/components/produce.vue
index c289ec0c0..b3615be8a 100644
--- a/src/views/home/components/produce.vue
+++ b/src/views/home/components/produce.vue
@@ -48,7 +48,7 @@
           <el-table-column prop="shelf" label="货架" width="180" />
           <el-table-column prop="locationRow" label="行" width="180" />
           <el-table-column prop="locationColum" label="列" width="180" />
-          <el-table-column prop="pickPriority" label="拣料优先级" width="180" />
+          <el-table-column prop="pickPriority" label="备货优先级" width="180" />
           <el-table-column prop="maxWeight" label="最大承重" width="180" />
           <el-table-column prop="maxArea" label="最大面积" width="180" />
           <el-table-column prop="maxVolume" label="最大体积" width="180" />
diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue
index 196fe3fb9..e5a4303fc 100644
--- a/src/views/wms/basicDataManage/customerManage/project/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/project/index.vue
@@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = false
             }
             if (item.field == 'code') {
-              item.componentProps.disabled = TransferissueJobMain
+              item.componentProps.disabled = true
             }
           })       
   }else {
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
index c96b667d7..26b6be7d8 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts
@@ -76,9 +76,9 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '出库库位类型范围',
-    field: 'outLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '出库库区类型范围',
+    field: 'outAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -93,9 +93,9 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '入库库位类型范围',
-    field: 'inLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '入库库区类型范围',
+    field: 'inAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
index f78defa36..e39ebaa09 100644
--- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
+++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue
@@ -157,8 +157,8 @@ const buttonTableClick = async (val, row) => {
     // 编辑
     const rowSplit = JSON.parse(JSON.stringify(row))
     rowSplit.itemTypes = rowSplit.itemTypes.split(',')
-    rowSplit.outLocationTypes = rowSplit.outLocationTypes.split(',')
-    rowSplit.inLocationTypes = rowSplit.inLocationTypes.split(',')
+    rowSplit.outAreaTypes = rowSplit.outAreaTypes.split(',')
+    rowSplit.inAreaTypes = rowSplit.inAreaTypes.split(',')
     rowSplit.outInventoryStatuses = rowSplit.outInventoryStatuses.split(',')
     rowSplit.inInventoryStatuses = rowSplit.inInventoryStatuses.split(',')
     openForm('update', rowSplit)
@@ -188,8 +188,8 @@ const formsSuccess = async (formType, data) => {
   if (data.activeTime == 0) data.activeTime = null
   if (data.expireTime == 0) data.expireTime = null
   data.itemTypes = data.itemTypes.join(',')
-  data.outLocationTypes = data.outLocationTypes.join(',')
-  data.inLocationTypes = data.inLocationTypes.join(',')
+  data.outAreaTypes = data.outAreaTypes.join(',')
+  data.inAreaTypes = data.inAreaTypes.join(',')
   data.outInventoryStatuses = data.outInventoryStatuses.join(',')
   data.inInventoryStatuses = data.inInventoryStatuses.join(',')
   if (formType === 'create') {
@@ -201,8 +201,8 @@ const formsSuccess = async (formType, data) => {
       })
       .catch(() => {
         data.itemTypes = data.itemTypes.split(',')
-        data.outLocationTypes = data.outLocationTypes.split(',')
-        data.inLocationTypes = data.inLocationTypes.split(',')
+        data.outAreaTypes = data.outAreaTypes.split(',')
+        data.inAreaTypes = data.inAreaTypes.split(',')
         data.outInventoryStatuses = data.outInventoryStatuses.split(',')
         data.inInventoryStatuses = data.inInventoryStatuses.split(',')
       })
@@ -215,8 +215,8 @@ const formsSuccess = async (formType, data) => {
       })
       .catch(() => {
         data.itemTypes = data.itemTypes.split(',')
-        data.outLocationTypes = data.outLocationTypes.split(',')
-        data.inLocationTypes = data.inLocationTypes.split(',')
+        data.outAreaTypes = data.outAreaTypes.split(',')
+        data.inAreaTypes = data.inAreaTypes.split(',')
         data.outInventoryStatuses = data.outInventoryStatuses.split(',')
         data.inInventoryStatuses = data.inInventoryStatuses.split(',')
       })
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
index ff8f871f3..403fd4ce6 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
@@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        max: 50,
+        precision: 0
+      }
+    },
   },
   {
     label: '号码分隔符',
@@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   serialLength: [
-    { required: true, message: '请输入号码流水长度', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { required: true, message: '请输入号码流水长度', trigger: 'blur' }
   ],
   resetPeriod: [
     { required: true, message: '请选择流水重置周期', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
new file mode 100644
index 000000000..db0555ea9
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue
@@ -0,0 +1,242 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Plansetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+   :HeadButttondata="HeadButttondata" 
+   @button-base-click="buttonBaseClick"
+   :route-name="routeName" 
+   @updataTableColumns="updataTableColumns"
+   @searchFormClick="searchFormClick"
+   :allSchemas="Plansetting.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="PlansettingRules" 
+    :formAllSchemas="Plansetting.allSchemas" 
+    :apiUpdate="PlansettingApi.updatePlansetting"
+    :apiCreate="PlansettingApi.createPlansetting"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Plansetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/plansetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as PlansettingApi from '@/api/wms/plansetting'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import { Plansetting, PlansettingRules } from './plansetting.data'
+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: 'Plansetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() //路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Plansetting.allSchemas.tableColumns)
+
+//字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PlansettingApi.getPlansettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:plansetting:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:plansetting:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:plansetting: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') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:plansetting:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:plansetting: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 =Plansetting.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 PlansettingApi.createPlansetting(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await PlansettingApi.updatePlansetting(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, 'basicPlansetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await PlansettingApi.deletePlansetting(id)
+    tableObject.loading = false
+    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 PlansettingApi.exportPlansetting(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 PlansettingApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
new file mode 100644
index 000000000..88e08994d
--- /dev/null
+++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts
@@ -0,0 +1,259 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
+
+/**
+ * @returns {Array} 计划设置
+ */
+export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请模式',
+    field: 'requestMode',
+    dictType: DICT_TYPE.REQEUST_MODE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '跳过任务生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    isTable: false,
+    isForm: false
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    isTable: false,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  { 
+    label: '备注',
+    field: 'remark',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  { 
+    label: '创建者', 
+    field: 'creator', 
+    isTable: false, 
+    isForm: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+//表单校验
+export const PlansettingRules = reactive({
+  code: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  requestMode: [
+    { required: true, message: '请选择申请模式', trigger: 'change' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 14bf2a9c3..630c69b7b 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -225,4 +225,7 @@ export const AreaRules = reactive({
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
+  type: [
+    { required: true, message: '请选择类型', trigger: 'change' }
+  ],
 })
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index 660230aa1..cbd6b2916 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -34,22 +34,6 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '城市',
-    field: 'city',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '地址',
-    field: 'address',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '类型',
     field: 'type',
@@ -110,6 +94,22 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '城市',
+    field: 'city',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '地址',
+    field: 'address',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '联系人姓名',
     field: 'contactPerson',
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index 1b55e1bbf..5b9c7b7a3 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -155,16 +155,19 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.disabled = true
             }
             if (item.field == 'warehouseCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+               // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
             }
             if (item.field == 'areaCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+              // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
             }
             if (item.field == 'locationGroupCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+              // 编辑暂时可以修改
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
             }
           })       
           
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index d92288446..2765c0899 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -130,18 +130,18 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '类型',
-    field: 'type',
-    dictType: DICT_TYPE.LOCATION_TYPE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.LOCATION_TYPE,
+  //   dictClass: 'string',
+  //   isSearch: true,
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '巷道',
     field: 'aisle',
@@ -189,7 +189,7 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '拣料优先级',
+    label: '备货优先级',
     field: 'pickPriority',
     sort: 'custom',
     table: {
@@ -396,11 +396,11 @@ export const LocationRules = reactive({
   erpLocationCode: [
     { required: true, message: '请选择ERP库位类型', trigger: 'change' }
   ],
-  type: [
-    { required: true, message: '请选择类型', trigger: 'change' }
-  ],
+  // type: [
+  //   { required: true, message: '请选择类型', trigger: 'change' }
+  // ],
   pickPriority: [
-    { required: true, message: '请输入拣料优先级', trigger: 'blur' }
+    { required: true, message: '请输入备货优先级', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index 8f9969ad8..11fead26e 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -20,7 +20,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -30,7 +30,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -39,7 +39,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'warehouseCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -64,7 +64,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -97,7 +97,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       component: 'Switch',
@@ -157,7 +157,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -188,7 +188,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isForm: false,
     isTable: false
@@ -199,7 +199,7 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     }
   }
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index f98b88837..b3f70053f 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = true
             }
             if (item.field == 'productionLineCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
+              item.componentProps.disabled = false
+              item.componentProps.isSearchList = true
             }
     })  
   }
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index d3cacd355..3ff8f8bd0 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -20,7 +20,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -30,7 +30,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -42,7 +42,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -51,7 +51,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -127,7 +127,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       component: 'Switch',
@@ -210,7 +210,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   { 
@@ -218,7 +218,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'creator',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTable: false,
     isForm: false
@@ -229,7 +229,7 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'right'
     }
   }
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
index 694145ed9..cdf170b44 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -14,7 +14,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 200,
       fixed: 'left'
     },
     isSearch: true
@@ -24,18 +24,10 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'name',
     sort: 'custom',
     table: {
-      width: 150
+      width: 200
     },
     isSearch: true
   },
-  {
-    label: '描述',
-    field: 'description',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '类型',
     field: 'type',
@@ -44,6 +36,14 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTable: true,
     sort: 'custom',
+    table: {
+      width: 200
+    },
+  },
+  {
+    label: '描述',
+    field: 'description',
+    sort: 'custom',
     table: {
       width: 150
     },
@@ -78,7 +78,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sort: 'custom',
     table: {
-      width: 180
+      width: 200
     },
     form: {
       component: 'DatePicker',
@@ -109,7 +109,7 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sort: 'custom',
     table: {
-      width: 180
+      width: 200
     },
   },
   {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index 0be18cf35..232885f92 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -170,13 +170,13 @@ const openForm = (type: string, row?: any) => {
         item.componentProps.disabled = false
       }
       if (item.field == 'workshopCode') {
-              item.componentProps.disabled = false
-              item.componentProps.isSearchList = true
-            }
-            if (item.field == 'productionLineCode') {
-              item.componentProps.disabled = true
-              item.componentProps.isSearchList = false
-            }
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
+        if (item.field == 'productionLineCode') {
+          item.componentProps.disabled = false
+          item.componentProps.isSearchList = true
+        }
     })  
   }
   basicFormRef.value.open(type, row)
@@ -206,6 +206,33 @@ const formsSuccess = async (formType,data) => {
       getList()
 }
 
+// 修改 tableform 属性
+Workstation.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'rawLocationCode') {
+      item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'RAW',
+      // },
+      {
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+    if(item.field == 'fgLocationCode') {
+      item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'FG',
+      // },
+      {
+          key: 'available',
+          value: 'TRUE',
+        }
+      ]
+    }
+  })
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
@@ -279,6 +306,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await WorkstationApi.importTemplate()
+  importTemplateData.templateUrl = await WorkstationApi.importWorkstationTemplate()
 })
 </script>
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 30e74faf8..6ba60cf79 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -10,6 +10,9 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkshopApi from '@/api/wms/workshop'
 import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
+
+import * as WorkstationApi from '@/api/wms/workstation'
+
 import { validateYS } from '@/utils/validator'
 
 const { t } = useI18n() // 国际化
@@ -37,17 +40,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '类型',
-    field: 'type',
-    dictType: DICT_TYPE.WORK_STATION_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '类型',
+  //   field: 'type',
+  //   dictType: DICT_TYPE.WORK_STATION_TYPE,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '车间代码',
     field: 'workshopCode',
@@ -118,12 +121,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
       }
     }
   },
@@ -142,20 +140,7 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '库位信息', // 查询弹窗标题
         searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        },{
-          key: 'type',
-          value: 'FG',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
+        searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
       }
     }
   },
diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
index 6dc20de14..ed90ce54a 100644
--- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
@@ -245,18 +245,18 @@ export const BomRules = reactive({
   ],
   processCode: [
     { required: true, message: '请输入工序代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' },
   ],
   version: [
     { required: true, message: '请输入版本', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   layer: [
     { required: true, message: '请输入层级', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
new file mode 100644
index 000000000..4ff27d7ea
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itemarea.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Itemarea.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 #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</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="ItemareaRules"
+    :formAllSchemas="Itemarea.allSchemas"
+    :apiUpdate="ItemareaApi.updateItemarea"
+    :apiCreate="ItemareaApi.createItemarea"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+    :basicFormWidth="'60%'"
+  />
+
+  <!-- 详情 -->
+  <Detail 
+    ref="detailRef" 
+    :isBasic="true" 
+    :allSchemas="Itemarea.allSchemas" 
+    :detailAllSchemas="ItemareaDetail.allSchemas"
+    :apiCreate="ItemareaDetailApi.createItemareaDetail"
+    :apiUpdate="ItemareaDetailApi.updateItemareaDetail"
+    :apiPage="ItemareaDetailApi.getItemareaDetailPage"
+    :apiDelete="ItemareaDetailApi.deleteItemareaDetail"
+
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/itemarea/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Itemarea,ItemareaRules,ItemareaDetail } from './itemarea.data'
+import * as ItemareaApi from '@/api/wms/itemarea'
+import * as ItemareaDetailApi from '@/api/wms/itemareaDetail'
+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: 'Itemarea' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itemarea.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 查询页面返回——详情
+const searchTableSuccessDetail = (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: ItemareaApi.getItemareaPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:itemarea:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:itemarea:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:itemarea: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:itemarea:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea: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 =Itemarea.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 ItemareaApi.createItemarea(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItemareaApi.updateItemarea(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, 'basicItemarea')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemareaApi.deleteItemarea(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 ItemareaApi.exportItemarea(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 ItemareaApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
new file mode 100644
index 000000000..58096e357
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -0,0 +1,685 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
+
+export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '区域代码',
+    field: 'areaCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '入库包装规格',
+    field: 'inPackUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '出库包装规格',
+    field: 'outPackUnit',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '最高库存数量',
+    field: 'maxQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '最低库存数量',
+    field: 'minQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '安全预警库存数量',
+    field: 'safeQty',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '是否自动补料',
+    field: 'autoRepleinsh',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 140
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '补料来源库区',
+    field: 'repleinshFromArea',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '补料数量',
+    field: 'repleinshQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    },
+  },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库自动转为出库包装规格',
+    field: 'newlyToOutpackunit',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '出库自动转为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '需要接收确认',
+    field: 'needReceive',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '出库后剩余库存自动转换为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '超过高储是否允许叫料',
+    field: 'allowIssueRequest',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '优先空库位',
+    field: 'emptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '优先非空库位',
+    field: 'notEmptyLocationFirst',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混批次',
+    field: 'enableMixLot',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混物品',
+    field: 'enableMixItem',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混状态',
+    field: 'enableMixStatus',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '巷道排序方向',
+    field: 'aisleOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架排序方向',
+    field: 'sheIfOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行排序方向',
+    field: 'rowOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '列排序方向',
+    field: 'columOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    } ,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    } ,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 120
+    } ,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItemareaRules = reactive({
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  areaCode: [
+    { required: true, message: '请选择到区域代码', trigger: 'change' }
+  ],
+  inPackUnit: [
+    { required: true, message: '请选择入库包装规格', trigger: 'change' }
+  ],
+  outPackUnit: [
+    { required: true, message: '请选择出库包装规格', trigger: 'change' }
+  ],
+  needReceive: [
+    { required: true, message: '请选择需要接受确认', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请选择是否可用', trigger: 'change' }
+  ], 
+  manageMode: [
+    { required: true, message: '请选择管理精度', trigger: 'change' }
+  ],
+})
+
+/**
+ * @returns {Array} 库存转移申请子表
+ */
+export const ItemareaDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '主表ID',
+    field: 'masterId',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '创建者Id',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '最后更新者Id',
+    field: 'updater',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '库位组',
+    field: 'locationGroup',
+    sort: 'custom',
+  },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index 52892f9a5..c5e1778db 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -14,13 +14,9 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
-    // tableForm:{
-    //   minWidth:200,
-    //    sortable:false
-    // }
   },
   { 
     label: '名称', 
@@ -442,14 +438,6 @@ export const rules = reactive({
     { required: true, message: '请输入名称', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
   ],
-  desc1:  [
-    { required: true, message: '请输入描述1', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  desc2:  [
-    { required: true, message: '请输入描述2', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
   status: [
     { required: true, message: '请选择状态', trigger: 'change' },
   ],
@@ -483,36 +471,11 @@ export const rules = reactive({
   type:  [
     { required: true, message: '请选择类型', trigger: 'change' },
   ],
-  category:  [
-    { required: true, message: '请选择种类', trigger: 'change' },
-  ],
-  itemGroup:  [
-    { required: true, message: '请选择分组', trigger: 'change' },
-  ],
-  color:  [
-    { required: true, message: '请选择颜色', trigger: 'change' },
-  ],
-  configuration:  [
-    { required: true, message: '请选择配置', trigger: 'change' },
-  ],
-  project:  [
-    { required: true, message: '请输入项目', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-  ],
-  eqLevel:  [
-    { required: true, message: '请选择质量等级', trigger: 'change' },
-  ],
   validityDays:  [
     { required: true, message: '请输入有效天数', trigger: 'change' },
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' },
   ],
-  activeTime:  [
-    { required: true, message: '请输入生效时间', trigger: 'change' },
-  ],
-  expireTime:  [
-    { required: true, message: '请输入失效时间', trigger: 'change' },
-  ],
 })
 console.log(Itembasic)
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
similarity index 92%
rename from src/views/wms/basicDataManage/itemManage/itempackaging/index.vue
rename to src/views/wms/basicDataManage/itemManage/itempackage/index.vue
index 1119d950c..35721bc60 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackaging/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue
@@ -60,7 +60,7 @@
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
-    url="/wms/itempackaging/import"
+    url="/wms/itempackage/import"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
   />
@@ -68,9 +68,9 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import * as ItempackagingApi from '@/api/wms/itempackaging'
+import * as ItempackagingApi from '@/api/wms/itempackage'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
-import { Itempackaging, ItempackagingRules } from './itempackaging.data'
+import { Itempackaging, ItempackagingRules } from './itempackage.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -100,9 +100,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackaging:create' }), // 新增
-  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackaging:import' }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackaging:export' }), // 导出
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:itempackage:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:itempackage:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:itempackage:export' }), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置
@@ -147,8 +147,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackaging:update' }), // 编辑
-  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackaging:delete' }) // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:itempackage:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:itempackage:delete' }) // 删除
 ]
 
 // 列表-操作按钮事件
@@ -281,3 +281,4 @@ onMounted(async () => {
   importTemplateData.templateUrl = await ItempackagingApi.importTemplate()
 })
 </script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itempackaging/itempackaging.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
similarity index 70%
rename from src/views/wms/basicDataManage/itemManage/itempackaging/itempackaging.data.ts
rename to src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
index 3a320a280..87c40736f 100644
--- a/src/views/wms/basicDataManage/itemManage/itempackaging/itempackaging.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts
@@ -1,7 +1,9 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from './../itembasic/itembasic.data'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
 
 const { t } = useI18n() // 国际化
 
@@ -50,121 +52,43 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '包装单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    table: {
-      width: 120
-    } 
-  },
-  { 
-    label: '包装数量', 
-    field: 'stdPackQty',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 120
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    }
-  },
-  {
-    label: '替代包装单位1',
-    field: 'altPackUnit1',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    table: {
-      width: 150
-    } 
-  },
-  { 
-    label: '替代包装量1', 
-    field: 'altPackQty1',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
-  { 
-    label: '替代包装量2', 
-    field: 'altPackQty2',
-    sort: 'custom',
-    table: {
-      width: 130
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    }
-  },
-  {
-    label: '替代包装单位3',
-    field: 'altPackUnit3',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
     table: {
       width: 150
-    } 
-  },
-  { 
-    label: '替代包装量3', 
-    field: 'altPackQty3',
-    sort: 'custom',
-    table: {
-      width: 130
     },
     form: {
-      component: 'InputNumber',
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        min: 0,
-        precision: 6
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
       }
     }
   },
-  {
-    label: '替代包装单位4',
-    field: 'altPackUnit4',
-    sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    table: {
-      width: 150
-    } 
-  },
   { 
-    label: '替代包装量4', 
-    field: 'altPackQty4',
+    label: '包装数量', 
+    field: 'packQty',
     sort: 'custom',
+    isSearch: true,
     table: {
-      width: 130
+      width: 120
     },
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
+        min: 1,
         precision: 6
       }
     }
@@ -258,7 +182,42 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     isForm: false,
-    isTable: false
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
   },
   {
     label: '操作',
@@ -276,7 +235,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
 export const ItempackagingRules = reactive({
   itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
   uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
-  stdPackUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
-  stdPackQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
+  packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
+  packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }],
   available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
new file mode 100644
index 000000000..e6a2262e1
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Itemwarehouse.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Itemwarehouse.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 #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</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="ItemwarehouseRules"
+    :formAllSchemas="Itemwarehouse.allSchemas"
+    :apiUpdate="ItemwarehouseApi.updateItemwarehouse"
+    :apiCreate="ItemwarehouseApi.createItemwarehouse"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Itemwarehouse.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/itemwarehouse/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Itemwarehouse,ItemwarehouseRules } from './itemwarehouse.data'
+import * as ItemwarehouseApi from '@/api/wms/itemwarehouse'
+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: 'Itemwarehouse' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Itemwarehouse.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: ItemwarehouseApi.getItemwarehousePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:itemwarehouse:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:itemwarehouse:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:itemwarehouse: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:itemwarehouse:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemwarehouse: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 =Itemwarehouse.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 ItemwarehouseApi.createItemwarehouse(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ItemwarehouseApi.updateItemwarehouse(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, 'basicItemwarehouse')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ItemwarehouseApi.deleteItemwarehouse(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 ItemwarehouseApi.exportItemwarehouse(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 ItemwarehouseApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
new file mode 100644
index 000000000..d9a08a586
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts
@@ -0,0 +1,215 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '../../factoryModeling/areabasic/areabasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
+
+export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料基础信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '区域代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    isSearch: true,
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库区代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库区基础信息', // 查询弹窗标题
+        searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+        searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '管理精度',
+    field: 'manageMode',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.MANAGEMENT_MODE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    }
+  },
+  {
+    label: '入库包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table:{
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格基础信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '删除者ID',
+    field: 'deleterId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '地点ID',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const ItemwarehouseRules = reactive({
+  itemCode: [required],
+  warehouseCode: [required],
+  manageMode: [required],
+  packUnit: [required],
+  available: [required],
+})
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
new file mode 100644
index 000000000..ff1fc3745
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Packageunit.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Packageunit.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="PackageunitRules"
+    :formAllSchemas="Packageunit.allSchemas"
+    :apiUpdate="PackageunitApi.updatePackageunit"
+    :apiCreate="PackageunitApi.createPackageunit"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Packageunit.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/packageunit/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { Packageunit,PackageunitRules } from './packageunit.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+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: 'Packageunit' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Packageunit.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: PackageunitApi.getPackageunitPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:packageunit:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:packageunit:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:packageunit: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:packageunit:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:packageunit: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 =Packageunit.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 PackageunitApi.createPackageunit(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageunitApi.updatePackageunit(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, 'basicPackageunit')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PackageunitApi.deletePackageunit(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 PackageunitApi.exportPackageunit(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 PackageunitApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
new file mode 100644
index 000000000..cec3bc81d
--- /dev/null
+++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts
@@ -0,0 +1,279 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import { fa } from 'element-plus/es/locale'
+
+export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装类型',
+    field: 'type',
+    dictType: DICT_TYPE.PACK_UNIT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '长',
+    field: 'length',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '宽',
+    field: 'width',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '高',
+    field: 'height',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装描述',
+    field: 'desc',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否重复使用',
+    field: 'reuse',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '是否管理包装库存',
+    field: 'manageBalance',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '删除时间',
+    field: 'deletionTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '删除者',
+    field: 'deleterId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '扩展属性',
+    field: 'extraProperties',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '地点',
+    field: 'siteId',
+    sort: 'custom',
+    isForm: false,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
+// 表单校验
+export const PackageunitRules = reactive({
+  code: [
+    { required: true, message: '请输入包装代码', trigger: 'change' }
+  ],
+  name: [
+    { required: true, message: '请输入包装名称', trigger: 'change' }
+  ],
+  type: [
+    { required: true, message: '请选择包装类型', trigger: 'change' }
+  ],
+  desc: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { required: true, message: '请输入包装描述', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
index 33eec5260..f8b2e383e 100644
--- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
@@ -16,6 +16,7 @@ export const BarcodeRules = reactive({
   length: [required],
   prefixLenght: [required],
   prefixChar: [
+    { required: true, message: '请输入前缀字符', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   entityProperties: [
@@ -29,6 +30,9 @@ export const BarcodeRules = reactive({
     { required: true, message: '请输入截断尾部空格', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  labelType:[
+    { required: true, message: '请选择标签类型', trigger: 'blur' }
+  ],
   isEncypt: [required],
 })
 
diff --git a/src/views/wms/basicDataManage/labelManage/callMaterials/callMaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callMaterials/callMaterials.data.ts
new file mode 100644
index 000000000..378ee51c6
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/callMaterials/callMaterials.data.ts
@@ -0,0 +1,116 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+  barcodeString: [required]
+})
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '标签号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      fixed: 'left'
+    }
+  },
+  {
+    label: '标签类型',
+    field: 'type',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_TYPE,
+    dictClass: 'string'
+  },
+  {
+    label: '标签模板',
+    field: 'template',
+    sort: 'custom',
+  },
+  {
+    label: '标签状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    dictType: DICT_TYPE.LABEL_STATUS,
+    dictClass: 'string'
+  },
+  {
+    label: '关联号',
+    field: 'relateNumber',
+    sort: 'custom',
+  },
+  {
+    label: '标签条码字符串',
+    field: 'barcodeString',
+    sort: 'custom',
+    form: {
+      // component: 'textarea',
+      componentProps: {
+        type: "textarea",
+        rows: "6"
+      },
+    },
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '打印次数',
+    field: 'printTimes',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    isForm: false
+  },
+  {
+    label: '最后打印时间',
+    field: 'lastPrintTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false
+  },
+  {
+    label: '最后打印人ID',
+    field: 'lastPrintUserId',
+    sort: 'custom',
+    isForm: false
+  },
+  {
+    label: '最后打印人用户名',
+    field: 'lastPrintUserName',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180,
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
+
diff --git a/src/views/wms/basicDataManage/labelManage/callMaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callMaterials/index.vue
new file mode 100644
index 000000000..2c61be8e5
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/callMaterials/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.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" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="formsSuccess" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :apiUpdate="BarbasicApi.updateBarbasic"
+    :apiCreate="BarbasicApi.createBarbasic"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './callMaterials.data'
+import * as BarbasicApi from '@/api/wms/barbasic'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatTime } from '@/utils/index'
+import * as Itempackaging from '@/api/wms/itempackage'
+
+// 采购标签
+defineOptions({ name: 'CallMaterials' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * PurchasePackage type = PurchaseLabel 采购件标签记录页面   
+ * ManufacturePackage type = MakeLabel  制造件标签记录页面
+ * UtensilPackage type = ContainerLabel  器具标签记录页面
+ * SupplierPackage type = PurchaseLabel  供应商发货标签记录(用采购标签)
+ * callMaterials type = CallMaterialsLabel  叫料标签
+ */
+ const type = ref('CallMaterialsLabel')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(async () => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      if (formField == 'itemCode') {
+        setV['itemCode'] = val[0]['code']
+        setV['itemName'] = val[0]['name']
+        setV['itemDesc1'] = val[0]['desc1']
+        setV['itemDesc2'] = val[0]['desc2']
+        setV['uom'] = val[0]['uom']
+        setV['produceDate'] = val[0]['activeTime']
+        setV['expireDate'] = val[0]['expireTime']
+        setV['validityDays'] = val[0]['validityDays']
+        await Itempackaging.getItempackagingPage({
+          itemCode: val[0]['code']
+        }).then(res => {
+          if (res) {
+            if (res.list.length > 0) {
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
+            }
+          }
+        })
+      }
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: BarbasicApi.getBarbasicPage // 分页接口
+})
+tableObject.params.type = type.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package: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') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+  if (type == 'create') {
+    nextTick(() => {
+      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    })
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await BarbasicApi.deleteBarbasic(id)
+    tableObject.loading = false
+    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 BarbasicApi.exportBarbasic(tableObject.params)
+    download.excel(data, '采购件标签.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value+'&id='+row.id)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await BarbasicApi.createBarbasic(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await BarbasicApi.updateBarbasic(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 导入 */
+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,
+    type:type.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
index f1d5a3b17..ae604311c 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -65,7 +65,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as Itempackaging from '@/api/wms/itempackaging'
+import * as Itempackaging from '@/api/wms/itempackage'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -111,8 +111,8 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['stdPackQty'] = res.list[0].stdPackQty
-              setV['stdPackUnit'] = res.list[0].stdPackUnit
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
             }
           }
         })
@@ -245,7 +245,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(tableObject.params)
-    download.excel(data, '采购件标签.xlsx')
+    download.excel(data, '制造件件标签.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -253,7 +253,7 @@ const handleExport = async () => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/899807302088564736?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
   window.open(src.value+'&number='+row.relateNumber)
@@ -304,3 +304,4 @@ onMounted(async () => {
   getList()
 })
 </script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index 296e93f68..83827af3a 100644
--- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
@@ -58,7 +58,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'barcodeString',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
@@ -98,7 +98,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'lastPrintUserName',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
@@ -186,12 +186,12 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产日期',
     field: 'produceDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')],
         disabled: true
@@ -200,7 +200,9 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
@@ -244,7 +246,9 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
@@ -320,8 +324,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150,
@@ -336,8 +340,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
index ae1df17dd..b4fd7909f 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -65,7 +65,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as Itempackaging from '@/api/wms/itempackaging'
+import * as Itempackaging from '@/api/wms/itempackage'
 
 // 采购标签
 defineOptions({ name: 'PurchasePackage' })
@@ -111,8 +111,8 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['stdPackQty'] = res.list[0].stdPackQty
-              setV['stdPackUnit'] = res.list[0].stdPackUnit
+              setV['packQty'] = res.list[0].packQty
+              setV['packUnit'] = res.list[0].packUnit
             }
           }
         })
@@ -253,7 +253,7 @@ const handleExport = async () => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/899807302088564736?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
   window.open(src.value+'&number='+row.relateNumber)
@@ -304,3 +304,4 @@ onMounted(async () => {
   getList()
 })
 </script>
+@/api/wms/itempackage
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
index d5a04a2cd..0a3b05e3a 100644
--- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data";
 import * as ItembasicApi from "@/api/wms/itembasic";
@@ -67,7 +67,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'barcodeString',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
@@ -107,7 +107,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'lastPrintUserName',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
@@ -195,12 +195,12 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产日期',
     field: 'produceDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         disabled: true,
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
@@ -209,7 +209,9 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
@@ -239,12 +241,12 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         disabled: true,
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
@@ -253,7 +255,9 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true,
       }
@@ -329,8 +333,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150,
@@ -345,8 +349,8 @@ export const PackageInventory = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index be91fb679..ddd7e921c 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -237,7 +237,7 @@ const handleExport = async () => {
 }
 
 const BASE_URL = 'http://dev.ccwin-in.com:25110'
-const src = ref(BASE_URL + '/jmreport/view/899807302088564736?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
   window.open(src.value+'&number='+row.relateNumber)
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
index d82ab1f4d..75716a2f4 100644
--- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
@@ -14,7 +14,7 @@ export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -60,7 +60,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'barcodeString',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
@@ -100,7 +100,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'lastPrintUserName',
     sort: 'custom',
     table: {
-      width: 170,
+      width: 180,
     }
   },
   {
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index ee9d90977..80baf7b2b 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -379,7 +379,7 @@
             <el-col :span="24">
               <el-form-item label="数量排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.QtyOrder">
+                  <el-radio-group v-model="formData.configuration.QtyOrderDirection">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
@@ -606,7 +606,7 @@ const formData = ref({
     // 库位代码
     LocationCode: '',
     // 数量排序方向
-    QtyOrder: 'ASC',
+    QtyOrderDirection: 'ASC',
     // 巷道排序方向
     AisleOrder: 'ASC',
     // 货架排序方向
@@ -953,7 +953,7 @@ const resetForm = () => {
       // 库位代码
       LocationCode: '',
       // 数量排序方向
-      QtyOrder: 'ASC',
+      QtyOrderDirection: 'ASC',
       // 巷道排序方向
       AisleOrder: 'ASC',
       // 货架排序方向
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index b506b0325..8803a29f9 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -126,20 +126,23 @@
           <div class="title">规则配置</div>
           <el-row gutter="10">
             <el-col :span="24">
+              <el-form-item label="不拆分">
+                <el-switch  v-model="formData.configuration.NotGroup"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
+              </el-form-item>
               <!-- 按零件拆分 -->
               <el-form-item  label="按零件拆分">
-                <el-switch v-model="formData.configuration.ByItem"  active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch v-model="formData.configuration.ByItem"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
               </el-form-item>
               <!-- 按库位拆分 -->
               <el-form-item  label="按库位拆分">
-                <el-switch v-model="formData.configuration.ByLocation"  active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch v-model="formData.configuration.ByLocation"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
               </el-form-item>
               <!--按器具拆分-->
               <el-form-item label="按器具拆分">
-                <el-switch  v-model="formData.configuration.ByContainer"  active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch  v-model="formData.configuration.ByContainer"  active-value="TRUE" inactive-value="FALSE" @change="changeGroup"/>
               </el-form-item>
               <!-- 每个任务明细数量 -->
-              <el-form-item label="每个任务明细数量">
+              <el-form-item label="每个任务明细数量" v-show="false">
                 <el-input-number v-model="formData.configuration.JobDetailCount" :min="0" />
               </el-form-item>
             </el-col>
@@ -161,6 +164,7 @@ import { getSupplierList } from '@/api/wms/supplier'
 import * as RuleApi from '@/api/wms/rule'
 import { object } from 'vue-types'
 import { isString } from '@/utils/is'
+import { log } from 'console';
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -188,6 +192,8 @@ const formData = ref({
     { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
   ],
   configuration: {
+    // 不拆分
+    NotGroup: 'FALSE',
     // 按零件拆分
     ByItem: 'FALSE',
     // 按库位拆分
@@ -276,6 +282,23 @@ const changeSupplierType = (e) => {
   getFormSupplierList()
 }
 
+const changeGroup = () =>{
+  if(formData.value.configuration.NotGroup == 'TRUE'){
+    formData.value.configuration.ByItem = 'FALSE'
+    formData.value.configuration.ByLocation = 'FALSE'
+    formData.value.configuration.ByContainer = 'FALSE'
+  }else{
+    if(formData.value.configuration.ByItem == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+    if(formData.value.configuration.ByLocation == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+    if(formData.value.configuration.ByContainer == 'TRUE'){
+      formData.value.configuration.NotGroup == 'FALSE'
+    }
+  }
+}
 getFormSupplierList()
 
 /** 打开弹窗 */
@@ -416,6 +439,8 @@ const resetForm = () => {
       { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
     ],
     configuration: {
+      // 不拆分
+      NotGroup: 'FALSE',
       // 按零件拆分
       ByItem: 'FALSE',
       // 按库位拆分
diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
index 03a04882c..8c4897667 100644
--- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
@@ -18,7 +18,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'supplierCode',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 190,
       fixed: 'left'
     },
     isSearch: true,
@@ -45,7 +45,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 190
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -78,7 +78,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
   {
@@ -86,7 +86,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'price',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       component: 'InputNumber',
@@ -105,7 +105,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       component: 'Switch',
@@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expireTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -160,22 +160,14 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '创建时间',
     field: 'createTime',
     isTable: false,
     isForm:false,
     formatter: dateFormatter,
-    details: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -198,16 +190,24 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:false,
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
     isDetail: false,
     isForm: false ,
     table: {
-      width: 150,
+      width: 190,
       fixed: 'right'
     }
   }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index f57a56433..29733915b 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
-import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator'
+import {validateHanset,validateFax,validatePostCode,validateEmail,validateYS} from '@/utils/validator'
 
 /**
  * @returns {Array} 供应商
@@ -91,6 +91,14 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '联系人邮件',
+    field: 'email',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   {
     label:'银行',
     field: 'bank',
@@ -289,6 +297,10 @@ export const SupplierRules = reactive({
   contacts: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  email:  [
+    { max: 128, message: '不得超过128个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'}
+  ],
   bank: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
index 1ba659561..2395499b8 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@@ -53,7 +53,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -78,7 +78,7 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: false,
     table: {
-      width: 150
+      width: 180
     }
   },
   {
@@ -106,97 +106,56 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '供应商包装单位',
-    field: 'packUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
-  {
-    label: '供应商包装量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-  },
-  {
-    label: '供应商替代包装单位',
-    field: 'altPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 180
-    }
-  },
-  {
-    label: '供应商替代包装量',
-    field: 'altPackQty',
-    sort: 'custom',
-    table: {
-      width: 170
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-  },
-  {
-    label: '每器具包装数',
-    field: 'packQtyOfContainer',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-  },
-  {
-    label: '默认收货仓库',
-    field: 'defaultWarehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '仓库信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-      }
-    }
-  },
+  // {
+  //   label: '供应商包装单位',
+  //   field: 'packUnit',
+  //   dictType: DICT_TYPE.PACK_UNIT,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   }
+  // },
+  // {
+  //   label: '供应商包装量',
+  //   field: 'packQty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '默认收货仓库',
+  //   field: 'defaultWarehouseCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '仓库信息', // 查询弹窗标题
+  //       searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
+  //       searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+  //       searchCondition: [{
+  //         key: 'available',
+  //         value: 'TRUE',
+  //         isMainValue: false
+  //       }]
+  //     }
+  //   }
+  // },
   {
     label: '默认收货库位',
     field: 'defaultLocationCode',
@@ -217,11 +176,6 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
-          key: 'warehouseCode',
-          value: 'defaultWarehouseCode',
-          message: '请填写默认收货仓库！',
-          isMainValue: true
         }]
       }
     }
@@ -302,14 +256,6 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    }
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -343,6 +289,14 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   {
     label: '操作',
     field: 'action',
@@ -367,15 +321,12 @@ export const SupplieritemRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
-  packUnit: [
-    { required: true, message: '请选择供应商包装单位', trigger: 'change' }
-  ],
-  packQty: [
-    { required: true, message: '请输入供应商包装量', trigger: 'blur' }
-  ],
-  packQtyOfContainer: [
-    { required: true, message: '请输入每器具包装数', trigger: 'blur' }
-  ],
+  // packUnit: [
+  //   { required: true, message: '请选择供应商包装单位', trigger: 'change' }
+  // ],
+  // packQty: [
+  //   { required: true, message: '请输入供应商包装量', trigger: 'blur' }
+  // ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
index b39f68b92..27c00d765 100644
--- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
+++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts
@@ -10,7 +10,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -141,8 +141,8 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -152,8 +152,8 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -563,7 +563,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -571,7 +571,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'countDetailNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 1fc1182df..a82d33cf7 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -1,11 +1,23 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-const { t } = useI18n() // 国际化
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'CountPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
 /**
  * @returns {Array} 盘点计划主表
  */
@@ -15,7 +27,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -338,6 +350,82 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -369,22 +457,6 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
index 3c0f4483c..65250f6f8 100644
--- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
+++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 盘点记录主表
@@ -10,7 +10,7 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -139,9 +139,9 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -150,8 +150,9 @@ export const CountRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -318,7 +319,7 @@ export const CountRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
index d96a9f3c7..201dcc6dc 100644
--- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
+++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts
@@ -35,7 +35,7 @@ export const CountRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -370,7 +370,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -384,7 +384,7 @@ export const CountRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'countDetailNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index fa97af6e4..ce3dc3ce0 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 盘点调整记录主表
@@ -10,7 +10,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'countRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -120,9 +120,9 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -131,8 +131,9 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -282,7 +283,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -290,7 +291,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'countDetailNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index f6930d8c5..5844be0b9 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -35,7 +35,7 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -349,7 +349,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -363,7 +363,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'countDetailNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
index 1824332ad..f566d2893 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 客户收货记录主表
@@ -10,7 +10,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -143,9 +143,9 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -154,8 +154,9 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -177,8 +178,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -196,8 +197,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -337,8 +338,8 @@ export const CustomerreceiptRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -346,8 +347,8 @@ export const CustomerreceiptRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -393,7 +394,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   // {
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
index 1825c13e1..003c57b0e 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
@@ -31,7 +31,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -172,8 +172,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -184,8 +184,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -425,8 +425,8 @@ export const CustomerreceiptRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -434,8 +434,8 @@ export const CustomerreceiptRequestMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -466,7 +466,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
index de1cfb150..cd973da77 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
@@ -10,7 +10,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -32,7 +32,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -41,7 +41,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -49,7 +49,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -179,8 +179,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -190,8 +190,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -606,8 +606,8 @@ export const CustomerreturnJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -615,8 +615,8 @@ export const CustomerreturnJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -668,7 +668,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   // {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
index cda3d6df7..e6470c66e 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
@@ -218,8 +218,8 @@ const buttonTableClick = async (val, row) => {
     "acceptTime": null,
     "completeUserId": null,
     "completeTime": null,
-    "fromLocationTypes": "INSP,HOLD,SCRAP",
-    "toLocationTypes": "HOLD,INSP,SEMI,RAW",
+    "fromAreaTypes": "INSP,HOLD,SCRAP",
+    "toAreaTypes": "HOLD,INSP,SEMI,RAW",
     "number": "JOB2520231220-0007",
     "businessType": "CustomerRejectJob",
     "remark": "",
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
index 574780e6f..aab1717c3 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 客户退货记录主表
@@ -10,7 +10,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -45,7 +45,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -152,9 +152,9 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -163,8 +163,9 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -186,8 +187,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -205,8 +206,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -354,8 +355,8 @@ export const CustomerreturnRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -363,8 +364,8 @@ export const CustomerreturnRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -413,7 +414,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   // {
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 6c90539c5..10a2f8203 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -52,7 +52,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -76,7 +76,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -283,8 +283,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -295,8 +295,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -568,7 +568,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
index e7c7ef467..1480e7adc 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 客户结算记录主表
@@ -10,7 +10,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -112,9 +112,9 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -123,8 +123,9 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -138,8 +139,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -276,8 +277,8 @@ export const CustomersettleRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -326,7 +327,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -334,7 +335,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'soNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -342,7 +343,7 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'soLine',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
index 4ff422381..033784997 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts
@@ -36,7 +36,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -65,7 +65,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -89,7 +89,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -132,8 +132,8 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -384,8 +384,8 @@ export const CustomersettleRequestMainRules = reactive({
   // fromWarehouseCode: [
   //   { required: true, message: '请选择从仓库代码', trigger: 'change' }
   // ],
-  // fromLocationTypes: [
-  //   { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  // fromAreaTypes: [
+  //   { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   // ],
   // fromAreaCodes: [
   //   { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -422,7 +422,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isTableForm: false,
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
index 751070b25..3a538b354 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@@ -10,7 +10,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -32,7 +32,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -41,7 +41,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -49,7 +49,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'customerDeliverNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -178,8 +178,8 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -189,8 +189,8 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -605,8 +605,8 @@ export const DeliverJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -614,8 +614,8 @@ export const DeliverJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -664,7 +664,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   // {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index a385125b3..b013abb1d 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -217,8 +217,8 @@ const buttonTableClick = async (val, row) => {
     "acceptTime": 1703207934000,
     "completeUserId": null,
     "completeTime": null,
-    "fromLocationTypes": "FG",
-    "toLocationTypes": "CUST",
+    "fromAreaTypes": "FG",
+    "toAreaTypes": "CUST",
     "number": "JOB2420231222-0006",
     "businessType": "DeliverJob",
     "remark": "",
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
index ed80943d0..d3927c830 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 发货记录主表
@@ -10,7 +10,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -152,9 +152,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -163,8 +163,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -186,8 +187,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -197,8 +198,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -354,8 +355,8 @@ export const DeliverRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -363,8 +364,8 @@ export const DeliverRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -410,7 +411,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   // {
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index f0233ac24..acf947fee 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -47,7 +47,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -76,7 +76,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deliverPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -105,7 +105,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'customerDeliverNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isForm: false,
   },
@@ -270,8 +270,8 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -282,8 +282,8 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -564,7 +564,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
index ef4b4463a..51cf9cb85 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
@@ -10,8 +10,19 @@ import { Customerdock } from '@/views/wms/basicDataManage/customerManage/custome
 import * as CustomerItemApi from '@/api/wms/customeritem'
 import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
 
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
 const { t } = useI18n() // 国际化
 
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'DeliverPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
 /**
  * @returns {Array} 发货计划主表
  */
@@ -21,7 +32,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -55,9 +66,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划日期',
     field: 'planDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -66,8 +77,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -178,41 +190,71 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: plansettingData.autoCommit,
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
       }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
   },
   {
-    label: '是否可用',
-    field: 'available',
+    label: '自动执行',
+    field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -220,7 +262,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: plansettingData.autoExecute,
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -228,6 +270,36 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',
@@ -372,7 +444,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
index 8dc5953e7..af229740a 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
@@ -18,7 +18,7 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -64,9 +64,9 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单日期',
     field: 'orderDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -75,8 +75,9 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -84,9 +85,9 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '截止日期',
     field: 'dueDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -95,8 +96,9 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -333,8 +335,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -353,8 +355,8 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -525,7 +527,7 @@ export const SaleDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -716,11 +718,11 @@ export const SaleDetailRules = reactive({
     { required: true, message: '请输入行号', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index 13b27264d..4f6b192ac 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存余额
@@ -156,9 +156,9 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货日期',
     field: 'arriveDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -167,17 +167,20 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '生产日期',
     field: 'produceDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -186,17 +189,20 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '失效日期',
     field: 'expireDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -205,9 +211,12 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
index 6c1a81f56..2091217e8 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts
@@ -58,7 +58,7 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
index 60e1154c4..4a6b743fc 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts
@@ -66,7 +66,7 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
   {
@@ -74,7 +74,7 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'containerNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
   {
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
index 5fa429d89..25337e1c1 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts
@@ -57,7 +57,7 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
index def028e12..96c82cf8c 100644
--- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
+++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/containerInitRecordMain.data.ts
@@ -106,7 +106,7 @@ export const ContainerInitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index d87649c65..89c592de0 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -225,10 +225,10 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (row.asnNumber !== null && row.asnNumber !== '') {
-    const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
     window.open(src.value+'&id='+row.id)
   } else {
-    const src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken())
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
     window.open(src.value+'&id='+row.id)
   }
 }
diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts
index 09049d38f..8c17ada82 100644
--- a/src/views/wms/inventoryManage/package/package.data.ts
+++ b/src/views/wms/inventoryManage/package/package.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const PackageRules = reactive({
@@ -14,7 +14,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -68,16 +68,24 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
     },
   },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
   {
     label: '生产日期',
     field: 'produceDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
@@ -85,8 +93,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     table: {
@@ -112,12 +122,12 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
@@ -125,8 +135,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     table: {
@@ -184,16 +196,16 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150,
     },
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index 0e6c6f9da..bb93b67cd 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存事务
@@ -10,7 +10,7 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -223,9 +223,9 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货日期',
     field: 'arriveDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -234,17 +234,20 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '生产日期',
     field: 'produceDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -253,9 +256,12 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '生效时间',
@@ -280,9 +286,9 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -291,9 +297,12 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
index 09b00f3d9..b45596682 100644
--- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
+++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存转移日志
@@ -10,7 +10,7 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'recordNumber',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -19,7 +19,7 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -90,9 +90,9 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货日期',
     field: 'arriveDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -101,17 +101,20 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '生产日期',
     field: 'produceDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -120,9 +123,12 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '生效时间',
@@ -141,9 +147,9 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -152,9 +158,12 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
-    }
+    },
   },
   {
     label: '从事务号',
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
index 29062b593..85ce87c2a 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存初始化记录主表
@@ -10,7 +10,7 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -95,20 +95,21 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
       width: 180
     },
     form: {
-      component: 'Switch',
-      value: 'TRUE',
+      component: 'DatePicker',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     }
   },
@@ -273,7 +274,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -355,8 +356,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -366,8 +367,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -454,9 +455,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -465,8 +466,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -474,9 +476,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -485,8 +487,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -494,9 +497,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -505,8 +508,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -614,11 +618,11 @@ export const InventoryinitRecordDetailRules = reactive({
   areaCode: [
     { required: true, message: '请选择库区代码', trigger: 'change' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index 34c4d8138..1b69b58fa 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as WarehouseApi  from '@/api/wms/warehouse'
@@ -43,7 +43,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -370,7 +370,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -505,8 +505,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -527,8 +527,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -671,9 +671,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -684,22 +684,22 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -710,22 +710,22 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -736,13 +736,13 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
index f4121158c..0b0a8acd2 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -61,9 +61,9 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效日期',
     field: 'activeDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     table: {
       width: 180
@@ -73,7 +73,7 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts
index 8fbbb77b4..7a222f7c2 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -61,9 +61,9 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效日期',
     field: 'activeDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     table: {
       width: 180
@@ -73,7 +73,7 @@ export const PackageoverMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
index 8358fc4b0..fef7aa3e7 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 
 export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
@@ -62,9 +62,9 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效日期',
     field: 'activeDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     table: {
       width: 180
@@ -74,7 +74,7 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         style: {width:'100%'},
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index 80683014d..c616db448 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 报废出库任务主表
@@ -10,7 +11,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -32,7 +33,7 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -113,8 +114,8 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -124,8 +125,8 @@ export const ScrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -510,8 +511,8 @@ export const ScrapJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -563,7 +564,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -668,11 +669,21 @@ export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reason',
     dictType: DICT_TYPE.SCRAP_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 158fb9d00..7d8ae6095 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 报废出库记录主表
@@ -10,7 +11,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +21,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +30,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -96,9 +97,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -107,8 +108,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -122,8 +124,8 @@ export const ScrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -253,8 +255,8 @@ export const ScrapRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -303,7 +305,7 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -408,11 +410,21 @@ export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reason',
     dictType: DICT_TYPE.SCRAP_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '单价',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index 40519f859..aa9d8e2e9 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
@@ -54,6 +54,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
   />
 
   <!-- 详情 -->
@@ -70,6 +71,7 @@
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
+    @onBlur="onBlur"
   />
 
   <!-- 导入 -->
@@ -444,6 +446,18 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index 339591b3a..7246c6242 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -37,7 +37,7 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -143,8 +143,8 @@ export const ScrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -396,7 +396,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -584,15 +584,30 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reason',
     dictType: DICT_TYPE.SCRAP_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      filterable: true
     }
   },
+  {
+    label: '项目订单号',
+    field: 'projectOrderNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从货主代码',
     field: 'fromOwnerCode',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
index fda01bbc9..8a96b382a 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 调拨出库任务主表
@@ -10,7 +11,7 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -183,8 +184,8 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -195,8 +196,8 @@ export const TransferissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -567,8 +568,8 @@ export const TransferissueJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -576,8 +577,8 @@ export const TransferissueJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -629,7 +630,7 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -761,6 +762,28 @@ export const TransferissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
index 578d5d25e..7e996b6eb 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 调拨出库记录主表
@@ -10,7 +11,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +21,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +30,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -120,9 +121,9 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -131,8 +132,9 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -154,8 +156,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -165,8 +167,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -316,8 +318,8 @@ export const TransferissueRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -325,8 +327,8 @@ export const TransferissueRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -375,7 +377,7 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -607,6 +609,28 @@ export const TransferissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   // {
   //   label: '代码',
   //   field: 'code',
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 231f2455c..d9d57d8c4 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
@@ -54,6 +54,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
   />
 
   <!-- 详情 -->
@@ -70,6 +71,7 @@
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
+    @onBlur="onBlur"
   />
 
   <!-- 导入 -->
@@ -84,9 +86,6 @@ import { TransferissueRequestMain,TransferissueRequestMainRules,TransferissueReq
 import * as TransferissueRequestMainApi from '@/api/wms/transferissueRequestMain'
 import * as TransferissueRequestDetailApi from '@/api/wms/transferissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import * as PurchasereturnRequestMainApi from "@/api/wms/purchasereturnRequestMain";
-import {closeTransferissueRequestMain} from "@/api/wms/transferissueRequestMain";
-import * as PurchasereceiptRequestMainApi from "@/api/wms/purchasereceiptRequestMain";
 
 // 调拨出库申请
 defineOptions({ name: 'TransferissueRequestMain' })
@@ -317,6 +316,18 @@ const handleHandle = async (id: number) => {
   } catch {}
 }
 
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
index ab656bd87..d078cc6ab 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts
@@ -47,7 +47,7 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -226,8 +226,8 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -239,8 +239,8 @@ export const TransferissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -533,7 +533,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -594,6 +594,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       disabled: true
     }
   },
+  
   {
     label: '包装号',
     field: 'packingNumber',
@@ -781,6 +782,28 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index 68d5282bb..7e5236aff 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 调拨入库任务主表
@@ -10,7 +11,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -32,7 +33,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -138,8 +139,8 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -149,8 +150,8 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -559,8 +560,8 @@ export const TransferreceiptJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -568,8 +569,8 @@ export const TransferreceiptJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -621,7 +622,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -753,6 +754,28 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index 051f19e7a..290ae7d95 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 调拨入库记录主表
@@ -10,7 +11,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +21,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +30,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -88,9 +89,9 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -99,8 +100,9 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -162,8 +164,8 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -173,8 +175,8 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -324,8 +326,8 @@ export const TransferreceiptRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -333,8 +335,8 @@ export const TransferreceiptRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -383,7 +385,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -523,6 +525,28 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   {
     label: '从库位组代码',
     field: 'fromLocationGroupCode',
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 607aa3fb6..4b3a27e5b 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -30,7 +30,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -136,8 +136,8 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -147,8 +147,8 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -385,8 +385,8 @@ export const TransferreceiptRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCode: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -394,8 +394,8 @@ export const TransferreceiptRequestMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -429,7 +429,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -567,6 +567,28 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
   },
+  {
+    label: '原因',
+    field: 'reason',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRANSFER_REASON,
+    dictClass: 'string',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
index dbe124612..96c9e6e94 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 计划外出库任务主表
@@ -121,8 +122,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -133,8 +134,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -511,8 +512,8 @@ export const UnplannedissueJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -564,7 +565,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -669,11 +670,21 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
index 37ef06d92..783a7594e 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 计划外出库记录主表
@@ -10,7 +11,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +21,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +30,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -96,9 +97,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -107,8 +108,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -122,8 +124,8 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -265,8 +267,8 @@ export const UnplannedissueRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -315,7 +317,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -442,11 +444,21 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index c477ec814..fcefc2809 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
@@ -54,6 +54,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
   />
 
   <!-- 详情 -->
@@ -70,6 +71,7 @@
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
+    @onBlur="onBlur"
   />
 
   <!-- 导入 -->
@@ -400,6 +402,18 @@ const submitForm = async (formType, data) => {
   }
 }
 
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
 // 子表新增/编辑校验
 const detailValidate = (data) => {
   let tag = false;
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
index b1509aaab..e12e112c3 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts
@@ -34,7 +34,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -110,8 +110,8 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -364,7 +364,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -515,13 +515,20 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_ISSUE_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      filterable: true
     }
   },
   {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
index 17e70ea8c..167feec0e 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 计划外入库任务主表
@@ -10,7 +11,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -32,7 +33,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -121,8 +122,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   // },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -133,8 +134,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -511,8 +512,8 @@ export const UnplannedreceiptJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -564,7 +565,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -699,11 +700,21 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '货主代码',
@@ -724,9 +735,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -735,8 +746,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -744,9 +756,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -755,8 +767,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -764,9 +777,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -775,8 +788,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
index 5835c425a..afcc31947 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts
@@ -1,5 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import { TableColumn } from '@/types/table'
 
 /**
  * @returns {Array} 计划外入库记录主表
@@ -10,7 +11,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +21,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +30,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -96,9 +97,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -107,8 +108,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -122,8 +124,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -257,8 +259,8 @@ export const UnplannedreceiptRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -307,7 +309,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -432,9 +434,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -443,8 +445,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -452,9 +455,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -463,8 +466,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -472,9 +476,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -483,8 +487,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -510,11 +515,21 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
+    tableForm: {
+      type: 'Select',
+      filterable: true
+    }
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 983eb7684..78cbb6234 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -55,6 +55,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @inputNumberChange="inputNumberChange"
+    @tableFormSelectOnBlur="tableFormSelectOnBlur"
   />
 
   <!-- 详情 -->
@@ -72,6 +73,7 @@
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate"
     @detailBasicFormOnChange="qtyOnChange"
+    @onBlur="onBlur"
   />
 
   <!-- 创建标签 -->
@@ -108,13 +110,8 @@ import {
 import * as UnplannedreceiptRequestMainApi from '@/api/wms/unplannedreceiptRequestMain'
 import * as UnplannedreceiptRequestDetailApi from '@/api/wms/unplannedreceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import {
-  ProductionreturnRequestDetailLabel, ProductionreturnRequestDetailLabelRules
-} from "@/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data";
-import * as ProductionreturnRequestDetailApi from "@/api/wms/productionreturnRequestDetail";
 import * as ItembasicApi from "@/api/wms/itembasic";
 import * as PackageApi from "@/api/wms/package";
-import {UnplannedreceiptRequestDetailVO} from "@/api/wms/unplannedreceiptRequestDetail";
 import { formatTime } from '@/utils/index'
 
 // 计划外入库申请
@@ -634,6 +631,18 @@ const qtyOnChange = (field,val) =>{
   }
 }
 
+const onBlur = (field, e) => {
+  if (field == 'reason') {
+    detailRef.value.formRef.formRef.formModel[field] = e.target.value
+  }
+}
+
+const tableFormSelectOnBlur = (field, val, row, index) => {
+  if (field == 'reason') {
+    tableData.value[index][field] = val.target.value
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
index ae6a18bc3..902bad166 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
@@ -50,7 +50,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -150,8 +150,8 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -403,7 +403,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -655,9 +655,9 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -666,23 +666,24 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -691,23 +692,24 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -716,14 +718,15 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
@@ -742,13 +745,20 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'reason',
     dictType: DICT_TYPE.UNPLANNED_RECEIPT_REASON,
     dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return cellValue
+    },
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        filterable: true
+      }
+    },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      filterable: true
     }
   },
   {
@@ -1117,7 +1127,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 52c538f31..551c2f5d8 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue
@@ -194,8 +194,8 @@ const buttonTableClick = async (val, row) => {
         acceptTime: 1700562156000,
         completeUserName: null,
         completeTime: null,
-        fromLocationTypes: "RAW,SEMI",
-        toLocationTypes: "WIP",
+        fromAreaTypes: "RAW,SEMI",
+        toAreaTypes: "WIP",
         number: "JOB0620231121-0001",
         businessType: "Issue",
         remark: null,
@@ -229,8 +229,8 @@ const buttonTableClick = async (val, row) => {
           itemName: "物料01",
           itemDesc1: "",
           itemDesc2: "",
-          stdPackQty: null,
-          stdPackUnit: null,
+          packQty: null,
+          packUnit: null,
           supplierQty: null,
           supplierUom: null,
           projectCode: "xm01",
diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
index 0c1912d8f..ee3014e28 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts
@@ -10,7 +10,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -234,8 +234,8 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -246,8 +246,8 @@ export const IssueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -546,14 +546,14 @@ export const IssueJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -705,8 +705,8 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -716,11 +716,8 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -783,7 +780,7 @@ export const IssueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
index ac4e3198b..c232a91de 100644
--- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 发料记录主表
@@ -10,7 +10,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -80,9 +80,9 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -217,8 +218,8 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -244,8 +245,8 @@ export const IssueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -311,13 +312,13 @@ export const IssueRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
+  toAreaTypes: [
     { required: true, message: '请选择库位类型范围', trigger: 'change' }
   ],
   outTransaction: [
@@ -519,7 +520,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 798ea0e11..eaed0a207 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -140,8 +140,8 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -153,8 +153,8 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -749,7 +749,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
index afe89dbc4..53202d515 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  *  @returns {Array} 上线结算记录主表
@@ -10,7 +10,7 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'issueRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -80,9 +80,9 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -390,7 +391,7 @@ export const OnlinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
index 61fdbce9e..06de51f55 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
+++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts
@@ -34,7 +34,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -45,7 +45,7 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'issueRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
     form: {
@@ -518,7 +518,7 @@ export const OnlinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/pick/pickJobMain/index.vue b/src/views/wms/issueManage/pick/pickJobMain/index.vue
index 153f01d5b..fca7919b6 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickJobMain/index.vue
@@ -72,7 +72,7 @@ import * as PickJobMainApi from '@/api/wms/pickJobMain'
 import * as PickJobDetailApi from '@/api/wms/pickJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 拣料任务主
+// 备货任务主
 defineOptions({ name: 'PickJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -215,7 +215,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PickJobMainApi.exportPickJobMain(tableObject.params)
-    download.excel(data, '拣料任务主.xlsx')
+    download.excel(data, '备货任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
index b993d41ac..04280cab4 100644
--- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts
@@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
 /**
- * @returns {Array} 拣料任务主表
+ * @returns {Array} 备货任务主表
  */
 export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -10,7 +10,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -227,8 +227,8 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -239,8 +239,8 @@ export const PickJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -527,14 +527,14 @@ export const PickJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -575,7 +575,7 @@ export const PickJobMainRules = reactive({
 })
 
 /**
- * @returns {Array} 拣料任务子表
+ * @returns {Array} 备货任务子表
  */
 export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -696,7 +696,7 @@ export const PickJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/index.vue b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
index 94f63352d..87352f916 100644
--- a/src/views/wms/issueManage/pick/pickRecordMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickRecordMain/index.vue
@@ -67,7 +67,7 @@ import * as PickRecordMainApi from '@/api/wms/pickRecordMain'
 import * as PickRecordDetailApi from '@/api/wms/pickRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 拣料记录主
+// 备货记录主
 defineOptions({ name: 'PickRecordMain' })
 
 const message = useMessage() // 消息弹窗
@@ -148,7 +148,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PickRecordMainApi.exportPickRecordMain(tableObject.params)
-    download.excel(data, '拣料记录主.xlsx')
+    download.excel(data, '备货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
index 0b9568b57..85ea5f5ac 100644
--- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts
@@ -1,8 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
- * @returns {Array} 拣料记录主表
+ * @returns {Array} 备货记录主表
  */
 export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -10,7 +10,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -72,9 +72,9 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -83,8 +83,9 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -217,8 +218,8 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -236,8 +237,8 @@ export const PickRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -284,14 +285,14 @@ export const PickRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -329,7 +330,7 @@ export const PickRecordMainRules = reactive({
 })
 
 /**
- * @returns {Array} 拣料记录子表
+ * @returns {Array} 备货记录子表
  */
 export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -444,7 +445,7 @@ export const PickRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
index b1ff89c76..5e1d78556 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue
+++ b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
@@ -84,7 +84,7 @@ import * as PickRequestMainApi from '@/api/wms/pickRequestMain'
 import * as PickRequestDetailApi from '@/api/wms/pickRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 拣料申请
+// 备货申请
 defineOptions({ name: 'PickRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -270,7 +270,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PickRequestMainApi.exportPickRequestMain(tableObject.params)
-    download.excel(data, '拣料申请主.xlsx')
+    download.excel(data, '备货申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -323,7 +323,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '拣料申请主导入模版.xlsx'
+  templateTitle: '备货申请主导入模版.xlsx'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
index 3d0b1efc4..ca6888846 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
+++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts
@@ -23,7 +23,7 @@ const queryParams = {
  
 
 /**
- * @returns {Array} 拣料申请主表
+ * @returns {Array} 备货申请主表
  */
 export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -31,7 +31,7 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -46,8 +46,8 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -74,8 +74,8 @@ export const PickRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -354,14 +354,14 @@ export const PickRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请输入到仓库代码', trigger: 'blur' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -384,7 +384,7 @@ export const PickRequestMainRules = reactive({
 })
 
 /**
- * @returns {Array} 拣料申请子表
+ * @returns {Array} 备货申请子表
  */
 export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -411,7 +411,7 @@ export const PickRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 988c3540d..2337788fe 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import * as ProductionMainApi from '@/api/wms/productionMain'
 import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
@@ -25,11 +25,19 @@ import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 import * as WorkStationApi from '@/api/wms/workstation'
 import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
-
-
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
 
 const { t } = useI18n() // 国际化
 
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PreparetoissuePlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
 /**
  * @returns {Array} 备料计划主表
  */
@@ -39,7 +47,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 160,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -50,7 +58,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'productionPlanNumber',
     sort: 'custom',
     table: {
-      width: 160
+      width: 180
     },
     form: {
       labelMessage: '同时影响车间 生产线 班组 班次',
@@ -169,9 +177,9 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划日期',
     field: 'planDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -180,9 +188,9 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -273,6 +281,66 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoCommit,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoAgree,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -341,7 +409,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 220,
       fixed: 'right'
     },
   }
@@ -557,7 +625,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 160
+      width: 180
     },
     form: {
       componentProps: {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
index 53dfc428a..ff0b642a2 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
@@ -179,8 +179,8 @@ const buttonTableClick = async (val, row) => {
     "acceptTime": 1700737729000,
     "completeUserId": null,
     "completeTime": null,
-    "fromLocationTypes": "RAW,SEMI",
-    "toLocationTypes": "WIP",
+    "fromAreaTypes": "RAW,SEMI",
+    "toAreaTypes": "WIP",
     "number": "JOB2920231123-0001",
     "businessType": "ProductionReceipt",
     "remark": null,
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
index 653947e97..d86bc636d 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts
@@ -10,7 +10,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'issueJobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -239,8 +239,8 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -250,8 +250,8 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -550,14 +550,14 @@ export const ProductionreceiptJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
 })
 
@@ -707,7 +707,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index e73a6f6fb..e4be38b7e 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 生产收料记录主表
@@ -10,7 +10,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'issueRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -80,9 +80,9 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detai: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -209,8 +210,8 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -236,8 +237,8 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -303,14 +304,14 @@ export const ProductionreceiptRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -471,7 +472,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
index 60d845ae7..9557fe216 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
@@ -187,8 +187,8 @@ const buttonTableClick = async (val, row) => {
     "acceptTime": 1701856251000,
     "completeUserId": null,
     "completeTime": null,
-    "fromLocationTypes": "WIP",
-    "toLocationTypes": "HOLD",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "HOLD",
     "number": "JOB2820231206-0013",
     "businessType": "ReturnToHold",
     "remark": "",
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
index 2967b04ac..f49676ca9 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts
@@ -10,7 +10,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -243,8 +243,8 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -254,8 +254,8 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -534,14 +534,14 @@ export const ProductionreturnJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -719,7 +719,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
index 91eb4f3bc..c29c76ce7 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 生产退料记录主表
@@ -10,7 +10,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -80,9 +80,9 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -217,8 +218,8 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -244,8 +245,8 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -292,14 +293,14 @@ export const ProductionreturnRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -361,7 +362,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index b65bfa774..c636538eb 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -85,6 +85,11 @@
       @searchTableSuccess="searchTableSuccess"
       @submitForm="submitFormLabel"
     />
+      
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
 </template>
 
 <script setup lang="ts">
@@ -232,6 +237,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -243,6 +249,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -614,10 +622,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/904910575183290368?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     } else {
-      const src = ref(BASE_URL + '/jmreport/view/904911200226861056?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     }
   } else {
@@ -625,6 +633,23 @@ const handlePoint = async (row) => {
   }
 }
 
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '生产退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -637,5 +662,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
index 3ce0b65a1..952bb2142 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
@@ -51,7 +51,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -144,8 +144,8 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -156,8 +156,8 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -748,7 +748,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -1152,7 +1152,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
index 16c6a20fd..4f74ce577 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
@@ -84,6 +84,11 @@
       @searchTableSuccess="searchTableSuccess"
       @submitForm="submitFormLabel"
     />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/importNO" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
 </template>
 
 <script setup lang="ts">
@@ -237,6 +242,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -248,6 +254,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -607,10 +615,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/904910575183290368?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     } else {
-      const src = ref(BASE_URL + '/jmreport/view/904911200226861056?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     }
   } else {
@@ -618,6 +626,23 @@ const handlePoint = async (row) => {
   }
 }
 
+/** 导入 */
+const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '隔离退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -630,5 +655,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainNoApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
index 0ba56794a..0fd27bd5c 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts
@@ -339,7 +339,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -732,7 +732,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
index f36efa431..1c7fefc2f 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
@@ -192,8 +192,8 @@ const buttonTableClick = async (val, row) => {
     "acceptTime": 1701159181000,
     "completeUserId": null,
     "completeTime": null,
-    "fromLocationTypes": "RAW,SEMI",
-    "toLocationTypes": "WIP",
+    "fromAreaTypes": "RAW,SEMI",
+    "toAreaTypes": "WIP",
     "number": "JOB0720231128-0001",
     "businessType": "Repleinment",
     "remark": null,
diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
index 54311d734..19db4a15a 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts
@@ -10,7 +10,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -227,8 +227,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -239,8 +239,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -527,14 +527,14 @@ export const RepleinshJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -696,7 +696,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
index 2b25edc06..663260573 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 补料记录主表
@@ -10,7 +10,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -72,9 +72,9 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -83,8 +83,9 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -217,8 +218,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -236,8 +237,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -284,14 +285,14 @@ export const RepleinshRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -444,7 +445,7 @@ export const RepleinshRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index 5b68ade91..d0e656069 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -40,7 +40,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -71,8 +71,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -106,8 +106,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -392,14 +392,14 @@ export const RepleinshRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请输入到仓库代码', trigger: 'blur' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -470,7 +470,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
index 525cc6657..a17f9797c 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存修改记录主表
@@ -10,7 +10,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -95,9 +95,9 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -106,8 +106,9 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -273,7 +274,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -465,9 +466,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从到货日期',
     field: 'fromArriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -476,8 +477,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -485,9 +487,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到到货日期',
     field: 'toArriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -496,8 +498,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -505,9 +508,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从生产日期',
     field: 'fromProduceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -516,8 +519,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -525,9 +529,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到生产日期',
     field: 'toProduceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -536,8 +540,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -545,9 +550,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从过期日期',
     field: 'fromExpireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -556,8 +561,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -565,9 +571,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到过期日期',
     field: 'toExpireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -576,8 +582,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index d1772262d..345f37a76 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
@@ -38,7 +38,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -346,7 +346,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -680,9 +680,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '从到货日期',
     field: 'fromArriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -691,9 +691,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -703,9 +703,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '从生产日期',
     field: 'fromProduceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -714,9 +714,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -726,9 +726,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '从过期日期',
     field: 'fromExpireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -737,16 +737,16 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
       disabled: true
     },
@@ -754,9 +754,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '到过期日期',
     field: 'toExpireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -765,15 +765,15 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     },
   },
@@ -790,9 +790,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '到到货日期',
     field: 'toArrivdAte',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -801,9 +801,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -813,9 +813,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '到生产日期',
     field: 'toProduceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -824,9 +824,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index 0d5f5b842..d0fda520b 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -10,7 +10,7 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -147,8 +147,8 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -159,8 +159,8 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -546,14 +546,14 @@ export const InventorymoveJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -602,7 +602,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
index acc6f3bbe..d89084b67 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 库存转移记录主表
@@ -10,7 +10,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -115,9 +115,9 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -126,8 +126,9 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -149,8 +150,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -160,8 +161,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -303,8 +304,8 @@ export const InventorymoveRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -312,8 +313,8 @@ export const InventorymoveRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -359,7 +360,7 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 7edd66126..d02106a9e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
@@ -601,6 +601,7 @@ const submitForm = async (formType, data) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
+    isExist = false
     return message.warning('包装号重复')
   }
   data.subList.forEach(item => {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 606f2311e..2e4996055 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -40,7 +40,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -145,8 +145,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     // dictType: DICT_TYPE.LOCATION_TYPE,
     // dictClass: 'string',
     isTable: true,
@@ -175,8 +175,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     // dictType: DICT_TYPE.LOCATION_TYPE,
     // dictClass: 'string',
     isTable: true,
@@ -454,7 +454,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/moveManage/itemChange/itemChange.data.ts b/src/views/wms/moveManage/itemChange/itemChange.data.ts
index d9edd3a60..4f7331bd9 100644
--- a/src/views/wms/moveManage/itemChange/itemChange.data.ts
+++ b/src/views/wms/moveManage/itemChange/itemChange.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 import * as OwnerApi from '@/api/wms/owner'
 import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
@@ -159,9 +159,9 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货日期',
     field: 'arriveDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -170,7 +170,10 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     isForm: false
@@ -179,9 +182,9 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产日期',
     field: 'produceDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -190,7 +193,10 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     isForm: false
@@ -200,9 +206,9 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -211,9 +217,9 @@ export const ItemChange = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style:{width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     }
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
index 645e98bae..c0abc9591 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 下线结算记录主表
@@ -19,7 +19,7 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -80,9 +80,9 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -350,7 +351,7 @@ export const OfflinesettlementRecordDetail = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
index 2f4aa5b6d..ae32ed00d 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
+++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts
@@ -30,7 +30,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -41,7 +41,7 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive<CrudSchema[]
     field: 'productReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -386,7 +386,7 @@ export const OfflinesettlementRequestDetail = useCrudSchemas(reactive<CrudSchema
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
index 947f82120..abb006371 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 制品拆解任务主表
@@ -10,7 +10,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -251,8 +251,8 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -262,8 +262,8 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -534,8 +534,8 @@ export const ProductdismantleJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -633,9 +633,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -644,8 +644,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -653,9 +654,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -664,8 +665,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -682,8 +684,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -693,8 +695,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -770,7 +772,7 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -855,11 +857,11 @@ export const ProductdismantleJobDetailRules = reactive({
   inventoryStatus: [
     { required: true, message: '请选择库存状态', trigger: 'change' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   fromLocationCode: [
     { required: true, message: '请选择从库位代码', trigger: 'change' }
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index edde86cb6..c4aaa96ff 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 制品拆解记录主表
@@ -10,7 +10,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -88,9 +88,9 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -99,8 +99,9 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -225,8 +226,8 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -273,8 +274,8 @@ export const ProductdismantleRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -377,9 +378,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -388,8 +389,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -397,9 +399,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -408,8 +410,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -454,7 +457,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -783,7 +786,7 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       componentProps:{
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 43eec67b2..8dd8e6cc5 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as ProcessApi from '@/api/wms/process'
@@ -55,7 +55,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -144,8 +144,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -695,9 +695,9 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -706,25 +706,25 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     form: {
       component: 'DatePicker',
       componentProps: {
-        style:{width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
     },
     tableForm: {
       disabled: true,
-      type: 'FormDateTime',
+      type: 'FormDate',
       valueFormat: 'x',
     }
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -733,16 +733,16 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     form: {
       component: 'DatePicker',
       componentProps: {
-        style:{width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
         disabled: true
       }
     },
     tableForm: {
       disabled: true,
-      type: 'FormDateTime',
+      type: 'FormDate',
       valueFormat: 'x',
     }
   },
@@ -767,8 +767,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -777,8 +777,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isForm: false,
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -804,7 +804,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -1064,7 +1064,7 @@ export const DismantleRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -1314,7 +1314,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm:{
       disabled: true
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 21e186f9d..088faf7b7 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -215,6 +215,16 @@ const butttondata = (row) => {
     defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:production-main:resetting'}), // 重置
     defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:production-main:delete'}), // 删除
+    {
+      label: '生成备料计划/收货申请',
+      name: 'scbljh',
+      hide: isShowMainButton(row,['6']),
+      type: 'primary',
+      icon: 'Select',
+      hasPermi:'wms:production-main:publish',
+      link: true, // 文本展现按钮
+      color: ''
+    },
   ]
 }
 
@@ -222,7 +232,7 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPlanOpe') { // 打开
     tableObject.loading = true
-    ProductionMainApi.open(row.id).then(() => {
+    await ProductionMainApi.open(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -233,7 +243,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanClo') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductionMainApi.close(row.id).then(() => {
+    await ProductionMainApi.close(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -245,7 +255,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductionMainApi.submit(row.id).then(() => {
+    await ProductionMainApi.submit(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -256,7 +266,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanTur') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductionMainApi.reject(row.id).then(() => {
+    await ProductionMainApi.reject(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -268,7 +278,7 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductionMainApi.agree(row.id).then(() => {
+    await ProductionMainApi.agree(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -296,7 +306,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    ProductionMainApi.publish(row.id).then(() => {
+    await ProductionMainApi.publish(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -307,7 +317,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanRes') { // 重置
     await message.confirm('确认要重置吗？')
     tableObject.loading = true
-    ProductionMainApi.resetting(row.id).then(() => {
+    await ProductionMainApi.resetting(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -315,11 +325,24 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
+  } else if(val == 'scbljh') {
+    if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
+    await message.confirm('确认要生成备料计划/收货申请吗？')
+    tableObject.loading = true
+    await ProductionMainApi.generateRequest(row.number).then(() => {
+      message.success(t('common.createSuccess'))
+      tableObject.loading = false
+      getList()
+    }).catch(err => {
+      tableObject.loading = false
+      console.log(err)
+    })
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   }
+  
 }
 
 /** 添加/修改操作 */
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index c36240d64..4b65905b4 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as WorkMainApi from '@/api/wms/workMain'
 import * as WorkDetailApi from '@/api/wms/workDetail'
 import { WorkDetail, WorkMain } from '../workMain/workMain.data'
@@ -15,8 +15,20 @@ import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import * as BomApi from '@/api/wms/bom'
 import { Bom } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
+
+import * as getPlansettingApi  from '@/api/wms/plansetting/index'
+
 const { t } = useI18n() // 国际化
 
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductionPlan'
+}
+ const data = await getPlansettingApi.getPlansettingPage(queryParams)
+ const plansettingData =data?.list[0]||{}
+
 /**
  * @returns {Array} 生产计划主表
  */
@@ -26,12 +38,31 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
     isSearch: true,
   },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    // form: {
+    //   value: '1',
+    //   componentProps: {
+    //     disabled: true
+    //   }
+    // },
+    isForm:false,
+    isSearch: true,
+  },
   {
     label: '顺序',
     field: 'displayOrder',
@@ -149,20 +180,20 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划日期',
     field: 'planDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
-      width: 180
+      width: 120
     },
     form: {
       component: 'DatePicker',
       componentProps: {
         style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -234,54 +265,86 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      component: 'Switch',
+      value: plansettingData.autoCommit,
       componentProps: {
-        style: {width: '100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
       }
-    },
-    isForm: false,
+    }
   },
   {
-    label: '状态',
-    field: 'status',
-    sort: 'custom',
-    dictType: DICT_TYPE.PLAN_STATUS,
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
+    sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      value: '1',
+      component: 'Switch',
+      value: plansettingData.autoAgree,
       componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
         disabled: true
       }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
     },
-    isSearch: true,
+    form: {
+      component: 'Switch',
+      value: plansettingData.autoExecute,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    }
   },
+
   // {
   //   label: '开始时间',
   //   field: 'beginTime',
@@ -369,8 +432,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isForm: false,
   // },
   {
-    label: '最后更新者',
-    field: 'updater',
+    label: '创建者',
+    field: 'creator',
     sort: 'custom',
     table: {
       width: 150
@@ -378,8 +441,8 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '最后更新时间',
-    field: 'updateTime',
+    label: '创建时间',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -400,24 +463,35 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '最后更新者',
+    field: 'updater',
     sort: 'custom',
     table: {
       width: 150
     },
+    isForm: false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
     form: {
-      component: 'Switch',
-      value: 'TRUE',
+      component: 'DatePicker',
       componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+        style: {width: '100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
-    }
+    },
+    isForm: false,
   },
   {
     label: '操作',
@@ -616,7 +690,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
index 9d2ec8824..0f1be4649 100644
--- a/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/workMain/workMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
@@ -15,7 +15,7 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 160,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -64,9 +64,9 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '订单日期',
     field: 'orderDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -75,8 +75,9 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -84,9 +85,9 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '截止日期',
     field: 'dueDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -95,8 +96,9 @@ export const WorkMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -310,7 +312,7 @@ export const WorkDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
index 5cfc67d11..c519832a2 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
@@ -169,8 +169,8 @@ const buttonTableClick = async (val, row) => {
     "toWarehouseCode": null,
     "fromAreaCodes": "",
     "toAreaCodes": "",
-    "fromLocationTypes": "WIP,RAW",
-    "toLocationTypes": "SEMI,FG",
+    "fromAreaTypes": "WIP,RAW",
+    "toAreaTypes": "SEMI,FG",
     "completetime": 1702545291000,
     "requestTime": 1702524283000,
     "requestDueTime": 1689562428000,
diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
index e5b3c7d85..904c49e0e 100644
--- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts
@@ -10,7 +10,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -235,8 +235,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -246,8 +246,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -535,14 +535,14 @@ export const ProductputawayJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -720,7 +720,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
index df1d4faf1..f07a7dc7f 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 制品上架记录主表
@@ -10,7 +10,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -80,9 +80,9 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -225,8 +226,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -244,8 +245,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -292,14 +293,14 @@ export const ProductputawayRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -468,7 +469,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
index 8c815f51a..23af73565 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@@ -61,8 +61,8 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -258,8 +258,8 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: true,
@@ -537,7 +537,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
index 4a5a9dea8..9d1068068 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
@@ -193,8 +193,8 @@ const buttonTableClick = async (val, row) => {
     "completeTime": 1702377036000,
     "toWarehouseCode": null,
     "toAreaCodes": "",
-    "fromLocationTypes": "WIP",
-    "toLocationTypes": "WIP",
+    "fromAreaTypes": "WIP",
+    "toAreaTypes": "WIP",
     "number": "JOB2120231212-0001",
     "businessType": "ProductReceipt",
     "remark": null,
@@ -227,8 +227,8 @@ const buttonTableClick = async (val, row) => {
     "inventoryStatus": "OK",
     "woNumber": null,
     "woLine": null,
-    "stdPackQty": 8,
-    "stdPackUnit": "BOX",
+    "packQty": 8,
+    "packUnit": "BOX",
     "itemCode": "item01",
     "itemName": "物料01",
     "itemDesc1": "",
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
index 98cef4df0..75fb6eb02 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 制品收货任务主表
@@ -10,7 +10,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -259,8 +259,8 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -270,8 +270,8 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -542,8 +542,8 @@ export const ProductreceiptJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -641,9 +641,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -652,8 +652,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -661,9 +662,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -672,8 +673,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -714,8 +716,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -725,8 +727,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -802,7 +804,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -877,11 +879,11 @@ export const ProductreceiptJobDetailRules = reactive({
   woLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   toLocationCode: [
     { required: true, message: '请选择到库位代码', trigger: 'change' }
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
index 0fbad8065..58cb84811 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 制品收货记录主表
@@ -10,7 +10,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -104,9 +104,9 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -115,8 +115,9 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -241,8 +242,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -289,8 +290,8 @@ export const ProductreceiptRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   toAreaCodes: [
     { required: true, message: '请选择到库区代码范围', trigger: 'change' }
@@ -385,9 +386,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -396,8 +397,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -405,9 +407,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -416,8 +418,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -482,8 +485,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -493,8 +496,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -508,7 +511,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -684,11 +687,11 @@ export const ProductreceiptRecordDetailRules = reactive({
   woLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   number: [
     { required: true, message: '请输入单据号', trigger: 'blur' }
@@ -780,7 +783,7 @@ export const BackflushRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index f4fb0115e..97ae909a5 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -643,10 +643,10 @@ const handlePoint = async (row) => {
   // 判断是采购还是制造
   if (isCreateLabel.value) {
     if (labelType.value == 'cg') {
-      const src = ref(BASE_URL + '/jmreport/view/904910575183290368?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     } else {
-      const src = ref(BASE_URL + '/jmreport/view/904911200226861056?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&request_number='+row.number)
     }
   } else {
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index 4aece033c..528f14956 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as WorkshopApi from '@/api/wms/workshop'
@@ -55,7 +55,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -66,7 +66,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'productionPlanNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
     isForm: false,
@@ -154,8 +154,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -656,8 +656,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -673,8 +673,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm: false
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -700,7 +700,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -888,24 +888,24 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
       width: 180
     },
     tableForm: {
-      type: 'FormDateTime',
+      type: 'FormDate',
       valueFormat: 'x',
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -913,24 +913,24 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
       width: 180
     },
     tableForm: {
-      type: 'FormDateTime',
+      type: 'FormDate',
       valueFormat: 'x',
     },
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -1071,7 +1071,7 @@ export const BackflushRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -1325,7 +1325,7 @@ export const BackflushDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isTableForm: false,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index c0a55f07d..cf4468e48 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
 import * as BomApi from "@/api/wms/bom";
 
@@ -12,7 +12,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -22,7 +22,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
   {
@@ -88,9 +88,9 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -99,8 +99,9 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -226,8 +227,8 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -274,8 +275,8 @@ export const ProductrepairRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -387,9 +388,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -398,8 +399,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -407,9 +409,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -418,8 +420,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -464,7 +467,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -797,7 +800,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm:{
       disabled: true
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 8779257d1..fe3434f49 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -55,7 +55,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -144,8 +144,8 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -733,7 +733,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -1027,7 +1027,7 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -1281,7 +1281,7 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm:{
       disabled: true
diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
index 282fbeb6b..172a29b18 100644
--- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts
@@ -10,7 +10,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -227,8 +227,8 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -238,8 +238,8 @@ export const ProductscrapJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -510,8 +510,8 @@ export const ProductscrapJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -687,7 +687,7 @@ export const ProductscrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
index a9215df24..198fd8d69 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data";
 import * as WorkshopApi from "@/api/wms/workshop";
 import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data";
@@ -30,7 +30,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -40,7 +40,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -49,7 +49,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       show:false
     },
     isSearch: true
@@ -117,9 +117,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -128,8 +128,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -255,8 +256,8 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -303,8 +304,8 @@ export const ProductscrapRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   fromAreaCodes: [
     { required: true, message: '请选择从库区代码范围', trigger: 'change' }
@@ -489,7 +490,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -756,7 +757,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm:{
       disabled: true
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
index 50cad5b10..b40f61bb4 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
@@ -55,7 +55,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -146,8 +146,8 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -878,7 +878,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -1125,7 +1125,7 @@ export const ProdcutscrapBomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm:{
       disabled: true
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
index e9473ede4..33d2defa1 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts
@@ -10,7 +10,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -29,7 +29,7 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaseReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -215,8 +215,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -226,8 +226,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -706,7 +706,7 @@ export const InspectJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index 1c8b11411..5f867c3e1 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -131,12 +131,29 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest'}), // 生成采购上架申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:inspectRecordMain:putawayRequest',hide:!row.putawayRequestFlag}), // 生成采购上架申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+      handlePutawayRequest(row.number)
+    }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handlePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await InspectRecordMainApi.createPutAwayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
index da7294a36..abe003386 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 检验记录主表
@@ -10,7 +10,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaseReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -88,9 +88,9 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter : dateFormatter,
+    formatter : dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -99,8 +99,9 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -208,14 +209,6 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '订单号',
     field: 'poNumber',
@@ -367,8 +360,8 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     isTable: true,
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
@@ -412,6 +405,16 @@ export const InspectRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
   }
 ]))
 
@@ -429,8 +432,8 @@ export const InspectRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   poNumber: [
     { required: true, message: '请选择订单号', trigger: 'change' }
@@ -674,7 +677,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
index 8dd05f90f..1075e5de4 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts
@@ -182,8 +182,8 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -194,8 +194,8 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -476,8 +476,8 @@ export const InspectRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   poNumber: [
     { required: true, message: '请输入订单号', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 8309ee828..e6ce661d6 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 采购收货任务主表
@@ -10,7 +10,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -29,7 +29,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -65,6 +65,21 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
   {
     label: '运输方式',
     field: 'transferMode',
@@ -284,8 +299,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -295,8 +310,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -578,8 +593,8 @@ export const PurchasereceiptJobMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -658,9 +673,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -669,8 +684,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -678,9 +694,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -689,8 +705,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -698,9 +715,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -709,8 +726,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -759,8 +777,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -770,9 +788,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    label: '包装规格',
+    field: 'packUnit',
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -896,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -963,11 +980,11 @@ export const PurchasereceiptJobDetailRules = reactive({
   poLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index dd7691443..3990e757e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -125,14 +125,44 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceiptRecordMain:inspectRequest'}), // 生成到货检验申请
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),// 生成采购上架申请
   ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'putawayRequest') { // 生成采购上架申请
-    handleExport()
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
   }
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index d73aa5e0a..6026e73f1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 
 
@@ -12,7 +12,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -22,7 +22,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -31,7 +31,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -39,7 +39,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -47,7 +47,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -83,6 +83,21 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
   {
     label: '车牌号',
     field: 'vehiclePlateNumber',
@@ -108,8 +123,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -119,8 +134,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -184,9 +199,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -195,8 +210,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -332,6 +348,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
   }
 ]))
 
@@ -346,7 +372,7 @@ export const PurchasereceiptRecordMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
+  toAreaTypes: [
     { required: true, message: '请选择到库位类型服务', trigger: 'change' }
   ],
   outTransaction: [
@@ -393,7 +419,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -526,8 +552,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -537,9 +563,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    label: '包装规格',
+    field: 'packUnit',
     dictClass: 'string',
     isSearch: true,
     isTable: true,
@@ -652,9 +677,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -663,8 +688,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -672,9 +698,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -683,8 +709,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -692,9 +719,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -703,8 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -886,11 +914,11 @@ export const PurchasereceiptRecordDetailRules = reactive({
   poLine: [
     { required: true, message: '请选择订单行', trigger: 'change' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index c30144b35..baff226ae 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -54,6 +54,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 详情 -->
@@ -73,23 +74,53 @@
   />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchasereceipt-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @submitForm="submitFormLabel"
+  />
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { PurchasereceiptRequestMain,PurchasereceiptRequestMainRules,PurchasereceiptRequestDetail,PurchasereceiptRequestDetailRules } from './purchasereceiptRequestMain.data'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+ } from './purchasereceiptRequestMain.data'
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
 import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
 
 // 采购收货申请
 defineOptions({ name: 'PurchasereceiptRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const genLabelId = ref(); //主表ID
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -99,7 +130,6 @@ const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDet
 const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
 
 
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -107,6 +137,8 @@ const updataTableColumns = (val) => {
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  //console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
@@ -115,9 +147,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['itemCode'] = val[0]['code']
       } else if(formField == 'poNumber') {
         row['poNumber'] = val[0]['number']
-      } else {
-        // row['poNumber'] = val[0]['number']
+      } else if(formField == 'poLine'){
         row['poLine'] = val[0]['lineNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        let supplierCode = formRef.formModel.supplierCode;
+        let itemCode = val[0]['itemCode']
+        let queryData = {
+          supplierCode:supplierCode,
+          itemCode:itemCode
+        } 
+        SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+          row['defaultToLocationCode'] = res
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
       }
     } else {
       const setV = {}
@@ -151,6 +196,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -159,7 +206,11 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'export') { // 导出
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -184,16 +235,38 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
     defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
     defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
-    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
     // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
   ]
 }
 
@@ -213,9 +286,51 @@ const buttonTableClick = async (val, row) => {
     handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.id
+     }
+    genLabelId.value = row.id
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } 
+}
+
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    await message.confirm('是否为此数据生成标签？')
+    await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const labelPrint = async (row) => {
+  window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -248,52 +363,71 @@ const handleClose = async (id: number) => {
 
 /** 重新添加按钮操作 */
 const handleReAdd = async (id: number) => {
+  try{
     await message.confirm(t('common.confirmReAdd'))
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
     message.success(t('common.reAddSuccess'))
-    tableObject.loading = false
     await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 审批通过按钮操作 */
 const handleAgree = async (id: number) => {
+  try{
     await message.confirm(t('common.confirmAgree'))
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
     message.success(t('common.agreeSuccess'))
     tableObject.loading = false
     await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 审批驳回按钮操作 */
 const handleRefused = async (id: number) => {
+  try{
     await message.confirm(t('common.confirmRefused'))
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
     message.success(t('common.refusedSuccess'))
     tableObject.loading = false
     await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 处理按钮操作 */
 const handleHandle = async (id: number) => {
+  try{
     await message.confirm(t('common.confirmHandle'))
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
     tableObject.loading = false
     await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 提交按钮操作 */
 const handleSubmit = async (id: number) => {
+  try{
     await message.confirm(t('common.confirmSubmit'))
     tableObject.loading = true
     await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
     message.success(t('common.submitSuccess'))
     tableObject.loading = false
     await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
 }
 
 /** 导出按钮操作 */
@@ -386,6 +520,13 @@ const searchFormClick = (searchData) => {
 //   }
 // }
 
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 9b71b9ff1..df3bb46c9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -1,35 +1,39 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
-const { t } = useI18n() // 国际化
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-import * as ItembasicApi from '@/api/wms/itembasic'
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+import { useUserStore } from '@/store/modules/user'
+import { TableColumn } from '@/types/table'
 
+
+const { t } = useI18n() // 国际化
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
   pageNo:1,
   code:'PurchaseReceiptRequest'
 }
- const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
- const requestsettingData =data?.list[0]||{}
+const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+const requestsettingData =data?.list[0]||{}
 
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
 
 // 获取当前操作人的部门
- import { useUserStore } from '@/store/modules/user'
- import { TableColumn } from '@/types/table'
- const userStore = useUserStore()
- const userDept = userStore.userSelfInfo.dept
- // id 转str 否则form回显匹配不到
- userDept.id = userDept.id.toString()
- const userDeptArray:any = [userDept]
+const userStore = useUserStore()
+const userDept = userStore.userSelfInfo.dept
+// id 转str 否则form回显匹配不到
+userDept.id = userDept.id.toString()
+const userDeptArray:any = [userDept]
  
-
 /**
  * @returns {Array} 采购收货申请主表
  */
@@ -39,49 +43,77 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
     isSearch: true,
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
   },
   {
-    label: '要货计划单号',
-    field: 'ppNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isForm: false,
+    isForm: true,
   },
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '要货计划单号',
+    field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '供应商信息', // 查询弹窗标题
-        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
-        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
       }
-    }
+    },
+    isForm: true,
   },
   {
     label: '承运商',
@@ -94,6 +126,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '运输方式',
     field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
     sort: 'custom',
     table: {
       width: 150
@@ -108,6 +141,22 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'ASN_ExternalReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -127,8 +176,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -139,8 +188,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -328,7 +377,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoCommit,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -348,7 +397,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoAgree,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -368,7 +417,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     form: {
       component: 'Switch',
-      value: requestsettingData.autoExecute,
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE',
@@ -402,7 +451,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 230,
+      width: 300,
       fixed: 'right'
     },
   }
@@ -416,8 +465,8 @@ export const PurchasereceiptRequestMainRules = reactive({
   toWarehouseCode: [
     { required: true, message: '请输入到仓库代码', trigger: 'blur' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请输入到库位类型范围', trigger: 'blur' }
+  toAreaTypes: [
+    { required: true, message: '请输入到库区类型范围', trigger: 'blur' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -456,7 +505,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'number',
       searchTitle: '采购订单信息',
       searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
     },
     form: {
       labelMessage: '该订单号会影响订单行的选择',
@@ -466,7 +521,13 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'number',
         searchTitle: '采购订单信息',
         searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
       }
     }
   },
@@ -507,7 +568,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         message: '请填写订单号！',
         isMainValue: true
       }]
-      }
+    }
   },
   {
     label: '物料代码',
@@ -517,22 +578,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码',
-      searchField: 'code',
-      searchTitle: '物料基础信息',
-      searchAllSchemas: Itembasic.allSchemas,
-      searchPage: ItembasicApi.getItembasicPage
+      disabled: true
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
-        searchField: 'code',
-        searchTitle: '物料基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
+        disabled: true
       }
     }
   },
@@ -566,14 +616,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '包装号',
     field: 'packingNumber',
@@ -581,7 +624,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: true,
+    isTableForm: false,
     isForm: false
   },
   {
@@ -625,7 +668,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {
@@ -645,23 +689,44 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '替代批次',
-    field: 'altBatch',
-    sort: 'custom',
-    table: {
-      width: 150
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
     },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
   },
   {
-    label: '到货日期',
-    field: 'arriveDate',
-    formatter: dateFormatter,
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -670,24 +735,45 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm:{
       type:'FormDate',
-      placeholder: '请选择到货日期',
+      placeholder: '请选择生产日期',
       valueFormat: 'x',
     },
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter,
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -696,24 +782,24 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm:{
       type:'FormDate',
-      placeholder: '请选择生产日期',
+      placeholder: '请选择到货日期',
       valueFormat: 'x',
     },
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -722,9 +808,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -751,37 +837,76 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
-      },
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
     },
-    isTableForm: false,
-    isForm: false
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
+    label: '包装规格',
+    field: 'packUnit',
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
     },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
   },
   {
     label: '供应商计量数量',
@@ -837,7 +962,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -947,8 +1072,8 @@ export const PurchasereceiptRequestDetailRules = reactive({
   expireDate: [
     { required: true, message: '请输入过期日期', trigger: 'change' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
   poNumber: [
     { required: true, message: '请输入订单号', trigger: 'change' }
@@ -956,8 +1081,8 @@ export const PurchasereceiptRequestDetailRules = reactive({
   poLine: [
     { required: true, message: '请输入订单行', trigger: 'change' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
@@ -971,3 +1096,543 @@ export const PurchasereceiptRequestDetailRules = reactive({
 })
 
 
+
+export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
index 320f9c738..be0ad7436 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts
@@ -10,7 +10,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -29,7 +29,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaseReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -45,7 +45,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -105,8 +105,8 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isSearch: false,
@@ -117,8 +117,8 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -574,8 +574,8 @@ export const PurchasereturnJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -788,7 +788,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index 13add37e8..c1e88d93a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -66,6 +66,7 @@ import { PurchasereturnRecordMain,PurchasereturnRecordMainRules,PurchasereturnRe
 import * as PurchasereturnRecordMainApi from '@/api/wms/purchasereturnRecordMain'
 import * as PurchasereturnRecordDetailApi from '@/api/wms/purchasereturnRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
 
 // 采购退货记录主
 defineOptions({ name: 'PurchasereturnRecordMain' })
@@ -126,11 +127,22 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-  return []
+  return [defaultButtons.mainListDocumentPrintBtn(null)]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.id)
+  }
+}
+
+// 单据打印
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index f264a560f..ad3562c9a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 采购退货记录主表
@@ -10,7 +10,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'purchaseReceiptRecordNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -45,7 +45,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -53,7 +53,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -130,8 +130,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -141,8 +141,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -190,9 +190,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -201,8 +201,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -329,6 +330,16 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
   }
 ]))
 
@@ -343,8 +354,8 @@ export const PurchasereturnRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 098be8463..0308e6729 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -153,7 +153,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       row['fromLocationGroupCode'] = val[0]['locationGroupCode']
       row['toLocationGroupCode'] = null
       row['toWarehouseCode'] = null
-      row['toLocationTypes'] = null
+      row['toAreaTypes'] = null
       row['fromAreaCode'] = val[0]['areaCode']
       row['toAreaCode'] = val[0]['toAreaCode']
       row['fromQwnerCode'] = val[0]['fromQwnerCode']
@@ -200,7 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
               item.containerNumber = item.toContainerNumber
               item.toLocationGroupCode = null
               item.toWarehouseCode = null
-              item.toLocationTypes = null
+              item.toAreaTypes = null
               item.toLocationCode = null
               // item.fromLocationCode = item.fromLocationCode
               // item.fromLocationGroupCode = item.fromLocationGroupCode
@@ -266,7 +266,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
       setV['toLocationGroupCode'] = null
       setV['toWarehouseCode'] = null
-      setV['toLocationTypes'] = null
+      setV['toAreaTypes'] = null
       setV['fromAreaCode'] = val[0]['areaCode']
       setV['toAreaCode'] = val[0]['toAreaCode']
       setV['fromQwnerCode'] = val[0]['fromQwnerCode']
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 194494102..e5741f422 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
@@ -41,7 +41,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isForm: false,
@@ -76,7 +76,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isForm: false,
   },
@@ -85,7 +85,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isForm: false,
   },
@@ -154,8 +154,8 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -166,8 +166,8 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -454,8 +454,8 @@ export const PurchasereturnRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -813,9 +813,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -824,25 +824,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        disabled: true,
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     }, 
     tableForm:{
       disabled:true,
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -852,24 +852,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'DatePicker',
       componentProps: {
         disabled: true,
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     }, 
     tableForm:{
       disabled:true,
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -879,15 +880,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'DatePicker',
       componentProps: {
         disabled: true,
-        type: 'datetime',
-        format: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'x',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     }, 
     tableForm:{
       disabled:true,
-      type: 'FormDateTime',
-      format: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      format: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
@@ -932,7 +934,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }, 
     tableForm:{
       disabled:true
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
index 991a7525f..fcc7cfafe 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts
@@ -10,7 +10,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true,
@@ -20,7 +20,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
   },
@@ -208,9 +208,9 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -219,9 +219,9 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -507,14 +507,14 @@ export const PutawayJobMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   requestTime: [
     { required: true, message: '请输入申请时间', trigger: 'change' }
@@ -692,7 +692,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
index a354c19f5..063429468 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 上架记录主表
@@ -10,7 +10,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
     isSearch: true
@@ -20,7 +20,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'jobNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -80,9 +80,9 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -91,8 +91,9 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -225,8 +226,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -244,8 +245,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -292,14 +293,14 @@ export const PutawayRecordMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请选择到仓库代码', trigger: 'change' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   outTransaction: [
     { required: true, message: '请输入出库事务类型', trigger: 'blur' }
@@ -468,7 +469,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
index 0c293a674..d14a075c8 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts
@@ -71,9 +71,9 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isForm: false,
   // },
   {
-    label: '从库位类型范围',
-    field: 'fromLocationTypes',
-    dictType: DICT_TYPE.LOCATION_TYPE,
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -313,8 +313,8 @@ export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '到库位类型范围',
-    field: 'toLocationTypes',
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
     dictType: DICT_TYPE.LOCATION_TYPE,
     dictClass: 'string',
     isTable: true,
@@ -430,14 +430,14 @@ export const PutawayRequestMainRules = reactive({
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
-  fromLocationTypes: [
-    { required: true, message: '请选择从库位类型范围', trigger: 'change' }
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
   ],
   toWarehouseCode: [
     { required: true, message: '请输入到仓库代码', trigger: 'blur' }
   ],
-  toLocationTypes: [
-    { required: true, message: '请选择到库位类型范围', trigger: 'change' }
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
   ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
@@ -631,7 +631,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
new file mode 100644
index 000000000..252cbbfdf
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue
@@ -0,0 +1,240 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptJobMain.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="PurchasereceiptJobMainRules"
+    :formAllSchemas="PurchasereceiptJobMain.allSchemas"
+    :searchTableParams="searchTableParams"
+    :tableAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :tableFormRules="PurchasereceiptJobDetailRules"
+    :apiUpdate="PurchasereceiptJobMainApi.updatePurchasereceiptJobMain"
+    :apiCreate="PurchasereceiptJobMainApi.createPurchasereceiptJobMain"
+    :isBusiness="true"
+    @searchTableSuccess="searchTableSuccess"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptJobMain.allSchemas"
+    :detailAllSchemas="PurchasereceiptJobDetail.allSchemas"
+    :detailAllSchemasRules="PurchasereceiptJobDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiPage="PurchasereceiptJobDetailApi.getPurchasereceiptJobDetailPage"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptJobMain,PurchasereceiptJobMainRules,PurchasereceiptJobDetail,PurchasereceiptJobDetailRules } from './sparereceiptJobMain.data'
+import * as PurchasereceiptJobMainApi from '@/api/wms/purchasereceiptJobMain'
+import * as PurchasereceiptJobDetailApi from '@/api/wms/purchasereceiptJobDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 采购收货任务主
+defineOptions({ name: 'PurchasereceiptJobMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptJobMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      //row['poLine'] = val[0]['poLine']
+      //row['batch'] = val[0]['toBatch']
+      //row['altBatch'] = val[0]['altBatch']
+      //row['itemCode'] = val[0]['itemCode']
+      //row['itemName'] = val[0]['itemName']
+      //row['itemDesc1'] = val[0]['itemDesc1']
+      //row['itemDesc2'] = val[0]['itemDesc2']
+      //row['projectCode'] = val[0]['projectCode']
+      //row['qty'] = val[0]['qty']
+      //row['uom'] = val[0]['uom']
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      //setV['ppNumber'] = val[0]['ppNumber']
+      //setV['supplierCode'] = val[0]['supplierCode']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptJobMainApi.getPurchasereceiptJobMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-job-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainJobExe') { // 执行
+    console.log('列表-操作按钮事件-执行')
+  } else if (val == 'mainJobAba') { // 放弃
+    console.log('列表-操作按钮事件-放弃')
+  } else if (val == 'mainJobClo') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainJobAcc') { // 承接
+    console.log('列表-操作按钮事件-承接')
+  }
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'jobPurchasereceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptJobMainApi.exportPurchasereceiptJobMain(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>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
new file mode 100644
index 000000000..1e5574de4
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts
@@ -0,0 +1,1007 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 采购收货任务主表
+ */
+export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '要求截止时间',
+    field: 'requestDueTime',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.JOB_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '过期时间',
+    field: 'expiredTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  // {
+  //   label: '状态',
+  //   field: 'jobStageStatus',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '优先级',
+    field: 'priority',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '优先级增量',
+    field: 'priorityIncrement',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '岗位',
+    field: 'userPositionCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接人',
+    field: 'acceptUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承接时间',
+    field: 'acceptTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '完成人',
+    field: 'completeUserName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '完成时间',
+    field: 'completeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '自动完成',
+    field: 'autoComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库位',
+    field: 'allowModifyLocation',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改数量',
+    field: 'allowModifyQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许大于推荐数量',
+    field: 'allowBiggerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许小于推荐数量',
+    field: 'allowSmallerQty',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改库存状态',
+    field: 'allowModifyInventoryStatus',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许连续扫描',
+    field: 'allowContinuousScanning',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许部分完成',
+    field: 'allowPartialComplete',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改批次',
+    field: 'allowModifyBatch',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '允许修改箱码',
+    field: 'allowModifyPackingNumber',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptJobMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  requestTime: [
+    { required: true, message: '请输入申请时间', trigger: 'change' }
+  ],
+  requestDueTime: [
+    { required: true, message: '请输入要求截止时间', trigger: 'change' }
+  ],
+  status: [
+    { required: true, message: '请选择状态', trigger: 'change' }
+  ],
+  // jobStageStatus: [
+  //   { required: true, message: '请选择阶段状态', trigger: 'change' }
+  // ],
+  priority: [
+    { required: true, message: '请输入优先级', trigger: 'blur' }
+  ],
+  priorityIncrement: [
+    { required: true, message: '请输入优先级增量', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  userPositionCode: [
+    { required: true, message: '请输入岗位', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货任务子表
+ */
+export const PurchasereceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '备注',
+    fiield: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+]))
+
+//表单校验
+export const PurchasereceiptJobDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
new file mode 100644
index 000000000..0bbfaea12
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue
@@ -0,0 +1,215 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRecordMain.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="PurchasereceiptRecordMainRules"
+    :formAllSchemas="PurchasereceiptRecordMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRecordMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRecordDetailRules"
+    :apiPage="apiPage"
+    :tabs="PurchasereceiptRequestTabsList"
+    @changeTabs="changeTabs"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { PurchasereceiptRecordMain,PurchasereceiptRecordMainRules,PurchasereceiptRecordDetail,PurchasereceiptRecordDetailRules } from './sparereceiptRecordMain.data'
+import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList'
+
+// 采购收货记录主
+defineOptions({ name: 'PurchasereceiptRecordMain' })
+
+const apiPage = ref(PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage)
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns)
+const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-record-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:!row.inspectRequestFlag}),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:!row.putawayRequestFlag}),// 生成采购上架申请
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'putawayRequest') { // 生成采购上架申请
+    handleCreatePutawayRequest(row.number)
+  }else if(val == 'inspectRequest'){//生成到货检验申请
+    handleCreateInspectRequest(row.number)
+  }
+}
+
+
+/** 生成采购上架申请按钮操作 */
+const handleCreatePutawayRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成上架申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('上架申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 生成到货检验申请按钮操作 */
+const handleCreateInspectRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成到货检验申请吗？'))
+    tableObject.loading = true
+    await PurchasereceiptRecordMainApi.createPutawayRequest(number)
+    message.success(t('到货检验申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue,'recordPurchasereceiptMain')
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params)
+    download.excel(data, '采购收货记录主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+// tabs 切换事件
+const changeTabs = (data) =>{
+  if(data.prop == 'receiptDetail'){
+  console.log(data)
+    apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+  }else if(data.prop == 'scarceGoodsDetail'){
+    apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
+    detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
new file mode 100644
index 000000000..6026e73f1
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts
@@ -0,0 +1,929 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+
+
+/**
+ * @returns {Array} 采购收货记录主表
+ */
+export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+  },
+  {
+    label: '任务单号',
+    field: 'jobNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  supplierCode: [
+    { required: true, message: '请选择供应商代码', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库位类型服务', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请选择创建时间', trigger: 'change' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货记录子表
+ */
+export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'fromBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从器具号',
+    field: 'fromContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  }
+]))
+
+// 表单校验
+export const PurchasereceiptRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请选择从包装号', trigger: 'change' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请选择到包装号', trigger: 'change' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请选择到货日期', trigger: 'change' }
+  ],
+  produceDate: [
+    { required: true, message: '请选择生产日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请选择过期日期', trigger: 'change' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCodes: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  poNumber: [
+    { required: true, message: '请选择订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请选择订单行', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  visualInspectResult: [
+    { required: true, message: '请选择目检结果', trigger: 'change' }
+  ],
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
new file mode 100644
index 000000000..856f5d31a
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -0,0 +1,535 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="PurchasereceiptRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasereceiptRequestMain.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="PurchasereceiptRequestMainRules"
+    :formAllSchemas="PurchasereceiptRequestMain.allSchemas"
+    :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain"
+    :apiCreate="PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasereceiptRequestMain.allSchemas"
+    :detailAllSchemas="detailAllSchemas"
+    :detailAllSchemasRules="PurchasereceiptRequestDetailRules"
+    :apiCreate="PurchasereceiptRequestDetailApi.createPurchasereceiptRequestDetail"
+    :apiUpdate="PurchasereceiptRequestDetailApi.updatePurchasereceiptRequestDetail"
+    :apiPage="apiPage"
+    :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail"
+    fromeWhere="purchasereceipt"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+    :detailButtonIsShowAdd="false"
+  />
+
+  <!-- 导入 -->
+  <ImportForm 
+    ref="importFormRef" 
+    url="/wms/purchasereceipt-request-main/import" 
+    :importTemplateData="importTemplateData" 
+    @success="importSuccess" 
+    :updateIsDisable="true"
+    :coverIsDisable="true"
+    :mode="2"
+  />
+
+  <!-- 创建标签 -->
+  <BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRequestDetailLabel.allSchemas"
+    :tableFormRules="PurchasereceiptRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @submitForm="submitFormLabel"
+  />
+
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { 
+  PurchasereceiptRequestMain,
+  PurchasereceiptRequestMainRules,
+  PurchasereceiptRequestDetail,
+  PurchasereceiptRequestDetailRules,
+  PurchasereceiptRequestDetailLabel,
+ } from './sparereceiptRequestMain.data'
+import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
+import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { getAccessToken } from '@/utils/auth'
+
+// 采购收货申请
+defineOptions({ name: 'PurchasereceiptRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const genLabelId = ref(); //主表ID
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasereceiptRequestMain.allSchemas.tableColumns)
+
+const apiPage = ref(PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage)
+const detailAllSchemas = ref(PurchasereceiptRequestDetail.allSchemas)
+
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  //console.log("formRef",formRef)
+  //console.log("supplierCode",formRef.value.formRef.formModel.supplierCode)
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      //row[formField] = val[0][searchField]
+      if(formField == 'itemCode') {
+        row['itemCode'] = val[0]['code']
+      } else if(formField == 'poNumber') {
+        row['poNumber'] = val[0]['number']
+      } else if(formField == 'poLine'){
+        row['poLine'] = val[0]['lineNumber']
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        let supplierCode = formRef.formModel.supplierCode;
+        let itemCode = val[0]['itemCode']
+        let queryData = {
+          supplierCode:supplierCode,
+          itemCode:itemCode
+        } 
+        SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{
+          row['defaultToLocationCode'] = res
+        })
+      }else if (formField == 'packQty'){
+        row['packQty'] = val[0]['packQty']
+        row['packUnit'] = val[0]['packUnit']
+      }
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['supplierCode'] = val[0]['code']
+      formRef.setValues(setV)
+    }
+  })
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    if(formField == 'itemCode') {
+      setV['itemCode'] = val[0]['code']
+    } else {
+      setV['poNumber'] = val[0]['number']
+      setV['poLine'] = val[0]['lineNumber']
+    }
+    formRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasereceiptRequestMainApi.getPurchasereceiptRequestMainPageSpare // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {// 新增
+    openForm('create')
+  } else if (val == 'import') {// 导入
+    handleImport()
+  }else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      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 isASNShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    if(row.sourceType == 'ASN_ExternalReceipt'){
+      return false
+    }
+  } else {
+    return true
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+    // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+    {
+      label: '生成标签',
+      name: 'ssbq',
+      hide: isASNShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    },
+    defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    handleClose(row.id)
+  } else if (val == 'mainReAdd') { // 重新添加
+    handleReAdd(row.id)
+  } else if (val == 'mainSubmit') { // 提交审批
+    handleSubmit(row.id)
+  } else if (val == 'mainTurnDown') { // 驳回
+    handleRefused(row.id)
+  } else if (val == 'mainApprove') { // 审批通过
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if(val == 'ssbq'){ // 生成标签
+     // 生成标签
+     detatableData.params = {
+      masterId:row.id
+     }
+    genLabelId.value = row.id
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  }else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } 
+}
+
+
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    await message.confirm('是否为此数据生成标签？')
+    await PurchasereceiptRequestMainApi.genLabel(genLabelId.value)
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
+}
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const labelPrint = async (row) => {
+  window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.value.open(type, row)
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  detailRef.value.openDetail(row, titleName, titleValue,'requestPurchasereceiptMain')
+}
+
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmColse'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmReAdd'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmAgree'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmRefused'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmHandle'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try{
+    await message.confirm(t('common.confirmSubmit'))
+    tableObject.loading = true
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    tableObject.loading = false
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PurchasereceiptRequestMainApi.exportPurchasereceiptRequestMain(tableObject.params)
+    download.excel(data, '采购收货申请主.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasereceiptRequestDetail.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 PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(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() // 刷新当前列表
+}
+
+// tabs 切换事件
+// const changeTabs = (data) =>{
+//   if(data.prop == 'receiptDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }else if(data.prop == 'scarceGoodsDetail'){
+//     apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage
+//     detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas    
+//   }
+// }
+
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasereceiptRequestMainApi.importTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
new file mode 100644
index 000000000..a29cafc4a
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -0,0 +1,1639 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
+import * as SupplierApi from '@/api/wms/supplier'
+import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as LocationApi from '@/api/wms/location'
+import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
+
+// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
+const queryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'PurchaseReceiptRequest'
+}
+ const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
+ const requestsettingData =data?.list[0]||{}
+
+import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
+
+// 获取当前操作人的部门
+ import { useUserStore } from '@/store/modules/user'
+ import { TableColumn } from '@/types/table'
+ const userStore = useUserStore()
+ const userDept = userStore.userSelfInfo.dept
+ // id 转str 否则form回显匹配不到
+ userDept.id = userDept.id.toString()
+ const userDeptArray:any = [userDept]
+ 
+
+/**
+ * @returns {Array} 采购收货申请主表
+ */
+export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isForm: false,
+    isSearch: true,
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '供应商信息', // 查询弹窗标题
+        searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
+        searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: true,
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择要货计划单号', // 输入框占位文本
+        searchField: 'number', // 查询弹窗赋值字段
+        searchTitle: '要货计划信息', // 查询弹窗标题
+        searchAllSchemas: PurchasePlanMain.allSchemas, // 查询弹窗所需类
+        searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, // 查询弹窗所需分页方法
+        searchCondition: [
+          {
+            key: 'supplierCode',
+            value: 'supplierCode',
+            message: '请填写供应商代码！',
+            isMainValue: true
+          },
+          {
+            key: 'status',
+            value: 4,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: "TRUE",
+            isMainValue: false
+          }]
+      }
+    },
+    isForm: true,
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数据来源',
+    field: 'sourceType',
+    dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'spare_PartsReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isSearch: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区类型范围',
+    field: 'fromAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区类型范围',
+    field: 'toAreaTypes',
+    dictType: DICT_TYPE.LOCATION_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '从库区代码范围',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到库区代码范围',
+    field: 'toAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return userDeptArray.find((account) => account.id == cellValue)?.name
+    },
+    form: {
+      value: userDept.id,
+      component: 'Select',
+      api: () => userDeptArray,
+      componentProps: {
+        disabled: true,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        }
+      }
+    }
+  },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '自动提交',
+    field: 'autoCommit',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动通过',
+    field: 'autoAgree',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '自动执行',
+    field: 'autoExecute',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '直接生成记录',
+    field: 'directCreateRecord',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'Switch',
+      value: requestsettingData.directCreateRecord,
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 300,
+      fixed: 'right'
+    },
+  }
+]))
+
+//表单校验
+export const PurchasereceiptRequestMainRules = reactive({
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请输入到库区类型范围', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  autoCommit: [
+    { required: true, message: '请选择是否自动提交', trigger: 'change' }
+  ],
+  autoAgree: [
+    { required: true, message: '请选择是否自动通过', trigger: 'change' }
+  ],
+  autoExecute: [
+    { required: true, message: '请选择是否自动执行', trigger: 'change' }
+  ],
+  directCreateRecord: [
+    { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 采购收货申请子表
+ */
+export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:false,
+  // }
+]))
+
+//表单校验
+export const PurchasereceiptRequestDetailRules = reactive({
+  packingNumber: [
+    { required: true, message: '请输入包装号', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'change' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'change' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入过期日期', trigger: 'change' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'change' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'change' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  convertRate: [
+    { required: true, message: '请输入转换率', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'change' }
+  ],
+})
+
+
+
+export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+      }]
+    },
+    form: {
+      labelMessage: '该订单号会影响订单行的选择',
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key:'supplierCode',
+          value:'supplierCode',
+          message: '请选择供应商！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择订单行', // 输入框占位文本
+        searchField: 'lineNumber', // 查询弹窗赋值字段
+        searchTitle: '订单信息', // 查询弹窗标题
+        searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'number',
+          value:'poNumber',
+          message: '请填写订单号！',
+          isMainValue: true
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择订单行', // 输入框占位文本
+      searchField: 'lineNumber', // 查询弹窗赋值字段
+      searchTitle: '订单信息', // 查询弹窗标题
+      searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'number',
+        value:'poNumber',
+        message: '请填写订单号！',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '默认到库位代码',
+    field: 'defaultToLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false, // 开启查询弹窗
+        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+    tableForm:{
+      disabled:true,
+      isInpuFocusShow: false,
+      searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '库位信息', // 查询弹窗标题
+      searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+      searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    isTableForm: true,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择到货日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择过期日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 1,
+        precision: 6
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+]))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 39df4a5e7..afdd589d5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
@@ -269,9 +269,9 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '预测日期',
     field: 'predictTime',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -280,15 +280,15 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
@@ -392,7 +392,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index ad7639584..dae2ac888 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -120,7 +120,10 @@
         const setV = {}
         setV[formField] = val[0][searchField]
         if(formField == 'supplierCode'){
-          tableData.value = [] // 清空数据
+          tableData.value = [] // 清空子表数据
+          setV['contactName']=val[0]['contacts']
+          setV['contactPhone']=val[0]['phone']
+          setV['contactEmail']=val[0]['email']
         }
         formRef.setValues(setV)
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 3451a5e4e..d35ac2133 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
@@ -81,9 +81,9 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '订单日期',
     field: 'orderDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -92,36 +92,21 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       },
       value: new Date().getTime()
     },
   },
-  {
-    label: '税率',
-    field: 'taxRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        style: {width:'100%'},
-        min: 0
-      }
-    }
-  },
   {
     label: '截止日期',
     field: 'dueDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail:{
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -130,40 +115,31 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
   },
   {
-    label: '版本',
-    field: 'version',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
+    label: '税率',
+    field: 'taxRate',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    }
   },
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '版本',
+    field: 'version',
     sort: 'custom',
     table: {
       width: 150
@@ -186,13 +162,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '备注',
-    field: 'remark',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '是否寄存订单',
     field: 'isConsignment',
@@ -212,21 +181,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '业务类型',
-    field: 'businessType',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isForm: false,
-    form: {
-      value: 'PurchaseReceipt',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '是否可用',
     field: 'available',
@@ -247,6 +201,47 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+      value: 'PurchaseReceipt',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -311,6 +306,13 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -366,6 +368,19 @@ export const PurchaseMainRules = reactive({
  * @returns {Array} 采购订单子表
  */
 export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    isTableForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '行号',
     field: 'lineNumber',
@@ -422,19 +437,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '单据号',
-    field: 'number',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
  {
    label: '计量单位',
    field: 'uom',
@@ -492,8 +494,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     table: {
       width: 150
     },
@@ -508,8 +510,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -679,14 +681,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
- 
-  {
-    label: '备注',
-    field: 'remark',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '是否可用',
     field: 'available',
@@ -793,6 +787,13 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -812,11 +813,11 @@ export const PurchaseDetailRules = reactive({
     { required: true, message: '请输入行号', trigger: 'blur' }, 
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  stdPackQty:  [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty:  [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 856b77acc..157816868 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -27,9 +27,12 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchasePlanMainRules"
-    :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas"
-    :tableFormRules="PurchasePlanDetailRules" :tableData="tableData"
+  <BasicForm ref="formRef" @success="getList" 
+    :rules="PurchasePlanMainRules"
+    :formAllSchemas="PurchasePlanMain.allSchemas" 
+    :tableAllSchemas="PurchasePlanDetail.allSchemas"
+    :tableFormRules="PurchasePlanDetailRules" 
+    :tableData="tableData"
     :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" 
     :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
     :isBusiness="true" 
@@ -68,7 +71,6 @@
   import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-  import {mainListPurchasePlanModBtn} from "@/utils/disposition/defaultButtons";
 
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
@@ -108,6 +110,19 @@
         setV['itemCode'] = val[0]['code']
         setV['poNumber'] = val[0]['number']
         setV['poLine'] = val[0]['lineNumber']
+        if(formField == 'supplierCode'){
+          setV['supplierCode'] = val[0]['code']
+          await PurchasePlanMainApi.queryPurchasePlan(val[0]['code']).then(res => {
+            let beginTime = res.beginTime
+            var ms = beginTime.substring(0, 2)
+		        var me = beginTime.substring(3)
+            setV['beginTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+            let endTime = res.endTime
+            var ms = endTime.substring(0, 2)
+		        var me = endTime.substring(3)
+            setV['endTime'] = new Date(2024, 1, 1, Number(ms), Number(me))
+          })
+        }
         if (formField == 'poLine') {
           setV['itemCode'] = val[0]['itemCode']
           setV['uom'] = val[0]['uom']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index ce196f2dd..45cc14d71 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as PurchaseMainApi from '@/api/wms/purchaseMain'
@@ -48,14 +48,61 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
   {
     label: '时间窗口',
     field: 'timeWindow',
+    table: {
+      width: 150
+    },
+    isForm: false
+  },
+  {
+    label: '开始时间',
+    field: 'beginTime',
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      component:"TimePicker",
+      componentProps: {
+        format:"HH:mm",
+      }
+    }
   },
   {
     label: '仓库代码',
@@ -108,33 +155,74 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  
   {
-    label: '开始时间',
-    field: 'beginTime',
+    label: '自动发布',
+    field: 'autoPublish',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: "TRUE",
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
   {
-    label: '结束时间',
-    field: 'endTime',
+    label: '自动接收',
+    field: 'autoAccept',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isForm: false,
+    form: {
+      component: 'Switch',
+      value: "TRUE",
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
   },
-
   {
-    label: '备注',
-    field: 'remark',
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    isTable: false,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE',
+        disabled: true
+      }
+    },
+    isSearch: true,
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 150
+    },
   },
   {
     label: '创建时间',
@@ -160,8 +248,8 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '创建者',
-    field: 'creator',
+    label: '最后更新者',
+    field: 'updater',
     sort: 'custom',
     isForm: false,
     table: {
@@ -192,33 +280,13 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: true,
+    label: '备注',
+    field: 'remark',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    },
-    isSearch: true,
+    isTable: false,
   },
   {
     label: '操作',
@@ -255,12 +323,26 @@ export const PurchasePlanMainRules = reactive({
  * @returns {Array} 要货计划子表
  */
 export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    isTableForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '订单号',
     field: 'poNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     tableForm: {
       isInpuFocusShow: true,
@@ -358,20 +440,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     }
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -406,32 +474,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
 
   },
-  // {
-  //   label: '已计划数量',
-  //   field: 'plannedQty',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   },
-  //   tableForm: {
-  //     disabled: true
-  //   }
-  // },
-  {
-    label: '已发货数量',
-    field: 'shippedQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false
-  },
   {
     label: '计划数量',
     field: 'planQty',
@@ -452,6 +494,16 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -467,6 +519,31 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       type: 'Select'
     }
   },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
+    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: 'updater',
@@ -508,31 +585,6 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isSearch: true,
-    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: 'action',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
index de68f4b9d..ec595b436 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue
@@ -238,7 +238,7 @@ const handleExport = async () => {
 }
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {
   window.open(src.value+'&id='+id)
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
index 9f76f9337..2db26ae20 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const PackageRules = reactive({
@@ -14,7 +14,7 @@ export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -26,7 +26,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     table: {
-      width: 150,
+      width: 180,
       fixed: 'left'
     },
   },
@@ -84,12 +84,12 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生产日期',
     field: 'produceDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
@@ -97,8 +97,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     table: {
@@ -124,12 +126,12 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     label: '失效日期',
     field: 'expireDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     search: {
       component: 'DatePicker',
       componentProps: {
         style: {width:'100%'},
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'YYYY-MM-DD',
         type: 'daterange',
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
@@ -137,8 +139,10 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
       }
     },
     table: {
@@ -196,16 +200,16 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150,
     },
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string', // 默认都是字符串类型其他暂不考虑
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index a1d4b1e7d..65c78e8bb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -66,6 +66,7 @@ import { SupplierdeliverRecordMain,SupplierdeliverRecordMainRules,Supplierdelive
 import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
 import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
 
 // 供应商发货记录主
 defineOptions({ name: 'SupplierdeliverRecordMain' })
@@ -127,12 +128,39 @@ const buttonBaseClick = (val, item) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListGenerateApplicationBtn(null), // 生成采购申请
-  ]
+     defaultButtons.mainListGenerateApplicationBtn({hasPermi:'wms:supplierdeliver-record-main:createPurchasereceiptRequest',hide:!row.purchasereceiptRequestFlag}), // 生成采购申请
+     defaultButtons.mainListDocumentPrintBtn({})  // 单据打印
+    ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if(val == 'generateApplication'){
+    handlerCreatePurchasereceiptRequest(row.number)
+  }else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.id)
+  }
+}
+
+/** 生成采购收货申请按钮操作 */
+const handlerCreatePurchasereceiptRequest = async (number:string) => {
+  try{
+    await message.confirm(t('确认生成采购申请吗？'))
+    tableObject.loading = true
+    await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
+    message.success(t('采购申请生成成功'))
+    await getList()
+  }catch{}finally{
+    tableObject.loading = false
+  }
+}
+
+// 单据打印
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+const handleDocumentPrint = async (id) => {
+  window.open(documentSrc.value + '&id=' + id)
 }
 
 /** 详情操作 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 8bf224f5f..3410ecdf4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 供应商发货记录主表
@@ -20,7 +20,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -188,9 +188,9 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '生效日期',
     field: 'activeDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -199,8 +199,9 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -326,7 +327,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 160,
+      width: 300,
       fixed: 'right'
     },
   }
@@ -463,6 +464,27 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -483,8 +505,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
@@ -494,8 +516,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '标包单位',
-    field: 'stdPackUnit',
+    label: '包装规格',
+    field: 'packUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
@@ -529,9 +551,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -540,8 +562,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -549,9 +572,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '生产日期',
     field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -560,8 +583,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -569,9 +593,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -580,8 +604,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
@@ -701,7 +726,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -779,11 +804,11 @@ export const SupplierdeliverRecordDetailRules = reactive({
   poLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'blur' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'blur' }
   ],
   toLocationCode: [
     { required: true, message: '请输入到库位代码', trigger: 'blur' }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 98f7f111d..a7c792ee4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -37,10 +37,7 @@
         </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>
@@ -61,6 +58,7 @@
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+    @formFormDateChange="formFormDateChange"
   />
 
   <!-- 详情 -->
@@ -74,7 +72,6 @@
     :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
-    :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
   />
 
@@ -89,22 +86,19 @@
     :mode="2"
   />
 
-  <!-- 打印 -->
-  <point ref="pointRef" :detailListTableColumns="detailListTableColumns" />
-  <!-- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
-    <Table :columns="detailListTableColumns" :data="detatableData.tableList" :loading="detatableData.loading" :pagination="{
-      total: detatableData.total
-    }" v-model:pageSize="detatableData.pageSize" v-model:currentPage="detatableData.currentPage"
-      v-model:sort="detatableData.sort">
-      <template #batch="{ row }">
-        <el-input v-model="row.batch">{{ row.batch }}</el-input>
-      </template>
-    </Table>
-    <el-button @click="closeDialog">关闭</el-button>
-    <el-button @click="genLabel()">生成标签</el-button>
-
-    <el-button @click="print">打印</el-button>
-  </el-dialog> -->
+<!-- 创建标签 -->
+<BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="SupplierdeliverRequestDetailLabel.allSchemas"
+    :tableFormRules="SupplierdeliverRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    @submitForm="submitFormLabel"
+    
+  />
+ 
 </template>
 
 <script setup lang="ts">
@@ -115,22 +109,20 @@ import {
   SupplierdeliverRequestMain,
   SupplierdeliverRequestMainRules,
   SupplierdeliverRequestDetail,
-  SupplierdeliverRequestDetailRules
+  SupplierdeliverRequestDetailRules,
+  SupplierdeliverRequestDetailLabel,
 } from './supplierdeliverRequestMain.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
-import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
-// import * as PackageApi from '@/api/wms/package'
-// import * as BarbasicApi from '@/api/wms/barbasic'
+import { formatDate } from '@/utils/formatTime'
 
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const genLabelId = ref();
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -141,6 +133,7 @@ const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+const planArriveTimeStr = ref()
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
   nextTick(() => {
@@ -152,15 +145,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row['poNumber'] = val[0]['poNumber']
         row['itemCode'] = val[0]['itemCode']
         row['poLine'] = val[0]['poLine']
+        row['orderQty'] = val[0]['orderQty']
         row['uom'] = val[0]['uom']
       }
-      
+      if (formField == 'packQty'){
+        row['packUnit'] = val[0]['packUnit']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       if(formField == 'ppNumber'){
+        // 设置计划到货时间
+        let beginTime =  val[0]['endTime']
+        let deliveryDate =  formatDate(val[0]['deliveryDate'],'YYYY-MM-DD')
+        planArriveTimeStr.value = deliveryDate + ' '+ beginTime+":00"
+        setV['planArriveTime']= new Date(planArriveTimeStr.value)
         // 清空子表数据
-        tableData.value = [] // 重置明细数据
+        tableData.value = []
+      }
+      if(formField == 'supplierCode'){
+        setV['contactName'] = val[0]['contacts']
+        setV['contactPhone'] = val[0]['phone']
+        setV['contactEmail'] = val[0]['email']
       }
       formRef.setValues(setV)
     }
@@ -177,14 +183,13 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['poLine'] = val[0]['poLine']
       setV['uom'] = val[0]['uom']
     }
+    if (formField == 'packQty'){
+      setV['packUnit'] = val[0]['packUnit']
+      }
     formRef.setValues(setV)
   })
 }
 
-// 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo = []
-
 const { tableObject, tableMethods } = useTable({
   getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口
 })
@@ -268,10 +273,10 @@ const butttondata = (row) => {
       link: true // 文本展现按钮
     },
     defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','8']) }), // 标签打印
-    defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
+    //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
     // 生成记录
     {
-      label: '处理',
+      label: '发货',
       name: 'genRecords',
       hide: isShowMainButton(row, ['3']),
       type: 'primary',
@@ -310,8 +315,22 @@ const buttonTableClick = async (val, row) => {
     // 删除
     handleDelete(row.id)
   } else if (val == 'ssbq') {
-    // 生成标签
-    handlePoint(row)
+    await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => {
+      if(!res){
+          message.warning("请先上传自检报告!")
+          return
+      }else{
+        // 生成标签
+        detatableData.params = {
+          masterId:row.id
+        }
+        genLabelId.value = row.id
+        await getDetailList()
+        formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+      }
+    }).catch(err => {
+      console.log("自检报告校验异常",err)
+    })
   } else if (val == 'point') {
     // 标签打印
     labelPrint(row)
@@ -469,14 +488,26 @@ const handleTur = async (id: number) => {
 /** 处理按钮操作 */
 const genRecords = async (id: number) => {
   try {
-    // 处理的二次确认
-    await message.confirm('是否处理所选中数据？')
-    tableObject.loading = true
-    // 发起处理
-    await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
-    message.success(t('处理成功!'))
-    // 刷新列表
-    await getList()
+    await SupplierdeliverRequestMainApi.selfCheckReport(id).then(res => {
+      if(!res){
+          message.warning("请先上传自检报告!")
+          return
+      }else{
+        // 处理的二次确认
+        message.confirm('是否处理所选中数据？')
+        tableObject.loading = true
+        // 发起处理
+        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id).then(res => {
+          message.success(t('处理成功!'))
+          // 单据打印
+          handleDocumentPrint(res)
+        })
+        // 刷新列表
+        getList()
+      }
+    }).catch(err => {
+      console.log("自检报告校验异常",err)
+    })
   } catch {}finally{
     tableObject.loading = false
   }
@@ -500,129 +531,38 @@ const handleExport = async () => {
   }
 }
 
-const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
-const detailListTableColumns = detailTableColumns.value.filter(
-  (item) =>
-    item.label != '操作' &&
-    item.label != '创建者' &&
-    item.label != '创建时间' &&
-    item.label != '最后更新者' &&
-    item.label != '最后更新时间'
-)
-const dialogVisible = ref(false)
-const isShow = ref(false)
-const dialogTitle = ref('')
-const closeDialog = () => {
-  dialogVisible.value = false
-  isShow.value = false
-}
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+
 
-/** 生成标签按钮操作 */
-const genLabel = async () => {
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
   try {
-    // 生成标签的二次确认
     await message.confirm('是否为此数据生成标签？')
-    // 发起生成标签
     await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
-    dialogVisible.value = false
-    isShow.value = false
-    message.success(t('生成标签成功!'))
-    // 刷新列表
-    await getList()
-  } catch {}
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
+  }
 }
 
+
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-const src = ref(BASE_URL + '/jmreport/view/897700407827668992?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 
-const genLabelId = ref()
-// 生成标签
-const pointRef = ref()
-const handlePoint = async (row) => {
-  pointRef.value.openPoint(row.id)
-}
 // 标签打印
 const labelPrint = async (row) => {
   window.open(src.value + '&asn_number=' + row.asnNumber)
 }
 
 const print = async () => {
-  //向包装表里插入数据
-  //   const packageArray:any= ref([])
-  //   let packageObject = {
-  //     itemCode: '',
-  //     itemName: '',
-  //     itemDesc1: '',
-  //     itemDesc2: '',
-  //     batch: '',
-  //     altBatch: '',
-  //     produceDate: '',
-  //     validityDays: '',
-  //     expireDate: '',
-  //     uom: '',
-  //     qty: '',
-  //     altUom: '',
-  //     altQty: '',
-  //     convertRate: '',
-  //     stdPackQty: '',
-  //     stdPackUnit: '',
-  //     toWarehouseCode: '',
-  //     toDockCode: '',
-  //     toLocationCode: '',
-  //     supplierCode: '',
-  //     supplierItemCode: '',
-  //     poNumber: '',
-  //     poLine: '',
-  //     rpNumber: '',
-  //     asnNumber: '',
-  //   }
-  //   //获取主表数据
-  //  await  SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage({
-  //     number: detatableData.tableList[0].number
-  //   }).then(res => {
-  //     detatableData.tableList.forEach(item => {
-  //       packageObject.itemCode=item.itemCode
-  //       packageObject.itemName=item.itemName
-  //       packageObject.itemDesc1=item.itemDesc1
-  //       packageObject.itemDesc2=item.itemDesc2
-  //       packageObject.batch=item.batch
-  //       packageObject.altBatch=item.altBatch
-  //       packageObject.produceDate=item.produceDate
-  //       packageObject.expireDate=item.expireDate
-  //       packageObject.uom=item.uom
-  //       packageObject.qty=item.qty
-  //       packageObject.stdPackQty=item.stdPackQty
-  //       packageObject.stdPackUnit=item.stdPackUnit
-  //       packageObject.convertRate=item.convertRate
-  //       packageObject.poNumber=item.poNumber
-  //       packageObject.poLine=item.poLine
-  //       packageObject.supplierCode=res.list[0].supplierCode
-  //       packageObject.rpNumber=res.list[0].ppNumber
-  //       packageArray.value.push(packageObject)
-  //     })
-  //   })
-  //   const barBasicArray:any =ref([])
-  //   let barBasicObject = {
-  //     type: '',
-  //     template: '',
-  //     status: '',
-  //     relateNumber: '',
-  //     barcodeString: '',
-  //     printTimes: '',
-  //     lastPrintTime: '',
-  //     lastPrintUserId: '',
-  //     lastPrintUserName: '',
-  //   }
-  //   // 获取返回的包装号更新标签表
-  //   await PackageApi.createPackage(JSON.parse(JSON.stringify(packageArray.value))).then(res => {
-  //     res.list.forEach(item => {
-  //       barBasicObject.type = 'PurchaseLabel'
-  //       barBasicObject.relateNumber = item.number
-  //       barBasicObject.status = 'NEW'
-  //       barBasicArray.value.push(barBasicObject)
-  //     })
-  //   })
-  //   await BarbasicApi.createBarbasic(JSON.parse(JSON.stringify(barBasicArray.value)))
   window.open(src.value + '&number=' + detatableData.tableList[0].number)
 }
 
@@ -653,7 +593,12 @@ const handleDeleteTable = (item, index) => {
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
-  let isHave = data.subList.some((item) => item.produceDate > item.expireDate)
+  let isHave = data.subList.some((item) => {
+    console.log("CCCCC",item.expireDate)
+    if(item.expireDate != null){
+      item.produceDate > item.expireDate
+    }
+  })
   if (isHave) {
     message.error('生产日期不可以大于过期日期')
     formRef.value.formLoading = false
@@ -661,6 +606,23 @@ const submitForm = async (formType, data) => {
   }
   try {
     if (formType === 'create') {
+      let planArriveStr = formatDate(data.planArriveTime);
+      if(planArriveStr > planArriveTimeStr.value){
+        let confirmFlag = false;
+        await message.confirm("计划到货时间大于要货计划送达日期是否继续？").then(() => {
+          console.log("选择了OK")
+          //选择OK
+        }).catch(() => {
+          //选择取消
+          console.log("选择了cancel")
+          confirmFlag = true;
+          formRef.value.formLoading = false
+          return;
+        })
+        if(confirmFlag){
+          return;
+        }
+      }
       if(tableData.value.length <= 0){
         message.warning(`子表明细不能为空!`)
         formRef.value.formLoading = false
@@ -706,6 +668,13 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const formFormDateChange = (field, val,row, index) => {
+  if(field == 'produceDate'){
+    let produceDateStr = formatDate(val,'YYYYMMDD');
+    row.batch = produceDateStr
+  }
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue
deleted file mode 100644
index 45b1dd04a..000000000
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <!-- 打印 -->
-  <el-dialog v-model="dialogVisiblePoint" :title="dialogTitle" width="60%">
-    <ContentWrap>
-      <Table :columns="detailListTableColumns" :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 #batch="{ row }">
-        <el-input v-model="row.batch">{{ row.batch }}</el-input>
-      </template> -->
-    </Table>
-    </ContentWrap>
-    <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonTableClick($event)"/>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
-import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
-const props = defineProps({
-  // 表頭
-  detailListTableColumns: {
-    type: Array,
-    required: true,
-    default: null
-  },
-})
-
-// 供应商发货申请
-defineOptions({ name: 'SupplierdeliverRequestMain' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const Butttondata = [
-  {
-    label: '生成标签',
-    name: 'ssbq',
-    hide: false,
-    type: 'primary',
-    icon: 'ep:select',
-    color: '',
-    hasPermi: '',
-    link: false, // 文本展现按钮
-  },
-  defaultButtons.formCloseBtn(null) // 关闭
-]
-
-const dialogVisiblePoint = ref(false)
-const { tableObject, tableMethods } = useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
-})
-const dialogVisible = ref(false)
-const isShow = ref(false)
-const dialogTitle = ref('')
-const closeDialog = () => {
-  dialogVisiblePoint.value = false
-  isShow.value = false
-}
-
-/** 生成标签按钮操作 */
-const genLabel = async () => {
-  try {
-    // 生成标签的二次确认
-    await message.confirm('是否为此数据生成标签？')
-    tableObject.loading = true
-    // 发起生成标签
-    await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
-    dialogVisible.value = false
-    isShow.value = false
-    message.success(t('生成标签成功!'))
-    dialogVisiblePoint.value = false
-    isShow.value = false
-    tableObject.loading = false
-    // 刷新列表
-    await getList()
-  } catch { }
-}
-
-// 获得表格的各种操作
-const { getList } = tableMethods
-const genLabelId = ref();
-const  openPoint = async (masterId)=>{
-  tableObject.params = {
-    masterId:masterId,
-  }
-  dialogVisiblePoint.value = true
-   genLabelId.value = masterId
-   getList()
-}
-defineExpose({ openPoint }) // 提供 open 方法，用于打开弹窗
-
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val) => {
-    if (val == 'ssbq') { // 生成标签
-      genLabel()
-    } else if (val == 'close') {// 关闭
-      closeDialog()
-    }
-  }
-
-/** 初始化 **/
-onMounted(async () => {
- 
-})
-</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 8a8097903..0231819d2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1,19 +1,17 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
-const { t } = useI18n() // 国际化
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
 // import { PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
-import * as PurchaseMainApi from '@/api/wms/purchaseMain'
-import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { PurchasePlanDetail, PurchasePlanMain } from '../purchasePlanMain/purchasePlanMain.data'
 import { validateHanset, validateEmail } from '@/utils/validator'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
+const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -27,6 +25,7 @@ const requestsettingData = data?.list[0] || {}
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import { tr } from 'element-plus/es/locale'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -211,6 +210,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '运输方式',
     field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
     sort: 'custom',
     table: {
       width: 150
@@ -547,6 +547,32 @@ export const SupplierdeliverRequestMainRules = reactive({
  * @returns {Array} 供应商发货申请子表
  */
 export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
   {
     label: '批次',
     field: 'batch',
@@ -554,6 +580,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '替代批次',
@@ -568,61 +597,37 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '到货日期',
     field: 'arriveDate',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
-      valueFormat: 'x',
-    }
-  },
-  {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
       width: 180
     },
+    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    isTableForm: false,
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
   {
     label: '过期日期',
     field: 'expireDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -631,15 +636,15 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
     tableForm: {
-      type: 'FormDateTime',
-      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
       valueFormat: 'x',
     }
   },
@@ -696,7 +701,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         }]
     }
   },
-
   {
     label: '订单行',
     field: 'poLine',
@@ -714,43 +718,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '标包数量',
-    field: 'stdPackQty',
-    sort: 'custom',
+    label: '订单数量',
+    field: 'orderQty',
     table: {
       width: 150
     },
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 1,
+        disabled: true,
+        min: 0,
         precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },
-  {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
+  
   {
     label: '供应商计量数量',
     field: 'supplierPackQty',
@@ -814,7 +802,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isTableForm: false,
     form: {
@@ -823,7 +811,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-
   {
     label: '物料代码',
     field: 'itemCode',
@@ -855,7 +842,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-
   {
     label: '数量',
     field: 'qty',
@@ -876,14 +862,72 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 6
     }
   },
-
   {
-    label: '备注',
-    field: 'remark',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从货主代码',
@@ -1011,6 +1055,14 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -1036,11 +1088,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   produceDate: [
     { required: true, message: '请输入生产日期', trigger: 'blur' }
   ],
-  expireDate: [
-    { required: true, message: '请输入过期日期', trigger: 'blur' }
-  ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
   poNumber: [
     { required: true, message: '请选择订单号', trigger: 'change' }
@@ -1048,8 +1097,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   poLine: [
     { required: true, message: '请选择订单行', trigger: 'change' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请选择标包单位', trigger: 'change' }
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
@@ -1061,3 +1110,448 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
+
+export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD',
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled:true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '要货计划信息',
+        searchAllSchemas: PurchasePlanDetail.allSchemas,
+        searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+        searchCondition: [
+          {
+            key: 'number',
+            value: 'ppNumber',
+            message: '请填写要货计划单号！',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: false,
+      disabled:true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '要货计划信息',
+      searchAllSchemas: PurchasePlanDetail.allSchemas,
+      searchPage: PurchasePlanDetailApi.getPurchasePlanDetailPage,
+      searchCondition: [
+        {
+          key: 'number',
+          value: 'ppNumber',
+          message: '请填写要货计划单号！',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 0
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled:true,
+      type: 'Select'
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled:true,
+        isSearchList: false,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: false,
+      disabled:true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
index eb1a13203..5bfb0c197 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/purchaseclaimRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 采购索赔记录主表
@@ -20,7 +20,7 @@ export const PurchaseclaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true
   },
@@ -29,7 +29,7 @@ export const PurchaseclaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'asnNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -37,7 +37,7 @@ export const PurchaseclaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'ppNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -82,9 +82,9 @@ export const PurchaseclaimRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效日期',
     field: 'activeDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     deatil: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -293,7 +293,7 @@ export const PurchaseclaimRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     }
   },
   {
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 6bbadf7de..b87fbab5f 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -29,23 +29,34 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
-    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
+  <BasicForm 
+    ref="formRef" 
+    :rules="PurchaseclaimRequestMainRules"
+    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
+    :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
     :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
     :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
-    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
+    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" 
+    :isBusiness="true"
+    @success="getList" 
+    @handleAddTable="handleAddTable" 
+    @handleDeleteTable="handleDeleteTable" 
+    @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @inputStringBlur="inputStringBlur"/>
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
-    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
+  <Detail ref="detailRef" 
+    :isBasic="false" 
+    :allSchemas="PurchaseclaimRequestMain.allSchemas"
+    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" 
+    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
     :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
     :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
     :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
     :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
+    @searchTableSuccessDetail="searchTableSuccessDetail" 
+    />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
@@ -63,7 +74,6 @@
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
   import TableHead from '@/components/TableHead/src/TableHead.vue'
-  import {mainListDocumentPrintBtn} from "@/utils/disposition/defaultButtons";
 
   // 供应商索赔申请
   defineOptions({ name: 'PurchaseclaimRequestMain' })
@@ -471,8 +481,8 @@
     getList() // 刷新当前列表
   }
   const inputStringBlur =(headerItem,index,row) =>{
-    console.log("headerItem:",headerItem)
-    console.log("row:",row)
+    // console.log("headerItem:",headerItem)
+    //console.log("row:",row)
     if(headerItem == 'singlePrice'){
       // 输入完单价离开事件（金额 = 数量 乘以 单价）
       row.amount = row.qty * row.singlePrice
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 2929e770a..091e6f024 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -47,7 +47,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '发货单号',
     field: 'asnNumber',
     table: {
-      width: 150
+      width: 180
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -75,7 +75,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     table: {
-      width: 150
+      width: 180
     }
   },
   {
@@ -457,7 +457,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '单据号',
     field: 'number',
     table: {
-      width: 150
+      width: 180
     },
     form:{
       componentProps:{
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
index a66db0f26..07807ad56 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 /**
  * @returns {Array} 供应商发票记录主表
@@ -85,9 +85,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '生效日期',
     field: 'activeDate',
     isTable: true,
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     deatil: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormatter: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -262,7 +262,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'number',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
   },
   {
@@ -338,11 +338,11 @@ export const SupplierinvoiceRecordDetailRules = reactive({
   poLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请输入标包单位', trigger: 'blur' }
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index e94fa52fb..adcfbaf70 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -600,11 +600,11 @@ export const SupplierinvoiceRequestDetailRules = reactive({
   poLine: [
     { required: true, message: '请输入订单行', trigger: 'blur' }
   ],
-  stdPackQty: [
-    { required: true, message: '请输入标包数量', trigger: 'blur' }
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
   ],
-  stdPackUnit: [
-    { required: true, message: '请输入标包单位', trigger: 'blur' }
+  packUnit: [
+    { required: true, message: '请输入包装规格', trigger: 'blur' }
   ],
   convertRate: [
     { required: true, message: '请输入转换率', trigger: 'blur' }