huangmp 2 роки тому
батько
коміт
7ed7d066d0

+ 2 - 2
src/views/modules/print/merge-print-scan-delivery.vue

@@ -225,14 +225,14 @@ export default {
         this.$http({
           url: this.$http.adornUrl('/platform/logistics/mergePrintAndDelivery'),
           method: 'POST',
-          data: this.$http.adornData({orderNumber: this.scanOrderNo, logistics: this.printOrder.orderLogistics.logistics, deviceNo: this.deviceNo}),
+          data: this.$http.adornData({orderNumber: this.scanOrderNo, logistics: this.logistics, deviceNo: this.deviceNo}),
         }).then(({data}) => {
           if(data){
             this.$message.success("打印成功")
             this.getLogisticsInfo(this.scanOrderNo);
             if(this.logistics === 'YUNDA'){
               //打印韵达面单
-              this.printWallbill(this.printOrder.orderLogistics)
+              this.printWallbill(data)
             }
           }
         }).catch((error) => {

+ 4 - 2
src/views/modules/print/print-scan-delivery.vue

@@ -174,13 +174,15 @@ export default {
           method: 'POST',
           data: this.$http.adornData(dataBody),
         }).then(({data}) => {
-          if(data){
+          if(data.result){
             this.getLogisticsInfo(this.scanOrderNo);
             if(this.logistics === 'YUNDA'){
               //打印韵达面单
               this.printWallbill(data)
             }
-        }
+        }else{
+            this.$message.error(data.errorMsg)
+          }
           this.lastInputStr = substr;
         }).catch((error) => {
           this.lastInputStr = substr;