diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index f7031e48a..66cb6ddab 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -41,7 +41,16 @@ export const getBalancePage = async (params) => { return await request.get({ url: `/wms/balance/page`, params }) } } - +// 查询库存余额列表 +export const getBalancePageReturn= async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/senior', data }) + } else { + return await request.get({ url: `/wms/balance/pageReturn`, params }) + } +} // 查询库存余额列表增加物品筛选条件 export const getBalanceItemPage = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 3ca507505..8ef803177 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -217,6 +217,10 @@ export const Supplieritem = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'warehouseCode', + value: 'defaultWarehouseCode', + isMainValue: true }] } } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 2da331d83..564c1de5a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -483,7 +483,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchField: 'packingNumber', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePage, + searchPage: BalanceApi.getBalancePageReturn, searchCondition:[{ key: 'available', value: 'TRUE',