From 513dfa500dbef31049d942147b333c25b739b011 Mon Sep 17 00:00:00 2001 From: "liu.xiaofeng@ebiz-digits.com" Date: Fri, 28 Jul 2023 16:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E5=B9=B4=E9=BE=84=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/business-common.js | 5 ++++- src/views/ebiz/common/CalculatePremium.vue | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js index 8b359371a..864db26aa 100644 --- a/src/assets/js/business-common.js +++ b/src/assets/js/business-common.js @@ -559,7 +559,10 @@ export default { ) if (insuredDTO) { - let insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date()) + let insuredPersonAge = insuredDTO.insuredAge ? insuredDTO.insuredAge : insuredDTO.age + if(insuredDTO.birthday){ + insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date()) + } CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify({ birthday: insuredDTO.birthday, diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index 14323033f..ce54b8b9c 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -664,7 +664,10 @@ export default { //获取被保险人信息 if (this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) { this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) - this.saleInsuredPersonInfo.insuredAge = utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date()) + this.saleInsuredPersonInfo.insuredAge = this.saleInsuredPersonInfo.insuredAge ? this.saleInsuredPersonInfo.insuredAge : this.saleInsuredPersonInfo.age + if(this.saleInsuredPersonInfo.birthday){ + this.saleInsuredPersonInfo.insuredAge = utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date()) + } if (this.isFrom == 'proposal' && !this.saleInsuredPersonInfo.name) { // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库) let sex = this.saleInsuredPersonInfo.sex == '0'?'男':'女' @@ -2348,7 +2351,7 @@ export default { this.saleInsuredInfo.sex, this.saleInsuredInfo.occupationCode, this.saleInsuredInfo.occupationName, - utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date()) + this.saleInsuredPersonInfo.insuredAge ] } else { ;[birthday, sex, occupationCode, occupationName, age] = [ @@ -2356,7 +2359,7 @@ export default { this.saleInsuredPersonInfo.sex, this.saleInsuredPersonInfo.occupationCode, this.saleInsuredPersonInfo.occupationName, - utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date()) + this.saleInsuredPersonInfo.insuredAge ] } trialInfo = Object.assign(trialInfo, {