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

This commit is contained in:
proudlx
2021-04-24 16:05:40 +08:00
2 changed files with 26 additions and 10 deletions

View File

@@ -576,7 +576,11 @@ export default {
this.setInsuredCustomerMarriage(this.insuredPersonInfo.marriage)
//是否长期
<<<<<<< HEAD
this.insuredPersonInfo.effectiveDateType = res.orderDTO.insuredDTOs[0].effectiveDateType == 'false' ? false : true
=======
this.insuredPersonInfo.effectiveDateType = this.insuredPersonInfo.effectiveDateType == 'true' ? true : false
>>>>>>> 46e061eb394896364b6ab23f1914ba4a7c286241
if (this.insuredPersonInfo.homeProvince.length) {
this.insuredHomeName = getAreaName([
{ code: this.insuredPersonInfo.homeProvince },

View File

@@ -362,7 +362,7 @@ export default {
},
nextStep() {
this.commitReOrder()
return;
return
if (this.needRead && !this.isRead) {
Dialog.alert({
title: '提示',
@@ -380,25 +380,37 @@ export default {
*/
commitReOrder() {
let additionals = []
this.checkboxResult.forEach((res) => {
this.additionalList.forEach((res2) => {
if (res2.riskCode === res) {
additionals.push(res2)
}
})
// this.checkboxResult.forEach((res) => {
// this.additionalList.forEach((res2) => {
// if (res2.riskCode === res) {
// additionals.push(res2)
// }
// })
// })
this.additionalList.forEach((item) => {
if (item.riskCode == 'GFRS_A0008' && item.additionalInsuranceFlag == 1) {
this.checkboxResult.forEach((item2) => {
if (item.riskCode === item2) {
additionals.push(item)
}
})
}else{
additionals.push(item)
}
})
this.riskDTOLst = [...this.mainList, ...additionals]
let riskDTOLst = [...this.mainList, ...additionals]
// // todo start测试数据
// this.riskDTOLst.forEach((res, index)=>{
// res.riskCode = 'GFRS_M0002'
// console.log(res, '=====================测试测试测试====================')
// })
// // todo end测试数据
let insureDTOS = Object.assign({},this.insuredDTOs);
insureDTOS.riskDTOLst = riskDTOLst;
let data = {
orderDTO: {
appntDTO: this.appntDTO,
insuredDTOs: [this.insuredDTOs],
insuredDTOs: [insureDTOS],
orderInfoDTO: {
orderNo: CacheUtils.getLocItem('orderNo'),
supportBank: '0'