diff --git a/src/views/ebiz/proposal/Appnt.vue b/src/views/ebiz/proposal/Appnt.vue index 8831ee594..5bf4ae2db 100644 --- a/src/views/ebiz/proposal/Appnt.vue +++ b/src/views/ebiz/proposal/Appnt.vue @@ -15,8 +15,6 @@ +
+ + +
-
- -
下一步 @@ -59,7 +58,7 @@ import getAge from '@/assets/js/utils/age.js' import beforeDate from '@/assets/js/utils/getBeforeDate.js' import BreadcrumbNavigator from '@/components/ebiz/proposal/BreadcrumbNavigator' import { getDetail } from '@/api/ebiz/proposal/proposal.js' - +import utils from '@/assets/js/utils/date-utils' export default { data() { return { @@ -88,7 +87,7 @@ export default { customerShowPicker: false, occupationShowPicker: false, currentPopupIndex: '', - ageFlag: false //年龄输入框是否只读 false-可输入 true-只读 + // ageFlag: false //年龄输入框是否只读 false-可输入 true-只读 } }, computed: { @@ -123,7 +122,7 @@ export default { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) if(!this.appntDTO.name){ let sex = this.appntDTO.sex == '0'?'男':'女' - this.appntDTO.name = sex+this.appntDTO.age + this.appntDTO.name = sex+this.appntDTO.age+'岁' } } }, @@ -217,9 +216,20 @@ export default { this.appntDTO.name = data }, dateConfirm(data) { + console.log(data,'data') let age = getAge.getAge(data, new Date()) this.appntDTO.age = age - this.ageFlag = true + // this.ageFlag = true + }, + //年龄变化时,清空出生日期 + //并校验年龄规则按照出生日期的校验规则来定 + ageBlur(){ + this.appntDTO.birthday = '' + let minAge = getAge.getAge(utils.formatDate(new Date(this.maxDate),'yyyy-MM-dd'), new Date()) + let maxAge = getAge.getAge('1900-01-01', new Date()) + if(this.appntDTO.age < minAge || this.appntDTO.age > maxAge){ + this.$toast('您的年龄不符合投保人的年龄范围') + } }, //从客户列表选择客户 chooseCustomer(data) { @@ -244,13 +254,13 @@ export default { healthGrade, socialSecurity } - this.ageFlag = true + // this.ageFlag = true }, nextStep() { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) let sex = this.appntDTO.sex == '0'?'男':'女' - let name = sex + this.appntDTO.age + let name = sex + this.appntDTO.age+'岁' if(this.appntDTO.name == name){ this.appntDTO.name = '' } diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue index 9da329c9f..4070b4135 100644 --- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue +++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue @@ -156,7 +156,7 @@ export default { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) if(!v.name){ let sex = v.sex == '0'?'男':'女' - v.name = sex + v.insuredAge + v.name = sex + v.insuredAge+'岁' } //addtion数组中筛选出附加险 v.riskDTOLst.forEach(s => { diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue index 161fb2068..a9d1fca73 100644 --- a/src/views/ebiz/proposal/InsuredPerson.vue +++ b/src/views/ebiz/proposal/InsuredPerson.vue @@ -21,8 +21,6 @@ +
+ + +
-
- -
maxAge){ + this.$toast('您的年龄不符合被保人的年龄范围') + } }, selectClick(index) { this.currentPopupIndex = index @@ -325,7 +338,7 @@ export default { mainPath() { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) let sex = this.insured.sex == '0'?'男':'女' - let name = sex + this.insured.insuredAge + let name = sex + this.insured.insuredAge+'岁' if(this.insured.name == name){ this.insured.name = '' } diff --git a/src/views/ebiz/proposal/List.vue b/src/views/ebiz/proposal/List.vue index 42418ec73..f9ac214dd 100644 --- a/src/views/ebiz/proposal/List.vue +++ b/src/views/ebiz/proposal/List.vue @@ -63,7 +63,7 @@
转投保 - 编辑 + 复制计划书 编辑 预览 删除 diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue index 35cb48831..661d3693d 100644 --- a/src/views/ebiz/proposal/ProposalInfo.vue +++ b/src/views/ebiz/proposal/ProposalInfo.vue @@ -280,7 +280,8 @@
家庭保障计划
-
尊敬的{{ pageShowInfo.appntDTO.name.substr(0, 1) }}{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}
+ +
尊敬的{{ pageShowInfo.appntDTO.name.substr(0, 1) }}{{ pageShowInfo.appntDTO.sex == '0' ? '先生' : '女士' }}
@@ -478,7 +479,7 @@ export default { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) if(!item.name){ let sex = item.sex == '0'?'男':'女' - item.name = sex + item.insuredAge + item.name = sex + item.insuredAge+'岁' } this.pageShowInfo.showInsuredDTO = item that.$forceUpdate() @@ -600,13 +601,13 @@ export default { } let shareContent; let resData = await queryPersonal(reqData) - if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade) { + if (resData.content.length&&resData.content[0].slevel>0&&resData.content[0].sgrade&&resData.content[0].sgrade!='00') { if(resData.content[0].slevel<3){ resData.content[0].sgrade='00' } let sgrade =this.memberConversion(resData.content[0].sgrade); shareContent='国富双冠精英'+resData.content[0].slevel+'级'+sgrade+resData.content[0].name+'为您量身定制的保险产品,请查收'; - }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&!resData.content[0].sgrade) { + }else if (resData.content.length&&resData.content[0].glevel>0&&resData.content[0].ggrade&&!resData.content[0].sgrade&&resData.content[0].sgrade!='00') { if(resData.content[0].glevel<3){ resData.content[0].ggrade='00' } @@ -618,7 +619,7 @@ export default { let title let riskList = [] //所有险种 let riskCodeList = [] //所有险种code - this.pageShowInfo.insuredDTOs.map(item => { + this.pageShowInfo.insuredDTOs.map(item => { item.mainRisk.map(item01 => { if (item01.isMainRisk == '0') { //主险 riskList.push(item01) @@ -692,7 +693,7 @@ export default { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) if(!v.name){ let sex = v.sex == '0'?'男':'女' - v.name = sex + v.insuredAge + v.name = sex + v.insuredAge+'岁' } v.riskDTOLstNew = [] v.riskDTOLst.forEach(risk => { @@ -917,7 +918,7 @@ export default { let text='' switch (status) { case '00': - text = '准会员' + text = '' //准会员不显示 break case '01': text = '正式会员'