From 6552467cea36e4f1983665a82316a9011a39590c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 19:35:24 +0800
Subject: [PATCH] BUG 29456

---
 src/apps/AppMonitoringObject/Add.vue                  |  2 +-
 .../AppMonitoringObject/MonitorAddFamilyMember.vue    | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index abef1f75..cfe12b47 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -519,7 +519,7 @@ export default {
       handler: function (v) {
         let {name, idNumber, currentAreaId, currentAreaName} = v?.[0] || {}
         this.form = {...this.form, name, idNumber, currentAreaId, currentAreaName}
-        this.form.sex = this.idCardNoUtil.getIdCardInfo(idNumber)?.sex
+        this.form.sex = this.$idCardNoUtil.getIdCardInfo(idNumber)?.sex
       },
       deep: true,
     },
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index c81e96b0..85d4deb5 100644
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -94,8 +94,7 @@
               <span>现住址</span>
             </div>
             <div class="right">
-              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :root="user.areaId"
-                            @select="onAreaChange">
+              <AiAreaPicker :fullName.sync="form.currentAreaName" v-model="form.currentAreaId">
                 <div class="aiArea">
                   <span class="label" style="color: #333;" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
                   <i v-else>请选择</i>
@@ -490,7 +489,7 @@ export default {
     }
 
     this.isGirdUser()
-    this.$areaId = this.$store.state.user.areaId
+    this.$areaId = this.user.areaId
     uni.$on('reload', () => {
       this.getInfo()
     })
@@ -501,9 +500,6 @@ export default {
   },
 
   methods: {
-    onAreaChange(e) {
-      this.form.currentAreaId = e
-    },
     userClick(row, i) {
       if (!this.helthList[i].checked) {
         this.helthList[i].checked = true // 确定
@@ -515,7 +511,6 @@ export default {
             this.namelist.splice(index, 1)
           }
         })
-
       }
       this.form.healthyStatus = this.namelist.map(v => v.dictValue).join(',')
     },
@@ -671,7 +666,7 @@ export default {
       handler: function (v) {
         let {name, idNumber, currentAreaId, currentAreaName} = v?.[0] || {}
         this.form = {...this.form, name, idNumber, currentAreaId, currentAreaName}
-        this.form.sex = this.idCardNoUtil.getIdCardInfo(idNumber)?.sex
+        this.form.sex = this.$idCardNoUtil.getIdCardInfo(idNumber)?.sex
       },
       deep: true,
     },