From 3434a569308cc3d80817e37ce78bb848828b12a9 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 12 Dec 2023 15:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestDetail/index.ts | 7 +- .../transferissueRequestMain.data.ts | 48 +- .../unplannedreceiptRequestMain/index.vue | 173 ++++++- .../unplannedreceiptRequestMain.data.ts | 432 ++++++++++++++++-- 4 files changed, 577 insertions(+), 83 deletions(-) diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts index 51629781d..c62a7e13f 100644 --- a/src/api/wms/unplannedreceiptRequestDetail/index.ts +++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts @@ -66,4 +66,9 @@ export const exportUnplannedreceiptRequestDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/unplannedreceipt-request-detail/get-import-template' }) -} \ No newline at end of file +} + +// 创建包装信息后更新子表数据packingNumber +export const updateDetailPackingNumber = async (id: number, number) => { + return await request.put({ url: '/wms/unplannedreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number }) +} diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 9ecf41aa1..1b19dcba9 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -164,7 +164,12 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ searchField: 'code', searchTitle: '仓库信息', searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.getWarehousePage + searchPage: WarehouseApi.getWarehousePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] }, form: { // labelMessage: '信息提示说明!!!', @@ -677,6 +682,21 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( disabled: true, } }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + } + }, { label: '到库位代码', field: 'toLocationCode', @@ -690,7 +710,16 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( searchField: 'code', searchTitle: '库位信息', searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationPage + searchPage: LocationApi.getLocationPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'warehouseCode', + value: 'toWarehouseCode', + isMainValue: true, + }] }, form: { // labelMessage: '信息提示说明!!!', @@ -713,21 +742,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - } - }, { label: '从货主代码', field: 'fromOwnerCode', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index a470839db..67338db68 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -71,6 +71,21 @@ @searchTableSuccessDetail="searchTableSuccessDetail" /> + + + @@ -78,10 +93,24 @@