diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 13714bfea..17cf7361f 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -1,8 +1,7 @@ // 数据字典 export default { //国家地区 - nativeplace: [ - { + nativeplace: [{ id: 1, text: '中国大陆' }, @@ -140,8 +139,7 @@ export default { } ], //证件类型 - idType: [ - { + idType: [{ id: 1, text: '居民身份证' }, @@ -180,8 +178,7 @@ export default { } ], //投保人证件类型 - insuredIdType: [ - { + insuredIdType: [{ id: 1, text: '居民身份证' }, @@ -221,8 +218,7 @@ export default { ], //投保人/被保人关系 - relationToAppnt: [ - { + relationToAppnt: [{ id: 1, text: '本人' }, @@ -244,8 +240,7 @@ export default { } ], //婚姻状况 - marriage: [ - { + marriage: [{ id: 1, text: '已婚' }, @@ -263,8 +258,7 @@ export default { } ], //文化程度 - degree: [ - { + degree: [{ id: 1, text: '博士及以上' }, @@ -302,8 +296,7 @@ export default { } ], //居民身份 仅支持中国 - taxIdentity: [ - { + taxIdentity: [{ id: 1, text: '仅为中国税收居民' }, @@ -317,8 +310,7 @@ export default { } ], //交费期限 - payEndYear: [ - { + payEndYear: [{ id: 1, text: '1年交' }, @@ -368,8 +360,7 @@ export default { } ], //交费方式 - payIntv: [ - { + payIntv: [{ id: 1, text: '月交', disabled: true @@ -394,8 +385,7 @@ export default { } ], // 保险期间 data-dictionary - insureYear: [ - { + insureYear: [{ id: 1, text: '1年' }, @@ -453,8 +443,7 @@ export default { } ], //客户类型 - customerType: [ - { + customerType: [{ id: 0, text: '准客户' }, @@ -464,8 +453,7 @@ export default { } ], //客户来源 - customerSource: [ - { + customerSource: [{ id: 0, text: '转介绍' }, @@ -479,8 +467,7 @@ export default { } ], //在职情况 - workCondition: [ - { + workCondition: [{ id: 1, text: '在职' }, @@ -493,8 +480,7 @@ export default { text: '其他' } ], - policyState: [ - { + policyState: [{ id: '01', text: '待客户确认' }, @@ -680,8 +666,7 @@ export default { } ], // 产品编码 - riskType: [ - { + riskType: [{ shortName: '重疾险', name: '国富人寿八桂无忧重大疾病保险（B款）', code: 'GFRS_M0001' @@ -730,11 +715,15 @@ export default { shortName: '重疾险', name: '国富人寿八桂无忧重大疾病保险', code: 'GFRS_M0010' + }, + { + shortName: '年金险', + name: '国富人寿国富鑫享年金保险', + code: 'GFRS_M0011' } ], // 收入来源 - salarySource: [ - { + salarySource: [{ id: 1, text: '工薪' }, @@ -751,8 +740,7 @@ export default { text: '其它' } ], - sex: [ - { + sex: [{ text: '男', id: '0' }, @@ -762,8 +750,7 @@ export default { } ], //受益人类型 - bnfType: [ - { + bnfType: [{ id: '0', text: '法定受益人' }, @@ -773,8 +760,7 @@ export default { } ], //订单状态 - orderStatus: [ - { + orderStatus: [{ id: '0', text: '未签收' }, @@ -784,8 +770,7 @@ export default { } ], // 民族 - nationType: [ - { + nationType: [{ id: '01', text: '汉族' }, @@ -1023,8 +1008,7 @@ export default { } ], //政治面貌 - politicsStatus: [ - { + politicsStatus: [{ id: '01', text: '中共党员' }, @@ -1069,8 +1053,7 @@ export default { text: '无党派人士' } ], - rsIdType: [ - { + rsIdType: [{ id: 1, text: '居民身份证' }, @@ -1098,4 +1081,4 @@ export default { ], // 健康状况 healthCondition: [] -} +} \ No newline at end of file diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 269184420..e221169ae 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -31,7 +31,6 @@ :max="riskFactor.maxAmt || riskFactor.maxPrem" :show-plus="false" :show-minus="false" - class="ml10" @change="stepperChange(item.calFactorLst[riskFactorIndex].defaultValue, index, riskFactorIndex)" input-width="100" @@ -65,7 +64,6 @@ :max="dutyItem.maxDutyAmt" :show-plus="false" :show-minus="false" - class="ml10 mr10" @focus="focusStep" @blur="blurStep" @@ -204,12 +202,14 @@ export default { //构建提交数据、渲染险种 this.chooseProducts = JSON.parse(localStorage.chooseProducts) this.chooseProducts.map(item => { + item.isHidden = true item.calFactorLst.map(i => { if (i.defaultValue) { this.mult = i.defaultValue } }) }) + // this.influenceAddRiskCodes if (this.chooseProducts[0].influences && this.chooseProducts[0].influences.length > 0) { @@ -249,6 +249,7 @@ export default { }, //弹框选择 toSelect(index, index1, columns) { + console.log(index, index1, columns) ;[this.popupShow, this.productIndex, this.calFactorIndex] = [true, index, index1] this.columns = columns }, @@ -262,7 +263,9 @@ export default { this.columns = [] let currentFactor = this.chooseProducts[this.productIndex].calFactorLst let currentEle = currentFactor[this.calFactorIndex] - + console.log('value', value) + console.log('currentFactor', currentFactor) + console.log('currentEle', currentEle) if (currentEle.showContent != value.text) { //通用规则校验 if (this.payExceedInsured(currentEle, currentFactor, value.value)) { @@ -610,11 +613,11 @@ export default { this.chooseProducts.forEach((item, index) => { let trialInfo = {} item.calFactorLst.forEach(factor => { - //type 类型 0为picker 1计步器 2职业等级 if (factor.type == 0) { if (factor.hasFlag == '1') { trialInfo[factor.code] = factor[factor.code] trialInfo[factor.code + 'Flag'] = factor[factor.code + 'Flag'] + // trialInfo[factor.payEndYear] = factor[factor.payEndYear] } else { trialInfo[factor.code] = factor[factor.code] } @@ -643,8 +646,9 @@ export default { }) //通用规则1：交费方式为一次交情，无交费期限 if (trialInfo['payIntv'] == '0') { - trialInfo['payEndYear'] = '1' + trialInfo['payEndYear'] = '1000' trialInfo['payEndYearFlag'] = 'Y' + trialInfo['insuYearFlag'] = 'Y' } //责任险参数构建 // if (trialInfo.duty) { @@ -705,9 +709,18 @@ export default { console.log(value) this.mult = value let currentEle = this.chooseProducts[productIndex].calFactorLst[calFactorIndex] - this.mainRiskInfluenceAddRisk() - currentEle['amt'] = Number(currentEle.defaultValue) * Number(currentEle.moneyUnit) - this.getTrial() + if ((Number(value) * 10000) % (Number(currentEle.limit) * 10000) != 0) { + currentEle.defaultValue = currentEle.rules[productIndex].defaultValue + Dialog.alert({ + message: `输入不能超过${Number(currentEle.limit) * 10000}的倍数` + }).then(() => { + // on close + }) + } else { + this.mainRiskInfluenceAddRisk() + currentEle['amt'] = Number(currentEle.defaultValue) * Number(currentEle.moneyUnit) + this.getTrial() + } }, //下一步 async nextStep() { diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 1d86c5f0a..ff89d89db 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -368,6 +368,7 @@ export default { insuredDTOs = formatRiskList(insuredDTOs, 'insuredDTOs', 'riskDTOLst') this.insuredDTOs = insuredDTOs[0].insuredDTOs this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat, this.dutyLst) //进行数据关联 + console.log('insuredDTOs',insuredDTOs) this.getWXTitle(this.insuredDTOs) //获取微信标题 let active = this.insuredDTOs.length //默认展开项 this.activeNames = [active]