diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js index eb997c7a6..b58405972 100644 --- a/src/assets/js/business-common.js +++ b/src/assets/js/business-common.js @@ -511,6 +511,9 @@ export default { age, idNo: appntDTO.idNo, appntId: appntDTO.appntId, + healthGrade: appntDTO.healthGrade, + lifeGrade: appntDTO.lifeGrade, + mobile: appntDTO.mobile, occupationName: appntDTO.occupationName, occupationCode: appntDTO.occupationCode, marriage: appntDTO.marriage, diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 2f03fa830..37e3fd574 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -931,6 +931,11 @@ export default { shortName: '寿险', name: '国富人寿国富栋梁定期寿险', code: 'GFRS_M0020' + }, + { + shortName: '重疾险', + name: '国富人寿爱易保重大疾病保险', + code: 'GFRSPRO_M0021' } ], // 职级 diff --git a/src/assets/js/utils/validator.js b/src/assets/js/utils/validator.js index 81a1f8b07..55f91dc04 100644 --- a/src/assets/js/utils/validator.js +++ b/src/assets/js/utils/validator.js @@ -206,4 +206,4 @@ Validator.extend('manpowerName', { // return /^[\u4e00-\u9fa5·]{1,15}$/.test(value) return /^[a-zA-Z\.\s\u4e00-\u9fa5]{2,120}$/.test(value) } -}) \ No newline at end of file +}) diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index d8d68be76..5050fb76c 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -321,7 +321,7 @@ const dutyGFRS_A0004Rules = { mainRisk: 'GFRS_M0005', msg: '住院医疗提示:金额只能是0.5、1、1.5、2', msg_1: '附加到国富人寿国富民惠医疗保险(2020版)最高基本保额不超过1万元。', - msg_2: '住院医疗提示:金额只能是0.5、1', + msg_2: '住院医疗提示:金额只能是0.5、1' }, 320206: { msg: '住院津贴提示:投保可选责任时,可选责任最低投保 50 元,且应为 10 元的整数倍' @@ -437,19 +437,19 @@ export default { this.mainRiskCode = item.mainRiskCode } }) - if(this.mainRiskCode == 'GFRS_M0005'){ + if (this.mainRiskCode == 'GFRS_M0005') { this.chooseProducts.map(item => { - if(item.productCode == 'GFRS_A0004'){ - item.calFactorLst.map( item2 => { - if(item2.code == 'dutyGroup'){ + if (item.productCode == 'GFRS_A0004') { + item.calFactorLst.map(item2 => { + if (item2.code == 'dutyGroup') { item2.rules.map(item3 => { - console.log(item3); - if(item3.duty == '320205'){ - item3.maxDutyAmt = "1" + console.log(item3) + if (item3.duty == '320205') { + item3.maxDutyAmt = '1' } }) } - }) + }) } }) } @@ -557,7 +557,7 @@ export default { } return } - if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005' ) { + if (item.mainRiskCode === 'GFRS_M0016' || item.productCode === 'GFRS_A0004' || item.productCode === 'GFRS_A0005') { let isMedical = null if (this.isFrom === 'proposal') { isMedical = detailPromise == '1' @@ -819,7 +819,7 @@ export default { this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg_2) this.nextStepFlag = true return false - } else if(value-0 > 1){ + } else if (value - 0 > 1) { this.$toast(dutyGFRS_A0004Rules[currentEle.duty].msg_1) this.nextStepFlag = true return false @@ -831,9 +831,7 @@ export default { return false } } - - - + this.nextStepFlag = false return true } diff --git a/src/views/ebiz/sale/AddBeneficiaryInfo.vue b/src/views/ebiz/sale/AddBeneficiaryInfo.vue index 8d2721cbc..39f568e5d 100644 --- a/src/views/ebiz/sale/AddBeneficiaryInfo.vue +++ b/src/views/ebiz/sale/AddBeneficiaryInfo.vue @@ -204,9 +204,9 @@ import FieldDatePicter from '@/components/ebiz/FieldDatePicter' import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker' import DataDictionary from '@/assets/js/utils/data-dictionary' import areaList from '@/assets/js/utils/area' -import { getOrderDetail } from '@/api/ebiz/sale/sale' +// import { getOrderDetail } from '@/api/ebiz/sale/sale' import filter from '@/filters/index' -import getAreaName from '@/assets/js/utils/get-area-name' +// import getAreaName from '@/assets/js/utils/get-area-name' import utilsAge from '@/assets/js/utils/age' import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan' import CustomerPicker from '@/components/ebiz/customer/CustomerPicker' @@ -217,7 +217,7 @@ import { selectComp } from './js/methods' let relationToInsured = [ { id: 2, text: '配偶' }, { id: 3, text: '父母' }, - { id: 4, text: '子女' }, + { id: 4, text: '子女' } ] export default { @@ -233,7 +233,7 @@ export default { [Picker.name]: Picker, [Area.name]: Area, [IdentityCardScan.name]: IdentityCardScan, - [CustomerPicker.name]: CustomerPicker, + [CustomerPicker.name]: CustomerPicker }, data() { return { @@ -242,12 +242,12 @@ export default { sexRadio: [ { label: '男', - value: '0', + value: '0' }, { label: '女', - value: '1', - }, + value: '1' + } ], currentPopupIndex: '', relationToAppnt: '', @@ -294,7 +294,7 @@ export default { relationToInsured: '', //和被保险人的关系 lifeGrade: '', healthGrade: '', - bnfType: '0', //身故受益人 + bnfType: '0' //身故受益人 }, areaList: areaList, occupationShowPicker: false, @@ -306,7 +306,7 @@ export default { // area: '', // city: '', // province: '' - saleInsuredPersonInfo: JSON.parse(localStorage.saleInsuredPersonInfo), //被保人信息 + saleInsuredPersonInfo: JSON.parse(localStorage.saleInsuredPersonInfo) //被保人信息 } }, mounted() { @@ -370,15 +370,15 @@ export default { flag: 'goBack', extra: { refresh: '1', //是否返回后刷新0:否,1:是 - index: '-1', - }, + index: '-1' + } }) this.$jump({ flag: 'navigation', extra: { title: '指定受益人信息', - hiddenRight: '1', - }, + hiddenRight: '1' + } }) if (this.currentPopupIndex == 1) { this.customerShowPicker = false @@ -391,8 +391,8 @@ export default { flag: 'navigation', extra: { title: '指定受益人信息', - hiddenRight: '1', - }, + hiddenRight: '1' + } }) this.occupationShowPicker = false }, @@ -414,7 +414,7 @@ export default { } else if (pickerType == '4') { this.columns = [ { id: 0, text: '有' }, - { id: 1, text: '无' }, + { id: 1, text: '无' } ] } else if (pickerType == '5') { this.columns = DataDictionary.taxIdentity @@ -600,8 +600,8 @@ export default { flag: 'navigation', extra: { title: '指定受益人信息', - hiddenRight: '1', - }, + hiddenRight: '1' + } }) // let { customerName, customerSex } = data this.userInfo.name = data.customerName //用户名 @@ -708,7 +708,7 @@ export default { title: '提示', message: '亲,请确认受益人与被保险人关系哦', confirmButtonText: '继续填写', - cancelButtonText: '返回修改', + cancelButtonText: '返回修改' }) } } @@ -719,7 +719,7 @@ export default { title: '提示', message: '亲,请确认受益人与被保险人关系哦', confirmButtonText: '继续填写', - cancelButtonText: '返回修改', + cancelButtonText: '返回修改' }) } } @@ -838,7 +838,7 @@ export default { let obj = { '1': true, '5': true, - '6': true, + '6': true } let idType = this.userInfo.idType // 通过年龄 判断证件是否符合要求 @@ -871,7 +871,7 @@ export default { // 非大陆人员按外籍人员 let obj = { '4': true, - '8': true, + '8': true } let idType = this.userInfo.idType if (obj[idType] === undefined) { @@ -885,7 +885,7 @@ export default { beneficiaries = JSON.parse(localStorage.beneficiaryInfo) // 收益份额不超过 100% let ratio = 0 - beneficiaries.forEach((item) => { + beneficiaries.forEach(item => { ratio += parseInt(item.bnfLot) }) ratio += parseInt(this.userInfo.bnfLot) @@ -896,7 +896,7 @@ export default { if (this.userInfo.idNo != '') { // 受益人不能重复添加 (证件号码为基准) - let isDbAdd = beneficiaries.some((item) => { + let isDbAdd = beneficiaries.some(item => { return item.idNo == this.userInfo.idNo }) console.log(isDbAdd) @@ -922,11 +922,11 @@ export default { flag: 'h5', extra: { url: location.origin + '/#/sale/beneficiary', - needRefresh: '1', + needRefresh: '1' }, routerInfo: { - path: '/sale/beneficiary', - }, + path: '/sale/beneficiary' + } }) } else { this.$toast(this.$validator.errors.all()[0]) @@ -1123,15 +1123,15 @@ export default { // } else { // this.idLimit = false // } - }, + } }, filters: { - idToText: filter.idToText, + idToText: filter.idToText }, beforeRouteLeave(to, from, next) { document.body.style.backgroundColor = '' next() - }, + } }