From 4c51a95b018bda27ce223bbf3b18788652bb3dcf Mon Sep 17 00:00:00 2001
From: lyt <li.yuetong@ebiz-digits.com>
Date: Thu, 20 Apr 2023 18:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=9C=80=E6=B1=82=E3=80=91=E5=BB=BA=E8=AE=AE=E4=B9=A6?=
 =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/MainRiskList.vue          | 3 ++-
 src/views/ebiz/common/SelectedProduct.vue       | 2 +-
 src/views/ebiz/common/risk-rules.js             | 4 ++--
 src/views/ebiz/proposal/ChooseInsuredPerson.vue | 2 +-
 src/views/ebiz/proposal/InsuredPerson.vue       | 2 +-
 src/views/ebiz/proposal/ProposalInfo.vue        | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index b2475a460..bd5543521 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -510,7 +510,8 @@ export default {
           if (productTrialInfoDTO[item.code] != null) {
             productTrialInfoDTO[item.code].forEach(factor => {
               // item = Object.assign(item, factor)
-              if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age >= Number(factor.minAge) && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age <= Number(factor.maxAge)){
+              if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).insuredAge >= Number(factor.minAge) && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).insuredAge <= Number(factor.maxAge)){
+              // if(JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age >= Number(factor.minAge) && JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo')).age <= Number(factor.maxAge)){
                 item = Object.assign(item, factor)
               }
             })
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index 369480281..f7dcd29ee 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -23,7 +23,7 @@
       </div>
 
       <div class="text-right pv5">
-        <van-button v-if="isFrom == 'proposal'" size="small" round @click="editInsure(index)" class="mr5" type="danger">编辑</van-button>
+        <van-button v-if="isFrom == 'proposal'" size="small" round @click="editInsure(index,item.insuanceId)" class="mr5" type="danger">编辑</van-button>
         <van-button size="small" round @click="deteleInsure(index)" plain type="danger">删除</van-button>
       </div>
     </div>
diff --git a/src/views/ebiz/common/risk-rules.js b/src/views/ebiz/common/risk-rules.js
index a01f5b46e..09a3fd8b0 100644
--- a/src/views/ebiz/common/risk-rules.js
+++ b/src/views/ebiz/common/risk-rules.js
@@ -49,9 +49,9 @@ export default {
       tips = '投保人年龄不适合此款险种，请选择其他险种！'
     } else {
       if(riskProductCode == 'GFRS_M0061'){
-        age = utilsAge.getAge29(this.getSaleInsuredPersonInfo().birthday, new Date())
+        age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAge29(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
       }else{
-        age = utilsAge.getAgeByValue(this.getSaleInsuredPersonInfo().birthday, new Date())
+        age = this.getSaleInsuredPersonInfo().birthday?utilsAge.getAgeByValue(this.getSaleInsuredPersonInfo().birthday, new Date()):this.getSaleInsuredPersonInfo().insuredAge
       }
       tips = '被保险人年龄不适合此款险种，请选择其他险种！'
     }
diff --git a/src/views/ebiz/proposal/ChooseInsuredPerson.vue b/src/views/ebiz/proposal/ChooseInsuredPerson.vue
index 4070b4135..f3e10d4d5 100644
--- a/src/views/ebiz/proposal/ChooseInsuredPerson.vue
+++ b/src/views/ebiz/proposal/ChooseInsuredPerson.vue
@@ -402,7 +402,7 @@ export default {
     //编辑被保险人
     edit(item) {
       item.birthday = item.birthdayLabel
-      item.age = item.insuredAge
+      // item.age = item.insuredAge
       this.$CacheUtils.setLocItem('saleInsuredPersonInfo', JSON.stringify(item)) //存储被保险人信息
       localStorage.isFrom = 'proposal'
       let url = `/common/selectedProduct?proposalEdit=1&proposalOrderNo=${item.orderNo}`
diff --git a/src/views/ebiz/proposal/InsuredPerson.vue b/src/views/ebiz/proposal/InsuredPerson.vue
index a9d1fca73..93e5d9fef 100644
--- a/src/views/ebiz/proposal/InsuredPerson.vue
+++ b/src/views/ebiz/proposal/InsuredPerson.vue
@@ -150,7 +150,7 @@ export default {
         //如果是投被同人 就将投保人信息存入被保险人信息
         this.disabled = true
         this.insured = Object.assign(this.insured, JSON.parse(this.$CacheUtils.getLocItem('proposalAppnt')))
-        this.insured.insuredAge = getAge.getAge(this.insured.birthday, new Date())
+        this.insured.insuredAge = this.insured.birthday?getAge.getAge(this.insured.birthday, new Date()):this.insured.age
         this.insured.medical = localStorage.orderNoSocialSecurity === '1' ? '1' : '0'
         // 建议书投保人/被保人姓名不必填, 填写姓名时展示姓名(落库),不填写姓名时展示性别+年龄,如:男30岁(不落库)
         if(!this.insured.name){
diff --git a/src/views/ebiz/proposal/ProposalInfo.vue b/src/views/ebiz/proposal/ProposalInfo.vue
index 661d3693d..c7b919d3a 100644
--- a/src/views/ebiz/proposal/ProposalInfo.vue
+++ b/src/views/ebiz/proposal/ProposalInfo.vue
@@ -685,7 +685,7 @@ export default {
         this.pageShowInfo.insuredDTOs = res.content.orderDTO.insuredDTOs
         this.pageShowInfo.showInsuredDTO = this.pageShowInfo.insuredDTOs[0]
         //投保人年龄
-        this.pageShowInfo.appntDTO.age = getAge.getAge(this.pageShowInfo.appntDTO.birthdayLabel, new Date())
+        // this.pageShowInfo.appntDTO.age = getAge.getAge(this.pageShowInfo.appntDTO.birthdayLabel, new Date())
         let { insuredLabelResult, insuredResult, insuredInfoResult } = res.content.calculusResDTO
         orderDTO.insuredDTOs.forEach(v => {
           //根据数据字典 获取当前值