From a1ff252028bb2071e6d19d2bce7edd459a305e43 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 16 Feb 2022 14:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPeopleList.vue/Content.vue        |  21 +++-
 src/apps/AppPeopleList.vue/DetailPeople.vue   |  25 +++-
 src/apps/AppPeopleList.vue/ExamineList.vue    | 113 +++++++++++++-----
 src/apps/AppPeopleList.vue/PeopleList.vue     |   7 +-
 src/components/pages/selectGird.vue           |   1 +
 .../AppGridManagement/AppGridManagement.vue   |   2 +-
 6 files changed, 127 insertions(+), 42 deletions(-)

diff --git a/src/apps/AppPeopleList.vue/Content.vue b/src/apps/AppPeopleList.vue/Content.vue
index 00c9e7eb..b9fe3e83 100644
--- a/src/apps/AppPeopleList.vue/Content.vue
+++ b/src/apps/AppPeopleList.vue/Content.vue
@@ -2,9 +2,9 @@
   <div class="Content">
     <div class="text-area">
       <div class="title">不通过理由</div>
-      <textarea placeholder="请输入" maxlength="200"></textarea>
+      <textarea placeholder="请输入" maxlength="200" v-model="opinion"></textarea>
     </div>
-    <div class="footer" @click="submit">
+    <div class="footer" @click="examine(0)">
       <div class="btn">保存</div>
     </div>
   </div>
@@ -15,18 +15,27 @@ export default {
   name: "Content",
   data() {
     return {
-      value: '',
+      opinion: '',
+      id: '',
     };
   },
   onShow() {
     document.title = '居民档案审核'
   },
   onLoad(option) {
-    // this.id = option.id
+    this.id = option.id
   },
   methods: {
-    submit() {
-
+    examine(pass) {
+      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()
+          }, 600)
+        }
+      })
     }
   },
 };
diff --git a/src/apps/AppPeopleList.vue/DetailPeople.vue b/src/apps/AppPeopleList.vue/DetailPeople.vue
index 11879866..8b699e38 100644
--- a/src/apps/AppPeopleList.vue/DetailPeople.vue
+++ b/src/apps/AppPeopleList.vue/DetailPeople.vue
@@ -105,10 +105,10 @@
       </div>
     </div>
 
-    <div class="pad-b112"></div>
-    <div class="footer">
-      <div>不通过</div>
-      <div class="pass">通过</div>
+    <div class="pad-b112" v-if="!data.resident.auditStatus == 0"></div>
+    <div class="footer" v-if="!data.resident.auditStatus == 0">
+      <div @click="toContent">不通过</div>
+      <div class="pass" @click="examine(1)">通过</div>
     </div>
   </div>
 </template>
@@ -131,6 +131,9 @@ export default {
     this.$dict.load('householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType', 'job').then(() => {
       this.getDetail()
     })
+    uni.$on('updatePeople', res => {
+      this.getDetail()
+    })
   },
   onShow() {
     document.title = '家庭成员信息'
@@ -149,6 +152,20 @@ export default {
     callPhone(phone) {
       uni.makePhoneCall({ phoneNumber: phone })
     },
+    examine(pass) {
+      this.$confirm('确认通过该审核？').then(() => {
+        this.$http.post(`/app/appresident/examine?id=${this.id}&pass=${pass}`).then((res) => {
+          if (res.code == 0) {
+            this.getDetail()
+            this.$u.toast('审核成功')
+          }
+        })
+      })
+      
+    },
+    toContent() {
+      uni.navigateTo({url: `./Content?id=${this.id}`})
+    }
   },
 }
 </script>
diff --git a/src/apps/AppPeopleList.vue/ExamineList.vue b/src/apps/AppPeopleList.vue/ExamineList.vue
index 27b92792..fe9610e2 100644
--- a/src/apps/AppPeopleList.vue/ExamineList.vue
+++ b/src/apps/AppPeopleList.vue/ExamineList.vue
@@ -14,8 +14,8 @@
         <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>
       </div>
     </AiTopFixed>
-    <div v-if="data.family && data.family.length > 0">
-      <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
+    <div v-if="datas && datas.length > 0" class="list-content">
+      <div class="card" v-for="(item, i) in datas" :key="i" @click="toDetailPeople(item)">
         <div class="photos">
           <img :src="item.photo" alt="" v-if="item.photo" />
           <img src="./components/img/44.png" alt="" v-else />
@@ -29,6 +29,7 @@
               <span class="householdNames" v-else>
                 {{ $dict.getLabel('householdRelation', item.householdRelation) }}
               </span>
+              <span class="audit-status" :class="'status'+item.auditStatus">{{ $dict.getLabel('auditStatus', item.auditStatus) }}</span>
             </div>
 
             <div class="rightTop-rights">
@@ -57,7 +58,7 @@ export default {
   data() {
     return {
       id: '',
-      data: [],
+      datas: [],
       resident: {},
       areaId: '',
       areaName: '',
@@ -70,38 +71,76 @@ export default {
         },
       ],
       currentTabs: 0,
+      keyword: ''
     }
   },
   computed: {
     ...mapState(['user']),
   },
+  onLoad() {
+    this.$dict.load('householdRelation', 'auditStatus').then(() => {
+      this.getList()
+    })
+  },
   onShow() {
     document.title = '居民档案审核'
   },
   methods: {
-    change(index) {
-      this.data = []
-      // this.keyword = ''
-      this.currentTabs = index
-      // this.current = 1
-      // this.getList()
+    getListInit() {
+      this.current = 1
+      this.datas = []
+      this.getList()
     },
-    getDetail() {
-      this.$http.post(`/app/appresident/detail?id=${this.id}`).then((res) => {
+    getList() {
+      var auditType = 0 // 0待处理; 2已处理
+      if(this.currentTabs == 1) {
+        auditType = 2
+      }
+      this.$http.post('/app/appresident/list', null, {
+        params: {
+          size: 10,
+          current: this.current,
+          con: this.keyword,
+          areaId: this.areaId,
+          auditType
+        },
+      })
+      .then((res) => {
         if (res.code == 0) {
-          this.data = res.data
-          this.$forceUpdate()
-          this.$nextTick(() => {
-            this.resident = res.data.resident
-            this.$forceUpdate()
-          })
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+
+          this.pages = res.data.pages
         }
       })
     },
 
+    change(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+
     toDetailPeople(item) {
       uni.navigateTo({ url: `./DetailPeople?id=${item.id}` })
     },
+
+    seachObj(e) {
+      this.areaId = e
+      this.getListInit()
+    },
+
+    handerSearch(e) {
+      this.keyword = e
+      this.getListInit()
+    },
+
+    handerClear() {
+      this.keyword = ''
+      this.getListInit()
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
   },
 }
 </script>
@@ -109,12 +148,18 @@ export default {
 <style scoped lang="scss">
 .ExamineList {
   height: 100%;
+  .list-content{
+    padding: 0 60px;
+    background-color: #fff;
+  }
   .card {
     display: flex;
     box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.08);
     border-radius: 16px;
     padding: 48px 32px;
     margin-bottom: 32px;
+    background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
+    background-size: 100% 100%;
     .photos {
       img {
         width: 96px;
@@ -141,6 +186,8 @@ export default {
             font-size: 26px;
             font-weight: 500;
             color: #5aad6a;
+            display: inline-block;
+            width: 100px;
           }
           .fileStatuss {
             display: inline-block;
@@ -174,16 +221,6 @@ export default {
       }
     }
   }
-  .card:nth-child(2n-1) {
-    // background: royalblue;
-    background: url(http://respub.sinoecare.net/20211222/装饰-20211222162743.png) no-repeat;
-    background-size: 100% 100%;
-  }
-  .card:nth-child(2n) {
-    // background: pink;
-    background: url(http://respub.sinoecare.net/20211222/装饰2-20211222162934.png) no-repeat;
-    background-size: 100% 100%;
-  }
   .middle {
     display: flex;
     padding: 24px 32px;
@@ -205,6 +242,28 @@ export default {
   ::v-deep .content{
     padding: 0;
   }
+
+  .audit-status{
+    display: inline-block;
+    padding: 0 8px;
+    line-height: 40px;
+    background: #EAF0FE;
+    border-radius: 8px;
+    font-size: 24px;
+    font-family: PingFangSC-Regular, PingFang SC;
+  }
+  .status1{
+    color: #3E95FF;
+    background-color: #EAF0FE;
+  }
+  .status0{
+    color: #5AAD6A;
+    background-color: #E9FFED;
+  }
+  .status2{
+    color: #f46;
+    background-color: #FFECEF;
+  }
   
 }
 </style>
diff --git a/src/apps/AppPeopleList.vue/PeopleList.vue b/src/apps/AppPeopleList.vue/PeopleList.vue
index a0ac138e..ce3bda72 100644
--- a/src/apps/AppPeopleList.vue/PeopleList.vue
+++ b/src/apps/AppPeopleList.vue/PeopleList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="AppResidentDocument">
+  <div class="PeopleList">
     <div class="areatop">
       <!-- <div>区域选择</div>
       <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
@@ -46,8 +46,7 @@
 import { mapState } from 'vuex'
 
 export default {
-  name: 'AppResidentDocument',
-  appName: '居民档案',
+  name: 'PeopleList',
   components: {},
   props: {},
   data() {
@@ -142,7 +141,7 @@ export default {
 uni-page-body {
   height: 100%;
 }
-.AppResidentDocument {
+.PeopleList {
   height: 100%;
   .areatop {
     display: flex;
diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index c928db2c..93cea67d 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -69,6 +69,7 @@ export default {
       this.isMyGird = params.isMyGird
     }
     this.isGirdUser()
+    
   },
   methods: {
     isGirdUser() {
diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue
index ffc0819d..cdeef2c2 100644
--- a/src/saas/AppGridManagement/AppGridManagement.vue
+++ b/src/saas/AppGridManagement/AppGridManagement.vue
@@ -2,7 +2,7 @@
   <div class="AppGridManagement">
     <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
     <div class="select-gird" v-if="component != 'Map' && isAdmin" flex>
-      <AiPagePicker type="gird" class="fill" :selected="[params]" @select="handleSelectGird">
+      <AiPagePicker type="gird" class="fill" :selected="[params]" @select="handleSelectGird" >
         <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
         <div class="gird-name" v-text="params.girdName" />
         <u-icon name="arrow-down" color="#999" class="down-icon" size="20"/>