From 1539bb7d4af93486b001dda3a7cfdd1fcc079919 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 6 Sep 2024 17:24:13 +0800 Subject: [PATCH] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5847=20=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E8=BD=AC=E5=90=88=E6=A0=BC=E3=80=81=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=BA=94=E5=BC=B9=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveRequestMain/index.ts | 4 +- .../inventorymoveRequestMain/index.vue | 24 +++--- .../inventorymoveRequestMainMOVE/index.vue | 24 +++--- .../inventorymoveRequestMainOKHOLD/index.vue | 77 +++++++++++++++++-- 4 files changed, 95 insertions(+), 34 deletions(-) diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts index 68784d189..72e91ea6c 100644 --- a/src/api/wms/inventorymoveRequestMain/index.ts +++ b/src/api/wms/inventorymoveRequestMain/index.ts @@ -129,11 +129,11 @@ export const exportScrapToHoldRequestMain = async (params) => { } // 下载用户导入模板 +// 下载用户导入模板（除库存移动外） + export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-request-main/get-import-template' }) } - -// 下载用户导入模板（除库存移动外） export const importTemplateExceptMove = () => { return request.download({ url: '/wms/inventorymove-request-main/get-import-template-exceptMove' }) } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index f6dff9ecf..20689e6b7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -122,8 +122,8 @@ if ( routeName.value == 'OktoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'OkToHold' } - // fromInventoryStatus.value = 'OK' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "HOLD" businessType.value = 'OkToHold' importFileName.value = '物料转隔离申请' } @@ -133,8 +133,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'NokToHold' } - // fromInventoryStatus.value = 'NOK' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" businessType.value = 'NokToHold' importFileName.value = '不合格转隔离申请' } @@ -144,8 +144,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'OK', businessType :'HoldToOk' } - // fromInventoryStatus.value = 'HOLD' - // toInventoryStatus.value = "OK" + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "OK" businessType.value = 'HoldToOk' importFileName.value = '隔离转合格申请' } else if ( routeName.value == 'HoldtoscrapRequestMain') { @@ -154,8 +154,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'SCRAP', businessType:'HoldToScrap' } - // fromInventoryStatus.value = 'HOLD' - // toInventoryStatus.value = "SCRAP" + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "SCRAP" businessType.value = 'HoldToScrap' importFileName.value = '隔离转报废申请' } else if ( routeName.value == 'OktoscrapRequestMain') { @@ -164,8 +164,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'SCRAP', businessType :'OkToScrap' } - // fromInventoryStatus.value = 'OK' - // toInventoryStatus.value = "SCRAP" + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "SCRAP" businessType.value = 'OkToScrap' importFileName.value = '合格转报废申请' } @@ -175,8 +175,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'ScrapToHold' } - // fromInventoryStatus.value = 'SCRAP' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'SCRAP' + toInventoryStatus.value = "HOLD" businessType.value = 'ScrapToHold' importFileName.value = '报废转隔离申请' } else { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index 06788711b..f52cd62b5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -123,8 +123,8 @@ if ( routeName.value == 'OktoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'OkToHold' } - // fromInventoryStatus.value = 'OK' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "HOLD" businessType.value = 'OkToHold' importFileName.value = '物料转隔离申请' } @@ -134,8 +134,8 @@ else if ( routeName.value == 'NoktoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'NokToHold' } - // fromInventoryStatus.value = 'NOK' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" businessType.value = 'NokToHold' importFileName.value = '不合格转隔离申请' } @@ -145,8 +145,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'OK', businessType :'HoldToOk' } - // fromInventoryStatus.value = 'HOLD' - // toInventoryStatus.value = "OK" + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "OK" businessType.value = 'HoldToOk' importFileName.value = '隔离转合格申请' } else if ( routeName.value == 'HoldtoscrapRequestMain') { @@ -155,8 +155,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'SCRAP', businessType:'HoldToScrap' } - // fromInventoryStatus.value = 'HOLD' - // toInventoryStatus.value = "SCRAP" + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "SCRAP" businessType.value = 'HoldToScrap' importFileName.value = '隔离转报废申请' } else if ( routeName.value == 'OktoscrapRequestMain') { @@ -165,8 +165,8 @@ else if ( routeName.value == 'HoldtookRequestMain') { // toInventoryStatus:'SCRAP', businessType :'OkToScrap' } - // fromInventoryStatus.value = 'OK' - // toInventoryStatus.value = "SCRAP" + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "SCRAP" businessType.value = 'OkToScrap' importFileName.value = '合格转报废申请' } @@ -176,8 +176,8 @@ else if ( routeName.value == 'ScraptoholdRequestMain') { // toInventoryStatus:'HOLD', businessType :'ScrapToHold' } - // fromInventoryStatus.value = 'SCRAP' - // toInventoryStatus.value = "HOLD" + fromInventoryStatus.value = 'SCRAP' + toInventoryStatus.value = "HOLD" businessType.value = 'ScrapToHold' importFileName.value = '报废转隔离申请' } else { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 003fa48bc..0be2f9677 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -116,15 +116,76 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口 }) -tableObject.params = { - // fromInventoryStatus: 'OK', - // toInventoryStatus:'HOLD', - businessType :'OkToHold' +if ( routeName.value == 'OktoholdRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'OK', + // toInventoryStatus:'HOLD', + businessType :'OkToHold' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "HOLD" + businessType.value = 'OkToHold' + importFileName.value = '物料转隔离申请' +} +else if ( routeName.value == 'NoktoholdRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'NOK', + // toInventoryStatus:'HOLD', + businessType :'NokToHold' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + businessType.value = 'NokToHold' + importFileName.value = '不合格转隔离申请' +} +else if ( routeName.value == 'HoldtookRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'HOLD', + // toInventoryStatus:'OK', + businessType :'HoldToOk' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "OK" + businessType.value = 'HoldToOk' + importFileName.value = '隔离转合格申请' +} else if ( routeName.value == 'HoldtoscrapRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'HOLD', + // toInventoryStatus:'SCRAP', + businessType:'HoldToScrap' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "SCRAP" + businessType.value = 'HoldToScrap' + importFileName.value = '隔离转报废申请' +} else if ( routeName.value == 'OktoscrapRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'OK', + // toInventoryStatus:'SCRAP', + businessType :'OkToScrap' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "SCRAP" + businessType.value = 'OkToScrap' + importFileName.value = '合格转报废申请' +} +else if ( routeName.value == 'ScraptoholdRequestMain') { + tableObject.params = { + // fromInventoryStatus: 'SCRAP', + // toInventoryStatus:'HOLD', + businessType :'ScrapToHold' + } + fromInventoryStatus.value = 'SCRAP' + toInventoryStatus.value = "HOLD" + businessType.value = 'ScrapToHold' + importFileName.value = '报废转隔离申请' +} else { + tableObject.params = { + businessType :'Move' + } + businessType.value = 'Move' + importFileName.value = '库存移动申请' } -// fromInventoryStatus.value = 'OK' -// toInventoryStatus.value = "HOLD" -businessType.value = 'OkToHold' -importFileName.value = '物料转隔离申请' InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ if(item.field == 'fromWarehouseCode') {