1、打印模板数据

src/views/modules/print/print-scan-delivery.vue

@@ -212,7 +212,7 @@ export default {
       this.$http({
         url: this.$http.adornUrl('/logistics/getLogisticsInfo'),
         method: 'GET',
-        params: this.$http.adornParams({orderNo:orderNo}),
+        params: this.$http.adornParams({orderNumber:orderNo, logistics:this.logistics}),
       }).then(({data}) => {
         if(data){
           this.printOrder = data;
@@ -225,15 +225,17 @@ export default {
     handlePrintOrder(){
       if(this.logistics === 'YUNDA' || this.logistics === 'ZTO'){
         this.printWallbill(this.printOrder.orderLogistics)
+        return;
       }else {
         if (!this.deviceNo) {
           this.$message.error("请选择打印设备");
+          return;
         }
       }
       this.$http({
         url: this.$http.adornUrl('/logistics/printOrder'),
         method: 'POST',
-        data: this.$http.adornData({orderNo: this.scanOrderNo, logistics: this.printOrder.orderLogistics.logistics, deviceNo: this.deviceNo}),
+        data: this.$http.adornData({orderNo: this.scanOrderNo, logistics: this.logistics, deviceNo: this.deviceNo}),
       }).then(({data}) => {
         if(data){
           this.getLogisticsInfo(this.scanOrderNo);