From 8eb942ce266b526852e6d6d4bd8845c2bce3f671 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 28 Nov 2024 16:03:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-1337=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=8F=90=E7=A4=BA=E8=AF=B7?= =?UTF-8?q?=E5=85=88=E9=80=89=E6=8B=A9=E4=BB=8E=E4=BB=93=E5=BA=93=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 4845b1325..1ce815ca7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -527,6 +527,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchTitle: '库存余额信息', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], }, form: { // labelMessage: '信息提示说明！！！', @@ -537,6 +547,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchTitle: '库存余额信息', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [{ + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], } } }, From 6a589e1ad33525a1964a674f2972367211febdeb Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 28 Nov 2024 16:17:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E6=A0=BC=E8=BD=AC=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 64e2c27e4..92c53e3cb 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -254,6 +254,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { if(item.field == 'itemCode') { if (fromInventoryStatus.value) { item.tableForm.searchCondition = [ + { + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + }, { key: 'businessType', value: businessType.value , @@ -268,6 +274,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { ] } else if (fromInventoryStatus.value == null) { item.tableForm.searchCondition = [ + { + key:'fromWarehouseCode', + value:'fromWarehouseCode', + message: '请填写生产线代码！', + isMainValue: true + }, { key: 'businessType', value: businessType.value ,