From 6652a3df7768d0a83a7f6abde9b16c9c056035ea Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 20 May 2024 08:51:46 +0800
Subject: [PATCH] md

---
 .../emis/emisWaybill/emisWaybillModify.vue    | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/emis/emisWaybill/emisWaybillModify.vue b/src/views/emis/emisWaybill/emisWaybillModify.vue
index d2fafb6a..725cea38 100644
--- a/src/views/emis/emisWaybill/emisWaybillModify.vue
+++ b/src/views/emis/emisWaybill/emisWaybillModify.vue
@@ -30,6 +30,7 @@
                 <el-col :span="10">
                 </el-col>
 
+
                   <el-col :span="6">
                     <el-form-item label="目的国" prop="reciever.country">
                         <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
@@ -1068,11 +1069,20 @@ methods: {
               let selPrinterName=this.tanexPrinter.getDefaultPrinter();
               let selTplName="探路速运-主单联（通用）";
               this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList)
-              // 打印子单
-              orderList=this.form.subBillCode.split(',');
 
+
+              // 打印子单
               selTplName="探路速运-子单联（通用）";
-              this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList)
+
+              let childOrderList=[]
+              orderList=this.form.billCodeSub.split(',');
+              orderList.forEach(item=>{
+                if(item!=null && item!=''){
+                  childOrderList.push(item);
+                }
+              });
+              this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList)
+
 
           }).catch(() => {});
       }
@@ -1086,14 +1096,15 @@ methods: {
           let selTplName="探路速运-主单联（通用）";
           let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName);
           pdfUrlList.push(url)
-
           // 子单url
-          if(this.form.subBillCode){
-            orderList=this.form.subBillCode.split(',');
+          if(this.form.billCodeSub){
             selTplName="探路速运-子单联（通用）";
-            this.orderList.forEach(item=>{
-                let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName);
-                pdfUrlList.push(url)
+            let orderList=this.form.billCodeSub.split(',');
+             orderList.forEach(item=>{
+                if(item!=null && item!=''){
+                  let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName);
+                  pdfUrlList.push(url)
+                }
             });
           }
           let pdfUtils=new PdfUtils({});