|
|
@@ -2515,17 +2515,22 @@ export default {
|
|
|
this.$message.warning('该车未出厂，不允许签收')
|
|
|
return
|
|
|
}
|
|
|
- //获取车辆定位
|
|
|
- this.axios
|
|
|
- .get('/api/v1/otms/getCurrentLocation?capcityNumber=' + row.newCapacityNo)
|
|
|
- .then(res => {
|
|
|
- if (res.data.status=='succeed' && res.data.data.result.status!=1001) {
|
|
|
- this.location=res.data.data.result.adr;
|
|
|
- }else{
|
|
|
- this.location=null;
|
|
|
- this.$message.warning("获取不到车辆定位！请联系销售公司上传！");
|
|
|
- }
|
|
|
- });
|
|
|
+ if(row.arrivalAddress){
|
|
|
+ //优先获取抵达地址
|
|
|
+ this.location=row.arrivalAddress;
|
|
|
+ }else{
|
|
|
+ //其次获取车辆定位
|
|
|
+ this.axios
|
|
|
+ .get('/api/v1/otms/getCurrentLocation?capcityNumber=' + row.newCapacityNo)
|
|
|
+ .then(res => {
|
|
|
+ if (res.data.status=='succeed' && res.data.data.result.status!=1001) {
|
|
|
+ this.location=res.data.data.result.adr;
|
|
|
+ }else{
|
|
|
+ this.location=null;
|
|
|
+ this.$message.warning("获取不到车辆定位！请联系销售公司上传！");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
this.orderNumber = row.orderNo
|
|
|
this.capacityNumber = row.capacityNo
|
|
|
this.arrivalReceiving = true
|
