From d1d6ef69c10ef32ba1993fc9f36a41565eeaefad Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 15 Mar 2022 14:02:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPeopleList/PeopleList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppPeopleList/PeopleList.vue b/src/apps/AppPeopleList/PeopleList.vue
index 012f5459..2ed66b44 100644
--- a/src/apps/AppPeopleList/PeopleList.vue
+++ b/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>

From 60f60c96983473f2a7b8a0ec064735d5790ce664 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 15 Mar 2022 14:04:03 +0800
Subject: [PATCH 2/3] 28229

---
 src/apps/AppPeopleList/Add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppPeopleList/Add.vue b/src/apps/AppPeopleList/Add.vue
index abdda7f7..f2f12d1e 100644
--- a/src/apps/AppPeopleList/Add.vue
+++ b/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)

From 3a416ef22d903f13f38a2faa565f241a9c427e3c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 15 Mar 2022 14:22:13 +0800
Subject: [PATCH 3/3] 28226

---
 src/apps/AppPeopleList/DetailPeople.vue | 3 +++
 src/apps/AppPeopleList/ExamineList.vue  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppPeopleList/DetailPeople.vue b/src/apps/AppPeopleList/DetailPeople.vue
index 0a571c9e..50cb2582 100644
--- a/src/apps/AppPeopleList/DetailPeople.vue
+++ b/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;
diff --git a/src/apps/AppPeopleList/ExamineList.vue b/src/apps/AppPeopleList/ExamineList.vue
index 0c416b4b..ca513448 100644
--- a/src/apps/AppPeopleList/ExamineList.vue
+++ b/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) => {