diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index 496dd016e..edc0acaa6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -302,7 +302,7 @@ const handleExport = async () => { if(routeName.value == 'OktoholdJobMain'){ const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params) download.excel(data, '合格转隔离任务主.xlsx') - }else if ( routeName.value == 'HoldtookJobMain') { + }else if ( routeName.value == 'NoktoholdJobMain') { const data = await InventorymoveJobMainApi.exportNokToHoldJobMain(tableObject.params) download.excel(data, '不合格转隔离任务主.xlsx') }else if ( routeName.value == 'HoldtookJobMain') { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 4fed4c42e..277ab864f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -113,7 +113,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { fromInventoryStatus: 'NOK', toInventoryStatus:'HOLD', - businessType:'Move' + businessType:'NokToHold' } fromInventoryStatus.value = 'NOK' toInventoryStatus.value = "HOLD" @@ -122,7 +122,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { fromInventoryStatus: 'HOLD', toInventoryStatus:'OK', - businessType:'NokToHold' + businessType:'HoldToOk' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "OK" @@ -130,7 +130,8 @@ const { tableObject, tableMethods } = useTable({ } else if ( routeName.value == 'HoldtoscrapRecordMain') { tableObject.params = { fromInventoryStatus: 'HOLD', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType:'HoldToScrap' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "SCRAP" @@ -138,7 +139,8 @@ const { tableObject, tableMethods } = useTable({ } else if ( routeName.value == 'OktoscrapRecordMain') { tableObject.params = { fromInventoryStatus: 'OK', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType:'OktoScrap' } fromInventoryStatus.value = 'OK' toInventoryStatus.value = "SCRAP" @@ -146,7 +148,8 @@ const { tableObject, tableMethods } = useTable({ } else if ( routeName.value == 'ScraptoholdRecordMain') { tableObject.params = { fromInventoryStatus: 'SCRAP', - toInventoryStatus:'HOLD' + toInventoryStatus:'HOLD', + businessType:'ScrapToHold' } fromInventoryStatus.value = 'SCRAP' toInventoryStatus.value = "HOLD" @@ -230,7 +233,7 @@ const handleExport = async () => { if(routeName.value == 'OktoholdRecordMain'){ const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) download.excel(data, '合格转隔离记录主.xlsx') - }else if ( routeName.value == 'HoldtookRecordMain') { + }else if ( routeName.value == 'NoktoholdRecordMain') { const data = await InventorymoveRecordMainApi.exportNokToHoldRecordMain(tableObject.params) download.excel(data, '不合格转隔离记录主.xlsx') }else if ( routeName.value == 'HoldtookRecordMain') { @@ -239,7 +242,7 @@ const handleExport = async () => { }else if ( routeName.value == 'HoldtoscrapRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params) download.excel(data, '隔离转报废记录主.xlsx') - }else if ( routeName.value == 'OktoscrapRecordtMain') { + }else if ( routeName.value == 'OktoscrapRecordMain') { const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params) download.excel(data, '合格转报废记录主.xlsx') }else if ( routeName.value == 'ScraptoholdRecordMain') {