From 5f9fbfbff5f4db7576d69ef030d7f35ebc1af7a6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 14 Mar 2022 18:27:52 +0800
Subject: [PATCH] 28196

---
 src/apps/AppPeopleList/Add.vue        | 42 +++++++++++++++++++--------
 src/apps/AppPeopleList/PeopleList.vue |  3 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/apps/AppPeopleList/Add.vue b/src/apps/AppPeopleList/Add.vue
index b2155043..f322e22f 100644
--- a/src/apps/AppPeopleList/Add.vue
+++ b/src/apps/AppPeopleList/Add.vue
@@ -1,5 +1,16 @@
 <template>
   <div class="add">
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border">
+        <span class="label">居民类型</span>
+        <span class="value" @click="clickSelect('residentType', 'residentType')">
+          <span v-if="form.residentType === ''" class="color-999">请选择</span>
+          <span v-else>{{$dict.getLabel('residentType', form.residentType)}}</span>
+          <img src="./components/img/right-icon.png" alt="">
+        </span>
+      </div>
+    </div>
     <div class="item">
       <span class="tips">*</span>
       <div class="border">
@@ -45,7 +56,10 @@
       <div class="border">
         <span class="label">身份证号</span>
         <span class="value">
-          <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" @input="changeIdNumber" :disabled="this.form.id ? true : false">
+          <u-input type="text" placeholder="请输入" v-model="form.idNumber" input-align="right"
+                   placeholder-style="color:#999;font-size:16px;" height="48" :maxlength="18" :clearable="false"
+                   @input="changeIdNumber" :disabled="this.form.id ? true : false" />
+          <!-- <input type="idcard" placeholder="请输入" v-model="form.idNumber" maxlength="18" @input="changeIdNumber" :disabled="this.form.id ? true : false"> -->
         </span>
       </div>
     </div>
@@ -84,7 +98,7 @@
       <div class="border">
         <span class="label">现住址</span>
         <span class="value">
-          <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" :value="form.currentAreaId" mode="custom" all @select="onCurrentAreaChange">
+          <AiAreaPicker ref="address" class="aiArea" :areaId="user.areaId" :fullName.sync="form.currentAreaName" :value="form.currentAreaId" mode="custom" @select="onCurrentAreaChange">
             <div class="aiArea">
               <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
               <span v-else class="color-999">请选择</span>
@@ -108,7 +122,7 @@
       <div class="border">
         <span class="label">户籍地址</span>
         <span class="value">
-          <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.householdAreaName" :value="form.householdAreaId" mode="custom" all @select="onHouseAreaChange">
+          <AiAreaPicker ref="address" class="aiArea" :areaId="user.areaId" :fullName.sync="form.householdAreaName" :value="form.householdAreaId" mode="custom" @select="onHouseAreaChange">
             <div class="aiArea">
               <span class="label" v-if="form.householdAreaName">{{ form.householdAreaName }}</span>
               <span v-else class="color-999">请选择</span>
@@ -166,21 +180,25 @@ export default {
     }
   },
   onLoad(options) {
-    if(options.id) {
-      document.title = '编辑居民'
-      this.form.id = options.id
-      this.getDetail()
-    }else {
-      document.title = '新增居民'
-      this.form.residentType = options.type
-    }
-    this.$dict.load('yesOrNo', 'sex', 'householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType')
+    this.$dict.load('yesOrNo', 'sex', 'householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'residentType').then(() => {
+      if(options.id) {
+        document.title = '编辑居民'
+        this.form.id = options.id
+        this.getDetail()
+      }else {
+        document.title = '新增居民'
+        this.form.residentType = options.type || ''
+      }
+    })
   },
   computed: {
     ...mapState(['user']),
   },
   methods: {
     submit() {
+      if(this.form.residentType === '') {
+        return this.$u.toast('请选择居民类型')
+      }
       if(this.form.householdName === '') {
         return this.$u.toast('请选择是否户主')
       }
diff --git a/src/apps/AppPeopleList/PeopleList.vue b/src/apps/AppPeopleList/PeopleList.vue
index c6a353bd..dc09fe33 100644
--- a/src/apps/AppPeopleList/PeopleList.vue
+++ b/src/apps/AppPeopleList/PeopleList.vue
@@ -140,7 +140,8 @@ export default {
       this.getList()
     },
     toAdd() {
-      uni.navigateTo({url:'./Add'})
+      var residentType = ['', 0, 1][this.currentTabs]
+      uni.navigateTo({url:`./Add?type=${residentType}`})
     }
   },
   onReachBottom() {