From 89e209808bb96ad459cc5850b752bdd48e32e380 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 25 Feb 2022 15:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=B1=E4=B8=9C=E7=A7=BB=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEpidemicSituation/BackUserList.vue     |  1 +
 .../shandong10086/AppPeopleList/Content.vue   | 20 +++++++++++---
 .../AppPeopleList/DetailPeople.vue            | 26 ++++++++++++-------
 .../AppPeopleList/ExamineList.vue             |  5 +++-
 src/saas/AppBackUserList/AppBackUserList.vue  |  1 +
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/apps/AppEpidemicSituation/BackUserList.vue b/src/apps/AppEpidemicSituation/BackUserList.vue
index 9e643358..d5ac9393 100644
--- a/src/apps/AppEpidemicSituation/BackUserList.vue
+++ b/src/apps/AppEpidemicSituation/BackUserList.vue
@@ -197,6 +197,7 @@ export default {
     }
   }
   .user-list{
+    background-color: #f5f5f5;
     .item{
       padding: 32px 64px 24px;
       background-color: #fff;
diff --git a/src/project/shandong10086/AppPeopleList/Content.vue b/src/project/shandong10086/AppPeopleList/Content.vue
index b9fe3e83..4b690bce 100644
--- a/src/project/shandong10086/AppPeopleList/Content.vue
+++ b/src/project/shandong10086/AppPeopleList/Content.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="Content">
     <div class="text-area">
-      <div class="title">不通过理由</div>
-      <textarea placeholder="请输入" maxlength="200" v-model="opinion"></textarea>
+      <div class="title"><span class="tips">*</span>不通过理由</div>
+      <textarea placeholder="请输入" maxlength="500" v-model="opinion"></textarea>
+      <div class="num">{{opinion.length}}/500</div>
+      <!-- <u-input v-model="opinion" type="textarea" placeholder="请输入"  maxlength="500" /> -->
     </div>
     <div class="footer" @click="examine(0)">
       <div class="btn">保存</div>
@@ -27,12 +29,15 @@ export default {
   },
   methods: {
     examine(pass) {
+      if(!this.opinion) {
+        return this.$u.toast('请输入不通过理由')
+      }
       this.$http.post(`/app/appresident/examine?id=${this.id}&pass=${pass}&opinion=${this.opinion}`).then((res) => {
         if (res.code == 0) {
           this.$u.toast('审核成功')
           uni.$emit('updatePeople')
           setTimeout(() => {
-            uni.navigateBack()
+            uni.navigateBack({delta: 2})
           }, 600)
         }
       })
@@ -52,6 +57,11 @@ export default {
       color: #333;
       line-height: 44px;
       margin-bottom: 32px;
+      .tips{
+        font-size: 32px;
+        margin-right: 8px;
+        color: #f46;
+      }
     }
     textarea{
       width: 100%;
@@ -59,6 +69,10 @@ export default {
       word-break: break-all;
     }
   }
+  .num{
+    text-align: right;
+    color: #999;
+  }
   .footer {
     width: 100%;
     position: fixed;
diff --git a/src/project/shandong10086/AppPeopleList/DetailPeople.vue b/src/project/shandong10086/AppPeopleList/DetailPeople.vue
index 1bcb16ba..2a05c05e 100644
--- a/src/project/shandong10086/AppPeopleList/DetailPeople.vue
+++ b/src/project/shandong10086/AppPeopleList/DetailPeople.vue
@@ -84,23 +84,23 @@
         </div>
 
         <div class="item">
-          <span>现住址</span>
-          <span v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
+          <span class="label">现住址</span>
+          <span class="value" v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
         </div>
 
         <div class="item">
-          <span>现住详细地址</span>
-          <span v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
+          <span class="label">现住详细地址</span>
+          <span class="value" v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
         </div>
 
         <div class="item">
-          <span>户籍地址</span>
-          <span v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
+          <span class="label">户籍地址</span>
+          <span class="value" v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
         </div>
 
         <div class="item">
-          <span>户籍详细地址</span>
-          <span v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
+          <span class="label">户籍详细地址</span>
+          <span class="value" v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
         </div>
       </div>
     </div>
@@ -158,7 +158,7 @@ export default {
       this.$confirm('确认通过该审核？').then(() => {
         this.$http.post(`/app/appresident/examine?id=${this.id}&pass=${pass}`).then((res) => {
           if (res.code == 0) {
-            this.getDetail()
+            uni.navigateBack()
             this.$u.toast('审核成功')
           }
         })
@@ -232,6 +232,14 @@ export default {
         .phones {
           color: #3d94fb;
         }
+        .label{
+          width: 200px;
+        }
+        .value{
+          width: calc(100% - 200px);
+          text-align: right;
+          word-break: break-all;
+        }
       }
     }
   }
diff --git a/src/project/shandong10086/AppPeopleList/ExamineList.vue b/src/project/shandong10086/AppPeopleList/ExamineList.vue
index 9555c107..e2730e8b 100644
--- a/src/project/shandong10086/AppPeopleList/ExamineList.vue
+++ b/src/project/shandong10086/AppPeopleList/ExamineList.vue
@@ -11,7 +11,7 @@
             <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#999" color="#999" height="58" @search="handerSearch" @clear="handerClear"></u-search>
       </div>
     </AiTopFixed>
     <div v-if="datas && datas.length > 0" class="list-content">
@@ -82,6 +82,9 @@ export default {
     this.$dict.load('householdRelation', 'auditStatus').then(() => {
       this.getList()
     })
+    uni.$on('updatePeople', () => {
+      this.getListInit()
+    })
   },
   onShow() {
     document.title = '居民档案审核'
diff --git a/src/saas/AppBackUserList/AppBackUserList.vue b/src/saas/AppBackUserList/AppBackUserList.vue
index 48b8b343..a2c83a59 100644
--- a/src/saas/AppBackUserList/AppBackUserList.vue
+++ b/src/saas/AppBackUserList/AppBackUserList.vue
@@ -301,6 +301,7 @@ export default {
   }
 
   .user-list {
+    background-color: #f5f5f5;
     .item {
       padding: 32px 64px 24px;
       background-color: #fff;