diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index f8a41eaa4..ab6be58e8 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -646,7 +646,6 @@ export default { async init() { // 获取是否从建议书过来的 let that = this - this.isFrom = window.localStorage.isFrom //获取投保人信息 if (this.$CacheUtils.getLocItem('saleInsuredInfo')) { this.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')) diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index 1268903b1..f7dcd29ee 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -180,13 +180,17 @@ export default { } //建议书--右上角为退出流程键(到建议书列表)×,并清除浏览记录 if (localStorage.isFrom == 'proposal') { - setTimeout(() => { // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_right_button', { - img: this.$assetsUrl + 'images/del-close-btn@3x.png', - intercept: '1' //是否拦截原生返回事件 1是 其他否 - }) - }, 100) + setTimeout(() => { + EWebBridge.webCallAppInJs('webview_right_button', { + btns: [ + { + img: this.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] + }) + }, 500) } window.appCallBack = this.appCallBack document.body.style.backgroundColor = '#fff' diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index ac9bcb8dd..79f8a8f20 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -23,7 +23,7 @@ :flag="true" >
- +
{ - // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_right_button', { - img: this.$assetsUrl + 'images/del-close-btn@3x.png', - intercept: '1' //是否拦截原生返回事件 1是 其他否 + btns: [ + { + img: this.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] }) - }, 100) + }, 500) // 筛选按钮的点击事件 window.appCallBack = this.appCallBack }, @@ -195,45 +198,40 @@ export default { }) }, appCallBack(data) { - // 筛选按钮的点击事件 - this.$jump({ - flag: 'navigation', - extra: { - title: '投保人信息', - hiddenRight: '1' - } - }) if (this.currentPopupIndex == 1) { this.customerShowPicker = false + this.currentPopupIndex = '' } else if (this.currentPopupIndex == 2) { this.occupationShowPicker = false - } - if (data.trigger == 'right_button_click') { - return this.$dialog - .confirm({ - className: 'dialog-delete', - title: '提示', - message: '退出流程可能会丢失部分数据,是否确认退出?', - cancelButtonColor: '#E9332E', - confirmButtonColor: '#FFFFFF' - }) - .then(() => { - this.$jump({ - flag: 'h5', - extra: { - title: '建议书列表', - forbidSwipeBack: 1, //当前页面禁止右滑返回 - url: location.origin + `/#/proposal/list` - }, - routerInfo: { - path: `/proposal/list`, - type: '1' - } + this.currentPopupIndex = '' + } else if (this.currentPopupIndex == '') { + if (data.trigger == 'right_button_click') { + return this.$dialog + .confirm({ + className: 'dialog-delete', + title: '提示', + message: '退出流程可能会丢失部分数据,是否确认退出?', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF' }) - }) - .catch(() => { - return - }) + .then(() => { + this.$jump({ + flag: 'h5', + extra: { + title: '建议书列表', + forbidSwipeBack: 1, //当前页面禁止右滑返回 + url: location.origin + `/#/proposal/list` + }, + routerInfo: { + path: `/proposal/list`, + type: '1' + } + }) + }) + .catch(() => { + return + }) + } } }, chooseOccupation() { @@ -241,7 +239,7 @@ export default { flag: 'navigation', extra: { title: '投保人信息', - hiddenRight: '1' + // hiddenRight: '1' } }) this.occupationShowPicker = false @@ -272,7 +270,7 @@ export default { flag: 'navigation', extra: { title: '投保人信息', - hiddenRight: '1' + // hiddenRight: '1' } }) let { customerName, customerSex, birthday, customerPhone, age, occupationName, occupationCode, lifeGrade, healthGrade, socialSecurity } = data diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue index f3e10d4d5..fc8ebbdd6 100644 --- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue +++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue @@ -137,6 +137,18 @@ export default { title: '选择被保险人' }, }) + setTimeout(() => { + EWebBridge.webCallAppInJs('webview_right_button', { + btns: [ + { + img: this.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] + }) + }, 500) + window.appCallBack = this.appCallBack + if (this.$route.query.proposalOrderNo) { this.proposalOrderNo = this.$route.query.proposalOrderNo }else if (this.$CacheUtils.getLocItem('proposalNo')) { @@ -210,6 +222,35 @@ export default { }) }, methods: { + appCallBack(data) { + if (data.trigger == 'right_button_click') { + return this.$dialog + .confirm({ + className: 'dialog-delete', + title: '提示', + message: '退出流程可能会丢失部分数据,是否确认退出?', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF' + }) + .then(() => { + this.$jump({ + flag: 'h5', + extra: { + title: '建议书列表', + forbidSwipeBack: 1, //当前页面禁止右滑返回 + url: location.origin + `/#/proposal/list` + }, + routerInfo: { + path: `/proposal/list`, + type: '1' + } + }) + }) + .catch(() => { + return + }) + } + }, stepIn() { this.$router.push({ path: '/proposal/appnt' }) // this.$jump({ diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index 6be33498b..ca621e1c5 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -30,7 +30,7 @@ @confirm="dateConfirm" >
- +
{ - // eslint-disable-next-line no-undef - EWebBridge.webCallAppInJs('webview_right_button', { - img: this.$assetsUrl + 'images/del-close-btn@3x.png', - intercept: '1' //是否拦截原生返回事件 1是 其他否 - }) - }, 100) + EWebBridge.webCallAppInJs('webview_right_button', { + btns: [ + { + img: this.$assetsUrl + 'images/del-close.png', + route: { flag: '', extra: {} } + } + ] + }) + }, 500) window.appCallBack = this.appCallBack this.localInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) let { relationToAppnt, relationName } = this.localInfo @@ -230,45 +233,38 @@ export default { }) }, appCallBack(data) { - // 筛选按钮的点击事件 - this.$jump({ - flag: 'navigation', - extra: { - title: '被保险人信息', - hiddenRight: '1' - } - }) if (this.currentPopupIndex == 1) { this.customerShowPicker = false } else if (this.currentPopupIndex == 2) { this.occupationShowPicker = false - } - if (data.trigger == 'right_button_click') { - return this.$dialog - .confirm({ - className: 'dialog-delete', - title: '提示', - message: '退出流程可能会丢失部分数据,是否确认退出?', - cancelButtonColor: '#E9332E', - confirmButtonColor: '#FFFFFF' - }) - .then(() => { - this.$jump({ - flag: 'h5', - extra: { - title: '建议书列表', - forbidSwipeBack: 1, //当前页面禁止右滑返回 - url: location.origin + `/#/proposal/list` - }, - routerInfo: { - path: `/proposal/list`, - type: '1' - } + } else if (this.currentPopupIndex == '') { + if (data.trigger == 'right_button_click') { + return this.$dialog + .confirm({ + className: 'dialog-delete', + title: '提示', + message: '退出流程可能会丢失部分数据,是否确认退出?', + cancelButtonColor: '#E9332E', + confirmButtonColor: '#FFFFFF' }) - }) - .catch(() => { - return - }) + .then(() => { + this.$jump({ + flag: 'h5', + extra: { + title: '建议书列表', + forbidSwipeBack: 1, //当前页面禁止右滑返回 + url: location.origin + `/#/proposal/list` + }, + routerInfo: { + path: `/proposal/list`, + type: '1' + } + }) + }) + .catch(() => { + return + }) + } } }, chooseOccupation() { @@ -276,7 +272,7 @@ export default { flag: 'navigation', extra: { title: '被保险人信息', - hiddenRight: '1' + // hiddenRight: '1' } }) this.occupationShowPicker = false @@ -401,7 +397,7 @@ export default { flag: 'navigation', extra: { title: '被保险人信息', - hiddenRight: '1' + // hiddenRight: '1' } }) console.log('data == ', data) diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index f9ac214dd..411d09197 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -124,7 +124,15 @@ export default { this.isCheck = res.result }) }, - mounted() {}, + mounted() { + this.$jump({ + flag: 'navigation', + extra: { + title: '建议书列表', + hiddenRight: '1' + } + }) + }, methods: { initThisPage(showFlag) { if (showFlag) { @@ -170,7 +178,21 @@ export default { list = formatRiskList(list, 'insuredDTOs', 'riskDTOLst') //格式化数据为本地显示结果 this.proposalList = this.proposalList.concat(list) - console.log(this.proposalList) + this.proposalList.forEach(item => { + // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) + if(!item.appntDTO.name){ + let sexAppnt = item.appntDTO.sex == '0'?'男':'女' + item.appntDTO.name = sexAppnt + item.appntDTO.age+'岁' + } + if(item.insuredDTOs.length){ + item.insuredDTOs.forEach(item01 => { + if(!item01.name){ + let sex = item01.sex == '0'?'男':'女' + item01.name = sex + item01.insuredAge+'岁' + } + }) + } + }) if (this.proposalList.length == 0) { this.isSuccess = false } diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index c7b919d3a..87ddaf1fb 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -408,6 +408,13 @@ export default { }, }, mounted() { + this.$jump({ + flag: 'navigation', + extra: { + title: '建议书预览', + hiddenRight: '1' + } + }) setTimeout(() => { // eslint-disable-next-line no-undef EWebBridge.webCallAppInJs('webview_left_button', {