From 2d6a9c4bab656219feb2d53cefede8e692e54f41 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 9 Feb 2022 17:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E7=99=BB=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppHealthUp/AppHealthUp.vue |  6 ++--
 src/saas/AppHealthUp/OtherUser.vue   | 44 ++++++++++++++++++++++------
 src/saas/AppMailList/myAddList.vue   |  2 +-
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/saas/AppHealthUp/AppHealthUp.vue b/src/saas/AppHealthUp/AppHealthUp.vue
index 6a706194..59b9cee7 100644
--- a/src/saas/AppHealthUp/AppHealthUp.vue
+++ b/src/saas/AppHealthUp/AppHealthUp.vue
@@ -153,13 +153,14 @@ export default {
       tabList: [{ name: '健康上报'},{ name: '上报统计'}],
       currentTabs: 0,
       form: {temperature: '', touchInFourteen: '', health: []},
-      isUpload: false,
+      isUpload: true,
       weekList: ['一', '二', '三', '四', '五', '六', '日'],
       dayList: [],
       month: '',
       selectDay: '',
       healthInfo: {},
       isAdmin: false, //是否网格长
+      girdMemberId: '',
     }
   },
   computed: {
@@ -253,7 +254,7 @@ export default {
       this.currentTabs = index
     },
     toOther() {
-      uni.navigateTo({ url: './OtherUser'})
+      uni.navigateTo({ url: `./OtherUser?girdMemberId=${this.girdMemberId}`})
     },
     isGirdUser() {
       this.isAdmin = false
@@ -261,6 +262,7 @@ export default {
         if (res.code == 0) {
           if (res.data.checkType == 2) {
             this.isAdmin = true
+            this.girdMemberId = res.data.girdMemberId
           }
         }
       })
diff --git a/src/saas/AppHealthUp/OtherUser.vue b/src/saas/AppHealthUp/OtherUser.vue
index a5597355..ee901626 100644
--- a/src/saas/AppHealthUp/OtherUser.vue
+++ b/src/saas/AppHealthUp/OtherUser.vue
@@ -2,18 +2,19 @@
   <div class="OtherUser">
     <AiTopFixed>
       <div class="seachObjs">
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="getListInit" @clear="handerClear"></u-search>
       </div>
     </AiTopFixed>
     <div class="user-list">
-      <div class="item" @click="toOtherSta">
+      <div class="item" v-for="(item, index) in list" :key="index" @click="toOtherSta(item.id)" >
         <div class="left">
-          <img src="./components/img/user-icon.png" alt="">李轶
+          <img src="./components/img/user-icon.png" alt="">{{item.name}}
         </div>
         <div class="right">
-          今日已上报<img src="./components/img/right-icon.png" alt="">
+          <span :class="item.status == 1 ? '' : 'color-F5A319'">{{item.status == 1 ? '今日已上报' : '今日未上报'}}</span><img src="./components/img/right-icon.png" alt="">
         </div>
       </div>
+      <AiEmpty v-if="!list.length"/>
     </div>
   </div>
 </template>
@@ -26,22 +27,48 @@ export default {
   data() {
     return {
       keyword: '',
+      current: 1,
+      girdMemberId: '',
+      list: []
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  onLoad() {
-    
+  onLoad(option) {
+    this.girdMemberId = option.girdMemberId
+    this.getUserList()
   },
   onShow() {
     document.title = '其他成员'
   },
   methods: {
-    toOtherSta() {
-      uni.navigateTo({ url: './OtherStatistics'})
+    toOtherSta(id) {
+      uni.navigateTo({ url: `./OtherStatistics?id=${id}`})
     },
+    handerClear() {
+      this.keyword = ''
+      this.getListInit()
+    },
+    getListInit() {
+      this.current = 1
+      this.getUserList()
+    },
+    getUserList() {
+      this.$http.post(`/app/appepidemichealthreport/other-report?girdMemberId=${this.girdMemberId}&name=${this.keyword}&size=20&current=${this.current}`).then((res) => {
+        if (res.code == 0) {
+          if (this.current > 1 && this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    }
   },
+  onReachBottom() {
+    this.current ++
+    this.getUserList()
+  }
 }
 </script>
 
@@ -91,7 +118,6 @@ uni-page-body{
 
 
   .emptyWrap {
-    background: #f5f5f5;
     margin: 0;
   }
   ::v-deep .emptyText{
diff --git a/src/saas/AppMailList/myAddList.vue b/src/saas/AppMailList/myAddList.vue
index 3355b007..e57cefa9 100644
--- a/src/saas/AppMailList/myAddList.vue
+++ b/src/saas/AppMailList/myAddList.vue
@@ -16,7 +16,7 @@
     </div>
     <div class="empty" v-else>
       <img src="./img/empty.png" alt="">
-      <p>您还未添加便民通讯录<br/>点击<span>新增按钮</span>试试吧</p>
+      <p>您还未添加通讯录<br/>点击<span>新增按钮</span>试试吧</p>
     </div>
     <div class="footer-btn" @click="edit('')">新增</div>
   </div>