From 0dc7aaf85c744daee66043fe84d238420dab8356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 13:55:08 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=A1=B5=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureConfirmation.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 839bbffa5..031c653e1 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -301,9 +301,11 @@ export default { this.getOrderDetail().then(() => { console.log('this.appntSignStatus', this.appntSignStatus) console.log('this.appntSignStatus', this.appntSignStatus) - if (this.appntSignStatus == '3' || this.insuredSignStatus == '3') { + if (this.appntSignStatus == '3' && this.shareCode == '0') { // this.$toast('签名成功，请联系业务员进行后续流程！') Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' }) + } else if (this.insuredSignStatus == '3' && this.shareCode == '1') { + Dialog.alert({ title: '提示', message: '签名成功，请联系业务员进行后续流程！' }) } }) if (this.shareCode == '1') { From e50b14a8df7409e781e236ccda4d466d60ab8a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 14:06:51 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/Detail.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index fafdad99e..b1823ae26 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -151,6 +151,7 @@ export default { this.filterData(dataDictionary.sex, 'sex', appntDTO) this.filterData(dataDictionary.idType, 'idType', appntDTO) that.appntDTO = appntDTO + window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO)) // 被保人信息 res.content.insuredDTOs.map(insured => { insured.riskDTOLst.map(risk => { @@ -212,8 +213,14 @@ export default { extra: { title: this.wxTitle, content: '国富人寿保单回执签收', - url: location.origin + '/#/serve/airSign?policyNo=' + localStorage.policyNo + '&token=' + localStorage.token+ - '&saleInsuredInfo=' + JSON.stringify(this.appntDTO), + url: + location.origin + + '/#/serve/airSign?policyNo=' + + localStorage.policyNo + + '&token=' + + localStorage.token + + '&saleInsuredInfo=' + + localStorage.saleInsuredInfo, // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token, img: this.$assetsUrl + 'images/logo.png' } From 1ac73b43fa59f90920a261b5fa12bfc2f20801b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 14:23:17 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/Detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index b1823ae26..521252990 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -220,7 +220,7 @@ export default { '&token=' + localStorage.token + '&saleInsuredInfo=' + - localStorage.saleInsuredInfo, + encodeURI(localStorage.saleInsuredInfo), // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token, img: this.$assetsUrl + 'images/logo.png' } From bd0701fda30d0ffec73117bd54d57b13f1d26fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 14:37:17 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/Detail.vue | 145 +++++++++++++++++--------------- 1 file changed, 75 insertions(+), 70 deletions(-) diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index 521252990..a7599c51d 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -116,9 +116,11 @@ export default { ] }) }, 1000) - window['appCallBack'] = this.appCallBack + // 获取保单详情 - this.getPolicyDetail() + this.getPolicyDetail().then(() => { + window['appCallBack'] = this.appCallBack + }) }, components: { [Collapse.name]: Collapse, @@ -134,80 +136,83 @@ export default { let data = { policyNo: window.localStorage.getItem('policyNo') } - getPolicyDetail(data).then(res => { - if (res.result == '0') { - let appntDTO = res.content.appntDTO - let orderInfoDTO = res.content.orderInfoDTO - // 保单信息 - if (orderInfoDTO.orderStatus == '0') { - orderInfoDTO.orderStatusText = '未签收' - } else if (orderInfoDTO.orderStatus == '1') { - orderInfoDTO.orderStatusText = '已签收' - } else { - orderInfoDTO.orderStatusText = '' - } - that.OrderInfoDTO = orderInfoDTO - // 投保人信息 - this.filterData(dataDictionary.sex, 'sex', appntDTO) - this.filterData(dataDictionary.idType, 'idType', appntDTO) - that.appntDTO = appntDTO - window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO)) - // 被保人信息 - res.content.insuredDTOs.map(insured => { - insured.riskDTOLst.map(risk => { - Number(risk.payIntv) - switch (risk.payIntv) { - case -1: - risk.payIntv = '不定期交' - break - case 0: - risk.payIntv = '一次交清' - break - case 1: - risk.payIntv = '月交' - break - case 3: - risk.payIntv = '季交' - break - case 6: - risk.payIntv = '半年交' - break - case 12: - risk.payIntv = '年交' - break - } - if (risk.insuYear == '70') { - risk.insuYear = '至70周岁' - } else if (risk.insuYear == '75') { - risk.insuYear = '至75周岁' - } else if (risk.insuYear == '80') { - risk.insuYear = '至80周岁' - } else if (risk.insuYear == '106') { - risk.insuYear = '终身' - } else { - risk.insuYear = `${risk.insuYear}年` - } + return new Promise((resolve, reject) => { + getPolicyDetail(data).then(res => { + if (res.result == '0') { + let appntDTO = res.content.appntDTO + let orderInfoDTO = res.content.orderInfoDTO + // 保单信息 + if (orderInfoDTO.orderStatus == '0') { + orderInfoDTO.orderStatusText = '未签收' + } else if (orderInfoDTO.orderStatus == '1') { + orderInfoDTO.orderStatusText = '已签收' + } else { + orderInfoDTO.orderStatusText = '' + } + that.OrderInfoDTO = orderInfoDTO + // 投保人信息 + this.filterData(dataDictionary.sex, 'sex', appntDTO) + this.filterData(dataDictionary.idType, 'idType', appntDTO) + that.appntDTO = appntDTO + window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO)) + // 被保人信息 + res.content.insuredDTOs.map(insured => { + insured.riskDTOLst.map(risk => { + Number(risk.payIntv) + switch (risk.payIntv) { + case -1: + risk.payIntv = '不定期交' + break + case 0: + risk.payIntv = '一次交清' + break + case 1: + risk.payIntv = '月交' + break + case 3: + risk.payIntv = '季交' + break + case 6: + risk.payIntv = '半年交' + break + case 12: + risk.payIntv = '年交' + break + } + if (risk.insuYear == '70') { + risk.insuYear = '至70周岁' + } else if (risk.insuYear == '75') { + risk.insuYear = '至75周岁' + } else if (risk.insuYear == '80') { + risk.insuYear = '至80周岁' + } else if (risk.insuYear == '106') { + risk.insuYear = '终身' + } else { + risk.insuYear = `${risk.insuYear}年` + } + }) + this.filterData(dataDictionary.sex, 'sex', insured) + this.filterData(dataDictionary.idType, 'idType', insured) + this.filterData(dataDictionary.relationToAppnt, 'relation', insured) + insured.bnfDTOs.map(bnf => { + this.filterData(dataDictionary.bnfType, 'bnfType', bnf) + this.filterData(dataDictionary.sex, 'sex', bnf) + this.filterData(dataDictionary.idType, 'idType', bnf) + this.filterData(dataDictionary.relationToAppnt, 'relation', bnf) + }) }) - this.filterData(dataDictionary.sex, 'sex', insured) - this.filterData(dataDictionary.idType, 'idType', insured) - this.filterData(dataDictionary.relationToAppnt, 'relation', insured) - insured.bnfDTOs.map(bnf => { - this.filterData(dataDictionary.bnfType, 'bnfType', bnf) - this.filterData(dataDictionary.sex, 'sex', bnf) - this.filterData(dataDictionary.idType, 'idType', bnf) - this.filterData(dataDictionary.relationToAppnt, 'relation', bnf) - }) - }) - that.insuredDTOs = res.content.insuredDTOs - this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) - } else { - this.$toast(res.resultMessage) - } + that.insuredDTOs = res.content.insuredDTOs + this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) + } else { + this.$toast(res.resultMessage) + } + }) }) }, appCallBack(data) { if (data.trigger == 'right_button_click') { + console.log(localStorage.saleInsuredInfo) EWebBridge.webCallAppInJs('bridge', { flag: 'share', extra: { From a806f546ae09530e4fbc64e539d0000bba227364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 14:42:33 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/Detail.vue | 143 ++++++++++++++++---------------- 1 file changed, 70 insertions(+), 73 deletions(-) diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index a7599c51d..dc690ca14 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -116,11 +116,9 @@ export default { ] }) }, 1000) - + window['appCallBack'] = this.appCallBack // 获取保单详情 - this.getPolicyDetail().then(() => { - window['appCallBack'] = this.appCallBack - }) + this.getPolicyDetail() }, components: { [Collapse.name]: Collapse, @@ -136,78 +134,77 @@ export default { let data = { policyNo: window.localStorage.getItem('policyNo') } - return new Promise((resolve, reject) => { - getPolicyDetail(data).then(res => { - if (res.result == '0') { - let appntDTO = res.content.appntDTO - let orderInfoDTO = res.content.orderInfoDTO - // 保单信息 - if (orderInfoDTO.orderStatus == '0') { - orderInfoDTO.orderStatusText = '未签收' - } else if (orderInfoDTO.orderStatus == '1') { - orderInfoDTO.orderStatusText = '已签收' - } else { - orderInfoDTO.orderStatusText = '' - } - that.OrderInfoDTO = orderInfoDTO - // 投保人信息 - this.filterData(dataDictionary.sex, 'sex', appntDTO) - this.filterData(dataDictionary.idType, 'idType', appntDTO) - that.appntDTO = appntDTO - window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO)) - // 被保人信息 - res.content.insuredDTOs.map(insured => { - insured.riskDTOLst.map(risk => { - Number(risk.payIntv) - switch (risk.payIntv) { - case -1: - risk.payIntv = '不定期交' - break - case 0: - risk.payIntv = '一次交清' - break - case 1: - risk.payIntv = '月交' - break - case 3: - risk.payIntv = '季交' - break - case 6: - risk.payIntv = '半年交' - break - case 12: - risk.payIntv = '年交' - break - } - if (risk.insuYear == '70') { - risk.insuYear = '至70周岁' - } else if (risk.insuYear == '75') { - risk.insuYear = '至75周岁' - } else if (risk.insuYear == '80') { - risk.insuYear = '至80周岁' - } else if (risk.insuYear == '106') { - risk.insuYear = '终身' - } else { - risk.insuYear = `${risk.insuYear}年` - } - }) - this.filterData(dataDictionary.sex, 'sex', insured) - this.filterData(dataDictionary.idType, 'idType', insured) - this.filterData(dataDictionary.relationToAppnt, 'relation', insured) - insured.bnfDTOs.map(bnf => { - this.filterData(dataDictionary.bnfType, 'bnfType', bnf) - this.filterData(dataDictionary.sex, 'sex', bnf) - this.filterData(dataDictionary.idType, 'idType', bnf) - this.filterData(dataDictionary.relationToAppnt, 'relation', bnf) - }) - }) - that.insuredDTOs = res.content.insuredDTOs - this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) + getPolicyDetail(data).then(res => { + if (res.result == '0') { + let appntDTO = res.content.appntDTO + let orderInfoDTO = res.content.orderInfoDTO + // 保单信息 + if (orderInfoDTO.orderStatus == '0') { + orderInfoDTO.orderStatusText = '未签收' + } else if (orderInfoDTO.orderStatus == '1') { + orderInfoDTO.orderStatusText = '已签收' } else { - this.$toast(res.resultMessage) + orderInfoDTO.orderStatusText = '' } - }) + that.OrderInfoDTO = orderInfoDTO + // 投保人信息 + this.filterData(dataDictionary.sex, 'sex', appntDTO) + this.filterData(dataDictionary.idType, 'idType', appntDTO) + that.appntDTO = appntDTO + window.localStorage.setItem('saleInsuredInfo', JSON.stringify(appntDTO)) + // 被保人信息 + res.content.insuredDTOs.map(insured => { + insured.riskDTOLst.map(risk => { + Number(risk.payIntv) + switch (risk.payIntv) { + case -1: + risk.payIntv = '不定期交' + break + case 0: + risk.payIntv = '一次交清' + break + case 1: + risk.payIntv = '月交' + break + case 3: + risk.payIntv = '季交' + break + case 6: + risk.payIntv = '半年交' + break + case 12: + risk.payIntv = '年交' + break + } + if (risk.insuYear == '70') { + risk.insuYear = '至70周岁' + } else if (risk.insuYear == '75') { + risk.insuYear = '至75周岁' + } else if (risk.insuYear == '80') { + risk.insuYear = '至80周岁' + } else if (risk.insuYear == '106') { + risk.insuYear = '终身' + } else { + risk.insuYear = `${risk.insuYear}年` + } + }) + this.filterData(dataDictionary.sex, 'sex', insured) + this.filterData(dataDictionary.idType, 'idType', insured) + this.filterData(dataDictionary.relationToAppnt, 'relation', insured) + insured.bnfDTOs.map(bnf => { + this.filterData(dataDictionary.bnfType, 'bnfType', bnf) + this.filterData(dataDictionary.sex, 'sex', bnf) + this.filterData(dataDictionary.idType, 'idType', bnf) + this.filterData(dataDictionary.relationToAppnt, 'relation', bnf) + }) + }) + + that.insuredDTOs = res.content.insuredDTOs + this.list = formatAllRisk(this.insuredDTOs[0].riskDTOLst) + } else { + this.$toast(res.resultMessage) + } }) }, appCallBack(data) { From 8fb4c921d78638cc68ec9426577b44265d606899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 15:00:47 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=A9=BA=E7=AD=BE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/AirSign.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue index e5f997ec6..d0e9f0872 100644 --- a/src/views/ebiz/serve/AirSign.vue +++ b/src/views/ebiz/serve/AirSign.vue @@ -30,6 +30,7 @@ import { formatAllRisk } from '@/assets/js/utils/formatRiskList' export default { data() { + let isWeixin = this.$utils.device().isWeixin //判断环境 return { appntImg: '', idcardData: { @@ -46,14 +47,23 @@ export default { insuredDTOs: [], // 保单号 contNo: '', + // 是否在微信 + isWeixin, list: [] } }, created() { - // 获取保单详情 - this.getPolicyDetail() - this.disabled = false + if (this.isWeixin) { + window.localStorage.setItem('saleInsuredInfo', this.$route.query.saleInsuredInfo) + window.localStorage.setItem('token', this.$route.query.token) + window.localStorage.setItem('policyNo', this.$route.query.policyNo) + this.idcardData.idcardName = JSON.parse(this.$route.query.saleInsuredInfo).name + this.idcardData.idcardNumber = JSON.parse(this.$route.query.saleInsuredInfo).idNo + this.getPolicyDetail() + } else { + // 获取保单详情 + } }, components: { [Button.name]: Button, From b6d3142ef535db5b754d38f4afbff2d98eba14e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 17:19:04 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E7=AD=BE=E6=94=B6pdf=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureOfElectronic.vue | 152 +++++++++++------- 1 file changed, 95 insertions(+), 57 deletions(-) diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index 54a9a79dc..d401b9519 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -172,7 +172,11 @@ export default { if (res.result == '0') { res.orderDTO.ebizSignDTOS.map(item => { if (item.documentCode == '2') { - this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${item.policyUrl}`) + if (this.detailJump != '1') { + this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${item.policyUrl}`) + } else { + this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`) + } if (item.signType == '0') { that.appntSign = item // this.policyUrl = item.policyUrl @@ -718,74 +722,108 @@ export default { that.signVal = window.localStorage.getItem('sign-val') // 判断是不是万能险 let comment = window.localStorage.getItem('productCode') - // comment.map(item => { - // if (item.productCode == 'GFRS_M0003') { - // this.isComment = true - // } - // }) + if (comment == 'GFRS_M0003') { this.isComment = true } // 获取投保人信息 that.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo')) + // 在微信 if (this.isWeixin) { - that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt - } - - if (this.detailJump != '1') { - // 投被保人是否同人 - that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt - // 获取被保人信息 - that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) - } - // if (this.detailJump != '1') { - // this.getOrderDetail() - // } - // let imgBase64Data = sessionStorage.getItem('twoimgBase64Data') - // console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data) - if (this.isWeixin) { - let imgBase64Data = sessionStorage.getItem('imgBase64Data') - let wxSigned = sessionStorage.getItem('wxSigned') - let signInfo = JSON.parse(localStorage.getItem('signInfo')) - console.log('`````````````````````````````````') - console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data) - console.log('wxSigned: ' + wxSigned) - if (wxSigned) { - console.log('第二次进入电子保单!') - console.log('that222222222222', that) - this.getOrderDetail().then(() => { - this.Time = true - this.isOver = true - this.radio = '1' - this.base64 = imgBase64Data - this.isDisabledComplite = false - console.log('signInfo.status:' + signInfo.status) - if (signInfo.status == '0') { - // this.appntSign.documentStatus = '3' - console.log('``````````````````') - this.$set(this.appntSign, 'documentStatus', '3') - console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus) - this.isSign = false + // 在微信且不是回执签收 + if (this.detailJump != '1') { + that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnts + let imgBase64Data = sessionStorage.getItem('imgBase64Data') + let wxSigned = sessionStorage.getItem('wxSigned') + let signInfo = JSON.parse(localStorage.getItem('signInfo')) + console.log('`````````````````````````````````') + console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data) + console.log('wxSigned: ' + wxSigned) + if (wxSigned) { + console.log('第二次进入电子保单!') + console.log('that222222222222', that) + this.getOrderDetail().then(() => { + this.Time = true + this.isOver = true + this.radio = '1' + this.base64 = imgBase64Data this.isDisabledComplite = false - // this.isDisable = false - } else { - this.$set(this.insuredSign, 'documentStatus', '3') - // this.insuredSign.documentStatus = '3' - this.isDisabledComplite = false - this.isSign = false - } - }) + console.log('signInfo.status:' + signInfo.status) + if (signInfo.status == '0') { + // this.appntSign.documentStatus = '3' + console.log('``````````````````') + this.$set(this.appntSign, 'documentStatus', '3') + console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus) + this.isSign = false + this.isDisabledComplite = false + // this.isDisable = false + } else { + this.$set(this.insuredSign, 'documentStatus', '3') + // this.insuredSign.documentStatus = '3' + this.isDisabledComplite = false + this.isSign = false + } + }) + } else { + console.log('````````````````````````') + console.log('第一次进入电子保单') + this.timeOut() + this.getOrderDetail() + } } else { - console.log('````````````````````````') - console.log('第一次进入电子保单') - this.timeOut() - this.getOrderDetail() + // 在微信而且是回执签收 + let imgBase64Data = sessionStorage.getItem('imgBase64Data') + let wxSigned = sessionStorage.getItem('wxSigned') + let signInfo = JSON.parse(localStorage.getItem('signInfo')) + console.log('`````````````````````````````````') + console.log('imgBase64Data:twoimgBase64Data ' + imgBase64Data) + console.log('wxSigned: ' + wxSigned) + if (wxSigned) { + console.log('第二次进入电子保单!') + console.log('that222222222222', that) + this.getOrderDetail().then(() => { + this.Time = true + this.isOver = true + this.radio = '1' + this.base64 = imgBase64Data + this.isDisabledComplite = false + console.log('signInfo.status:' + signInfo.status) + if (signInfo.status == '0') { + // this.appntSign.documentStatus = '3' + console.log('``````````````````') + this.$set(this.appntSign, 'documentStatus', '3') + console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus) + this.isSign = false + this.isDisabledComplite = false + // this.isDisable = false + } else { + this.$set(this.insuredSign, 'documentStatus', '3') + // this.insuredSign.documentStatus = '3' + this.isDisabledComplite = false + this.isSign = false + } + }) + } else { + console.log('````````````````````````') + console.log('第一次进入电子保单') + this.timeOut() + this.getOrderDetail() + } } } else { - this.timeOut() - this.getOrderDetail() + // 不在微信且不是回执签收 + if (this.detailJump != '1') { + // 投被保人是否同人 + that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt + // 获取被保人信息 + that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) + this.timeOut() + this.getOrderDetail() + } else { + // 不在微信但是在回执签收 + this.timeOut() this.getOrderDetail() } } From d4d775b8b044325156f566c8a1db46c176653c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 17:40:11 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureOfElectronic.vue | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index d401b9519..3aa6b48df 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -421,12 +421,17 @@ export default { loadingType: 'spinner', message: '加载中……' }) + // 投保人 if (val == '0') { + // 投保人且不是回执签收 if (this.detailJump != '1') { + // 投保人不是回执签收且投被同人 if (this.relationToAppnt == '1') { + // 投保人不是回执签收且投被同人且在微信 if (this.isWeixin) { - this.toAirSign('1', '申请日期', this.caOffset, '4') + this.toAirSign('0', '申请日期', this.caOffset, '4') } else { + // 投保人不是回执签收且投被同人且不在微信 EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: this.saleInsuredInfo.idNo, @@ -451,9 +456,11 @@ export default { }) } } else { + // 微信投保人不是回执签收且投被不同人 if (this.isWeixin) { this.toAirSign('0', '法定监护人', this.caOffset, '4') } else { + // 不在微信投保人不是回执签收且投被不同人 console.log('投保人签名') EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 @@ -509,9 +516,11 @@ export default { that.saleInsuredInfo.idType = '9' break } + // 微信投保人且是回执签收 if (this.isWeixin) { this.toAirSign('1', '投保人签字', '-150', '4') } else { + // 不是微信投保人且是回执签收 EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: that.saleInsuredInfo.idNo, @@ -537,9 +546,11 @@ export default { } } } else { + // 在微信被保人 if (this.isWeixin) { this.toAirSign('1', '法定监护人', '10', '4') } else { + // 不在微信被保人 console.log('被保人签名') EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 @@ -582,29 +593,9 @@ export default { }, // 超录 chaolu() { - // localStorage.setItem( - // 'signInfo', - // JSON.stringify({ - // idNo: this.saleInsuredInfo.idNo, - // name: this.saleInsuredInfo.name, - // type: this.saleInsuredInfo.idType, - // originStatus: '2', - // keyword: '申请日期', - // status: '2', - // offset: '0', - // originUrl: location.href, - // commentKeyword: '认真', // 批注关键字 - // commentText: '本人已阅读保险条款、产品说明书和投保提示书，了解本产品的特点和保单利益的不确定性', // 批注文字 - // commentOffset: '28', // 批注偏移量 - // commentPos: '2', // 签字图片和关键字位置关系：等于1时，签字图片和关键字矩形重心重合 - // // * 等于2时，签字图片位于关键字正下方，中心线对齐；等于3时，签字图片位于关键字正右方，中心线对齐； - // // * 等于4时，签字图片左上角和关键字右下角重合，可能额外附加偏移量，详见构造函数的offset参数 - // caType: '1', // 是否是批注 - // pageNo: '1', // PDF起始页 - // KWIndex: '1' // 第几个关键字 - // }) - // ) + // 再微信 if (this.isWeixin) { + // 在微信且投被不同人 if (this.relationToAppnt != '1') { localStorage.setItem( 'signInfo', @@ -630,6 +621,7 @@ export default { ) window.location.href = this.$mainUrl + '/chaolu/index.html' } else { + // 在微信且投被同人 localStorage.setItem( 'signInfo', JSON.stringify({ @@ -655,6 +647,7 @@ export default { window.location.href = this.$mainUrl + '/chaolu/index.html' } } else { + // 不在微信且投被不同人 if (this.relationToAppnt != '1') { EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 @@ -684,6 +677,7 @@ export default { } }) } else { + // 不在微信且投被同人 EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: this.saleInsuredInfo.idNo, @@ -733,7 +727,7 @@ export default { if (this.isWeixin) { // 在微信且不是回执签收 if (this.detailJump != '1') { - that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnts + that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt let imgBase64Data = sessionStorage.getItem('imgBase64Data') let wxSigned = sessionStorage.getItem('wxSigned') let signInfo = JSON.parse(localStorage.getItem('signInfo')) @@ -796,7 +790,7 @@ export default { console.log('appntSign.documentStatus: ' + this.appntSign.documentStatus) this.isSign = false this.isDisabledComplite = false - // this.isDisable = false + this.isSubmit = false } else { this.$set(this.insuredSign, 'documentStatus', '3') // this.insuredSign.documentStatus = '3' From 1ebb8e4c2c51f0a0d60913be8e34065db934c441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 17:48:27 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9B=9E=E6=89=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureOfElectronic.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index 3aa6b48df..f72c0a5b7 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -518,7 +518,7 @@ export default { } // 微信投保人且是回执签收 if (this.isWeixin) { - this.toAirSign('1', '投保人签字', '-150', '4') + this.toAirSign('0', '投保人签字', '-150', '4') } else { // 不是微信投保人且是回执签收 EWebBridge.webCallAppInJs('ca_sign', { From cee2f85afb3aeecb6e883ed90e9f32b548223903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Fri, 15 Nov 2019 17:56:32 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E5=9B=9E=E6=89=A7=E7=AD=BE=E6=94=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureOfElectronic.vue | 2 +- src/views/ebiz/serve/Detail.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index f72c0a5b7..1f3343061 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -518,7 +518,7 @@ export default { } // 微信投保人且是回执签收 if (this.isWeixin) { - this.toAirSign('0', '投保人签字', '-150', '4') + this.toAirSign('0', '投保人签字', '0', '4') } else { // 不是微信投保人且是回执签收 EWebBridge.webCallAppInJs('ca_sign', { diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index dc690ca14..771b3a513 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -147,6 +147,8 @@ export default { } else { orderInfoDTO.orderStatusText = '' } + // 测试用 + orderInfoDTO.orderStatus = '0' that.OrderInfoDTO = orderInfoDTO // 投保人信息 this.filterData(dataDictionary.sex, 'sex', appntDTO) From db820d3c7456f28ce96a6a33c475a2ba71a37aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Mon, 18 Nov 2019 10:29:54 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=9E=E6=89=A7title?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/serve/AirSign.vue | 3 ++- src/views/ebiz/serve/Detail.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue index d0e9f0872..c13cc2857 100644 --- a/src/views/ebiz/serve/AirSign.vue +++ b/src/views/ebiz/serve/AirSign.vue @@ -190,7 +190,8 @@ export default { flag: 'h5', extra: { url: location.origin + '/#/sale/signatureOfElectronic', - forbidSwipeBack: '1' + forbidSwipeBack: '1', + title: '保险合同签收回执电子确认书签名' }, routerInfo: { path: '/sale/signatureOfElectronic' diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index 771b3a513..48e346cb0 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -268,7 +268,8 @@ export default { flag: 'h5', extra: { url: location.origin + '/#/sale/signatureOfElectronic', - forbidSwipeBack: '1' + forbidSwipeBack: '1', + title: '保险合同签收回执电子确认书签名' }, routerInfo: { path: '/sale/signatureOfElectronic' From e5b62168b92a88652e2c1b09de5f376ff997cc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Mon, 18 Nov 2019 10:46:12 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4title=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/SignatureOfElectronic.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index 1f3343061..06555f17b 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -767,6 +767,7 @@ export default { } } else { // 在微信而且是回执签收 + document.title = '保险合同签收回执电子确认书签名' let imgBase64Data = sessionStorage.getItem('imgBase64Data') let wxSigned = sessionStorage.getItem('wxSigned') let signInfo = JSON.parse(localStorage.getItem('signInfo')) @@ -817,6 +818,7 @@ export default { this.getOrderDetail() } else { // 不在微信但是在回执签收 + document.title = '保险合同签收回执电子确认书签名' this.timeOut() this.getOrderDetail() } From 783e516a51efc813d89d87d8bd2b89966b74900b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Mon, 18 Nov 2019 16:04:09 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A6=8F=E5=AE=9D?= =?UTF-8?q?=E5=AE=9D=E4=BA=A7=E5=93=81=E6=A0=A1=E9=AA=8C=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=92=8C=E9=99=A9=E7=A7=8D=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 2 +- src/views/ebiz/common/MainRiskList.vue | 5 +++++ src/views/ebiz/common/risk-rules.js | 21 ++++++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index fd6f15ae8..822e60039 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -514,7 +514,7 @@ export default { this.chooseProducts.forEach(item => { let trialInfo = {} item.calFactorLst.forEach(factor => { - //type 类型 0为picker 1计步器 2 + //type 类型 0为picker 1计步器 2职业等级 if (factor.type == 0) { if (factor.hasFlag == '1') { trialInfo[factor.code] = factor[factor.code] diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index 1b301a35d..7ab6a6665 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -114,6 +114,11 @@ export default { if (riskRules.lifeGradeLimit(resultData, this)) { return } + if (resultData.productCode == 'GFRS_M0006') { + if (riskRules.lifeGradeLimitForBaby(resultData, this)) { + return + } + } /********end 主险选择限制 end******/ //保存附加险 diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js index 7ec3873c0..d0b68a99b 100644 --- a/src/views/ebiz/common/risk-rules.js +++ b/src/views/ebiz/common/risk-rules.js @@ -10,8 +10,8 @@ export default { tips = '被保人年龄不适合此款险种，请选择其他险种！' } let minAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.minAge - let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge - ;[age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)] + let maxAge = resultData.productTrialInfoDTO.ageRange && resultData.productTrialInfoDTO.ageRange.maxAge; + [age, minAge, maxAge] = [Number(age), Number(minAge), Number(maxAge)] if (age > maxAge || age < minAge) { vm.$toast(tips) return true @@ -35,7 +35,7 @@ export default { let healthGrade = resultData.productInsuredDTO.healthGrade if (healthGrade == 0) return false if (Number(cuttentHealthGrade) > Number(healthGrade)) { - vm.$toast('健康等级不适合此款险种，请选择其他险种！') + vm.$toast('健康职业等级不适合此款险种，请选择其他险种！') return true } return false @@ -46,7 +46,18 @@ export default { let lifeGrade = resultData.productInsuredDTO.lifeGrade if (lifeGrade == 0) return false if (Number(cuttentLifeGrade) > Number(lifeGrade)) { - vm.$toast('寿险等级不适合此款险种，请选择其他险种！') + vm.$toast('寿险职业等级不适合此款险种，请选择其他险种！') + return true + } + return false + }, + // 福宝宝产品寿险等级对主险影响 + lifeGradeLimitForBaby(resultData, vm) { + let cuttentLifeGrade = this.getSaleInsuredInfo().lifeGrade + let lifeGrade = resultData.productInsuredDTO.lifeGrade + if (lifeGrade == 0) return false + if (Number(cuttentLifeGrade) > Number(lifeGrade)) { + vm.$toast('投保人寿险职业等级不适合此款险种，请选择其他险种！') return true } return false @@ -59,4 +70,4 @@ export default { getSaleInsuredInfo() { return localStorage.saleInsuredInfo && JSON.parse(localStorage.saleInsuredInfo) } -} +} \ No newline at end of file From 64be726754cbf34a5cec893da7e479d2dad49a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Mon, 18 Nov 2019 17:06:41 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=B9=B4?= =?UTF-8?q?=E9=BE=84=E6=8F=90=E7=A4=BA=E6=A0=A1=E9=AA=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=B0=8F=E4=BA=8E18=E5=B2=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/validator.js | 6 +++--- src/views/ebiz/proposal/Appnt.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index 8f532603d..ad172ca7f 100644 --- a/src/assets/js/utils/validator.js +++ b/src/assets/js/utils/validator.js @@ -58,11 +58,11 @@ Validator.extend('age', { return value > 17 && /^\d{1,3}$/.test(value) } }) -//被保人年龄（不得小于16周岁） +//被保人年龄（不得小于18周岁） Validator.extend('appntAge', { - getMessage: () => '年龄不得小于16周岁', + getMessage: () => '年龄不得小于18周岁', validate: value => { - return value > 15 && /^\d{1,3}$/.test(value) + return value > 17 && /^\d{1,3}$/.test(value) } }) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 64bd3ef9f..f9d5d0152 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -202,7 +202,7 @@ export default { this.appntDTO.age = String(this.appntDTO.age) this.$validator.validate().then(valid => { if (true === valid) { - //进行投保人年龄校验（大于16周岁） + //进行投保人年龄校验（大于18周岁） let params = { orderDTO: { appntDTO: this.appntDTO, From 9e551243b119a950c1e45e52a05f8f2e79827ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Tue, 19 Nov 2019 09:56:06 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/AttachmentManagement.vue | 30 ++------------------ 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue index 076449aee..431cb9698 100644 --- a/src/views/ebiz/sale/AttachmentManagement.vue +++ b/src/views/ebiz/sale/AttachmentManagement.vue @@ -747,27 +747,6 @@ export default { let imageInfoType = '' - // if (that.type == 'fileListIdFrontInsured' && that.id == '1') { - // imageInfoType = '1' - // } else if (that.type == 'fileListIdBackInsured' && that.id == '1') { - // imageInfoType = '2' - // } else if (that.type == 'fileListBankInsured') { - // imageInfoType = '3' - // } else if (that.type == 'fileListIdFrontInsured' && that.id == '2') { - // imageInfoType = '5' - // } else if (that.type == 'fileListIdBackInsured' && that.id == '2') { - // imageInfoType = '6' - // } else if (that.type == 'fileLIstImgInsured' && that.id == '3') { - // imageInfoType = '7' - // } else if (that.type == 'fileLIstImgInsured' && that.id == '4') { - // imageInfoType = '8' - // } else if (that.type == 'fileLIstImgInsured' && that.id == '5') { - // imageInfoType = '9' - // } else if (that.type == 'fileLIstImgInsured' && that.id == '6') { - // imageInfoType = '10' - // } else if (that.type == 'saleInsuredPersonInfoOther' && that.id == '7') { - // imageInfoType = '11' - // } if (that.type == 'fileListIdFrontInsured' && that.id == '1') { imageInfoType = '1' } else if (that.type == 'fileListIdBackInsured' && that.id == '1') { @@ -810,8 +789,6 @@ export default { fileName: that.imgName } - // window.localStorage.setItem('obj', JSON.stringify(obj)) - // that.list.push(JSON.parse(window.localStorage.getItem('obj'))) that.list.push(obj) } else if (that.type == 'fileListOther') { // 是其他 @@ -825,8 +802,7 @@ export default { subBusinessNo: '', fileName: that.imgName } - // window.localStorage.setItem('obj', JSON.stringify(obj)) - // that.list.push(JSON.parse(window.localStorage.getItem('obj'))) + that.list.push(obj) } else if (that.type == 'fileListtypebeneficiary') { // 是受益人 @@ -842,7 +818,7 @@ export default { } that.list.push(obj) } - // }) + } else { switch (that.type) { case 'fileListIdFront': @@ -933,7 +909,7 @@ export default { }, orderType: 'MEDIA_ORDER' } - // console.log(that.list) + saveInformation(data).then(res => { if (res.result == '0') { From ad3b90b79f4dbf6e5caafc68cb98c1db4e91fa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9A=AE=E4=BC=9F?= Date: Tue, 19 Nov 2019 16:42:54 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E6=98=9F=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/AddBeneficiaryInfo.vue | 18 +++++++-- src/views/ebiz/sale/InsuredInfo.vue | 44 ++++++++++++++++------ src/views/ebiz/sale/InsuredPerson.vue | 38 ++++++++++++++++--- 3 files changed, 80 insertions(+), 20 deletions(-) diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue index 00c94570a..4bad1ec85 100644 --- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue +++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue @@ -5,6 +5,7 @@ 长期 - + 同投保人 - + - + - + 证件扫描 长期 - + - + - - + + {{ codeDisabled ? `${countDown}s后重新获取` : '发送验证码' }} - + - +
负债金额 （万元） @@ -192,6 +207,7 @@ - + - +
设为联系地址
- + @@ -224,6 +241,7 @@ - +
设为联系地址
- + diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue index ea81b6e8f..a59d2bb90 100644 --- a/src/views/ebiz/sale/InsuredPerson.vue +++ b/src/views/ebiz/sale/InsuredPerson.vue @@ -6,6 +6,7 @@ - + - + @@ -184,6 +198,7 @@ readonly label="税收居民身份" name="税收居民身份" + required right-icon="arrow" placeholder="请选择" v-validate="'required'" @@ -198,6 +213,7 @@ clearable label="职业类别" name="职业类别" + required v-validate="'required'" placeholder="请选择" :parentShowPicker.sync="occupationShowPicker" @@ -209,6 +225,7 @@ readonly label="收入来源" name="收入来源" + required right-icon="arrow" placeholder="请选择" v-validate="'required'" @@ -219,6 +236,7 @@ v-model="userInfo.otherSalarySource" label name="其他来源" + required placeholder="请输入其它收入来源" clearable maxlength="30" @@ -228,6 +246,7 @@ label="平均年收入（万元）" name="平均年收入" placeholder="请输入" + required v-validate="'required|onlyNumber'" clearable maxlength="5" @@ -237,6 +256,7 @@ v-model="userInfo.liabilitiesMoney" name="负债金额" placeholder="请输入" + required v-validate="'required|onlyNumber'" clearable maxlength="5" @@ -249,6 +269,7 @@ readonly label="在职情况" name="在职情况" + required placeholder="请选择" v-validate="'required'" right-icon="arrow" @@ -258,6 +279,7 @@ v-model="userInfo.workcompany" label="工作单位" name="工作单位" + required placeholder="请输入" v-validate="'required'" maxlength="50" @@ -269,6 +291,7 @@ readonly label="单位地址" name="单位地址" + required right-icon="arrow" placeholder="请选择" v-validate="'required'" @@ -289,6 +312,7 @@ label="邮编" name="邮编" placeholder="请输入" + required v-validate="'required|zipCode'" maxlength="6" clearable @@ -302,6 +326,7 @@ Date: Thu, 21 Nov 2019 10:01:51 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9dev=E7=8E=AF=E5=A2=83bu?= =?UTF-8?q?g=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/validator.js | 8 ++++--- src/views/ebiz/sale/SignatureConfirmation.vue | 13 +++++++---- src/views/ebiz/sale/SignatureOfElectronic.vue | 23 ++++++++++++++----- src/views/ebiz/serve/Detail.vue | 2 +- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index ad172ca7f..e8da7f9ba 100644 --- a/src/assets/js/utils/validator.js +++ b/src/assets/js/utils/validator.js @@ -1,5 +1,7 @@ import Vue from 'vue' -import VeeValidate, { Validator } from 'vee-validate' +import VeeValidate, { + Validator +} from 'vee-validate' import zh_CN from 'vee-validate/dist/locale/zh_CN' import idNoCheck from './idNoCheck' @@ -85,7 +87,7 @@ Validator.extend('bankCard', { return field + '格式不正确，请您填写正确的格式' }, validate: value => { - return /^(\d{16}|\d{19})$/.test(value) + return /^(\d{16}|\d{18}|\d{19})$/.test(value) } }) @@ -136,4 +138,4 @@ Validator.extend('avoirdupois', { validate: value => { return /^[0-9]+([.]{1}[0-9]{1})?$/.test(value) && value > 0.1 } -}) +}) \ No newline at end of file diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 031c653e1..258513cd1 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -7,7 +7,7 @@ {{ tipsName }}先生/女士，您好！

-

该保单由国富人寿保险有限责任公司进行承保，具体确认信息如下：

+

该保单由国富人寿保险股份有限公司进行承保，具体确认信息如下：

@@ -18,6 +18,7 @@
+
@@ -25,6 +26,7 @@ {{ appnt.name }}

以下内容需要您按照顺序阅读并签字确认:

+

{{ item.documentCode == '1' ? '需阅读' : '需签署' }}

@@ -60,6 +62,7 @@

操作时间已失效，请联系销售人员！
+
@@ -208,7 +211,7 @@