From 5aba44c19250e0644c5691ad74d2635b03bdfa00 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 28 Mar 2022 16:35:41 +0800
Subject: [PATCH] 28574

---
 src/apps/AppMonitoringObject/Add.vue           | 18 +++++++++++++++---
 .../MonitorAddFamilyMember.vue                 |  8 ++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index 412ecbfa..f8395709 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -68,7 +68,7 @@
             <span>现住址</span>
           </div>
           <div class="right">
-            <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :areaId="$areaId" all @select="onAreaChange">
+            <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :areaId="user.areaId" all @select="onAreaChange">
                 <div class="aiArea">
                   <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
                   <i v-else>请选择</i>
@@ -265,7 +265,7 @@
 </template>
 
 <script>
-
+import {mapState} from 'vuex'
 export default {
   data() {
     return {
@@ -294,6 +294,7 @@ export default {
         girdId: '',
         girdName: '',
         healthyStatus: '',
+        age: '',
       },
       $areaId: '',
       isEdit: false,
@@ -301,6 +302,9 @@ export default {
       girdInfo: {}
     }
   },
+  computed: {
+    ...mapState(['user']),
+  },
 
   onLoad(query) {
     this.isGirdUser()
@@ -311,7 +315,7 @@ export default {
         this.id = query.id
         this.getInfo(this.id)
       }else {
-        this.currentAreaName = this.$store.state.user.areaFullName
+        this.form.currentAreaId = this.user.areaId
       }
     })
     
@@ -398,6 +402,14 @@ export default {
       }
       var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
       this.form.sex = info.gender
+      var myDate = new Date();
+      var month = myDate.getMonth() + 1;
+      var day = myDate.getDate();
+      var age = myDate.getFullYear() - this.form.idNumber.substring(6, 10) - 1;
+      if (this.form.idNumber.substring(10, 12) < month || this.form.idNumber.substring(10, 12) == month && this.form.idNumber.substring(12, 14) <= day) {
+        age++;
+      }
+      this.form.age = age
     },
     isGirdUser() {
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
diff --git a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
index a5b83249..e7935936 100644
--- a/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
+++ b/src/apps/AppMonitoringObject/MonitorAddFamilyMember.vue
@@ -407,6 +407,14 @@ export default {
       }
       var info = this.$idCardNoUtil.getIdCardInfo(this.form.idNumber)
       this.form.sex = info.gender
+      var myDate = new Date();
+      var month = myDate.getMonth() + 1;
+      var day = myDate.getDate();
+      var age = myDate.getFullYear() - this.form.idNumber.substring(6, 10) - 1;
+      if (this.form.idNumber.substring(10, 12) < month || this.form.idNumber.substring(10, 12) == month && this.form.idNumber.substring(12, 14) <= day) {
+        age++;
+      }
+      this.form.age = age
     },
   }
 }