diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index f7f797f97..37b59e638 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -314,7 +314,7 @@ const handleExport = async () => { }else if ( routeName.value == 'HoldtoscrapJobMain') { const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'OktoscrapJobtMain') { + }else if ( routeName.value == 'OktoscrapJobMain') { const data = await InventorymoveJobMainApi.exportOkToScrapJobMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'ScraptoholdJobMain') { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index d97334fab..265b41b9f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -83,7 +83,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns]) - +const businessType = ref() console.log(99 , routeName.value) const fromInventoryStatus = ref() const toInventoryStatus = ref() @@ -114,7 +114,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { fromInventoryStatus: 'NOK', toInventoryStatus:'HOLD', - businessType:'Move' + businessType:'NoktoHold' } fromInventoryStatus.value = 'NOK' toInventoryStatus.value = "HOLD" @@ -123,7 +123,7 @@ const { tableObject, tableMethods } = useTable({ tableObject.params = { fromInventoryStatus: 'HOLD', toInventoryStatus:'OK', - businessType:'NokToHold' + businessType:'HoldtoOk' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "OK" @@ -131,7 +131,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" @@ -139,7 +140,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" @@ -147,17 +149,19 @@ 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" importFileName.value = '报废转隔离记录' } else { - console.log(146 , fromInventoryStatus.value) - fromInventoryStatus.value = null - importFileName.value = '库存移动记录' -} + console.log(146, fromInventoryStatus.value) + fromInventoryStatus.value = null + businessType.value = 'Move' + importFileName.value = '库存移动记录' + } // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods @@ -242,7 +246,7 @@ const handleExport = async () => { }else if ( routeName.value == 'HoldtoscrapRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'OktoscrapRecordtMain') { + }else if ( routeName.value == 'OktoscrapRecordMain') { const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'ScraptoholdRecordMain') {