Merge remote-tracking branch 'origin/feature/GFRS-2215【待完成】重新投保' into dev

# Conflicts:
#	src/views/ebiz/insureAgain/InsureInformation.vue
This commit is contained in:
bai.jinyan
2021-04-24 13:00:32 +08:00

View File

@@ -554,7 +554,7 @@ export default {
}) })
this.setCustomerMarriage(res.orderDTO.appntDTO.marriage) this.setCustomerMarriage(res.orderDTO.appntDTO.marriage)
//是否长期 //是否长期
this.userInfo.effectiveDateType = res.orderDTO.appntDTO.effectiveDateType == 'false' ? false :true; this.userInfo.effectiveDateType = res.orderDTO.appntDTO.effectiveDateType == 'true' ? true : false
//有无社保 //有无社保
this.userInfo.medical = res.orderDTO.appntDTO.medical this.userInfo.medical = res.orderDTO.appntDTO.medical
@@ -574,9 +574,9 @@ export default {
}) })
}) })
this.setInsuredCustomerMarriage(this.insuredPersonInfo.marriage) this.setInsuredCustomerMarriage(this.insuredPersonInfo.marriage)
//是否长期 //是否长期
this.insuredPersonInfo.effectiveDateType = res.orderDTO.insuredDTOs[0].effectiveDateType == 'false' ? false :true; this.insuredPersonInfo.effectiveDateType = this.insuredPersonInfo.effectiveDateType == 'true' ? true : false
if (this.insuredPersonInfo.homeProvince.length) { if (this.insuredPersonInfo.homeProvince.length) {
this.insuredHomeName = getAreaName([ this.insuredHomeName = getAreaName([
{ code: this.insuredPersonInfo.homeProvince }, { code: this.insuredPersonInfo.homeProvince },