From bfebbfb1fa4bedf182492c41be5ef071dd3a8460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 13 Mar 2020 10:04:11 +0800 Subject: [PATCH 01/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E6=8A=95=E8=A2=AB=E4=BF=9D?= =?UTF-8?q?=E4=BA=BA=E5=90=8C=E4=B8=80=E4=BA=BA=E5=91=8A=E7=9F=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86=20--=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/NotifyingMessage.vue | 25 +++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue index e4377d92d..ba16305be 100644 --- a/src/views/ebiz/sale/NotifyingMessage.vue +++ b/src/views/ebiz/sale/NotifyingMessage.vue @@ -13,14 +13,25 @@
- {{ impartTypeNumber[im.impartType] }} - {{ - im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 8 || im.impartType == 10 - ? saleInsuredInfo.name - : saleInsuredPersonInfo.name - }} + {{ + relationToAppnt == '1' + ? '投保人/被保险人' + + impartTypeNumber[im.impartType] + .replace('投保人', '') + .replace('被保人', '') + .replace('被保险人', '') + : impartTypeNumber[im.impartType] + }} + +
+ {{ + im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 8 || im.impartType == 10 + ? saleInsuredInfo.name + : saleInsuredPersonInfo.name + }} - + +
+ - + 下一步 @@ -116,7 +116,7 @@ export default { occupationShowPicker: false, currentPopupIndex: '', disabled: false, - ageShow: '' //被保人显示年龄 + ageShow: '' //被保险人显示年龄 } }, @@ -143,7 +143,7 @@ export default { this.insured.relationToAppnt = relationToAppnt this.insured.relationLabel = relationName if (this.insured.relationToAppnt == '1') { - //如果是投被同人 就将投保人信息存入被保人信息 + //如果是投被同人 就将投保人信息存入被保险人信息 this.disabled = true this.insured = Object.assign(this.insured, JSON.parse(localStorage.proposalAppnt)) this.insured.age = getAge.getAge(this.insured.birthday, new Date()) @@ -151,7 +151,7 @@ export default { } this.ageShow = this.insured.age == '-1' ? '0' : this.insured.age }, - //设置被保人年龄显示 如果this.insured.age为 -1时显示为空，不为1时显示为正常输入值 + //设置被保险人年龄显示 如果this.insured.age为 -1时显示为空，不为1时显示为正常输入值 changeAgeInput(val) { // this.ageShow = val == '-1' ? '0' : val this.insured.age = val @@ -195,7 +195,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) @@ -209,7 +209,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) @@ -234,7 +234,7 @@ export default { let resultSex = checkSex(cacheSex, localSex, relation) let resultRelation = checkRelation(relation, this.insured.age) if (!resultSex) { - return Toast.fail('被保人性别有误') + return Toast.fail('被保险人性别有误') } if (!resultRelation) { return Toast.fail('0-7岁未成年人须由其父母投保') @@ -323,7 +323,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index cf362a18d..9fce47110 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -215,7 +215,7 @@ export default { }, //编辑 edit(item) { - //建议书列表 编辑=》制作中的建议书跳转到选择被保人页面； + //建议书列表 编辑=》制作中的建议书跳转到选择被保险人页面； localStorage.orderNo = item.orderInfoDTO.orderNo this.$jump({ flag: 'h5', diff --git a/src/views/ebiz/proposal/js/exhibitionMethod.js b/src/views/ebiz/proposal/js/exhibitionMethod.js index b26261364..ed2197efc 100644 --- a/src/views/ebiz/proposal/js/exhibitionMethod.js +++ b/src/views/ebiz/proposal/js/exhibitionMethod.js @@ -43,7 +43,7 @@ export function formLabel(label, key) { return result } -//将被保人与利益演示相关联 +//将被保险人与利益演示相关联 export function relevance(insured, insuredLabelResult, insuredResult, insuredInfoResult, amtFormat, dutyLst) { insured.forEach(insure => { insure.productFeatures = '' diff --git a/src/views/ebiz/proposal/rule.js b/src/views/ebiz/proposal/rule.js index df6562b60..36475c70b 100644 --- a/src/views/ebiz/proposal/rule.js +++ b/src/views/ebiz/proposal/rule.js @@ -1,5 +1,5 @@ export function checkSex(cacheSex, localSex, relation) { - //当关系为配偶时 被保人性别必须与投保人性别不一致 + //当关系为配偶时 被保险人性别必须与投保人性别不一致 if (relation == '2' && localSex == cacheSex) { return false } else { @@ -7,7 +7,7 @@ export function checkSex(cacheSex, localSex, relation) { } } export function checkRelation(relation, age) { - //当被保人年龄小于8岁 被保人与投保人关系必须为父母 + //当被保险人年龄小于8岁 被保险人与投保人关系必须为父母 if (age < 8 && relation != '4') { return false } else { diff --git a/src/views/ebiz/sale/AccountInformation.vue b/src/views/ebiz/sale/AccountInformation.vue index 7dc78fc5f..4e96e86af 100644 --- a/src/views/ebiz/sale/AccountInformation.vue +++ b/src/views/ebiz/sale/AccountInformation.vue @@ -4,7 +4,7 @@ {{ `投保人：${saleInsuredInfo.name}` }}
@@ -110,7 +110,7 @@ import BankCardScan from '@/components/ebiz/sale/BankCardScan' export default { data() { return { - // 选中后传给后端的投保人或者被保人名字 + // 选中后传给后端的投保人或者被保险人名字 name: '', // 开户银行 bank: '', @@ -118,7 +118,7 @@ export default { checked: false, // 自动续保 isChecked: false, - // 投被保人是否同一个 + // 投被保险人是否同一个 relationToAppnt: '', // 银行卡号 bankId: '', @@ -126,7 +126,7 @@ export default { radio: '0', // 银行列表弹框 show: false, - // 被保人信息 + // 被保险人信息 saleInsuredPersonInfo: {}, // 投保人信息 saleInsuredInfo: {}, @@ -398,7 +398,7 @@ export default { if (res.result == 0) { //如果是从编辑进来的 if (this.$route.query.edit) { - //投被保人关系 + //投被保险人关系 this.relationToAppnt = res.orderDTO.insuredDTOs[0].relationToAppnt this.$utils.intLocalStorage(res) @@ -417,10 +417,10 @@ export default { let that = this - // 获取投被保人是否同一个人 + // 获取投被保险人是否同一个人 if (localStorage.saleInsuredPersonInfo) { that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt - // 获取被保人信息 + // 获取被保险人信息 that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) } if (localStorage.saleInsuredInfo) { diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue index 920e18118..e784009cc 100644 --- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue +++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue @@ -6,8 +6,8 @@ v-model="relationToAppnt" required readonly - label="是被保人的" - name="是被保人的" + label="是被保险人的" + name="是被保险人的" right-icon="arrow" placeholder="请选择" v-validate="'required'" @@ -302,7 +302,7 @@ export default { bnfOrder: '1', //受益顺序 bnfLot: '', //受益比例 bnfFlag: '', - relationToInsured: '', //和被保人的关系 + relationToInsured: '', //和被保险人的关系 lifeGrade: '', healthGrade: '', bnfType: '0' //身故受益人 @@ -336,7 +336,7 @@ export default { this.userInfo.name = name }, selectClick(index) { - // 同被保人不允许编辑 + // 同被保险人不允许编辑 if (this.isInsured) { return } @@ -408,7 +408,7 @@ export default { }, //弹框选择 toSelect(pickerType, valueKey) { - //同被保人不允许编辑 + //同被保险人不允许编辑 if (this.isInsured) { return } @@ -466,13 +466,13 @@ export default { } else if (this.pickerType == '6') { ;[this.userInfo.marriage, this.marriage] = [value.id, value.text] } else if (this.pickerType == '7') { - // //如果受益人是被保人本人 + // //如果受益人是被保险人本人 // if (value.id == 1) { // //获取投保人数据 // getOrderDetail({ orderNo: localStorage.orderNo }).then(res => { // if (res.result == 0) { // this.isInsured = true - // //获取被保人信息 + // //获取被保险人信息 // let insuredInfo = res.orderDTO.insuredDTOs[0] // for (let key in this.userInfo) { // this.userInfo[key] = insuredInfo[key] @@ -657,13 +657,13 @@ export default { let age = utilsAge.getAge(this.userInfo.birthday, new Date()) let relationToAppnt = localStorage.relationToAppnt let insuredDetail = JSON.parse(localStorage.insuredDetail) - // //被保人不是已婚 + // //被保险人不是已婚 // if (this.insuredMarriage != '1') { // return this.$toast('与投保人关系不正确') // } // let insuredSex = JSON.parse(localStorage.saleInsuredPersonInfo).sex // let appntSex = JSON.parse(localStorage.saleInsuredInfo).sex - // //投被保人性别相同 + // //投被保险人性别相同 // if (insuredSex == appntSex) { // return this.$toast('性别输入有误') // } @@ -671,21 +671,21 @@ export default { // 页面跳转 this.$validator.validate().then(valid => { if (true === valid) { - // 受益人是被保人的配偶 + // 受益人是被保险人的配偶 if (this.userInfo.relationToInsured == '2') { - // 受益人与投保人都是被保人的配偶时 + // 受益人与投保人都是被保险人的配偶时 if (this.userInfo.relationToInsured == '2' && relationToAppnt == '2') { if (this.userInfo.name != insuredDetail.name || this.userInfo.sex != insuredDetail.sex || this.userInfo.idNo != insuredDetail.idNo) { return this.$toast('受益人数据不合法，请重新输入') } } - //与被保人关系是配偶 + //与被保险人关系是配偶 let insuredInfo = JSON.parse(localStorage.saleInsuredPersonInfo) //如果投保人不是已婚 if (insuredInfo.marriage != '1') { - return this.$toast('与被保人关系有误') + return this.$toast('与被保险人关系有误') } - //如果被保人与投保人性别相同 + //如果被保险人与投保人性别相同 if (insuredInfo.sex == this.userInfo.sex) { return this.$toast('性别录入与婚姻状况不符') } @@ -696,7 +696,7 @@ export default { } } - // 受益人是被保人的父母，被保人是投保人的子女时 + // 受益人是被保险人的父母，被保险人是投保人的子女时 if (this.userInfo.relationToInsured == '3' && relationToAppnt == '4') { if (this.userInfo.sex == insuredDetail.sex) { if (this.userInfo.name != insuredDetail.name || this.userInfo.idNo != insuredDetail.idNo) { diff --git a/src/views/ebiz/sale/AttachmentManagement.vue b/src/views/ebiz/sale/AttachmentManagement.vue index 90adf60ab..e0b783e0e 100644 --- a/src/views/ebiz/sale/AttachmentManagement.vue +++ b/src/views/ebiz/sale/AttachmentManagement.vue @@ -158,7 +158,7 @@
- 被保人附件 + 被保险人附件
@@ -310,19 +310,19 @@ export default { fileLIstImg: [], // 投保人选择的必选其他 saleInsuredInfoOther: [], - // 被保人选择的必选其他 + // 被保险人选择的必选其他 saleInsuredPersonInfoOther: [], // 银行卡正面 fileListBank: [], //银行卡反面 // fileListBankBack: [], - // 被保人身份证正面 + // 被保险人身份证正面 fileListIdFrontInsured: [], - // 被保人身份证反面 + // 被保险人身份证反面 fileListIdBackInsured: [], - // 被保人银行账户 + // 被保险人银行账户 fileListBankInsured: [], - // 被保人其他类型页面 + // 被保险人其他类型页面 fileLIstImgInsured: [], // 受益人 // fileListtypebeneficiary: [], @@ -337,7 +337,7 @@ export default { isDisabled: true, // 数据字典证件类型 idType: [], - // 被保人信息 + // 被保险人信息 saleInsuredPersonInfo: {}, // 投保人信息 saleInsuredInfo: {}, @@ -348,13 +348,13 @@ export default { // 图片返回数组 imgList: [], type: '', - // 是投保人还是被保人 + // 是投保人还是被保险人 isAppant: '', // 传给后端的list list: [], // 是哪个证件类型 id: '', - // 投保人被保人是否是一个人 1为同一个人 + // 投保人被保险人是否是一个人 1为同一个人 relationToAppnt: '', changeCard: localStorage.changeCard } @@ -365,14 +365,14 @@ export default { getOrderDetail({ orderNo: localStorage.orderNo }).then(res => { // console.log(res) if (res.result == 0) { - //是投保人还是被保人 + //是投保人还是被保险人 localStorage.accountInformationRadio = res.orderDTO.orderAccountDTO.accountType - //投被保人关系 + //投被保险人关系 this.relationToAppnt = res.orderDTO.insuredDTOs[0].relationToAppnt this.$utils.intLocalStorage(res) //投保人信息 // localStorage.saleInsuredInfo = JSON.stringify(res.orderDTO.appntDTO) - //被保人信息 + //被保险人信息 // localStorage.saleInsuredPersonInfo = JSON.stringify(res.orderDTO.insuredDTOs[0]) } else { this.$toast(res.resultMessage) @@ -385,15 +385,15 @@ export default { document.body.style.backgroundColor = '#fff' } let that = this - // 投被保人是否同人 + // 投被保险人是否同人 if (localStorage.saleInsuredPersonInfo) { that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt - // 获取被保人信息 + // 获取被保险人信息 that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) } // 获取订单号 that.orderNo = window.localStorage.getItem('orderNo') - // 获取是投保人还是被保人 + // 获取是投保人还是被保险人 that.isAppant = window.localStorage.getItem('accountInformationRadio') // 数据字典获取 that.idType = DataDictionary.idType @@ -421,7 +421,7 @@ export default { } else { that.fileListIdFront = [] } - // 被保人身份证正面 + // 被保险人身份证正面 if (window.localStorage.getItem('imgfrontInsuredPath') != null) { let imgfront = { url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${window.localStorage.getItem('imgfrontInsuredPath')}` @@ -457,7 +457,7 @@ export default { } else { that.fileListIdBack = [] } - // 被保人身份证背面 + // 被保险人身份证背面 if (window.localStorage.getItem('imgBackInsuredPath') != null) { let imgback = { url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${window.localStorage.getItem('imgBackInsuredPath')}` @@ -493,7 +493,7 @@ export default { } else { that.fileListBank = [] } - // 被保人银行卡 + // 被保险人银行卡 // if (window.localStorage.getItem('bankCardUrlInsuredPath') != null) { // let bankCardUrlInsured = { // url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${window.localStorage.getItem('bankCardUrlInsuredPath')}` @@ -769,7 +769,7 @@ export default { that.type == 'fileLIstImgInsured' || that.type == 'saleInsuredPersonInfoOther' ) { - // 是被保人 + // 是被保险人 // 证件类型 let imageInfoType = '' @@ -978,7 +978,7 @@ export default { typebeneficiary() { // 1.趸交保费≥20万元或期交保费*总期数≥20万元时， // 2.指定受益人 - // 3.受益人与被保人关系为其他 + // 3.受益人与被保险人关系为其他 if (!window.localStorage.getItem('trialList') == true || !window.localStorage.getItem('beneficiaryInfo') == true) { return false } else { diff --git a/src/views/ebiz/sale/AvoidDutyTip.vue b/src/views/ebiz/sale/AvoidDutyTip.vue index e5ad459c2..b5ccfb229 100644 --- a/src/views/ebiz/sale/AvoidDutyTip.vue +++ b/src/views/ebiz/sale/AvoidDutyTip.vue @@ -31,9 +31,9 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - // 投保人还是被保人信息 + // 投保人还是被保险人信息 signVal: '', - // 被保人签名信息 + // 被保险人签名信息 insuredSign: {}, // 投保人签名信息 appntSign: {}, @@ -57,7 +57,7 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, @@ -90,9 +90,9 @@ export default { } 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') { diff --git a/src/views/ebiz/sale/Beneficiary.vue b/src/views/ebiz/sale/Beneficiary.vue index ee1ad40ab..12b6d5a35 100644 --- a/src/views/ebiz/sale/Beneficiary.vue +++ b/src/views/ebiz/sale/Beneficiary.vue @@ -33,7 +33,7 @@

- 是被保人的 + 是被保险人的 {{ item.relationToInsured | idToText('relationToAppnt') }}

diff --git a/src/views/ebiz/sale/CardScan.vue b/src/views/ebiz/sale/CardScan.vue index c1710d6fe..1c61cc611 100644 --- a/src/views/ebiz/sale/CardScan.vue +++ b/src/views/ebiz/sale/CardScan.vue @@ -25,7 +25,7 @@ export default { src: require('@/assets/images/u6071.png'), // 是否可以点击完成 isDisabled: true, - // 是投保人还是被保人扫描 0是投保人 1是被保人 + // 是投保人还是被保险人扫描 0是投保人 1是被保险人 cardScanningType: '' } }, diff --git a/src/views/ebiz/sale/Detail.vue b/src/views/ebiz/sale/Detail.vue index 024f41697..a0920faec 100644 --- a/src/views/ebiz/sale/Detail.vue +++ b/src/views/ebiz/sale/Detail.vue @@ -20,9 +20,9 @@ - +

- + @@ -45,7 +45,7 @@
- + @@ -103,7 +103,7 @@ export default { OrderInfoDTO: {}, // 投保人信息 appntDTO: {}, - // 被保人信息 + // 被保险人信息 insuredDTOs: [], // 保单号 contNo: '', @@ -204,7 +204,7 @@ export default { } }) }) - // 被保人信息 + // 被保险人信息 res.orderDTO.insuredDTOs.map(item => { if (item.sex == '0') { item.sex = '男' diff --git a/src/views/ebiz/sale/DoubleRecordTip.vue b/src/views/ebiz/sale/DoubleRecordTip.vue index 48e837a74..300cce5f5 100644 --- a/src/views/ebiz/sale/DoubleRecordTip.vue +++ b/src/views/ebiz/sale/DoubleRecordTip.vue @@ -31,9 +31,9 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - // 投保人还是被保人信息 + // 投保人还是被保险人信息 signVal: '', - // 被保人签名信息 + // 被保险人签名信息 insuredSign: {}, // 投保人签名信息 appntSign: {}, @@ -57,7 +57,7 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, @@ -90,9 +90,9 @@ export default { } 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') { diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue index f30f42bf5..44a34983c 100644 --- a/src/views/ebiz/sale/InsuranceInformation.vue +++ b/src/views/ebiz/sale/InsuranceInformation.vue @@ -99,9 +99,9 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - // 投保人还是被保人信息 + // 投保人还是被保险人信息 signVal: '', - // 被保人签名信息 + // 被保险人签名信息 insuredSign: {}, // 投保人签名信息 appntSign: {}, diff --git a/src/views/ebiz/sale/InsuranceTip.vue b/src/views/ebiz/sale/InsuranceTip.vue index 9d562fbe6..a4dd07080 100644 --- a/src/views/ebiz/sale/InsuranceTip.vue +++ b/src/views/ebiz/sale/InsuranceTip.vue @@ -31,9 +31,9 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - // 投保人还是被保人信息 + // 投保人还是被保险人信息 signVal: '', - // 被保人签名信息 + // 被保险人签名信息 insuredSign: {}, // 投保人签名信息 appntSign: {}, @@ -57,7 +57,7 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, @@ -90,9 +90,9 @@ export default { } 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') { diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index cd946c445..13963a2b4 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -948,7 +948,7 @@ export default { params.orderDTO.appntDTO = this.userInfo let resultData = await saveOrUpdateOrderInfo(params) if (resultData.result == 0) { - //存储被保人信息 + //存储被保险人信息 // let age = utilsAge.getAge(this.userInfo.birthday, new Date()) // localStorage.saleInsuredInfo = JSON.stringify({ // birthday: this.userInfo.birthday, diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue index 2d7abe2ac..1c2a69732 100644 --- a/src/views/ebiz/sale/InsuredPerson.vue +++ b/src/views/ebiz/sale/InsuredPerson.vue @@ -682,7 +682,7 @@ export default { this.userInfo.name = name }, selectClick(index) { - // 投被保人不允许编辑 + // 投被保险人不允许编辑 if (this.isAppnt) { return } @@ -714,7 +714,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) @@ -740,7 +740,7 @@ export default { if (this.isAppnt && pickerType != '7') { return } - //pickerType 1、国家地区 2、证件类型 3、文化程度 4、有无社保(弃用) 5、税收居民身份 6、婚姻状况 7、被保人关系 + //pickerType 1、国家地区 2、证件类型 3、文化程度 4、有无社保(弃用) 5、税收居民身份 6、婚姻状况 7、被保险人关系 ;[this.popupShow, this.pickerType] = [true, pickerType] if (valueKey) this.valueKey = valueKey if (pickerType == '1') { @@ -1002,7 +1002,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) @@ -1022,7 +1022,7 @@ export default { this.$jump({ flag: 'navigation', extra: { - title: '被保人信息', + title: '被保险人信息', hiddenRight: '1' } }) @@ -1102,17 +1102,17 @@ export default { // 计算年龄 let age = utilsAge.getAge(this.userInfo.birthday, new Date()) - //投被保人关系是配偶 + //投被保险人关系是配偶 if (this.userInfo.relationToAppnt == '2') { - //投保人或者被保人不是已婚 + //投保人或者被保险人不是已婚 if (this.appntMarriage != '1' || this.userInfo.marriage != '1') { - return this.$toast('投被保人婚姻状况有误') + return this.$toast('投被保险人婚姻状况有误') } let insuredSex = this.userInfo.sex let appntSex = JSON.parse(localStorage.saleInsuredInfo).sex - //投被保人性别相同 + //投被保险人性别相同 if (insuredSex == appntSex) { - return this.$toast('被保人性别有误') + return this.$toast('被保险人性别有误') } } @@ -1194,7 +1194,7 @@ export default { } //如果是身份证，且未成年，则与投保人关系必须是子女关系 // if(age < 18 && this.userInfo.relationToAppnt != '4'){ - // return this.$toast('被保人小于18周岁，选择身份证时，与投保人关系必须为子女') + // return this.$toast('被保险人小于18周岁，选择身份证时，与投保人关系必须为子女') // } //证件类型是户口本 @@ -1243,7 +1243,7 @@ export default { //如果是已婚 if ((this.userInfo.sex == '0' && age < 22) || (this.userInfo.sex == '1' && age < 20)) { if (this.userInfo.marriage != '2') { - return this.$toast('被保人不符合国家婚姻法定年龄') + return this.$toast('被保险人不符合国家婚姻法定年龄') } } // this.save() @@ -1262,7 +1262,7 @@ export default { if (chooseProductCodes && chooseProductCodes.length) { //获取险种列表 // let chooseProductCodes = JSON.parse(localStorage.chooseProductCodes) - //取出local中的被保人信息 + //取出local中的被保险人信息 let saleInsuredPersonInfo = JSON.parse(localStorage.saleInsuredPersonInfo) //如果 性别, 出生日期, 有无社保, 职业 发生变化 console.log(this.userInfo, '这是userInfo') @@ -1312,8 +1312,8 @@ export default { params.orderDTO.insuredDTOs = [this.userInfo] let resultData = await saveOrUpdateOrderInfo(params) if (resultData.result == 0) { - //存储被保人信息 - //如果投被保人是同一个人, 更新投保人信息 + //存储被保险人信息 + //如果投被保险人是同一个人, 更新投保人信息 // if (this.userInfo.relationToAppnt == '1') { // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo) // } diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue index 1d744aad5..4105edc3b 100644 --- a/src/views/ebiz/sale/List.vue +++ b/src/views/ebiz/sale/List.vue @@ -368,10 +368,10 @@ export default { case '43': //未签名待客户确认, 跳到签名确认页面 url = '/sale/SignatureConfirmation?edit=1' break - case '35': //投保人保存成功, 跳到被保人页面-- + case '35': //投保人保存成功, 跳到被保险人页面-- url = '/sale/insuredPerson?edit=1' break - case '36': //被保人保存成功, 跳到已选产品列表 + case '36': //被保险人保存成功, 跳到已选产品列表 url = '/common/selectedProduct?edit=1' break case '37': //受益人保存成功, 跳到告知信息-- diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue index ba16305be..cea3c7cbc 100644 --- a/src/views/ebiz/sale/NotifyingMessage.vue +++ b/src/views/ebiz/sale/NotifyingMessage.vue @@ -12,7 +12,7 @@
- + {{ relationToAppnt == '1' ? '投保人/被保险人' + @@ -80,7 +80,7 @@
- +
{{ item.impartCode + '.' + item.impartContent }} @@ -130,15 +130,15 @@ export default { activeNames: [], // 投保人信息 saleInsuredInfo: {}, - // 被保人信息 + // 被保险人信息 saleInsuredPersonInfo: {}, - // 投被保人是否同人 1为同一个人 + // 投被保险人是否同人 1为同一个人 relationToAppnt: '', // 产品编码 productCodes: '', // 是否可以点击 isDisabled: false, - // 默认显示被保人根据后台返回 + // 默认显示被保险人根据后台返回 noRisk: false, //是否存在附加险 isExistAdditionalRisk: false, @@ -152,16 +152,16 @@ export default { impartTypeNumber: { '0': '投保人健康告知', '2': '投保人财务告知', - '1': '被保人健康告知', - '3': '被保人财务告知', + '1': '被保险人健康告知', + '3': '被保险人财务告知', '4': '投保人健康告知', - '5': '被保人健康告知', + '5': '被保险人健康告知', '6': '投保人财务告知', - '7': '被保人财务告知', + '7': '被保险人财务告知', '8': '投保人健康告知', '10': '投保人财务告知', - '9': '被保人健康告知', - '11': '被保人财务告知' + '9': '被保险人健康告知', + '11': '被保险人财务告知' } } }, @@ -169,7 +169,7 @@ export default { getOrderDetail({ orderNo: localStorage.orderNo }).then(res => { // getOrderDetail({ orderNo: `8186270000000036` }).then(res => { if (res.result == 0) { - //投被保人关系 + //投被保险人关系 this.isExistAdditionalRisk = res.orderDTO.insuredDTOs[0].riskDTOLst.length > 1 ? true : false console.log('this.is ====',this.isExistAdditionalRisk) this.relationToAppnt = res.orderDTO.insuredDTOs[0].relationToAppnt @@ -228,7 +228,7 @@ export default { if (items.extra3) { let obj = JSON.parse(items.extra3) if (obj.age && obj.sex == '') { - //被保人年纪大于2岁不显示该题 + //被保险人年纪大于2岁不显示该题 if (that.saleInsuredPersonAge > obj.age) { array.splice(index, 1, '') } @@ -241,7 +241,7 @@ export default { } }) } - // 被保人财务告知添加判断 + // 被保险人财务告知添加判断 if (item.impartType == 3 || item.impartType == 7 || item.impartType == 11) { item.impartItemDTOS.map((items, index, array) => { if (items.extra3) { @@ -365,7 +365,7 @@ export default { } }) }) - // 展示被保人项产品 noRis为true + // 展示被保险人项产品 noRis为true if (this.noRisk) { res.productImpartLstDTO.impartDTOS.map((item, index, array) => { if (item.impartType == '0') { @@ -377,7 +377,7 @@ export default { }) } if (this.relationToAppnt == '1') { - // 展示被保人项产品 noRis为true + // 展示被保险人项产品 noRis为true if (this.noRisk) { res.productImpartLstDTO.impartDTOS.map((item, index, array) => { if (item.impartType == '0') { @@ -442,7 +442,7 @@ export default { financeImpartDTO = item return financeImpartDTO } else if (item.impartType == '1' || item.impartType == '5' || item.impartType == '9') { - // 被保人健康 + // 被保险人健康 item.impartItemDTOS.map(i => { delete i.isSelect delete i.show @@ -455,7 +455,7 @@ export default { objInsured = item return objInsured } else if (item.impartType == '3' || item.impartType == '7' || item.impartType == '11') { - // 被保人财富 + // 被保险人财富 item.impartItemDTOS.map(i => { delete i.isSelect delete i.show @@ -478,7 +478,7 @@ export default { appntDTO: { impartDTO: obj }, - // 被保人 + // 被保险人 insuredDTOs: [{ impartDTO: objInsured, financeImpartDTO: financeImpart }] } } @@ -512,7 +512,7 @@ export default { impartDTO: obj, financeImpartDTO: financeImpartDTO }, - // 被保人 + // 被保险人 insuredDTOs: [{ impartDTO: objInsured }] } } @@ -546,7 +546,7 @@ export default { impartDTO: obj, financeImpartDTO: financeImpartDTO }, - // 被保人 + // 被保险人 insuredDTOs: [{ impartDTO: objInsured, financeImpartDTO: financeImpart }] } } diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 83e190d64..cb841cdae 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -75,7 +75,7 @@
- 被保人 + 被保险人 {{ item.name }}

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

@@ -157,7 +157,7 @@
- 被保人 + 被保险人 {{ item.name }}

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

@@ -240,17 +240,17 @@ export default { orderInfo: {}, // 投保人信息 appnt: {}, - // 被保人信息 + // 被保险人信息 insured: [], // 投保人签名阅读信息 appntSign: [], - // 被保人签名阅读信息 + // 被保险人签名阅读信息 insuredSign: [], // 折叠面板 activeNames: ['1', '2'], // 图片路径 src: this.$assetsUrl + 'images/u6490.png', - // 被保人信息 + // 被保险人信息 saleInsuredPersonInfo: {}, // 投保人信息 saleInsuredInfo: {}, @@ -260,13 +260,13 @@ export default { isShow: true, // 调微信人脸的token tokenInweixin: '', - // 投保人被保人是否同一个人 + // 投保人被保险人是否同一个人 relationToAppnt: '', // 微信分享校验值 signInvalid: '', // 微信分享链接是否失效 false 为未失效 true为已失效 isInvalid: false, - // 是谁分享的微信链接 1为被保人 0或2为投保人 + // 是谁分享的微信链接 1为被保险人 0或2为投保人 shareCode: '', // 是否从空签成功跳转过来 1为是 其他为不是 airSign: '', @@ -278,7 +278,7 @@ export default { idcardNumber: '' }, appntSignStatus: '', //投保人电子签名状态 - insuredSignStatus: '', //被保人电子签名状态 + insuredSignStatus: '', //被保险人电子签名状态 changeCard: localStorage.changeCard } }, @@ -336,7 +336,7 @@ export default { } }) if (sessionStorage.shareCode == '1') { - console.log('进来被保人') + console.log('进来被保险人') this.tipsName = JSON.parse(localStorage.saleInsuredPersonInfo).name } else { console.log('进来投保人') @@ -363,7 +363,7 @@ export default { }, // 人脸识别 start_ocr(val) { - // val 0投保人 1被保人 2本人 + // val 0投保人 1被保险人 2本人 let that = this if (this.isWeixin) { window.localStorage.setItem('sign-val', val) @@ -503,7 +503,7 @@ export default { share(code) { let shareName = '' if (code == '1') { - shareName = '被保人' + shareName = '被保险人' } else { shareName = '投保人' } @@ -734,11 +734,11 @@ export default { this.$toast.clear() this.$utils.intLocalStorage(res) - // 获取被保人信息recmd + // 获取被保险人信息recmd this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) // 获取投保人信息 this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo')) - this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保人关系赋值给页面 + this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保险人关系赋值给页面 this.riskName = res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName localStorage.riskName = this.riskName that.recmd = res.orderDTO.recmdDTO @@ -776,7 +776,7 @@ export default { that.appntSign.sort(function(a, b) { return a.key - b.key }) - //获取投保和被保人电子投保单签字状态 + //获取投保和被保险人电子投保单签字状态 that.appntSign.map(item => { // 判断是否双录 if (item.documentCode == '6') { @@ -869,7 +869,7 @@ export default { if (e) { // this.$toast.clear() // this.$toast('人脸检测成功') - // 1 为被保人 + // 1 为被保险人 if (window.sessionStorage.shareCode == '1') { this.insuredUrl() } else { @@ -895,11 +895,11 @@ export default { message: '当前投保单件需进行双录，请手动切换至双录系统，进行双录操作，完成后进行后续操作', showCancelButton: false }).then(() => { - // 获取投被保人是否同一个人 + // 获取投被保险人是否同一个人 that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt }) } else if (window.localStorage.getItem('jumpFromSign') == '1' || window.localStorage.getItem('attachmentShow') == '1') { - // 获取投被保人是否同一个人 + // 获取投被保险人是否同一个人 that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt } }, diff --git a/src/views/ebiz/sale/SignatureConfirmationOld.vue b/src/views/ebiz/sale/SignatureConfirmationOld.vue index 2c332886a..243f4cbd2 100644 --- a/src/views/ebiz/sale/SignatureConfirmationOld.vue +++ b/src/views/ebiz/sale/SignatureConfirmationOld.vue @@ -71,7 +71,7 @@
- 被保人 + 被保险人 {{ item.name }}

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

@@ -174,7 +174,7 @@
- 被保人 + 被保险人 {{ item.name }}

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

@@ -264,17 +264,17 @@ export default { orderInfo: {}, // 投保人信息 appnt: {}, - // 被保人信息 + // 被保险人信息 insured: [], // 投保人签名阅读信息 appntSign: {}, - // 被保人签名阅读信息 + // 被保险人签名阅读信息 insuredSign: {}, // 折叠面板 activeNames: ['1', '2'], // 图片路径 src: this.$assetsUrl + 'images/u6490.png', - // 被保人信息 + // 被保险人信息 saleInsuredPersonInfo: {}, // 投保人信息 saleInsuredInfo: {}, @@ -284,13 +284,13 @@ export default { isShow: true, // 调微信人脸的token tokenInweixin: '', - // 投保人被保人是否同一个人 + // 投保人被保险人是否同一个人 relationToAppnt: '', // 微信分享校验值 signInvalid: '', // 微信分享链接是否失效 false 为未失效 true为已失效 isInvalid: false, - // 是谁分享的微信链接 1为被保人 0或2为投保人 + // 是谁分享的微信链接 1为被保险人 0或2为投保人 shareCode: '', // 是否从空签成功跳转过来 1为是 其他为不是 airSign: '', @@ -588,7 +588,7 @@ export default { share(code) { let shareName = '' if (code == '1') { - shareName = '被保人' + shareName = '被保险人' } else { shareName = '投保人' } @@ -751,11 +751,11 @@ export default { if (res.result == '0') { this.$toast.clear() this.$utils.intLocalStorage(res) - // 获取被保人信息recmd + // 获取被保险人信息recmd this.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) // 获取投保人信息 this.saleInsuredInfo = JSON.parse(window.localStorage.getItem('saleInsuredInfo')) - this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保人关系赋值给页面 + this.relationToAppnt = this.saleInsuredPersonInfo.relationToAppnt //将缓存中的与被保险人关系赋值给页面 that.recmd = res.orderDTO.recmdDTO that.orderInfo = res.orderDTO.orderInfoDTO that.insured = res.orderDTO.insuredDTOs @@ -874,11 +874,11 @@ export default { message: '当前投保单件需进行双录，请手动切换至双录系统，进行双录操作，完成后进行后续操作', showCancelButton: false }).then(() => { - // 获取投被保人是否同一个人 + // 获取投被保险人是否同一个人 that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt }) } else if (window.localStorage.getItem('jumpFromSign') == '1' || window.localStorage.getItem('attachmentShow') == '1') { - // 获取投被保人是否同一个人 + // 获取投被保险人是否同一个人 that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt } }, diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue index 769671df3..d8704a8ca 100644 --- a/src/views/ebiz/sale/SignatureOfElectronic.vue +++ b/src/views/ebiz/sale/SignatureOfElectronic.vue @@ -65,7 +65,7 @@
- 被保人/监护人签名： + 被保险人/监护人签名：
{{ insuredSign.documentStatus == '2' ? '未签名' : '已签名' @@ -115,13 +115,13 @@ export default { Time: true, // 按钮是否可以点击 isDisable: true, - // 被保人是否可以点击 + // 被保险人是否可以点击 isDisableInsured: true, // 投保人签名阅读信息 appntSign: {}, - // 被保人签名阅读信息 + // 被保险人签名阅读信息 insuredSign: {}, - // 是投保人还是被保人 0 投保人 1被保人 2 投被同人 + // 是投保人还是被保险人 0 投保人 1被保险人 2 投被同人 signVal: '', // CA签字位置 caOffset: '-150', // 投保人签名位置 @@ -131,11 +131,11 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, - // 投被保人是否同人 1为投被同人，其他为不是 + // 投被保险人是否同人 1为投被同人，其他为不是 relationToAppnt: '', // 是否在微信 isWeixin, @@ -565,12 +565,12 @@ export default { } } } else { - // 在微信被保人 + // 在微信被保险人 if (this.isWeixin) { this.toAirSign('1', '法定监护人', '10', '4') } else { - // 不在微信被保人 - console.log('被保人签名') + // 不在微信被保险人 + console.log('被保险人签名') EWebBridge.webCallAppInJs('ca_sign', { //身份证号码 number: that.saleInsuredPersonInfo.idNo, @@ -838,9 +838,9 @@ export default { // 不在微信且不是回执签收 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() diff --git a/src/views/ebiz/sale/SignatureOfNotice.vue b/src/views/ebiz/sale/SignatureOfNotice.vue index 26026040e..be52c1979 100644 --- a/src/views/ebiz/sale/SignatureOfNotice.vue +++ b/src/views/ebiz/sale/SignatureOfNotice.vue @@ -70,13 +70,13 @@ export default { Time: true, // 按钮是否可以点击 isDisable: true, - // 被保人是否可以点击 + // 被保险人是否可以点击 isDisableInsured: true, // 投保人签名阅读信息 appntSign: {}, - // 被保人签名阅读信息 + // 被保险人签名阅读信息 insuredSign: {}, - // 是投保人还是被保人 0 投保人 1被保人 2 投被同人 + // 是投保人还是被保险人 0 投保人 1被保险人 2 投被同人 signVal: '', // 图片路径 url: '', @@ -84,11 +84,11 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, - // 投被保人是否同人 1为投被同人，其他为不是 + // 投被保险人是否同人 1为投被同人，其他为不是 relationToAppnt: '', // 是否在微信 isWeixin, @@ -531,9 +531,9 @@ export default { } if (this.detailJump != '1') { - // 投被保人是否同人 + // 投被保险人是否同人 that.relationToAppnt = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')).relationToAppnt - // 获取被保人信息 + // 获取被保险人信息 that.saleInsuredPersonInfo = JSON.parse(window.localStorage.getItem('saleInsuredPersonInfo')) } }, diff --git a/src/views/ebiz/sale/identityCardScan.vue b/src/views/ebiz/sale/identityCardScan.vue index 7eea649a6..af2840212 100644 --- a/src/views/ebiz/sale/identityCardScan.vue +++ b/src/views/ebiz/sale/identityCardScan.vue @@ -59,7 +59,7 @@ export default { imgFront: this.$assetsUrl + 'images/idCardFront.png', // 身份证背面 imgBack: this.$assetsUrl + 'images/idCardBack.png', - // 是否是投保人还是被保人扫描 + // 是否是投保人还是被保险人扫描 scanFromInsured: '', // 上传结果 state: '', diff --git a/src/views/ebiz/sale/js/methods.js b/src/views/ebiz/sale/js/methods.js index 5bce49796..da4406408 100644 --- a/src/views/ebiz/sale/js/methods.js +++ b/src/views/ebiz/sale/js/methods.js @@ -11,7 +11,7 @@ export function selectComp(that, index, type = '') { //投保人 localStorage.scanFromInsured = 'true' } else if (type == '2') { - //被保人 + //被保险人 localStorage.scanFromInsured = 'false' } ;[that.isScan, title] = [true, '身份证扫描'] @@ -49,7 +49,7 @@ function closeBtn(that) { * * @param {*} that 上下文 * @param {*} data 扫描数据 - * @param {*} type 1 投保人 2 被保人 + * @param {*} type 1 投保人 2 被保险人 */ export function getIdentityInfo(that, data, type) { console.log(data) @@ -84,7 +84,7 @@ export function getIdentityInfo(that, data, type) { } } that.isScan = false - let title = type == '1' ? '投保人信息' : '被保人信息' + let title = type == '1' ? '投保人信息' : '被保险人信息' that.$jump({ flag: 'navigation', extra: { diff --git a/src/views/ebiz/sale/productTip.vue b/src/views/ebiz/sale/productTip.vue index 80ff15253..830d3d85c 100644 --- a/src/views/ebiz/sale/productTip.vue +++ b/src/views/ebiz/sale/productTip.vue @@ -30,7 +30,7 @@ export default { data() { let isWeixin = this.$utils.device().isWeixin //判断环境 return { - // 投保人还是被保人信息 + // 投保人还是被保险人信息 signVal: '', // 投保人签名信息 appntSign: {}, @@ -54,7 +54,7 @@ export default { base64: '', // 是否可以点击 isDisabledComplite: true, - // local带来的被保人信息 + // local带来的被保险人信息 saleInsuredPersonInfo: {}, // local带来的投保人信息 saleInsuredInfo: {}, @@ -89,9 +89,9 @@ export default { } 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') { diff --git a/src/views/ebiz/serve/AirSign.vue b/src/views/ebiz/serve/AirSign.vue index d00a53fb4..e0f4c5ec9 100644 --- a/src/views/ebiz/serve/AirSign.vue +++ b/src/views/ebiz/serve/AirSign.vue @@ -43,7 +43,7 @@ export default { OrderInfoDTO: {}, // 投保人信息 appntDTO: {}, - // 被保人信息 + // 被保险人信息 insuredDTOs: [], // 保单号 contNo: '', @@ -123,7 +123,7 @@ export default { this.filterData(dataDictionary.sex, 'sex', appntDTO) this.filterData(dataDictionary.idType, 'idType', appntDTO) that.appntDTO = appntDTO - // 被保人信息 + // 被保险人信息 res.content.insuredDTOs.map(insured => { insured.riskDTOLst.map(risk => { Number(risk.payIntv) diff --git a/src/views/ebiz/serve/Detail.vue b/src/views/ebiz/serve/Detail.vue index b0ac88151..573a7bb85 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -23,9 +23,9 @@ - +
- + @@ -43,7 +43,7 @@
- + @@ -99,7 +99,7 @@ export default { OrderInfoDTO: {}, // 投保人信息 appntDTO: {}, - // 被保人信息 + // 被保险人信息 insuredDTOs: [], // 保单号 contNo: '', @@ -157,7 +157,7 @@ export default { 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) diff --git a/src/views/ebiz/serve/List.vue b/src/views/ebiz/serve/List.vue index 01100bb49..cee1cc356 100644 --- a/src/views/ebiz/serve/List.vue +++ b/src/views/ebiz/serve/List.vue @@ -2,7 +2,7 @@
- +
From 0343aeb2a4aed6dbb350d453b1ffefb1a3383491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 13 Mar 2020 10:18:11 +0800 Subject: [PATCH 03/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=99=A9=E7=A7=8D=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E7=AD=BE=E5=90=8D=E9=A1=B5=E7=89=B9=E5=88=AB?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B7=BB=E5=8A=A0=20--=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/AddRiskList.vue | 1 + src/views/ebiz/common/CalculatePremium.vue | 20 ++++++++++--------- src/views/ebiz/common/MainRiskList.vue | 1 + src/views/ebiz/sale/SignatureConfirmation.vue | 11 ++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/views/ebiz/common/AddRiskList.vue b/src/views/ebiz/common/AddRiskList.vue index 6a15b5ea4..5abe3d653 100644 --- a/src/views/ebiz/common/AddRiskList.vue +++ b/src/views/ebiz/common/AddRiskList.vue @@ -122,6 +122,7 @@ export default { let currentProductInfo = { calFactorLst, isMainRisk: 1, + hint: resultData.hint, riskType: resultData.riskType, riskName: this.result.riskName, productCode: this.result.productCode, diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index e9a1e3a10..bee47e640 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -488,17 +488,18 @@ export default { return } let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex].rules[dutyItemIndex] + let showHint = this.chooseProducts[productIndex].hint if (value < min || value > max) { - this.$toast(localStorage.hint) + this.$toast(showHint) } else { if ((Number(value) * 10000) % (Number(currentEle.limit) * 10000) != 0) { Dialog.alert({ - message: localStorage.hint + message: showHint }).then(() => { currentEle.defaultDutyAmt = currentEle.minDutyAmt }) - // this.$toast(localStorage.hint) + // this.$toast(showHint) } else { // this.mainRiskInfluenceAddRisk() // currentEle['amt'] = Number(defalutValue) * Number(currentEle.moneyUnit) @@ -1071,18 +1072,19 @@ export default { : this.chooseProducts[productIndex].calFactorLst[calFactorIndex] //改动原因：孝心保产品有对年龄的特殊要求 //添加判断，是否是孝心保产品 + let showHint = this.chooseProducts[productIndex].hint let productCode = localStorage.trialList == '' ? '' : JSON.parse(localStorage.trialList)[0].productCode if (productCode == 'GFRS_M0014') { //被保险人年龄如果在50-65区间 if (this.saleInsuredPersonInfo.age >= 50 && this.saleInsuredPersonInfo.age <= 65) { //使用rules规则里的第二条控制保额份数 if (Number(defalutValue) < Number(riskFactor.rules[1].minPrem) || Number(defalutValue) > Number(riskFactor.rules[1].maxPrem)) { - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { this.mainRiskInfluenceAddRisk() @@ -1094,12 +1096,12 @@ export default { } else if (this.saleInsuredPersonInfo.age >= 66 && this.saleInsuredPersonInfo.age <= 75) { //使用rules规则里的第一条控制保额份数 if (Number(defalutValue) < Number(riskFactor.rules[0].minPrem) || Number(defalutValue) > Number(riskFactor.rules[0].maxPrem)) { - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // this.defalutAmt = currentEle.rules[productIndex].displayAmount - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { this.mainRiskInfluenceAddRisk() @@ -1144,12 +1146,12 @@ export default { } } else { if (Number(defalutValue) < Number(min) || Number(defalutValue) > Number(max)) { - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { if ((Number(defalutValue) * 10000) % (Number(currentEle.limit) * 10000) != 0) { // defalutValue = currentEle.rules[productIndex].displayAmount - this.$toast(localStorage.hint) + this.$toast(showHint) this.nextStepFlag = true } else { this.mainRiskInfluenceAddRisk() diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index b5922a808..d2e611839 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -171,6 +171,7 @@ export default { calFactorLst, hasAddtionRisk, isMainRisk: 0, + hint: resultData.hint, riskType: resultData.riskType, riskName: this.result.riskName, productCode: this.result.riskProductCode, diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index cb841cdae..431af6fb4 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -729,6 +729,17 @@ export default { : '您以无社保身份投保，理赔时，若未通过社会基本医疗保险或者公费医疗就诊并结算的，意外伤害医疗保险金的赔付比例和免赔额分别70%，100元；理赔时，若通过社会基本医疗保险或者公费医疗就诊并结算的，意外伤害医疗保险金的赔付比例为90%，免赔额为0元。' Dialog({ message }) } + } else { + // 附加住院医疗险 GFRS_A0004 + if ( + !!res.orderDTO.productDTO && + !!res.orderDTO.productDTO.special && + !!res.orderDTO.productDTO.special.content && + res.orderDTO.productDTO.special.content !== '' + ) { + const message = res.orderDTO.productDTO.special.content + Dialog({ message }) + } } localStorage.setItem('lastOrderNo', data.orderNo) From 2fb0da3cd7d2586faa85e1e691491c93ab1a2deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 13 Mar 2020 13:12:10 +0800 Subject: [PATCH 04/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E4=BF=AE=E6=94=B9=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?= =?UTF-8?q?=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 174 +++++++++++++++------ 1 file changed, 127 insertions(+), 47 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index bee47e640..ca6ad1934 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -77,7 +77,7 @@ :show-minus="false" class="ml10 mr10" @focus="focusStep" - @blur="blurStep(dutyItem)" + @blur="blurStep(dutyItem, index)" @change=" dutyStepperChange( item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt, @@ -163,7 +163,7 @@ :show-minus="false" class="ml10 mr10" @focus="focusStep" - @blur="blurStep(dutyItem)" + @blur="blurStep(dutyItem, index)" @change=" dutyStepperChange( item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt, @@ -216,7 +216,7 @@ class="ml10 mr10" :disabled="dutyItem.changeWithMainRisk === true ? 'disabled' : ''" @focus="focusStep" - @blur="blurStep(dutyItem)" + @blur="blurStep(dutyItem, index)" @change=" dutyStepperChange( item.calFactorLst[riskFactorIndex].rules[dutyItemIndex].defaultDutyAmt, @@ -407,25 +407,52 @@ export default { // } // }) // } - //保存险种编号 - this.mainRiskCode = item.mainRiskCode + //保存主险险种编号 + if (item.isMainRisk == 0) { + this.mainRiskCode = item.mainRiskCode + } }) //GFRS_M0016需要展示免赔额和赔付比例，并需要根据是否有社保调整数值 // let mainRiskCode = chooseProducts[0].mainRiskCode + // eslint-disable-next-line no-unused-vars + this.dogetLimitAndGetRate().then(res => { + if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) { + this.influences = this.chooseProducts[0].influences + this.chooseProducts[0].influences.forEach(item => { + this.influenceAddRiskCodes.push(item.productCode) + }) + } + this.mainRiskInfluenceAddRisk() + //初始化数据试算 + this.getTrial() + }) + }, + //特殊处理 GFRS_M0016 GFRS_A0004 GFRS_A0005 赔付比例处理 + async dogetLimitAndGetRate() { + const orderNo = localStorage.getItem('orderNo') + let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : await getOrderDetail({ orderNo }) this.chooseProducts.map(item => { - if (item.mainRiskCode === 'GFRS_M0016') { - const orderNo = localStorage.getItem('orderNo') - let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : getOrderDetail({ orderNo }) - detailPromise.then(res => { - let isMedical = null - if (this.isFrom === 'proposal') { - isMedical = res === '1' - } else { - isMedical = res.orderDTO.insuredDTOs[0].medical === '0' + if (!(item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005')) { + //其他产品删掉两个字段 + let calFactorLst = item.calFactorLst + for (let i = calFactorLst.length - 1; i >= 0; i--) { + let item = calFactorLst[i] + if (item.code === 'getLimit' || item.code === 'getRate') { + calFactorLst.splice(i, 1) } - //根据社保写死两个字段 赔付比例和免赔额 - item.calFactorLst.map(i => { - //免赔额 + } + return + } + if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004') { + let isMedical = null + if (this.isFrom === 'proposal') { + isMedical = detailPromise === '1' + } else { + isMedical = detailPromise.orderDTO.insuredDTOs[0].medical === '0' + } + //根据社保写死两个字段 赔付比例和免赔额 + item.calFactorLst.map(i => { + if (item.mainRiskCode === 'GFRS_M0016') { if (i.code === 'getLimit') { const text = isMedical ? '0元（意外医疗）' : '100元（意外医疗）' const value = isMedical ? '0' : '100' @@ -451,38 +478,46 @@ export default { i.getRate = value i.columns = [{ text, value }] } - }) - this.$forceUpdate() - }) - } else { - //其他产品删掉两个字段 - let calFactorLst = item.calFactorLst - for (let i = calFactorLst.length - 1; i >= 0; i--) { - let item = calFactorLst[i] - if (item.code === 'getLimit' || item.code === 'getRate') { - calFactorLst.splice(i, 1) + } else if (item.productCode === 'GFRS_A0004') { + if (i.code === 'getLimit') { + const text2 = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' + const value2 = isMedical ? '0' : '100' + + //保存数据 + this.medicalInfo = this.medicalInfo || {} + this.medicalInfo.getLimit = text2 + + i.showContent = text2 + i.getLimit = value2 + i.columns = [{ text2, value2 }] + } + //赔付比例 + if (i.code === 'getRate') { + const text = isMedical ? '80%（住院医疗）' : '60%（住院医疗）' + const value = isMedical ? '0.8' : '0.6' + + //保存数据 + this.medicalInfo = this.medicalInfo || {} + this.medicalInfo.getRate = text + + i.showContent = text + i.getRate = value + i.columns = [{ text, value }] + } + } else if (item.productCode === 'GFRS_A0005') { + // 设置默认值？ } - } + }) + this.$forceUpdate() } }) - - // this.influenceAddRiskCodes - - if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) { - this.influences = this.chooseProducts[0].influences - this.chooseProducts[0].influences.forEach(item => { - this.influenceAddRiskCodes.push(item.productCode) - }) - } - - this.mainRiskInfluenceAddRisk() - //初始化数据试算 - this.getTrial() }, // 责任保额份数变化 dutyStepperChange(value, productIndex, calFactorIndex, dutyItemIndex, isChecked, min, max) { //这个险种使用其他验证方式 - if (this.mainRiskCode === 'GFRS_M0016') return + if (this.chooseProducts[productIndex].productCode === 'GFRS_M0016') return + // 004险种其他验证方式 + if (this.chooseProducts[productIndex].productCode === 'GFRS_A0004') return if (this.chooseProducts[productIndex].productCode === 'GFRS_A0003') { this.getTrial() return @@ -594,15 +629,20 @@ export default { ].rules[dutyItemIndex]['necess'] return false } - this.valiAndSend(dutyItem) + this.valiAndSend(dutyItem, productIndex) }, - valiAndSend(dutyItem) { + valiAndSend(dutyItem, productIndex) { //验证责任 + let validateRiskCode = this.chooseProducts[productIndex].productCode + let showHint = this.chooseProducts[productIndex].hint let inputValue = dutyItem.defaultDutyAmt, duty = dutyItem.duty - if (this.mainRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) { + if (validateRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) { //验证不通过 return + } else if (validateRiskCode === 'GFRS_A0004' && duty == '210100' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { + //验证不通过 险种为GFRS_A0004 责任编码为320205 + return } else { this.mainRiskInfluenceAddRisk() this.getTrial() @@ -612,13 +652,13 @@ export default { focusStep() { this.nextStepFlag = true }, - blurStep(dutyItem) { + blurStep(dutyItem, productIndex) { this.nextStepFlag = false //失去焦点时做验证 if (dutyItem.necess) { //勾选时才做验证 - this.valiAndSend(dutyItem) + this.valiAndSend(dutyItem, productIndex) } }, //险种GFRS_M0016的责任的验证规则 @@ -638,6 +678,27 @@ export default { } } }, + //险种 GFRS_A0004 险种验证规则 + valiA0004Duty(value, showHint, currentEle) { + // 保额只能为5000 10000 15000 200000 + if (currentEle.duty == '210100') { + if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { + this.$toast(showHint) + this.nextStepFlag = true + return false + } + if (this.mainRiskCode === 'GFRS_M0005') { + if (!(value == '0.5' || value == '1')) { + this.$toast(showHint) + this.nextStepFlag = true + return false + } + } + this.nextStepFlag = false + return true + } + return true + }, /********start 通用规则、特殊规则处理 start******/ //通用规则1：交费方式为一次交情，无交费期限 hiddenPayEndYear(currentEle) { @@ -1183,6 +1244,25 @@ export default { } } + //GFRS_A0004需要验证责任 + for (let m = 0; m < this.chooseProducts.length; m++) { + if (this.chooseProducts[m].productCode == 'GFRS_A0004') { + let showHint = this.chooseProducts[m].hint + let calFactorLst = this.chooseProducts[m].calFactorLst + for (let i = 0; i < calFactorLst.length; i++) { + if (calFactorLst[i].code === 'dutyGroup') { + let duties = calFactorLst[i].rules + for (let j = 0; j < duties.length; j++) { + let item = duties[j] + if (!this.valiA0004Duty(item.defaultDutyAmt, showHint, item)) { + return + } + } + } + } + } + } + //组装险种提交数据 let [mainRiskCode, riskDTOLst] = ['', []] let rollInResult = '' //校验预计转入保费结果 From d4709a13293dcb7034a5b45c00cb4ab33937b825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 13 Mar 2020 13:41:00 +0800 Subject: [PATCH 05/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=B4=A3=E4=BB=BB=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E?= =?UTF-8?q?=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index ca6ad1934..7d8e0d83b 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -640,7 +640,7 @@ export default { if (validateRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) { //验证不通过 return - } else if (validateRiskCode === 'GFRS_A0004' && duty == '210100' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { + } else if (validateRiskCode === 'GFRS_A0004' && duty == '320205' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { //验证不通过 险种为GFRS_A0004 责任编码为320205 return } else { @@ -681,7 +681,7 @@ export default { //险种 GFRS_A0004 险种验证规则 valiA0004Duty(value, showHint, currentEle) { // 保额只能为5000 10000 15000 200000 - if (currentEle.duty == '210100') { + if (currentEle.duty == '320205') { if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { this.$toast(showHint) this.nextStepFlag = true From 69ec3cc22ab0ac1122bb23004f486755706c1026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 13 Mar 2020 15:54:41 +0800 Subject: [PATCH 06/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=A2=AB=E4=BF=9D=E4=BA=BA=E8=81=8C=E4=B8=9A=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=81=8C=E4=B8=9A=E7=BC=96=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E?= =?UTF-8?q?=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 7d8e0d83b..ff7bf20a4 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -1075,15 +1075,27 @@ export default { // trialInfo.duty = [{ dutyCode: trialInfo.duty }] // } //获取投被保生日、性别 - let birthday, sex + let birthday, sex, occupationCode, occupationName if (item.isRemit == '0' && item.remitType == '0') { - ;[birthday, sex] = [this.saleInsuredInfo.birthday, this.saleInsuredInfo.sex] + ;[birthday, sex, occupationCode, occupationName] = [ + this.saleInsuredInfo.birthday, + this.saleInsuredInfo.sex, + this.saleInsuredInfo.occupationCode, + this.saleInsuredInfo.occupationName + ] } else { - ;[birthday, sex] = [this.saleInsuredPersonInfo.birthday, this.saleInsuredPersonInfo.sex] + ;[birthday, sex, occupationCode, occupationName] = [ + this.saleInsuredPersonInfo.birthday, + this.saleInsuredPersonInfo.sex, + this.saleInsuredPersonInfo.occupationCode, + this.saleInsuredPersonInfo.occupationName + ] } trialInfo = Object.assign(trialInfo, { birthday, sex, + occupationCode, + occupationName, platformType: 'app', productCode: item.productCode, medical: JSON.parse(localStorage.getItem('saleInsuredPersonInfo')).medical From 7aa2822382ef15d890cdb36474ba39d316a18b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Sun, 15 Mar 2020 19:38:44 +0800 Subject: [PATCH 07/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=B4=A3=E4=BB=BB=E6=A3=80=E9=AA=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 36 +++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index ff7bf20a4..7a9b3966f 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -307,6 +307,18 @@ const dutyRules = { msg: '意外住院津贴日额最低基本保险金额为10元/天，超过最低基本保险金额为10元/天整数倍，最高不得超过200元/天' } } +const dutyGFRS_A0004Rules = { + 320205: { + mainRisk: 'GFRS_M0005', + msg: '住院医疗保险金额为5000、10000、15000、20000元，与GFRS_M0005险种搭配金额不得大于10000元' + }, + 320206: { + msg: '住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + }, + 320207: { + msg: '恶性肿瘤住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + } +} const DUTY_DEFAULT_MUTIPLE = 1000 const DUTY_DEFAULT_MIN = 10000 @@ -640,7 +652,7 @@ export default { if (validateRiskCode === 'GFRS_M0016' && !this.valiDuty(inputValue, duty)) { //验证不通过 return - } else if (validateRiskCode === 'GFRS_A0004' && duty == '320205' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { + } else if (validateRiskCode === 'GFRS_A0004' && !this.valiA0004Duty(inputValue, showHint, dutyItem)) { //验证不通过 险种为GFRS_A0004 责任编码为320205 return } else { @@ -680,16 +692,26 @@ export default { }, //险种 GFRS_A0004 险种验证规则 valiA0004Duty(value, showHint, currentEle) { - // 保额只能为5000 10000 15000 200000 - if (currentEle.duty == '320205') { - if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { - this.$toast(showHint) + // 验证其他 最小50 其他为50 10 倍数 + if (currentEle.duty == '320206' || currentEle.duty == '320207') { + let numberValue = Number(value) + if ((numberValue * 10000) % 10 != 0 || numberValue < 50) { + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) this.nextStepFlag = true return false } - if (this.mainRiskCode === 'GFRS_M0005') { + } + + // 保额只能为5000 10000 15000 200000 + if (currentEle.duty == '320205') { + if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.nextStepFlag = true + return false + } + if (this.mainRiskCode === dutyGFRS_A0004Rules[currentEle.duty]['mainRisk']) { if (!(value == '0.5' || value == '1')) { - this.$toast(showHint) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) this.nextStepFlag = true return false } From e3f93e3001b2ddc5d3b3d3b7562d58c163792488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 10:03:02 +0800 Subject: [PATCH 08/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E8=B4=A3=E4=BB=BB=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?= =?UTF-8?q?=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 7a9b3966f..d3c955392 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -310,13 +310,14 @@ const dutyRules = { const dutyGFRS_A0004Rules = { 320205: { mainRisk: 'GFRS_M0005', - msg: '住院医疗保险金额为5000、10000、15000、20000元，与GFRS_M0005险种搭配金额不得大于10000元' + msg: '住院医疗提示：金额只能是0.5、1、1.5、2', + msg_1: '附加到国富人寿国富民惠医疗保险（2020版）最高基本保额不超过1万元。' }, 320206: { - msg: '住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + msg: '住院津贴提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍' }, 320207: { - msg: '恶性肿瘤住院津贴保险金额最低为50元，超过最低基本保险金额为10元整数倍' + msg: '恶性肿瘤提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍' } } const DUTY_DEFAULT_MUTIPLE = 1000 @@ -492,16 +493,15 @@ export default { } } else if (item.productCode === 'GFRS_A0004') { if (i.code === 'getLimit') { - const text2 = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' - const value2 = isMedical ? '0' : '100' - + const text = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' + const value = isMedical ? '0' : '100' //保存数据 this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getLimit = text2 + this.medicalInfo.getLimit = text - i.showContent = text2 - i.getLimit = value2 - i.columns = [{ text2, value2 }] + i.showContent = text + i.getLimit = value + i.columns = [{ text, value }] } //赔付比例 if (i.code === 'getRate') { @@ -696,7 +696,7 @@ export default { if (currentEle.duty == '320206' || currentEle.duty == '320207') { let numberValue = Number(value) if ((numberValue * 10000) % 10 != 0 || numberValue < 50) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg) this.nextStepFlag = true return false } @@ -705,13 +705,13 @@ export default { // 保额只能为5000 10000 15000 200000 if (currentEle.duty == '320205') { if (!(value == '0.5' || value == '1' || value == '1.5' || value == '2')) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg) this.nextStepFlag = true return false } if (this.mainRiskCode === dutyGFRS_A0004Rules[currentEle.duty]['mainRisk']) { if (!(value == '0.5' || value == '1')) { - this.$toast(dutyGFRS_A0004Rules[currentEle.duty]['msg']) + this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg_1) this.nextStepFlag = true return false } From c73212c477815b3e162b30e493d58535f15e1b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 10:36:26 +0800 Subject: [PATCH 09/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E7=AD=BE=E5=90=8D=E9=A1=B5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9=E3=80=81=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E4=B9=A6=E7=A4=BE=E4=BF=9D=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?= =?UTF-8?q?=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 6 +++--- src/views/ebiz/proposal/InsuredPerson.vue | 3 ++- src/views/ebiz/sale/SignatureConfirmation.vue | 15 ++++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index d3c955392..0e82a0c32 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -443,7 +443,7 @@ export default { //特殊处理 GFRS_M0016 GFRS_A0004 GFRS_A0005 赔付比例处理 async dogetLimitAndGetRate() { const orderNo = localStorage.getItem('orderNo') - let detailPromise = this.isFrom === 'proposal' ? new Promise(r => r(localStorage.getItem('proposalMedical'))) : await getOrderDetail({ orderNo }) + let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo }) this.chooseProducts.map(item => { if (!(item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005')) { //其他产品删掉两个字段 @@ -459,9 +459,9 @@ export default { if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004') { let isMedical = null if (this.isFrom === 'proposal') { - isMedical = detailPromise === '1' + isMedical = detailPromise == '1' } else { - isMedical = detailPromise.orderDTO.insuredDTOs[0].medical === '0' + isMedical = detailPromise.orderDTO.insuredDTOs[0].medical == '0' } //根据社保写死两个字段 赔付比例和免赔额 item.calFactorLst.map(i => { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index bfd32f9b7..c1b768806 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -225,8 +225,9 @@ export default { //点击下一步 nextStep() { //保存有没有社保，在保费计算用到 - localStorage.setItem('proposalMedical', this.insured.medical === '0' ? '1' : '0') + //localStorage.setItem('proposalMedical', this.insured.medical == '0' ? '1' : '0') + localStorage.proposalMedical = this.insured.medical == '0' ? '1' : '0' this.insured.age = String(this.insured.age) let cacheSex = JSON.parse(localStorage.proposalAppnt).sex let localSex = this.insured.sex diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue index 431af6fb4..77cf10e71 100644 --- a/src/views/ebiz/sale/SignatureConfirmation.vue +++ b/src/views/ebiz/sale/SignatureConfirmation.vue @@ -450,7 +450,7 @@ export default { } } } - /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') { + /* if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') { if (that.appntSign[0].documentStatus == 0) { path = 'insuranceInformation' } else if (that.appntSign[1].documentStatus == 2) { @@ -720,7 +720,16 @@ export default { const mainRiskCode = res.orderDTO.insuredDTOs[0].riskDTOLst[0].mainRiskCode // const isShowDialog = mainRiskCode === 'GFRS_M0005' || mainRiskCode === 'GFRS_M0016' const isShowDialog = mainRiskCode === 'GFRS_M0016' - if (isShowDialog) { + if ( + !!res.orderDTO.productDTO && + !!res.orderDTO.productDTO.special && + !!res.orderDTO.productDTO.special.content && + res.orderDTO.productDTO.special.content !== '' + ) { + const message = res.orderDTO.productDTO.special.content + Dialog({ message }) + } + /* if (isShowDialog) { //记录每次弹框的订单号。再次进入页面，订单号改变才会弹窗。 let lastOrderNo = localStorage.lastOrderNo if (lastOrderNo !== data.orderNo) { @@ -740,7 +749,7 @@ export default { const message = res.orderDTO.productDTO.special.content Dialog({ message }) } - } + }*/ localStorage.setItem('lastOrderNo', data.orderNo) this.$toast.clear() From fd6d3138d911e919327be0ec19d147091ade5ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 11:40:24 +0800 Subject: [PATCH 10/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E8=B4=A3=E4=BB=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 36 +++++++++++----------- src/views/ebiz/common/CalculatePremium.vue | 3 ++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 9e97c9471..88014c8e5 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -165,19 +165,19 @@ export default { id: 6, text: '台湾居民来往大陆通行证' }, - { + /* { id: 7, text: '其他', disabled: true + }*/ + { + id: 8, + text: '外国人永久居留身份证' + }, + { + id: 9, + text: '港澳台居民居住证' } - // { - // id: 8, - // text: '外国人永久居留身份证' - // }, - // { - // id: 9, - // text: '港澳台居民居住证' - // } ], //投保人证件类型 insuredIdType: [ @@ -207,19 +207,19 @@ export default { id: 6, text: '台湾居民来往大陆通行证' }, - { + /* { id: 7, text: '其他', disabled: true + }*/ + { + id: 8, + text: '外国人永久居留身份证' + }, + { + id: 9, + text: '港澳台居民居住证' } - // { - // id: 8, - // text: '外国人永久居留身份证' - // }, - // { - // id: 9, - // text: '港澳台居民居住证' - // } ], //出生证明 birthType: [ diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 0e82a0c32..18fe1eefd 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -692,6 +692,9 @@ export default { }, //险种 GFRS_A0004 险种验证规则 valiA0004Duty(value, showHint, currentEle) { + if (!currentEle.necess) { + return true + } // 验证其他 最小50 其他为50 10 倍数 if (currentEle.duty == '320206' || currentEle.duty == '320207') { let numberValue = Number(value) From 65c1d4ccd155d5c5383d530a456fa1d6786c2e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 11:59:07 +0800 Subject: [PATCH 11/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E8=B4=A3=E4=BB=BB=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E9=AA=8C=E8=AF=81=E8=B0=83=E6=95=B4=20--=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 18fe1eefd..0e5c01ef5 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -692,13 +692,14 @@ export default { }, //险种 GFRS_A0004 险种验证规则 valiA0004Duty(value, showHint, currentEle) { - if (!currentEle.necess) { + /* if (!(currentEle.necess == true)) { + this.nextStepFlag = false return true - } + }*/ // 验证其他 最小50 其他为50 10 倍数 if (currentEle.duty == '320206' || currentEle.duty == '320207') { - let numberValue = Number(value) - if ((numberValue * 10000) % 10 != 0 || numberValue < 50) { + let numberValue = Number(value) * 10000 + if (numberValue % 10 != 0 || numberValue < 50) { this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg) this.nextStepFlag = true return false @@ -722,6 +723,7 @@ export default { this.nextStepFlag = false return true } + this.nextStepFlag = false return true }, /********start 通用规则、特殊规则处理 start******/ From 3a7402de9fc1f1dc2e19464366ce551e785ff530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 15:45:33 +0800 Subject: [PATCH 12/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=B8=BB=E9=99=A9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=90=86=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/MainRiskList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue index d2e611839..3bd5b3641 100644 --- a/src/views/ebiz/common/MainRiskList.vue +++ b/src/views/ebiz/common/MainRiskList.vue @@ -156,6 +156,7 @@ export default { calFactorLst, hasAddtionRisk, isMainRisk: 0, + hint: resultData.hint, riskType: resultData.riskType, riskName: this.result.riskName, productCode: this.result.riskProductCode, From efaeef9c9b020a4a82d595f4ca89872d798ecb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Mon, 16 Mar 2020 15:56:18 +0800 Subject: [PATCH 13/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20norisk=E5=88=A4=E6=96=AD=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3?= =?UTF-8?q?=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/sale/NotifyingMessage.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue index cea3c7cbc..322c24f1d 100644 --- a/src/views/ebiz/sale/NotifyingMessage.vue +++ b/src/views/ebiz/sale/NotifyingMessage.vue @@ -360,7 +360,7 @@ export default { im.questions.push(obj) } } - if (im.extra4 == 'noRisk' && this.isExistAdditionalRisk == false) { + if (this.noRisk == false && im.extra4 == 'noRisk') { this.noRisk = true } }) @@ -377,7 +377,7 @@ export default { }) } if (this.relationToAppnt == '1') { - // 展示被保险人项产品 noRis为true + // 展示被保险人项产品 noRis为true 保障型：去除投保人告知，其他不变 if (this.noRisk) { res.productImpartLstDTO.impartDTOS.map((item, index, array) => { if (item.impartType == '0') { @@ -388,6 +388,7 @@ export default { } }) } else { + // 展示被保险人项产品 noRis为false 保障型、意外型：去除被保人告知，其他不变 res.productImpartLstDTO.impartDTOS.map((item, index, array) => { if (item.impartType == '1' || item.impartType == '5') { array.splice(index, 1) From 9c5eaee837b57e3306af36d40cadec0cb8d10753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Tue, 17 Mar 2020 13:22:49 +0800 Subject: [PATCH 14/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/utils/data-dictionary.js | 15 ++++++++++++++ src/views/ebiz/proposal/Exhibition.vue | 28 +++++++++++++++----------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 88014c8e5..e57115c4d 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -911,6 +911,21 @@ export default { shortName: '万能险', name: '国富人寿鑫管家终身寿险（万能型）', code: 'GFRS_M0017' + }, + { + shortName: '医疗险', + name: '国富人寿附加住院医疗保险（医疗型）', + code: 'GFRS_A0004' + }, + { + shortName: '意外险', + name: '国富人寿附加综合意外伤害保险（意外型）', + code: 'GFRS_A0005' + }, + { + shortName: '重疾险', + name: '国富人寿国富民安重大疾病保险（重疾型）', + code: 'GFRS_M0018' } ], // 职级 diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index e648428de..3fce0232f 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -223,18 +223,22 @@ export default { mounted() { localStorage.setItem('pdfShareCode', '') document.body.style.backgroundColor = '#fff' - setTimeout(() => { - // 右上角的显示 - window.EWebBridge.webCallAppInJs('webview_right_button', { - btns: [ - { - img: this.$assetsUrl + 'images/share@3x.png' - } - ] - }) - }, 1000) - window['appCallBack'] = this.appCallBack - this.init() + if (this.isWeixin) { + this.init() + }else { + setTimeout(() => { + // 右上角的显示 + window.EWebBridge.webCallAppInJs('webview_right_button', { + btns: [ + { + img: this.$assetsUrl + 'images/share@3x.png' + } + ] + }) + }, 1000) + window['appCallBack'] = this.appCallBack + this.init() + } }, beforeRouteLeave(to, from, next) { document.body.style.backgroundColor = '' From 1c591c8e4188a8e3feaf93c566e3a1a63cc6ddce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Tue, 17 Mar 2020 13:58:07 +0800 Subject: [PATCH 15/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Exhibition.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 3fce0232f..62c9fa65c 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -302,6 +302,7 @@ export default { }, //app回调 appCallBack(data) { + let that = this if (data.trigger == 'right_button_click') { EWebBridge.webCallAppInJs('bridge', { flag: 'share', @@ -315,7 +316,7 @@ export default { '&token=' + encodeURI(localStorage.token) + '&mainRiskCodes=' + - encodeURI(JSON.stringify(localStorage.mainRiskCodes)), + encodeURI(JSON.stringify(that.mainRiskCodes)), // url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token, img: this.$assetsUrl + 'images/logo.png' } From be02ad5f8568ba6760e78f66a4b4e41322ebeea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Wed, 18 Mar 2020 10:23:06 +0800 Subject: [PATCH 16/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=20GFRS-758=E2=80=9C=E4=BF=9D?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E2=80=9D=E5=88=86=E4=BA=AB=E8=87=B3?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=A5=BD=E5=8F=8B=E5=90=8E=EF=BC=8C=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=A0=87=E9=A2=98=E6=9C=AA=E8=B5=8B=E5=80=BC=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= 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 573a7bb85..5ab4eca97 100644 --- a/src/views/ebiz/serve/Detail.vue +++ b/src/views/ebiz/serve/Detail.vue @@ -217,7 +217,7 @@ export default { EWebBridge.webCallAppInJs('bridge', { flag: 'share', extra: { - title: this.wxTitle, + title: '国富人寿保单回执签字', content: '国富人寿保单回执签收', url: location.origin + From f9320fbc18d213bade6e08f3fc6aa01d60cb1678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 20 Mar 2020 10:47:50 +0800 Subject: [PATCH 17/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E5=88=A0=E9=99=A4=E9=99=A9?= =?UTF-8?q?=E7=A7=8D=E6=8F=90=E7=A4=BA=E5=88=A0=E9=99=A4=20--=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/SelectedProduct.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue index c8fdd1bac..8c7f34cc2 100644 --- a/src/views/ebiz/common/SelectedProduct.vue +++ b/src/views/ebiz/common/SelectedProduct.vue @@ -179,7 +179,7 @@ export default { this.isShow = true }) .catch(() => { - this.$toast('删除失败！') + /*this.$toast('删除失败！')*/ }) }, async delProduct(index) { From cc3d05038534e21e3c6a1f2f8c26435c7d1e5d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 20 Mar 2020 11:04:34 +0800 Subject: [PATCH 18/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20GFRS=5FA0004=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A4=9A=E9=80=89=E5=A4=84=E7=90=86=20--?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 27 +--------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 0e5c01ef5..c96b502ff 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -491,32 +491,7 @@ export default { i.getRate = value i.columns = [{ text, value }] } - } else if (item.productCode === 'GFRS_A0004') { - if (i.code === 'getLimit') { - const text = isMedical ? '0元（住院医疗）' : '100元（住院医疗）' - const value = isMedical ? '0' : '100' - //保存数据 - this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getLimit = text - - i.showContent = text - i.getLimit = value - i.columns = [{ text, value }] - } - //赔付比例 - if (i.code === 'getRate') { - const text = isMedical ? '80%（住院医疗）' : '60%（住院医疗）' - const value = isMedical ? '0.8' : '0.6' - - //保存数据 - this.medicalInfo = this.medicalInfo || {} - this.medicalInfo.getRate = text - - i.showContent = text - i.getRate = value - i.columns = [{ text, value }] - } - } else if (item.productCode === 'GFRS_A0005') { + } else if (item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005') { // 设置默认值？ } }) From b33231afbaf91f3edab2f3fd1b0aa06951ce4b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?= Date: Fri, 20 Mar 2020 17:10:48 +0800 Subject: [PATCH 19/22] =?UTF-8?q?GFRS-729=E3=80=900326=E3=80=91=E5=9B=BD?= =?UTF-8?q?=E5=AF=8C=E4=BA=BA=E5=AF=BF=E5=9B=BD=E5=AF=8C=E6=B0=91=E5=AE=89?= =?UTF-8?q?=E9=87=8D=E5=A4=A7=E7=96=BE=E7=97=85=E4=BF=9D=E9=99=A9=EF=BC=88?= =?UTF-8?q?2020=E7=89=88=EF=BC=89=5F1=20=E4=BF=9D=E8=B4=B9=E8=AF=95?= =?UTF-8?q?=E7=AE=97=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=88showPrem=EF=BC=89=20--=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/common/CalculatePremium.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index c96b502ff..f26354078 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -255,7 +255,7 @@ >首期保费（元）： 保额（元）： - {{ trialList[index].prem.toFixed(2) | moneyFormat }} + {{ trialList[index].showPrem.toFixed(2) | moneyFormat }}
From 28074091724e9f24a27632c8ea2bd2458927fcc5 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Mon, 23 Mar 2020 18:30:28 +0800 Subject: [PATCH 20/22] =?UTF-8?q?[fix]=20GFRS-792=20[=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E4=B9=A6]=E2=80=9C=E8=AF=A5=E5=AE=A2=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=A4=BE=E4=BF=9D=E7=8A=B6=E5=86=B5=E2=80=9D=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E4=B8=BA=E2=80=9C=E6=97=A0=E7=A4=BE=E4=BF=9D=E2=80=9D?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E4=B9=A6=E5=BD=95=E5=85=A5=E2=80=9C=E8=A2=AB=E4=BF=9D=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E2=80=9D=E6=97=B6=EF=BC=8C=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8D=B4=E9=BB=98=E8=AE=A4=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E6=9C=89=E7=A4=BE=E4=BF=9D=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Appnt.vue | 8 +++++--- src/views/ebiz/proposal/InsuredPerson.vue | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index f9d5d0152..60b5baab2 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -184,7 +184,7 @@ export default { hiddenRight: '1' } }) - let { customerName, customerSex, birthday, customerPhone, age, occupationName, occupationCode, lifeGrade, healthGrade } = data + let { customerName, customerSex, birthday, customerPhone, age, occupationName, occupationCode, lifeGrade, healthGrade, socialSecurity } = data this.appntDTO = { mobile: customerPhone, birthday, @@ -194,7 +194,8 @@ export default { age: age ? age : '', occupationCode, lifeGrade, - healthGrade + healthGrade, + socialSecurity } }, @@ -213,7 +214,8 @@ export default { } saveProposal(params).then(res => { if (res.result == '0') { - localStorage.orderNo = res.content.orderNo + // localStorage.orderNo = res.content.orderNo + localStorage.orderNo = JSON.stringify(this.appntDTO) this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index c1b768806..ce3fd53f5 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -147,7 +147,7 @@ export default { this.disabled = true this.insured = Object.assign(this.insured, JSON.parse(localStorage.proposalAppnt)) this.insured.age = getAge.getAge(this.insured.birthday, new Date()) - this.insured.medical = '0' + this.insured.medical = JSON.parse(localStorage.orderNo).socialSecurity } this.ageShow = this.insured.age == '-1' ? '0' : this.insured.age }, From 8e17c4dd9bfe582b89be99027701b27e04153a33 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Tue, 24 Mar 2020 10:53:05 +0800 Subject: [PATCH 21/22] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=20GFRS-807=20[?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6]=E9=80=89=E6=8B=A9=E8=A2=AB?= =?UTF-8?q?=E4=BF=9D=E9=99=A9=E4=BA=BA=E4=B8=BA=E2=80=9C=E6=9C=AC=E4=BA=BA?= =?UTF-8?q?=E2=80=9D=E6=97=B6=EF=BC=8C=E2=80=9C=E8=A2=AB=E4=BF=9D=E9=99=A9?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E2=80=9D=E9=A1=B5=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E8=AF=A5=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=88=E2=80=9C=E8=B4=BE=E8=AF=A9=20=E6=97=A0=E2=80=9D?= =?UTF-8?q?=EF=BC=89=E3=80=82=20=E5=9B=A0=E4=B8=8D=E5=BD=93=E6=93=8D?= =?UTF-8?q?=E4=BD=9ClocalStorage.orderNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/Appnt.vue | 4 ++-- src/views/ebiz/proposal/InsuredPerson.vue | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 60b5baab2..3ec1d8bc7 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -214,8 +214,8 @@ export default { } saveProposal(params).then(res => { if (res.result == '0') { - // localStorage.orderNo = res.content.orderNo - localStorage.orderNo = JSON.stringify(this.appntDTO) + localStorage.orderNo = res.content.orderNo + localStorage.orderNoSocialSecurity = this.appntDTO.socialSecurity this.$jump({ flag: 'h5', extra: { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index ce3fd53f5..5b2d4f9c6 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -50,13 +50,21 @@ v-validate="'required'" placeholder="被保险人职业" /> - +
- + 下一步
@@ -147,7 +155,7 @@ export default { this.disabled = true this.insured = Object.assign(this.insured, JSON.parse(localStorage.proposalAppnt)) this.insured.age = getAge.getAge(this.insured.birthday, new Date()) - this.insured.medical = JSON.parse(localStorage.orderNo).socialSecurity + this.insured.medical = localStorage.orderNoSocialSecurity } this.ageShow = this.insured.age == '-1' ? '0' : this.insured.age }, From ae177c250d9499d495348d63b9b89d4473cff432 Mon Sep 17 00:00:00 2001 From: "tian.guangyuan" Date: Wed, 25 Mar 2020 18:45:25 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bug=20=20=E5=BB=BA?= =?UTF-8?q?=E8=AE=AE=E4=B9=A6=E5=88=B6=E4=BD=9C=EF=BC=8C=E8=A2=AB=E4=BF=9D?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E5=BD=95=E5=85=A5=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E7=A4=BE?= =?UTF-8?q?=E4=BF=9D=E4=B8=BA=E5=95=A5=E4=B8=8D=E8=83=BD=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ebiz/proposal/InsuredPerson.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index 5b2d4f9c6..d67441c26 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -50,7 +50,7 @@ v-validate="'required'" placeholder="被保险人职业" /> - +
@@ -155,7 +155,7 @@ export default { this.disabled = true this.insured = Object.assign(this.insured, JSON.parse(localStorage.proposalAppnt)) this.insured.age = getAge.getAge(this.insured.birthday, new Date()) - this.insured.medical = localStorage.orderNoSocialSecurity + this.insured.medical = localStorage.orderNoSocialSecurity !== undefined ? localStorage.orderNoSocialSecurity : '0' } this.ageShow = this.insured.age == '-1' ? '0' : this.insured.age },