【nev-pc】所有使用initPrintAllData打印，添加await以及async

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)
     //     }
     //   }

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)
     //     }
     //   }

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)
     //     }
     //   }

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 => {

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
         })

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)
       }
     },

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)
           })
       }

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)
       }
     },

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)
       }
     },

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)
       }
     },

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)
       }
     },

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 {

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 {

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)
       }
     },

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)
       }
     },

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)

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)

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: [

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: [

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: [

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)

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)

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)

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)

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

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)
         }
       }

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)

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)

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)

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()

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)

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)
         })
       }

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)
         }
       }