Merge branch '0327/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into release/0327

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
This commit is contained in:
tian.guangyuan
2020-03-27 20:12:26 +08:00
44 changed files with 346 additions and 279 deletions

View File

@@ -1284,6 +1284,7 @@ export default {
return this.$toast('关联保单的格式不正确')
}
}
//组装险种提交数据
let [mainRiskCode, riskDTOLst] = ['', []]
let rollInResult = '' //校验预计转入保费结果