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..e2de4e5f8 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 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/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..6f3788867 100644 --- a/src/api/wms/inspectRecordMain/index.ts +++ b/src/api/wms/inspectRecordMain/index.ts @@ -37,7 +37,7 @@ export interface InspectRecordMainVO { ownerCode: string available: string sampleQty: number - fromLocationTypes: string + fromAreaTypes: string } // 查询检验记录主列表 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/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/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/pickJobMain/index.ts b/src/api/wms/pickJobMain/index.ts index 3f52ed878..bb4e84ace 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 diff --git a/src/api/wms/pickRecordMain/index.ts b/src/api/wms/pickRecordMain/index.ts index 97ea9cea6..96a5635e9 100644 --- a/src/api/wms/pickRecordMain/index.ts +++ b/src/api/wms/pickRecordMain/index.ts @@ -18,10 +18,10 @@ 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 } diff --git a/src/api/wms/pickRequestMain/index.ts b/src/api/wms/pickRequestMain/index.ts index 5344d4df3..277ef1448 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 diff --git a/src/api/wms/productdismantleJobMain/index.ts b/src/api/wms/productdismantleJobMain/index.ts index 353653c77..b2dddc5e7 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 diff --git a/src/api/wms/productdismantleRecordMain/index.ts b/src/api/wms/productdismantleRecordMain/index.ts index b5de74274..4628be7a3 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 } 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/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..b42ba45d1 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 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..d6eaaa8ff 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 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/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/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index acd866722..a2704ace6 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 } 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..0fd2d39cd 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 } 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..9d111f89f 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 diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts index 3a468e448..48f4db18d 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 diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 3e2f9a27d..ac751a5b6 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 diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 7c61327e9..fb50c380b 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -26,8 +26,8 @@ export interface PurchasereceiptRecordMainVO { 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/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index 4aa84e577..e41ef3286 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 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/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts index 3cc50a9a2..bcdd51ea8 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 diff --git a/src/api/wms/scrapRecordMain/index.ts b/src/api/wms/scrapRecordMain/index.ts index 57f2a8b76..bd1caffc3 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 } 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/transferissueJobMain/index.ts b/src/api/wms/transferissueJobMain/index.ts index 53e7e3293..047e832ee 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 diff --git a/src/api/wms/transferissueRecordMain/index.ts b/src/api/wms/transferissueRecordMain/index.ts index 7433ba3ce..a1eab49e8 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 } diff --git a/src/api/wms/transferissueRequestMain/index.ts b/src/api/wms/transferissueRequestMain/index.ts index 28425411a..4aee7771f 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 diff --git a/src/api/wms/transferreceiptJobMain/index.ts b/src/api/wms/transferreceiptJobMain/index.ts index d2538c3b8..1cf66f552 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 diff --git a/src/api/wms/transferreceiptRecordMain/index.ts b/src/api/wms/transferreceiptRecordMain/index.ts index ec41b4208..915394535 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 } diff --git a/src/api/wms/transferreceiptRequestMain/index.ts b/src/api/wms/transferreceiptRequestMain/index.ts index dcf0e539d..d7462f636 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 diff --git a/src/api/wms/unplannedissueJobMain/index.ts b/src/api/wms/unplannedissueJobMain/index.ts index ce835fe53..0d4d1ecd1 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 diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts index c0544e0c0..61ee92037 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 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..c76d24506 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 diff --git a/src/api/wms/unplannedreceiptRecordMain/index.ts b/src/api/wms/unplannedreceiptRecordMain/index.ts index e54a19f47..f9ebbc157 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 } 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/views/Home/components/produce.vue b/src/views/Home/components/produce.vue index c289ec0c0..294bc28ef 100644 --- a/src/views/Home/components/produce.vue +++ b/src/views/Home/components/produce.vue @@ -95,8 +95,8 @@ {{ formatDate(scope.row.acceptTime) }} - - + + diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index c96b667d7..f43c86d90 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -76,8 +76,8 @@ export const Businesstype = useCrudSchemas(reactive([ }, }, { - label: '出库库位类型范围', - field: 'outLocationTypes', + label: '出库库区类型范围', + field: 'outAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -93,8 +93,8 @@ export const Businesstype = useCrudSchemas(reactive([ } }, { - label: '入库库位类型范围', - field: 'inLocationTypes', + label: '入库库区类型范围', + field: 'inAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, 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/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index b39f68b92..cb8edd7ab 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -141,8 +141,8 @@ export const CountJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -152,8 +152,8 @@ export const CountJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 1824332ad..d2efa582c 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -177,8 +177,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -196,8 +196,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -337,8 +337,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 +346,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' } diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 1825c13e1..e27551486 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -172,8 +172,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -184,8 +184,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( }, }, { - 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' } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index de1cfb150..fc6620b5a 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -179,8 +179,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -190,8 +190,8 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ }, }, { - 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' } 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..9ed0a517c 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -186,8 +186,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -205,8 +205,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -354,8 +354,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 +363,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' } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 6c90539c5..df3853b4b 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -283,8 +283,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ 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([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts index e7c7ef467..65bf1038c 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts @@ -138,8 +138,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -276,8 +276,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' } diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 4ff422381..e56974435 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -132,8 +132,8 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ 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' } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 751070b25..0e2d55a35 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -178,8 +178,8 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -189,8 +189,8 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, }, { - 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' } 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..52f3b9f6b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -186,8 +186,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -197,8 +197,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -354,8 +354,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 +363,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' } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index f0233ac24..c14b575d6 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -270,8 +270,8 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ 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([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 80683014d..aa885a2d7 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -113,8 +113,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -124,8 +124,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -510,8 +510,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' } diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 158fb9d00..e7e9322b2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -122,8 +122,8 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -253,8 +253,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' } diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 339591b3a..a48c9afd5 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -143,8 +143,8 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ } }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts index fda01bbc9..f9732cda2 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/transferissueJobMain.data.ts @@ -183,8 +183,8 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -195,8 +195,8 @@ export const TransferissueJobMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -567,8 +567,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 +576,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' } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 578d5d25e..5afa093c3 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -154,8 +154,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -165,8 +165,8 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -316,8 +316,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 +325,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' } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index ab656bd87..4a7dc626e 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -226,8 +226,8 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -239,8 +239,8 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts index 68d5282bb..de51eb88b 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts @@ -138,8 +138,8 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -149,8 +149,8 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -559,8 +559,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 +568,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' } diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index 051f19e7a..5b04795ba 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -162,8 +162,8 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -173,8 +173,8 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -324,8 +324,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 +333,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' } diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index 607aa3fb6..b73e61948 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -136,8 +136,8 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -147,8 +147,8 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( }, }, { - 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' } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index dbe124612..451d7ae69 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -121,8 +121,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ // }, // }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -133,8 +133,8 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -511,8 +511,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' } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 37ef06d92..2056f1b16 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -122,8 +122,8 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -265,8 +265,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' } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index b1509aaab..9ee200687 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -110,8 +110,8 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: 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..d5345e82c 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -121,8 +121,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ // }, // }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -133,8 +133,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -511,8 +511,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' } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 5835c425a..6668e06e3 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -122,8 +122,8 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -257,8 +257,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' } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index ae6a18bc3..705dddd19 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -150,8 +150,8 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive } }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 52c538f31..3d61a23a2 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, diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 0c1912d8f..a717a5a46 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -234,8 +234,8 @@ export const IssueJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -246,8 +246,8 @@ export const IssueJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index ac4e3198b..2c3747890 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -217,8 +217,8 @@ export const IssueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -244,8 +244,8 @@ export const IssueRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -311,13 +311,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: [ diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 798ea0e11..cca25af26 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([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -153,8 +153,8 @@ export const IssueRequestMain = useCrudSchemas(reactive([ isForm: false }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts index b993d41ac..e95e63b59 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts +++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts @@ -227,8 +227,8 @@ export const PickJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -239,8 +239,8 @@ export const PickJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts index 0b9568b57..542b3a255 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts @@ -217,8 +217,8 @@ export const PickRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -236,8 +236,8 @@ export const PickRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -284,14 +284,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' } diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts index 3d0b1efc4..aaa991059 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts @@ -46,8 +46,8 @@ export const PickRequestMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -74,8 +74,8 @@ export const PickRequestMain = useCrudSchemas(reactive([ }, }, { - 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' } 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..0efd84e62 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -239,8 +239,8 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -250,8 +250,8 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ }, }, { - 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' } ], }) diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index e73a6f6fb..3c8892336 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -209,8 +209,8 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -236,8 +236,8 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -303,14 +303,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' } 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..d3a6f0b7b 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -243,8 +243,8 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -254,8 +254,8 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 91eb4f3bc..51d5e4d0e 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -217,8 +217,8 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -244,8 +244,8 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -292,14 +292,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' } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 3ce0b65a1..136c8c633 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -144,8 +144,8 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -156,8 +156,8 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, 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..75b6b2db0 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -227,8 +227,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -239,8 +239,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index 2b25edc06..8f7c9dcfe 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -217,8 +217,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -236,8 +236,8 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -284,14 +284,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' } diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 5b68ade91..e6e34b506 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -71,8 +71,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ } }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -106,8 +106,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ } }, { - 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' } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 0d5f5b842..58ae0273a 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -147,8 +147,8 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, @@ -159,8 +159,8 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index acc6f3bbe..b960e0722 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -149,8 +149,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -160,8 +160,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -303,8 +303,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 +312,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' } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 606f2311e..2b3cbd2e9 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -145,8 +145,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', // dictType: DICT_TYPE.LOCATION_TYPE, // dictClass: 'string', isTable: true, @@ -175,8 +175,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', // dictType: DICT_TYPE.LOCATION_TYPE, // dictClass: 'string', isTable: true, diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts index 947f82120..e5f90da52 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts @@ -251,8 +251,8 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -262,8 +262,8 @@ export const ProductdismantleJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index edde86cb6..f89e58be6 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -225,8 +225,8 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -273,8 +273,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' } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index 43eec67b2..a66327cb4 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -144,8 +144,8 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive isForm: false }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, 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..d18610695 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts @@ -235,8 +235,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -246,8 +246,8 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index df1d4faf1..c214b6708 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -225,8 +225,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -244,8 +244,8 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -292,14 +292,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' } diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 8c815f51a..fbf1089de 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([ 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([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: true, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index 4a5a9dea8..f939f8ee8 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, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 98cef4df0..567ccfb51 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -259,8 +259,8 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -270,8 +270,8 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 0fbad8065..e43a132f4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -241,8 +241,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -289,8 +289,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' } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 4aece033c..c31cb9e42 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -154,8 +154,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts index c0a55f07d..90d463846 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts @@ -226,8 +226,8 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -274,8 +274,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' } diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 8779257d1..43acfe255 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -144,8 +144,8 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: 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..5e8580e09 100644 --- a/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/productscrapJobMain.data.ts @@ -227,8 +227,8 @@ export const ProductscrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -238,8 +238,8 @@ export const ProductscrapJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index a9215df24..dd898c40f 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -255,8 +255,8 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -303,8 +303,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' } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 50cad5b10..aaa5e90b8 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -146,8 +146,8 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ isTable: false }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: 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..b0449ffc6 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts @@ -215,8 +215,8 @@ export const InspectJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -226,8 +226,8 @@ export const InspectJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts index da7294a36..503c00bde 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts @@ -367,8 +367,8 @@ export const InspectRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', isTable: true, dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', @@ -429,8 +429,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' } 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([ 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([ 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..dff08fb6c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -284,8 +284,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -295,8 +295,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -578,8 +578,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' } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index d73aa5e0a..90c8c9b75 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -108,8 +108,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -119,8 +119,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -346,7 +346,7 @@ export const PurchasereceiptRecordMainRules = reactive({ toWarehouseCode: [ { required: true, message: '请选择到仓库代码', trigger: 'change' } ], - toLocationTypes: [ + toAreaTypes: [ { required: true, message: '请选择到库位类型服务', trigger: 'change' } ], outTransaction: [ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 9b71b9ff1..36857bb98 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -127,8 +127,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isForm: false, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -139,8 +139,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isForm: false, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -416,8 +416,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' } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index 320f9c738..8ef069828 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -105,8 +105,8 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isSearch: false, @@ -117,8 +117,8 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ }, }, { - 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' } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index f264a560f..283ce0138 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -130,8 +130,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -141,8 +141,8 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -343,8 +343,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..32befcda0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -154,8 +154,8 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ 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([ 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' } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts index 991a7525f..5b573fa20 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts @@ -208,8 +208,8 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -219,8 +219,8 @@ export const PutawayJobMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -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' } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index a354c19f5..11df17942 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -225,8 +225,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -244,8 +244,8 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', + label: '到库区类型范围', + field: 'toAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -292,14 +292,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' } diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 0c293a674..7bacb2bb1 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -71,8 +71,8 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ // isForm: false, // }, { - label: '从库位类型范围', - field: 'fromLocationTypes', + label: '从库区类型范围', + field: 'fromAreaTypes', dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, @@ -313,8 +313,8 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ } }, { - 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' }