Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1357,11 +1357,15 @@ export default {
         this.$message.warning('该车未出厂，不允许签收')
         return
       }
-      if (row.arrivalAddress != null && row.arrivalAddress != null) {
+      if (row.arrivalAddress != null && row.receiptAddress != null) {
         this.$message.warning('该车已有抵达签收实绩，不允许签收')
         return
       }
-      this.location = row.addressPlace
+      if(row.arrivalAddress){
+        this.location = row.arrivalAddress;
+      }else{
+        this.location = row.addressPlace;
+      }
       this.orderNumber = row.orderNo
       this.capacityNumber = row.capacityNo
       this.arrivalReceiving = true