diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 4cde26921..76e471680 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -34,6 +34,16 @@ export const getLocationPage = async (params) => { return await request.get({ url: `/wms/location/page`, params }) } } +// 查询库位列表 +export const getLocationPageOnlineSettlement = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/location/seniorOnlineSettlement', data }) + } else { + return await request.get({ url: `/wms/location/pageOnlineSettlement`, params }) + } +} // 校验库位 export const verifyLocation = async (params) => { return await request.get({ url: `/wms/location/listLocationByCode`, params }) diff --git a/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue b/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue index 5a845ea61..6f7f05a3f 100644 --- a/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue +++ b/src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue @@ -143,7 +143,9 @@ const butttondata = (row) => { const searchTableRef = ref() // 列表-操作按钮事件 +const settlementRow = ref(null) const buttonTableClick = async (val, row) => { + settlementRow.value = row if(val == 'settlement'){ // 结算 searchTableRef.value.open( @@ -228,16 +230,15 @@ const opensearchTable = ( searchTableRef1.value.open( "结算库位", Location.allSchemas, - LocationApi.getLocationPage, + LocationApi.getLocationPageOnlineSettlement, "toLocationCode", "code", false, 'form', null, { - // supplierCode:row.supplierCode, - // itemCode:row.itemCode, - // batch:row.batch + supplierCode:settlementRow.value?.supplierCode, + itemCode:settlementRow.value?.itemCode, }, undefined, false, diff --git a/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts b/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts index 36d2f80c9..81b657154 100644 --- a/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts +++ b/src/views/wms/issueManage/onlinesettlement/settlementReport/settlementReport.data.ts @@ -161,10 +161,20 @@ export const SettlementReportSelectionForm = useCrudSchemas(reactive