From 13ad42127113900b1eea16df00b2d4f1a46f9fd6 Mon Sep 17 00:00:00 2001
From: "liu.xiaofeng@ebiz-digits.com" <liu.xiaofeng@ebiz-digits.com>
Date: Fri, 28 Jul 2023 10:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=AE=97=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BF=9D=E9=A2=9D=E4=BF=9D=E8=B4=B9=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/business-common.js           | 2 +-
 src/views/ebiz/common/CalculatePremium.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/assets/js/business-common.js b/src/assets/js/business-common.js
index 456fde334..8b359371a 100644
--- a/src/assets/js/business-common.js
+++ b/src/assets/js/business-common.js
@@ -559,7 +559,7 @@ export default {
     )
 
     if (insuredDTO) {
-      let insuredPersonAge = insuredDTO.birthday?utilsAge.getAge(insuredDTO.birthday, new Date()):insuredDTO.insuredAge
+      let 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 b9b12cc56..14323033f 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -376,6 +376,7 @@ import { saveOrUpdateOrderInfo, getOrderDetail,orderTrial } from '@/api/ebiz/sal
 import { saveProposal, getTrialRecordInfo, saveOrUpdateTrialRecordInfo } from '@/api/ebiz/proposal/proposal.js'
 import { getAgentInfo } from '@/api/ebiz/my/my.js'
 import occupationList from '@/components/ebiz/occipation/data/occupation'
+import utilsAge from '@/assets/js/utils/age'
 import riskRules from "./risk-rules";
 
   //险种GFRS_M0016的责任的验证规则
@@ -663,7 +664,7 @@ export default {
       //获取被保险人信息
       if (this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) {
         this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
-        this.saleInsuredPersonInfo.insuredAge = this.saleInsuredPersonInfo.insuredAge ? this.saleInsuredPersonInfo.insuredAge : this.saleInsuredPersonInfo.age
+        this.saleInsuredPersonInfo.insuredAge = utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date())
         if (this.isFrom == 'proposal' && !this.saleInsuredPersonInfo.name) {
           // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
           let sex = this.saleInsuredPersonInfo.sex == '0'?'男':'女'
@@ -2347,7 +2348,7 @@ export default {
             this.saleInsuredInfo.sex,
             this.saleInsuredInfo.occupationCode,
             this.saleInsuredInfo.occupationName,
-            this.saleInsuredInfo.insuredAge?this.saleInsuredInfo.insuredAge:this.saleInsuredInfo.age,
+            utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date())
           ]
         } else {
           ;[birthday, sex, occupationCode, occupationName, age] = [
@@ -2355,7 +2356,7 @@ export default {
             this.saleInsuredPersonInfo.sex,
             this.saleInsuredPersonInfo.occupationCode,
             this.saleInsuredPersonInfo.occupationName,
-            this.saleInsuredPersonInfo.insuredAge?this.saleInsuredPersonInfo.insuredAge:this.saleInsuredPersonInfo.age
+            utilsAge.getAge(this.saleInsuredPersonInfo.birthday, new Date())
           ]
         }
         trialInfo = Object.assign(trialInfo, {
@@ -2875,7 +2876,7 @@ export default {
       //建议书需要添加全部投保人信息，电投只需要投保人ID
       let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
       if (!insuredDTOItem.insuredAge) {
-        insuredDTOItem.insuredAge = insuredDTOItem.age
+        insuredDTOItem.insuredAge = insuredDTOItem.birthday ? utilsAge.getAge(insuredDTOItem.birthday, new Date()) : insuredDTOItem.age
       }
       let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo
       let params = {