Merge branch 'feature/GFRS-2265【待确定】个险-惠企保重大疾病保险' into dev

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
This commit is contained in:
yang.huaxiang
2021-03-15 13:39:40 +08:00
6 changed files with 19 additions and 15 deletions

View File

@@ -48,18 +48,18 @@ export default {
getOrderDetail({ orderNo: localStorage.orderNo }).then(
res => {
if (res.result == 0) {
//------------------------专为桂企写死--begin---------------//
//------------------------专为桂/惠企写死--begin---------------//
if (res.orderDTO.insuredDTOs[0] && res.orderDTO.insuredDTOs[0].riskDTOLst) {
this.flag = this.specilFlag = res.orderDTO.insuredDTOs[0].riskDTOLst.some(v => {
return v.riskCode == 'GFRS_M0024'
return v.riskCode == 'GFRS_M0024' || v.riskCode == 'GFRS_M0040'
})
if (this.flag) {
this.specilFlag = '1'
}
} else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024') {
} else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024' || res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0040') {
this.specilFlag = '1'
}
// ------------------------专为桂企写死--end---------------//
// ------------------------专为桂/惠企写死--end---------------//
// 处理活动产品
this.activeFlag = res.orderDTO.orderInfoDTO.activeType
}
@@ -123,7 +123,7 @@ export default {
//------------------------专为桂企写死--begin---------------//
if (this.list.length > 0 && this.specilFlag == '1' && localStorage.isFrom == 'sale') {
this.result = this.list.find(v => {
return v.riskProductCode == 'GFRS_M0024'
return v.riskProductCode == 'GFRS_M0024' || v.riskProductCode == 'GFRS_M0040'
})
}
// ------------------------专为桂企写死--end---------------//