Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
pang.lizong
2019-09-27 18:13:33 +08:00
2 changed files with 96 additions and 30 deletions

View File

@@ -248,36 +248,102 @@ export default {
}
})
let data = {
orderType: 'IMPART_ORDER',
orderDTO: {
orderInfoDTO: {
orderNo: window.localStorage.getItem('orderNo')
},
// 投保人
appntDTO: {
impartDTO: obj,
financeImpartDTO: financeImpartDTO
},
// 被保人
insuredDTOs: [{ impartDTO: objInsured, financeImpartDTO: financeImpart }]
}
}
saveInformation(data).then(res => {
if (res.result == '0') {
that.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/sale/accountInformation'
if (financeImpartDTO == {}) {
let data = {
orderType: 'IMPART_ORDER',
orderDTO: {
orderInfoDTO: {
orderNo: window.localStorage.getItem('orderNo')
},
routerInfo: {
path: '/sale/accountInformation'
}
})
} else {
this.$toast(res.resultMessage)
// 投保人
appntDTO: {
impartDTO: obj
},
// 被保人
insuredDTOs: [{ impartDTO: objInsured, financeImpartDTO: financeImpart }]
}
}
})
saveInformation(data).then(res => {
if (res.result == '0') {
that.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/sale/accountInformation'
},
routerInfo: {
path: '/sale/accountInformation'
}
})
} else {
this.$toast(res.resultMessage)
}
})
} else if (financeImpart == {}) {
let data = {
orderType: 'IMPART_ORDER',
orderDTO: {
orderInfoDTO: {
orderNo: window.localStorage.getItem('orderNo')
},
// 投保人
appntDTO: {
impartDTO: obj,
financeImpartDTO: financeImpartDTO
},
// 被保人
insuredDTOs: [{ impartDTO: objInsured }]
}
}
saveInformation(data).then(res => {
if (res.result == '0') {
that.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/sale/accountInformation'
},
routerInfo: {
path: '/sale/accountInformation'
}
})
} else {
this.$toast(res.resultMessage)
}
})
} else {
let data = {
orderType: 'IMPART_ORDER',
orderDTO: {
orderInfoDTO: {
orderNo: window.localStorage.getItem('orderNo')
},
// 投保人
appntDTO: {
impartDTO: obj,
financeImpartDTO: financeImpartDTO
},
// 被保人
insuredDTOs: [{ impartDTO: objInsured, financeImpartDTO: financeImpart }]
}
}
saveInformation(data).then(res => {
if (res.result == '0') {
that.$jump({
flag: 'h5',
extra: {
url: location.origin + '/#/sale/accountInformation'
},
routerInfo: {
path: '/sale/accountInformation'
}
})
} else {
this.$toast(res.resultMessage)
}
})
}
} else {
this.$toast(this.$validator.errors.all()[0])
}

View File

@@ -431,7 +431,7 @@ export default {
keyword: '法定监护人',
pageNo: '1',
index: '1',
offset: '-500',
offset: '-800',
pos: '3'
}).then(data => {
console.log(`--签名返回val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`, JSON.stringify(data))
@@ -510,7 +510,7 @@ export default {
keyword: '法定监护人',
pageNo: '1',
index: '1',
offset: '150',
offset: '350',
pos: '3'
}).then(data => {
console.log(`--签名返回val:${val},this.detailJump:${this.detailJump},this.relationToAppnt:${this.relationToAppnt}`, JSON.stringify(data))