Browse Source

WMS bug 隔离转合格任务记录列表展示和导出问题

hella_online_20240815
gaojs 1 month ago
parent
commit
2528c99814
  1. 2
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
  2. 26
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

2
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@ -314,7 +314,7 @@ const handleExport = async () => {
}else if ( routeName.value == 'HoldtoscrapJobMain') { }else if ( routeName.value == 'HoldtoscrapJobMain') {
const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params) const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) 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) const data = await InventorymoveJobMainApi.exportOkToScrapJobMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else if ( routeName.value == 'ScraptoholdJobMain') { }else if ( routeName.value == 'ScraptoholdJobMain') {

26
src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@ -83,7 +83,7 @@ const route = useRoute() // 路由信息
const routeName = ref() const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns]) const tableColumns = ref([...InventorymoveRecordMain.allSchemas.tableColumns,...InventorymoveRecordDetail.allSchemas.tableMainColumns])
const businessType = ref()
console.log(99 , routeName.value) console.log(99 , routeName.value)
const fromInventoryStatus = ref() const fromInventoryStatus = ref()
const toInventoryStatus = ref() const toInventoryStatus = ref()
@ -114,7 +114,7 @@ const { tableObject, tableMethods } = useTable({
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'NOK', fromInventoryStatus: 'NOK',
toInventoryStatus:'HOLD', toInventoryStatus:'HOLD',
businessType:'Move' businessType:'NoktoHold'
} }
fromInventoryStatus.value = 'NOK' fromInventoryStatus.value = 'NOK'
toInventoryStatus.value = "HOLD" toInventoryStatus.value = "HOLD"
@ -123,7 +123,7 @@ const { tableObject, tableMethods } = useTable({
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', fromInventoryStatus: 'HOLD',
toInventoryStatus:'OK', toInventoryStatus:'OK',
businessType:'NokToHold' businessType:'HoldtoOk'
} }
fromInventoryStatus.value = 'HOLD' fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "OK" toInventoryStatus.value = "OK"
@ -131,7 +131,8 @@ const { tableObject, tableMethods } = useTable({
} else if ( routeName.value == 'HoldtoscrapRecordMain') { } else if ( routeName.value == 'HoldtoscrapRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'HOLD', fromInventoryStatus: 'HOLD',
toInventoryStatus:'SCRAP' toInventoryStatus:'SCRAP',
businessType:'HoldtoScrap'
} }
fromInventoryStatus.value = 'HOLD' fromInventoryStatus.value = 'HOLD'
toInventoryStatus.value = "SCRAP" toInventoryStatus.value = "SCRAP"
@ -139,7 +140,8 @@ const { tableObject, tableMethods } = useTable({
} else if ( routeName.value == 'OktoscrapRecordMain') { } else if ( routeName.value == 'OktoscrapRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'OK', fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP' toInventoryStatus:'SCRAP',
businessType:'OktoScrap'
} }
fromInventoryStatus.value = 'OK' fromInventoryStatus.value = 'OK'
toInventoryStatus.value = "SCRAP" toInventoryStatus.value = "SCRAP"
@ -147,17 +149,19 @@ const { tableObject, tableMethods } = useTable({
} else if ( routeName.value == 'ScraptoholdRecordMain') { } else if ( routeName.value == 'ScraptoholdRecordMain') {
tableObject.params = { tableObject.params = {
fromInventoryStatus: 'SCRAP', fromInventoryStatus: 'SCRAP',
toInventoryStatus:'HOLD' toInventoryStatus:'HOLD',
businessType:'ScraptoHold'
} }
fromInventoryStatus.value = 'SCRAP' fromInventoryStatus.value = 'SCRAP'
toInventoryStatus.value = "HOLD" toInventoryStatus.value = "HOLD"
importFileName.value = '报废转隔离记录' importFileName.value = '报废转隔离记录'
} else { } else {
console.log(146 , fromInventoryStatus.value) console.log(146, fromInventoryStatus.value)
fromInventoryStatus.value = null fromInventoryStatus.value = null
importFileName.value = '库存移动记录' businessType.value = 'Move'
} importFileName.value = '库存移动记录'
}
// //
const { getList, setSearchParams } = tableMethods const { getList, setSearchParams } = tableMethods
@ -242,7 +246,7 @@ const handleExport = async () => {
}else if ( routeName.value == 'HoldtoscrapRecordMain') { }else if ( routeName.value == 'HoldtoscrapRecordMain') {
const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params) const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) 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) const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params)
download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) download.excel(data, `${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
}else if ( routeName.value == 'ScraptoholdRecordMain') { }else if ( routeName.value == 'ScraptoholdRecordMain') {

Loading…
Cancel
Save