From a3a7c90a92bce7703454fc2874187233bc679c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Mon, 27 Nov 2023 17:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=BB=BA=E6=A8=A1=E5=BC=B9=E5=B1=82=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../areabasic/areabasic.data.ts | 7 +++++- .../factoryModeling/dock/dock.data.ts | 14 +++++++++-- .../factoryModeling/location/location.data.ts | 15 ++++++++++- .../locationgroup/locationgroup.data.ts | 11 +++++++- .../factoryModeling/process/process.data.ts | 11 +++++++- .../productionline/productionline.data.ts | 21 +++++++++++++--- .../workstation/workstation.data.ts | 25 ++++++++++++++++--- 7 files changed, 92 insertions(+), 12 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index 0eeb49d27..14bf2a9c3 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -46,7 +46,12 @@ export const Area = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '仓库信息', // 查询弹窗标题 searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 - searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index bdb096c85..660230aa1 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -77,7 +77,12 @@ export const Dock = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '仓库信息', // 查询弹窗标题 searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 - searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -96,7 +101,12 @@ export const Dock = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 131de7fe2..9ac7fef9f 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -52,7 +52,12 @@ export const Location = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '仓库信息', // 查询弹窗标题 searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 - searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -76,6 +81,10 @@ export const Location = useCrudSchemas(reactive([ key:'warehouseCode', value:'warehouseCode', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } } @@ -100,6 +109,10 @@ export const Location = useCrudSchemas(reactive([ key:'areaCode', value:'areaCode', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } } diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index b54bab1c0..c5986b5ec 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -49,7 +49,12 @@ export const Locationgroup = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '仓库信息', // 查询弹窗标题 searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 - searchPage: WarehouseApi.getWarehousePage // 查询弹窗所需分页方法 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -74,6 +79,10 @@ export const Locationgroup = useCrudSchemas(reactive([ key:'warehouseCode', value:'warehouseCode', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } } diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts index 0577b0401..90ada7743 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts @@ -61,7 +61,12 @@ export const Process = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '车间信息', // 查询弹窗标题 searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 - searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -85,6 +90,10 @@ export const Process = useCrudSchemas(reactive([ key:'workshopCode', value:'workshopCode', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } } diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts index 636ccae75..d80dbac99 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts @@ -61,7 +61,12 @@ export const Productionline = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '车间信息', // 查询弹窗标题 searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 - searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -80,7 +85,12 @@ export const Productionline = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -99,7 +109,12 @@ export const Productionline = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 9823d38d1..a85277616 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -64,7 +64,12 @@ export const Workstation = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '车间信息', // 查询弹窗标题 searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 - searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -89,6 +94,10 @@ export const Workstation = useCrudSchemas(reactive([ key:'workshopCode', value:'workshopCode', isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] } } @@ -108,7 +117,12 @@ export const Workstation = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, @@ -127,7 +141,12 @@ export const Workstation = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } },