From bafc29a59558b96ad557699b911a3b7ca1ff390a Mon Sep 17 00:00:00 2001
From: "liu.xiaofeng@ebiz-digits.com" <liu.xiaofeng@ebiz-digits.com>
Date: Fri, 7 Jul 2023 17:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=8D=95=E9=97=AE=E9=A2=98=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E5=90=8E=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=BA=86=E4=BF=9D=E8=B4=B9=E9=97=AE=E9=A2=98=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=AB=8B=E5=8D=B3=E6=8A=95=E4=BF=9D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=85=B3=E4=BA=8E=E8=81=8C=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/information.vue | 32 +++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue
index df07712d4..7d53f4d0d 100644
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -978,7 +978,9 @@ export default {
             if (res.result == 0) {
               //选择保障方案
               this.trialList = res.trialList
-              this.allPrice = res.trialList[0].prem
+              if (!this.allPrice) {
+                this.allPrice = res.trialList[0].prem
+              }
             } else {
               this.$toast(res.resultMessage)
             }
@@ -1594,10 +1596,32 @@ export default {
         this.userInfo.homeAddress = data.homeAddress //家庭详细地址
         this.userInfo.occupationCode = data.occupationCode
         this.userInfo.occupationName = data.occupationName
+        let thisoccupationType = ''
+        let thislifeGrade = ''
+        let thishealthGrade = ''
+        let collect = (data,code) => {
+          data.forEach(item => {
+            if (item.code == code) {
+              if (this.trialDTOS.productInsuredDTO.healthGrade && this.trialDTOS.productInsuredDTO.healthGrade != '0') {
+                thisoccupationType = item.healthGrade
+              }
+              if (this.trialDTOS.productInsuredDTO.lifeGrade && this.trialDTOS.productInsuredDTO.lifeGrade != '0') {
+                thisoccupationType = item.lifeGrade
+              }
+              thislifeGrade = item.lifeGrade
+              thishealthGrade = item.healthGrade
+            } else {
+              if (item.subs && item.subs.length != 0) {
+                collect(item.subs,code)
+              }
+            }
+          })
+        }
+        collect(occupationList,data.occupationCode)
 
-        this.userInfo.occupationType = data.lifeGrade
-        this.userInfo.lifeGrade = data.lifeGrade
-        this.userInfo.healthGrade = data.healthGrade
+        this.userInfo.occupationType =thisoccupationType
+        this.userInfo.lifeGrade = thislifeGrade
+        this.userInfo.healthGrade = thishealthGrade
         this.userInfo.averageAnnualIncome = this.itemProductDTOS.productCode == 'GFRS_M0032' ? data.averageYearlyIncome : '0' //平均年收入
         //2516--三个学平险--被保险人国籍默认中国，允许修改
         if (this.itemProductDTOS.productCode == 'GFRS_M0048' || this.itemProductDTOS.productCode == 'GFRS_M0049' || this.itemProductDTOS.productCode == 'GFRS_M0050'