diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue index cee803cc1..cea7bed74 100644 --- a/src/components/ebiz/sale/IndexBar.vue +++ b/src/components/ebiz/sale/IndexBar.vue @@ -42,15 +42,15 @@ export default { return { pageTitle: [ { pageNo: 1, pageItem: '投保人信息', urlStr: '/sale/insuredInfo', tabClass: '' }, - { pageNo: 2, pageItem: '被保人信息', urlStr: '/sale/insuredPerson', tabClass: '' }, + { pageNo: 2, pageItem: '被保险人信息', urlStr: '/sale/insuredPerson', tabClass: '' }, { pageNo: 3, pageItem: '选择产品', urlStr: '/common/selectedProduct', tabClass: '' }, { pageNo: 4, pageItem: '受益人信息', urlStr: '/sale/beneficiary', tabClass: '' }, - { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/NotifyingMessage', tabClass: '' }, - { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/AccountInformation', tabClass: '' }, - { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/AttachmentManagement', tabClass: '' }, + { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/notifyingMessage', tabClass: '' }, + { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/accountInformation', tabClass: '' }, + { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/attachmentManagement', tabClass: '' }, { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/signatureConfirmation', tabClass: '' } ], - //localStorage.salePageFlag: 1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认 + //localStorage.salePageFlag:控制导航是否可以直接跳转页面 1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认 salePageFlag: Number(localStorage.salePageFlag) } }, @@ -86,7 +86,7 @@ export default { url = `/sale/AttachmentManagement?edit=1&salePageFlag=${pageIndex}` break case 8: //跳到签名确认页面 - url = `/sale/signatureConfirmation?edit=1&salePageFlag=${pageIndex}` + url = `/sale/SignatureConfirmation?edit=1&salePageFlag=${pageIndex}` break default: break @@ -104,7 +104,7 @@ export default { let endIndex = location.hash.indexOf('?', 1) let str = endIndex == -1 ? location.hash.slice(1) : location.hash.slice(1, endIndex) this.pageTitle.forEach(v => { - if (v.urlStr == str) { + if (v.urlStr.toLowerCase() == str.toLowerCase()) { v.tabClass = 'active' } }) diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index ff148ced9..e2aa0b66a 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -415,7 +415,17 @@ export default { this.$utils.intLocalStorage(res) } - + if (res.orderDTO.orderAccountDTO.accountName) { + //如果存在填过的账户信息 + this.radio = res.orderDTO.orderAccountDTO.accountType + this.name = res.orderDTO.orderAccountDTO.accountName + this.bank = res.orderDTO.orderAccountDTO.bankName + this.bankCode = res.orderDTO.orderAccountDTO.bankCode + this.bankId = res.orderDTO.orderAccountDTO.cardBookCode + localStorage.setItem('isAutoPay', res.orderDTO.orderAccountDTO.isAutoPay) + localStorage.setItem('isAutoRenewal', res.orderDTO.orderAccountDTO.isAutoRenewal) + localStorage.setItem('isRenew', res.orderDTO.orderAccountDTO.isRenew) + } this.productNo = res.orderDTO.insuredDTOs[0].riskDTOLst[0].mainRiskCode //计算年龄 const birthday = res.orderDTO.insuredDTOs[0].birthday diff --git a/src/views/ebiz/sale/Beneficiary.vue b/src/views/ebiz/sale/Beneficiary.vue index ebd17cdbf..168fed086 100644 --- a/src/views/ebiz/sale/Beneficiary.vue +++ b/src/views/ebiz/sale/Beneficiary.vue @@ -92,6 +92,13 @@ export default { getOrderDetail({ orderNo: localStorage.orderNo }).then(res => { if (res.result == 0) { this.$utils.intLocalStorage(res) + this.type = res.orderDTO.orderInfoDTO.bnfFlag == '1' ? '2' : '1' //bnfFlag 0-法定受益人 1-指定受益人 + if (res.orderDTO.insuredDTOs[0].bnfDTOs !== null) { + this.beneficiaries = this.beneficiaries.concat(res.orderDTO.insuredDTOs[0].bnfDTOs) + localStorage.beneficiaryInfo = JSON.stringify(res.orderDTO.insuredDTOs[0].bnfDTOs) + } else { + localStorage.beneficiaryInfo = [] + } } }) } else { @@ -185,6 +192,7 @@ export default { // console.log(res) if (res.result == 0) { localStorage.removeItem('applicant') + localStorage.removeItem('fromAddBeneficiaryInfo') if (!this.$route.query.salePageFlag) { //不是从导航栏进入 localStorage.salePageFlag = '5' diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue index aba8b8da6..072635128 100644 --- a/src/views/ebiz/sale/NotifyingMessage.vue +++ b/src/views/ebiz/sale/NotifyingMessage.vue @@ -179,8 +179,48 @@ export default { this.$utils.intLocalStorage(res) this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo')) this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) - // 获取告知消息 - this.information() + //如果返回参数存在曾经提交的告知信息，获取曾经提交的告知信息 + let insuredFinanceImpartDTO = res.orderDTO.appntDTO.financeImpartDTO //投保人财务告知集合 + let insuredImpartDTO = res.orderDTO.appntDTO.impartDTO //投保人健康告知集合 + let insuredPersionFinanceImpartDTO = res.orderDTO.insuredDTOs[0].financeImpartDTO //被保人财务告知集合 + let insuredPersionImpartDTO = res.orderDTO.insuredDTOs[0].impartDTO //被保人健康告知集合 + if ( + insuredFinanceImpartDTO.impartItemDTOS || + insuredImpartDTO.impartItemDTOS || + insuredPersionFinanceImpartDTO.impartItemDTOS || + insuredPersionImpartDTO.impartItemDTOS + ) { + if (insuredFinanceImpartDTO.impartItemDTOS) { + this.impartDTOS.push({ impartItemDTOS: insuredFinanceImpartDTO.impartItemDTOS, impartType: insuredFinanceImpartDTO.impartType }) + } + if (insuredImpartDTO.impartItemDTOS) { + this.impartDTOS.push({ impartItemDTOS: insuredImpartDTO.impartItemDTOS, impartType: insuredImpartDTO.impartType }) + } + if (insuredPersionFinanceImpartDTO.impartItemDTOS) { + this.impartDTOS.push({ impartItemDTOS: insuredPersionFinanceImpartDTO.impartItemDTOS, impartType: insuredPersionFinanceImpartDTO.impartType }) + } + if (insuredPersionImpartDTO.impartItemDTOS) { + this.impartDTOS.push({ impartItemDTOS: insuredPersionImpartDTO.impartItemDTOS, impartType: insuredPersionImpartDTO.impartType }) + } + this.impartDTOS.map(v => { + v.impartItemDTOS.map(i => { + i.isSelect = + this.formatDateTime() + + Math.random() + .toString(36) + .substr(2) + i.show = false + if (i.impartAnswer == '0') { + i.show = true + } else { + i.questions[0].answer = '' + } + }) + }) + } else { + // 获取告知消息 + this.information() + } //投被同人取到年纪和性别去判断是是否显示内容 this.saleInsuredAge = utilsAge.getAge(this.saleInsuredInfo.birthday, new Date()) this.saleInsuredSex = this.saleInsuredInfo.sex @@ -245,8 +285,8 @@ export default { // 一键全否 allFalse() { let that = this - // alert('1') that.impartDTOS.map(it => { + console.log('it', it.impartItemDTOS) it.impartItemDTOS.map(itm => { itm.impartAnswer = '1' }) @@ -576,10 +616,10 @@ export default { that.$jump({ flag: 'h5', extra: { - url: location.origin + '/#/sale/accountInformation' + url: location.origin + '/#/sale/AccountInformation' }, routerInfo: { - path: '/sale/accountInformation' + path: '/sale/AccountInformation' } }) } else {