Merge branch 'release/1226' into dev

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
This commit is contained in:
wangmingzhe
2019-12-26 13:34:16 +08:00
7 changed files with 59 additions and 32 deletions

View File

@@ -171,8 +171,8 @@ export default {
influenceAddRiskCodes: [],
influences: [],
nextStepFlag: false,
isRelated: localStorage.isRelated === '0',
policyNo: '', //关联保单号
isRelated: localStorage.isRelated === '0',//关联保单号
policyNo: '',
// 份数
mult: '',
isFrom: '',
@@ -212,7 +212,6 @@ export default {
if (item.mainRiskCode == 'GFRS_M0006') {
item.isHidden = true
}
// debugger
if(item.mainRiskCode != 'GFRS_M0008') {
item.calFactorLst.map(i => {
this.defalutAmt = i.displayAmount
@@ -679,7 +678,7 @@ export default {
trialInfo['payEndYear'] = '1000'
trialInfo['payEndYearFlag'] = 'Y'
// 福宝宝和万能险传A
if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003') {
if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') {
trialInfo['insuYearFlag'] = 'Y'
}
}