From e5a8f074236c4aec1ef56e1ac304a4434787199b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 11 Jul 2024 17:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BD=BF=E7=94=A8initPrintAllData=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0await=E4=BB=A5=E5=8F=8Aasync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../completDump/completDumpNotePT.vue | 6 +++--- .../completDump/completDumpNoteZP.vue | 6 +++--- .../completDump/completDumpNoteZS.vue | 6 +++--- .../deliver/FISDeliverNote-Query.vue | 6 +++--- .../finishedProductManage/deliver/FISDeliverRequest.vue | 4 ++-- .../finishedProductManage/productionReturn/returnNote.vue | 6 +++--- .../customerStorageAllocationNote.vue | 8 ++++---- .../interStorageAllocation/interStorageAllocationNote.vue | 4 ++-- .../lineSideWarehouseAdjustmentSheetNote.vue | 4 ++-- .../lineSideWarehouseAllocationNote.vue | 6 +++--- .../lineSideWarehouseScrappingNote.vue | 4 ++-- .../nonproductive/materialReturnRequest.vue | 8 ++++---- .../inventoryManage/nonproductive/pickingRequest.vue | 8 ++++---- .../recycledMaterials/materialsAdjustment.vue | 4 ++-- .../recycledMaterials/materialsReceipt.vue | 4 ++-- fe/PC/src/views/kittingManage/KittingIssueNote.vue | 4 ++-- fe/PC/src/views/materialIssueBP/IssueNoteBP.vue | 4 ++-- .../materialIssueManage/automaticPT/automaticNotePT.vue | 1 - .../materialIssueManage/automaticZP/automaticNoteZP.vue | 1 - .../materialIssueManage/automaticZS/automaticNoteZS.vue | 1 - fe/PC/src/views/materialIssuePT/IssueNotePT.vue | 4 ++-- fe/PC/src/views/materialIssueZP/IssueNoteZP.vue | 4 ++-- fe/PC/src/views/materialIssueZS/IssueNoteZS.vue | 4 ++-- .../automaticMaterialCall/automaticCallJob-msQuery.vue | 4 ++-- .../automaticMaterialCall/automaticCallNote.vue | 4 ++-- .../beforeGroundingReturn/beforeGroundingReturnNote.vue | 8 ++++---- .../rawMaterialManage/directIssue/directIssueNote.vue | 4 ++-- .../rawMaterialManage/manualMaterialRequest/IssueJob.vue | 4 ++-- .../rawMaterialManage/manualMaterialRequest/IssueNote.vue | 4 ++-- .../materialDirectSend/materialDirectSendNote.vue | 4 ++-- .../rawMaterialManage/purchaseOnShelves/PutawayNote.vue | 4 ++-- .../purchaseReceipt/PurchaseReceiptNote-msQuery.vue | 4 ++-- .../views/rawMaterialManage/purchaseReturn/returnNote.vue | 8 ++++---- 33 files changed, 76 insertions(+), 79 deletions(-) diff --git a/fe/PC/src/views/finishedProductManage/completDump/completDumpNotePT.vue b/fe/PC/src/views/finishedProductManage/completDump/completDumpNotePT.vue index 29bdf437a..23bb47e5d 100644 --- a/fe/PC/src/views/finishedProductManage/completDump/completDumpNotePT.vue +++ b/fe/PC/src/views/finishedProductManage/completDump/completDumpNotePT.vue @@ -87,19 +87,19 @@ export default { }, methods: { //抽屉常用按钮 - // drawerbutton (val) { + // async drawerbutton (val) { // // 打印 // if(val == 'print'){ // if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ // getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { // if(res){this.propsData.supplierShortName = res.shortName || res.name} - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // }).catch(err => { // console.log(err) // }) // }else{ - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // } // } diff --git a/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZP.vue b/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZP.vue index 61b660d31..f0a635fa8 100644 --- a/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZP.vue +++ b/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZP.vue @@ -87,19 +87,19 @@ export default { }, methods: { //抽屉常用按钮 - // drawerbutton (val) { + // async drawerbutton (val) { // // 打印 // if(val == 'print'){ // if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ // getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { // if(res){this.propsData.supplierShortName = res.shortName || res.name} - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // }).catch(err => { // console.log(err) // }) // }else{ - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // } // } diff --git a/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZS.vue b/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZS.vue index 7b92836bc..841f85e20 100644 --- a/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZS.vue +++ b/fe/PC/src/views/finishedProductManage/completDump/completDumpNoteZS.vue @@ -87,19 +87,19 @@ export default { }, methods: { //抽屉常用按钮 - // drawerbutton (val) { + // async drawerbutton (val) { // // 打印 // if(val == 'print'){ // if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ // getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { // if(res){this.propsData.supplierShortName = res.shortName || res.name} - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // }).catch(err => { // console.log(err) // }) // }else{ - // let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + // let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); // this.Print(data) // } // } diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index 86d2b0810..b2372d9c7 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -117,15 +117,15 @@ export default { drawerbutton (val) { // 打印 if(val == 'print'){ - this.beforePrintHandle(()=>{ + this.beforePrintHandle(async ()=>{ let _option = { details:{ packingCode:"toPackingCode", } } - // let data = initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); + // let data = await initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); // todo:打印单据更改 - let data = initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option); + let data = await initPrintAllData(this.tableDataDetails,'fhd.rdlx',false,_option); this.Loading.appMainLoading = true this.Print(data) sumPrint(this.propsData.number, this.URL).then(res => { diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue index fdce44ac4..dfdd1bea2 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverRequest.vue @@ -268,13 +268,13 @@ export default { // 获取记录 this.Loading.appMainLoading = true getPageListWip(param, 'wms/store/deliver-note/list-for-fis',true) - .then(res => { + .then(async res => { let _option = { details:{ packingCode:"toPackingCode", } } - let data = initPrintAllData(res.items[0],'chdmxb.rdlx',false,_option); + let data = await initPrintAllData(res.items[0],'chdmxb.rdlx',false,_option); this.Print(data) this.Loading.appMainLoading = false }) diff --git a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue index 0266a7eb6..49b33b977 100644 --- a/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue +++ b/fe/PC/src/views/finishedProductManage/productionReturn/returnNote.vue @@ -85,7 +85,7 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'printer'){ this.tableDataDetails.title = "线边仓退料单" @@ -94,9 +94,9 @@ export default { fromLot:'toLot' } } - // let _data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,_option); + // let _data = await initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,_option); // todo:打印单据更改 - let _data = initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option,true); + let _data = await initPrintAllData(this.tableDataDetails,'xbctl.rdlx',false,_option,true); this.Print(_data) } }, diff --git a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue index 4c3c813f4..977d8f20b 100644 --- a/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/customerStorageAllocation/customerStorageAllocationNote.vue @@ -104,13 +104,13 @@ export default { if(val == 'print'){ // 获取库位描述，默认所有明细的toLocationCode为同一个 getLocationByCode(this.tableDataDetails.details[0].toLocationCode) - .then(res=>{ + .then(async res=>{ this.tableDataDetails.details.forEach(item=>{item.toLocationName = res.name}) - let data = initPrintAllData(this.tableDataDetails,'khcwdbd.rdlx'); + let data = await initPrintAllData(this.tableDataDetails,'khcwdbd.rdlx'); this.Print(data) }) - .catch(err=>{ - let data = initPrintAllData(this.tableDataDetails,'khcwdbd.rdlx'); + .catch(async err=>{ + let data = await initPrintAllData(this.tableDataDetails,'khcwdbd.rdlx'); this.Print(data) }) } diff --git a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue index 732a8a1e0..a568e7c0e 100644 --- a/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/interStorageAllocation/interStorageAllocationNote.vue @@ -100,9 +100,9 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { if(val == 'print'){ - let data = initPrintAllData(this.tableDataDetails,'cwdbd.rdlx'); + let data = await initPrintAllData(this.tableDataDetails,'cwdbd.rdlx'); this.Print(data) } }, diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue index 1c5d8d3d8..c3e7a3542 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAdjustmentSheet/lineSideWarehouseAdjustmentSheetNote.vue @@ -87,7 +87,7 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _option = { @@ -95,7 +95,7 @@ export default { locationCode:"toLocationCode", } } - let data = initPrintAllData(this.tableDataDetails,'tzd.rdlx','AdjustmentReason',_option); + let data = await initPrintAllData(this.tableDataDetails,'tzd.rdlx','AdjustmentReason',_option); this.Print(data) } }, diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue index 48397e42e..b444da273 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseAllocation/lineSideWarehouseAllocationNote.vue @@ -100,11 +100,11 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { if(val == 'print'){ // todo:打印单据更改(单据需要提供) - // let data = initPrintAllData(this.tableDataDetails,'cwdbd.rdlx'); - let data = initPrintAllData(this.tableDataDetails,'lineSideWarehouse.rdlx'); + // let data = await initPrintAllData(this.tableDataDetails,'cwdbd.rdlx'); + let data = await initPrintAllData(this.tableDataDetails,'lineSideWarehouse.rdlx'); this.Print(data) } }, diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue index abe712174..b906fd81a 100644 --- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue +++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue @@ -88,9 +88,9 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { if(val == 'print'){ - let data = initPrintAllData(this.tableDataDetails,'xbcbfd.rdlx','Reason'); + let data = await initPrintAllData(this.tableDataDetails,'xbcbfd.rdlx','Reason'); this.Print(data) } }, diff --git a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue index 3d038bc3b..05f2d1d90 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue +++ b/fe/PC/src/views/inventoryManage/nonproductive/materialReturnRequest.vue @@ -134,7 +134,7 @@ export default { }) }) this.Loading.appMainLoading = true - getPageList(this.PageListParams, 'basedata/item-basic').then(res => { + getPageList(this.PageListParams, 'basedata/item-basic').then(async res => { this.Loading.appMainLoading = false res.items.forEach(res_item=>{ this.tableDataDetails.details.forEach(detail=>{ @@ -143,12 +143,12 @@ export default { } }) }) - let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true); + let data = await initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true); this.Print(data) - }).catch(err => { + }).catch(async err => { this.Loading.appMainLoading = false this.$message.error('物品信息配置获取失败'); - let data = initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true); + let data = await initPrintAllData(this.tableDataDetails,'fsctl.rdlx',false,false,true); this.Print(data) }) } else { diff --git a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue b/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue index 0068ce927..024a48a8e 100644 --- a/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue +++ b/fe/PC/src/views/inventoryManage/nonproductive/pickingRequest.vue @@ -134,7 +134,7 @@ export default { }) }) this.Loading.appMainLoading = true - getPageList(this.PageListParams, 'basedata/item-basic').then(res => { + getPageList(this.PageListParams, 'basedata/item-basic').then(async res => { this.Loading.appMainLoading = false res.items.forEach(res_item=>{ this.tableDataDetails.details.forEach(detail=>{ @@ -143,12 +143,12 @@ export default { } }) }) - let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true); + let data = await initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true); this.Print(data) - }).catch(err => { + }).catch(async err => { this.Loading.appMainLoading = false this.$message.error('物品信息配置获取失败'); - let data = initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true); + let data = await initPrintAllData(this.tableDataDetails,'fscll.rdlx',false,false,true); this.Print(data) }) } else { diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue index 6132294c3..320670faa 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue @@ -86,7 +86,7 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ // 特殊字段处理 @@ -102,7 +102,7 @@ export default { qty:"toQty", } } - let data = initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option); + let data = await initPrintAllData(_propsData,'tzd.rdlx','AdjustmentReason',_option); this.Print(data) } }, diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue index e3874e0b5..a82c59baa 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsReceipt.vue @@ -86,10 +86,10 @@ export default { }, methods: { //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ - let data = initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true); + let data = await initPrintAllData(this.tableDataDetails,'hslrkd.rdlx',false,false,true); this.Print(data) } }, diff --git a/fe/PC/src/views/kittingManage/KittingIssueNote.vue b/fe/PC/src/views/kittingManage/KittingIssueNote.vue index 2d168e191..0a58bfac9 100644 --- a/fe/PC/src/views/kittingManage/KittingIssueNote.vue +++ b/fe/PC/src/views/kittingManage/KittingIssueNote.vue @@ -98,7 +98,7 @@ this.paging(); }, methods: { - drawerbuttonHanlde (val) { + async drawerbuttonHanlde (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -106,7 +106,7 @@ item.handledToLot = item.handledToLot + " " item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : '' }) - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); this.Print(data) } else { this.drawerbutton(val, this) diff --git a/fe/PC/src/views/materialIssueBP/IssueNoteBP.vue b/fe/PC/src/views/materialIssueBP/IssueNoteBP.vue index f39227280..3552eccee 100644 --- a/fe/PC/src/views/materialIssueBP/IssueNoteBP.vue +++ b/fe/PC/src/views/materialIssueBP/IssueNoteBP.vue @@ -98,7 +98,7 @@ export default { this.paging(); }, methods: { - drawerbuttonHanlde (val) { + async drawerbuttonHanlde (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -106,7 +106,7 @@ export default { item.handledToLot = item.handledToLot + " " item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : '' }) - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); this.Print(data) } else { this.drawerbutton(val, this) diff --git a/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue b/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue index 8160cf693..e4def1c2e 100644 --- a/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue +++ b/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue @@ -51,7 +51,6 @@ import { LoadingMixins } from "@/mixins/LoadingMixins" import { drawerMixins } from "@/mixins/drawerMixins" import { TableHeaderMixins } from "@/mixins/TableHeaderMixins" import { mixins } from "@/mixins/mixins" -import { initPrintAllData } from "@/mixins/printMixin" export default { name: "automaticNotePT", mixins: [ diff --git a/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue b/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue index ca3e56d1b..c838a77e4 100644 --- a/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue +++ b/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue @@ -51,7 +51,6 @@ import { LoadingMixins } from "@/mixins/LoadingMixins" import { drawerMixins } from "@/mixins/drawerMixins" import { TableHeaderMixins } from "@/mixins/TableHeaderMixins" import { mixins } from "@/mixins/mixins" -import { initPrintAllData } from "@/mixins/printMixin" export default { name: "automaticNoteZP", mixins: [ diff --git a/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue b/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue index 03d2bd65b..df9d65f94 100644 --- a/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue +++ b/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue @@ -51,7 +51,6 @@ import { LoadingMixins } from "@/mixins/LoadingMixins" import { drawerMixins } from "@/mixins/drawerMixins" import { TableHeaderMixins } from "@/mixins/TableHeaderMixins" import { mixins } from "@/mixins/mixins" -import { initPrintAllData } from "@/mixins/printMixin" export default { name: "automaticNoteZS", mixins: [ diff --git a/fe/PC/src/views/materialIssuePT/IssueNotePT.vue b/fe/PC/src/views/materialIssuePT/IssueNotePT.vue index 78990af6e..6ca76ecb8 100644 --- a/fe/PC/src/views/materialIssuePT/IssueNotePT.vue +++ b/fe/PC/src/views/materialIssuePT/IssueNotePT.vue @@ -98,7 +98,7 @@ export default { this.paging(); }, methods: { - drawerbuttonHanlde (val) { + async drawerbuttonHanlde (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -106,7 +106,7 @@ export default { item.handledToLot = item.handledToLot + " " item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : '' }) - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); this.Print(data) } else { this.drawerbutton(val, this) diff --git a/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue b/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue index 69d7658e4..040189824 100644 --- a/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue +++ b/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue @@ -98,7 +98,7 @@ export default { this.paging(); }, methods: { - drawerbuttonHanlde (val) { + async drawerbuttonHanlde (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -106,7 +106,7 @@ export default { item.handledToLot = item.handledToLot + " " item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : '' }) - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); this.Print(data) } else { this.drawerbutton(val, this) diff --git a/fe/PC/src/views/materialIssueZS/IssueNoteZS.vue b/fe/PC/src/views/materialIssueZS/IssueNoteZS.vue index ddee067a2..d3ecb527f 100644 --- a/fe/PC/src/views/materialIssueZS/IssueNoteZS.vue +++ b/fe/PC/src/views/materialIssueZS/IssueNoteZS.vue @@ -98,7 +98,7 @@ export default { this.paging(); }, methods: { - drawerbuttonHanlde (val) { + async drawerbuttonHanlde (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -106,7 +106,7 @@ export default { item.handledToLot = item.handledToLot + " " item.boxQtyShow = _propsData.enumIssueSendType == 2 ? item.requestQty : '' }) - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,false,true); this.Print(data) } else { this.drawerbutton(val, this) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue index 565fded68..9e19d445d 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue @@ -463,7 +463,7 @@ export default { }) } }, - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -481,7 +481,7 @@ export default { fromLocationErpCode:"recommendLocationErpCode", } } - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,_option); this.Print(data) } else { drawerMixins.methods.drawerbutton(val, this) diff --git a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue index 52d63c266..96ceac9ff 100644 --- a/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue +++ b/fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue @@ -122,7 +122,7 @@ export default { this.Loading.tableLoading = false }) }, - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -134,7 +134,7 @@ export default { let _option = { number:"requestNumber", } - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,_option); this.Print(data) } else if(val == 'confirm') { this.Loading.appMainLoading = true diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index 50735b655..51c83c326 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue @@ -104,19 +104,19 @@ export default { }) }, //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ - getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { + getOneSupplierInfoByCode(this.propsData.supplierCode).then(async res => { if(res){this.propsData.supplierShortName = res.shortName || res.name} - let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); + let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); this.Print(data) }).catch(err => { console.log(err) }) }else{ - let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); + let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); this.Print(data) } } diff --git a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue index 4a3b73e8a..34f3ad9ef 100644 --- a/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue +++ b/fe/PC/src/views/rawMaterialManage/directIssue/directIssueNote.vue @@ -102,7 +102,7 @@ export default { this.Loading.tableLoading = false }) }, - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -110,7 +110,7 @@ export default { _propsData.details.forEach(item=>{ item.fromLot = item.fromLot + " " }) - let data = initPrintAllData(_propsData,'zjfl.rdlx'); + let data = await initPrintAllData(_propsData,'zjfl.rdlx'); this.Print(data) } else { drawerMixins.methods.drawerbutton(val, this) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue index 5fa49ad9a..0819ca16c 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue @@ -465,7 +465,7 @@ export default { }) } }, - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -481,7 +481,7 @@ export default { fromLocationErpCode:"recommendFromLocationErpCode", } } - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,_option); this.Print(data) } else { drawerMixins.methods.drawerbutton(val, this) diff --git a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue index fd4709c0e..6a54c42a5 100644 --- a/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue +++ b/fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue @@ -103,7 +103,7 @@ export default { this.Loading.tableLoading = false }) }, - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails)) @@ -115,7 +115,7 @@ export default { let _option = { number:"requestNumber", } - let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option); + let data = await initPrintAllData(_propsData,'xbcll.rdlx',false,_option); this.Print(data) } else { drawerMixins.methods.drawerbutton(val, this) diff --git a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue index eff848d66..ce26e4003 100644 --- a/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue +++ b/fe/PC/src/views/rawMaterialManage/materialDirectSend/materialDirectSendNote.vue @@ -118,13 +118,13 @@ drawerbutton (val) { // 打印 if(val == 'print'){ - this.beforePrintHandle(()=>{ + this.beforePrintHandle(async ()=>{ let _option = { details:{ packingCode:"toPackingCode", } } - let data = initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); + let data = await initPrintAllData(this.tableDataDetails,'chdmxb.rdlx',false,_option); this.Print(data) sumPrint(this.propsData.number, this.URL).then(res => { this.paging() diff --git a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue index e428e56b9..ccac76a8a 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue @@ -109,7 +109,7 @@ export default { this.tableDataDetails.details.forEach(item => { _ids.push(item.handledPackingCode) }); - getInventoryLabelByCodes(_ids).then(res => { + getInventoryLabelByCodes(_ids).then(async res => { let _printData = JSON.parse(JSON.stringify(this.tableDataDetails)) if(res && res.length > 0){ _printData.supplierCode = res[0].supplierCode; @@ -133,7 +133,7 @@ export default { }) _printData.details = [] for(let i in _sumArr){ _printData.details.push(_sumArr[i]) } - let data = initPrintAllData(_printData,'ysd.rdlx',false,false,true); + let data = await initPrintAllData(_printData,'ysd.rdlx',false,false,true); this.Print(data).then(()=>{ // 记录已打印接口，打印成功后刷新页面 putawayPrintUpdateRemark(this.propsData.id) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue index 76d80848b..b8d14e1be 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptNote-msQuery.vue @@ -208,7 +208,7 @@ export default { drawerbutton (val) { // 打印收货单（合格品收货明细显示） if(val == 'print-shd'){ - this.toPrintHttp(()=>{ + this.toPrintHttp(async ()=>{ let _printData = JSON.parse(JSON.stringify(this.tableDataDetails)) _printData.details = [] let _hg=[],_no=[] @@ -225,7 +225,7 @@ export default { // } }); _printData.details = _hg.concat(_no); - let data = initPrintAllData(_printData,'cgshd.rdlx'); + let data = await initPrintAllData(_printData,'cgshd.rdlx'); this.Print(data) }) } diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index 54dcb1e7b..32b1fa517 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue @@ -104,19 +104,19 @@ export default { }) }, //抽屉常用按钮 - drawerbutton (val) { + async drawerbutton (val) { // 打印 if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ - getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { + getOneSupplierInfoByCode(this.propsData.supplierCode).then(async res => { if(res){this.propsData.supplierShortName = res.shortName || res.name} - let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); this.Print(data) }).catch(err => { console.log(err) }) }else{ - let data = initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); + let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); this.Print(data) } }