Commit 45d1838c authored by Administrator's avatar Administrator

Merge branch 'release' into 'jd_dev'

Release最新代码合并入捷道研发分支20241119

See merge request !36
parents b0f50925 2df98e90
...@@ -1995,10 +1995,14 @@ ...@@ -1995,10 +1995,14 @@
} }
that.getOffData() that.getOffData()
// 没有收货人信息 // // 没有收货人信息
if(!that.params.consigneeVO){ // if(!that.params.consigneeVO){
that.hasConsignee = false // that.hasConsignee = false
} // }
// 如果用户当前不支持无收货人,则强制显示收货人信息
// if(that.noConsignee){
// that.hasConsignee = true
// }
// 回显目的城市和目的国 // 回显目的城市和目的国
const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId) const dstCityIndex = this.filteredDstCityList.findIndex(item => item.shi === that.params.objectiveId)
...@@ -2034,11 +2038,7 @@ ...@@ -2034,11 +2038,7 @@
this.currentHarvestIndex = harvestIndex this.currentHarvestIndex = harvestIndex
} }
this.hasConsignee = res.data.hasConsignee // this.hasConsignee = res.data.hasConsignee
// 如果用户当前不支持无收货人,则强制显示收货人信息
if(!that.noConsignee){
that.hasConsignee = true
}
} }
}) })
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment