Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppPeopleList/Add.vue

@@ -223,7 +223,7 @@ export default {
       if(!/[^0]0{0,2}$/.test(this.form.currentAreaId)) {
         return this.$u.toast('现住址必须选到村级')
       }
-      if(!/[^0]0{0,2}$/.test(this.form.householdAreaId)) {
+      if(this.form.householdAreaId && !/[^0]0{0,2}$/.test(this.form.householdAreaId)) {
         return this.$u.toast('户籍地必须选到村级')
       }
       this.form.age =  this.$calcAge(this.form.idNumber)

src/apps/AppPeopleList/DetailPeople.vue

@@ -284,6 +284,9 @@ export default {
   .tab-list{
   padding-top: 32px;
   display: flex;
+  word-wrap: nowrap;
+  overflow-x: scroll;
+  -webkit-overflow-scrolling: touch;
   .tab-item{
     display: inline-block;
     width: 148px;

src/apps/AppPeopleList/ExamineList.vue

@@ -106,7 +106,8 @@ export default {
           current: this.current,
           con: this.keyword,
           areaId: this.areaId,
-          auditType
+          auditType,
+          source: 1
         },
       })
       .then((res) => {

src/apps/AppPeopleList/PeopleList.vue

@@ -30,7 +30,7 @@
         <div class="right">
           <div class="rightTop">
             <span class="name">{{ item.name }}</span>
-            <span class="btn" v-if="item.doRight == 1">
+            <span class="btn" v-if="user.id == item.createUserId">
               <img src="./components/img/edit-icon.png" alt="" @click.stop="edit(item.id)">
               <img src="./components/img/del-icon.png" alt="" @click.stop="del(item.id)">
             </span>