From 0e00e7ad2933f54933ba61a6344878c4ff6b7b4b Mon Sep 17 00:00:00 2001
From: anbbukn <anbbukn2@foxmail.com>
Date: Wed, 1 Jul 2020 18:56:42 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=95=E4=BF=9D=E8=A2=AB=E4=BF=9D=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/InsuredInfo.vue   | 21 +++++------
 src/views/ebiz/sale/InsuredPerson.vue | 51 +++++++++++++++++++--------
 2 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue
index 1a2920341..c13edc943 100644
--- a/src/views/ebiz/sale/InsuredInfo.vue
+++ b/src/views/ebiz/sale/InsuredInfo.vue
@@ -318,8 +318,8 @@
       <van-field
         v-model="homeName"
         readonly
-        label="家庭地址"
-        name="家庭地址"
+        label="联系地址"
+        name="联系地址"
         required
         right-icon="arrow"
         placeholder="请选择"
@@ -351,7 +351,7 @@
     <!-- <van-popup v-model="areaShow" position="bottom">
       <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
     </van-popup> -->
-    <!-- 家庭地址选择 -->
+    <!-- 联系地址选择 -->
     <van-popup v-model="homeShow" position="bottom"
       ><van-area :area-list="areaLists" value="450000" @confirm="sureArea($event, '2')" @cancel="homeShow = false"
     /></van-popup>
@@ -439,9 +439,9 @@ export default {
       valueKey: 'text',
       // census: '', //户籍
       // areaName: '', //单位地址
-      homeName: '', //家庭地址
+      homeName: '', //联系地址
       companyDefault: false, //设置公司地址为默认地址
-      homeDefault: false, //设置家庭地址为默认地址
+      homeDefault: false, //设置联系地址为默认地址
       setDefaultAddress: false, //设为联系地址
       sessionId: '', //后台返回的 id
       effectiveDateTypeAble: false, //长期按钮是否禁用
@@ -550,7 +550,7 @@ export default {
               { code: res.orderDTO.appntDTO.homeProvince },
               { code: res.orderDTO.appntDTO.homeCity },
               { code: res.orderDTO.appntDTO.homeArea }
-            ]) //获取家庭地址
+            ]) //获取联系地址
             // this.census = getAreaName([{ code: res.orderDTO.appntDTO.householdProvince }, { code: res.orderDTO.appntDTO.householdCity }]) //获取户籍
           }
           //------------------------专为桂企写死--begin---------------//
@@ -669,10 +669,7 @@ export default {
         //   this.columns = DataDictionary.degree
         //   break
         case '4':
-          this.columns = [
-            { id: 0, text: '有' },
-            { id: 1, text: '无' }
-          ]
+          this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }]
           break
         case '5':
           this.columns = DataDictionary.taxIdentity
@@ -928,7 +925,7 @@ export default {
       //   this.areaName = getAreaName([{ code: data.companyProvince }, { code: data.companyCity }, { code: data.companyArea }]) //单位地址
       // }
       if (data.homeProvince.length) {
-        this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
+        this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //联系地址
       }
       // 计算年龄
       let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -1278,7 +1275,7 @@ export default {
         //   ;[this.userInfo.companyProvince, this.userInfo.companyCity, this.userInfo.companyArea] = [area[0].code, area[1].code, area[2].code]
         //   this.areaShow = false
         //   break
-        case '2': //家庭地址
+        case '2': //联系地址
           this.homeName = getAreaName(area, 'new')
           ;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
           this.homeShow = false
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 982d790e5..838c14617 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -343,7 +343,9 @@
     </van-cell-group>
     <!-- 家庭信息 -->
     <van-cell-group class="mt5" v-if="!isScan">
-      <p style=" border-bottom: 1px solid #ebedf0" class=" fs15 fwb pl10 mt10 pv12">家庭信息</p>
+      <p style=" border-bottom: 1px solid #ebedf0" class=" fs15 fwb pl10 mt10 pv12">
+        家庭信息 <van-checkbox v-model="withRootUser.value">复选框</van-checkbox>
+      </p>
       <!-- <van-field
         :value="userInfo.marriage | idToText('marriage')"
         readonly
@@ -369,8 +371,8 @@
       <van-field
         v-model="homeName"
         readonly
-        label="家庭地址"
-        name="家庭地址"
+        label="联系地址"
+        name="联系地址"
         required
         right-icon="arrow"
         placeholder="请选择"
@@ -411,7 +413,7 @@
     <van-popup v-model="areaShow" position="bottom">
       <van-area :area-list="areaList" value="110101" @confirm="sureArea($event, '1')" @cancel="areaShow = false" />
     </van-popup>
-    <!-- 家庭地址选择 -->
+    <!-- 联系地址选择 -->
     <van-popup v-model="homeShow" position="bottom">
       <van-area :area-list="areaLists" value="450000" @confirm="sureArea($event, '2')" @cancel="homeShow = false" />
     </van-popup>
@@ -466,6 +468,10 @@ export default {
   },
   data() {
     return {
+      withRootUser: {
+        load: false, //防止重复请求
+        value: false
+      },
       isScan: false, //是否显示证件扫描组件
       effectiveDateTypeAble: false, //长期按钮是否禁用
       sexRadio: [
@@ -593,7 +599,7 @@ export default {
               // this.sureArea([{ code: insuredInfo.householdProvince }, { code: insuredInfo.householdCity }], '3')
               //单位地址
               // this.sureArea([{ code: insuredInfo.companyProvince }, { code: insuredInfo.companyCity }, { code: insuredInfo.companyArea }], '1')
-              //家庭地址
+              //联系地址
               this.sureArea([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }], '2')
               //是否长期
               if (insuredInfo.effectiveDateType == 'false') {
@@ -645,7 +651,7 @@ export default {
             //     { code: insuredPersonInfo.companyArea }
             //   ])
             // }
-            //家庭地址
+            //联系地址
             if (insuredPersonInfo.homeProvince.length) {
               this.homeName = getAreaName([
                 { code: insuredPersonInfo.homeProvince },
@@ -667,7 +673,7 @@ export default {
             //   { code: saleInsuredPersonInfo.homeProvince },
             //   { code: saleInsuredPersonInfo.homeCity },
             //   { code: saleInsuredPersonInfo.homeArea }
-            // ]) //家庭地址
+            // ]) //联系地址
             // }
           }
         } else {
@@ -775,10 +781,7 @@ export default {
       } /*else if (pickerType == '3') {
         this.columns = DataDictionary.degree
       } */ else if (pickerType == '4') {
-        this.columns = [
-          { id: 0, text: '有' },
-          { id: 1, text: '无' }
-        ]
+        this.columns = [{ id: 0, text: '有' }, { id: 1, text: '无' }]
       } else if (pickerType == '5') {
         this.columns = DataDictionary.taxIdentity
       } /* else if (pickerType == '6') {
@@ -888,7 +891,7 @@ export default {
               // this.sureArea([{ code: insuredInfo.householdProvince }, { code: insuredInfo.householdCity }], '3')
               //单位地址
               // this.sureArea([{ code: insuredInfo.companyProvince }, { code: insuredInfo.companyCity }, { code: insuredInfo.companyArea }], '1')
-              //家庭地址
+              //联系地址
               this.sureArea([{ code: insuredInfo.homeProvince }, { code: insuredInfo.homeCity }, { code: insuredInfo.homeArea }], '2')
               //是否长期
               if (insuredInfo.effectiveDateType == 'false') {
@@ -1165,7 +1168,7 @@ export default {
       //   this.areaName = getAreaName([{ code: data.companyProvince }, { code: data.companyCity }, { code: data.companyArea }]) //单位地址
       // }
       if (data.homeProvince.length) {
-        this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //家庭地址
+        this.homeName = getAreaName([{ code: data.homeProvince }, { code: data.homeCity }, { code: data.homeArea }]) //联系地址
       }
       //计算年龄
       let age = utilsAge.getAge(this.userInfo.birthday, new Date())
@@ -1533,7 +1536,7 @@ export default {
         //   ;[this.userInfo.companyProvince, this.userInfo.companyCity, this.userInfo.companyArea] = [area[0].code, area[1].code, area[2].code]
         //   this.areaShow = false
         //   break
-        case '2': //家庭地址
+        case '2': //联系地址
           this.homeName = getAreaName(area)
           ;[this.userInfo.homeProvince, this.userInfo.homeCity, this.userInfo.homeArea] = [area[0].code, area[1].code, area[2].code]
           this.homeShow = false
@@ -1613,7 +1616,7 @@ export default {
         // case '1': //户籍
         //   this.censusShow = true
         //   break
-        case '2': //家庭地址
+        case '2': //联系地址
           this.homeShow = true
           break
         case '3': //单位地址
@@ -1731,6 +1734,24 @@ export default {
     this.timeId = null
     this.countDown = 60
     this.codeDisabled = false
+  },
+  watch: {
+    async 'withRootUser.value'(n) {
+      if (n) {
+        const rs = await getOrderDetail({ orderNo: window.localStorage.getItem('orderNo') })
+        this.homeName = getAreaName([
+          { code: rs.orderDTO.appntDTO.homeProvince },
+          { code: rs.orderDTO.appntDTO.homeCity },
+          { code: rs.orderDTO.appntDTO.homeArea }
+        ])
+        this.userInfo.homeProvince = rs.orderDTO.appntDTO.homeProvince
+        this.userInfo.homeCity = rs.orderDTO.appntDTO.homeCity
+        this.userInfo.homeArea = rs.orderDTO.appntDTO.homeArea
+        this.userInfo.homeAddress = rs.orderDTO.appntDTO.homeAddress
+      } else {
+        this.homeName = this.userInfo.homeAddress = ''
+      }
+    }
   }
   // watch: {
   //    'userInfo.idNo': {