From 23189f56b61f61a79f768713a41f47b7a2548c63 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 10 Feb 2022 10:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/saas/AppSpecialPeople/detail.vue | 60 ++++++++++++++++------------
 src/saas/AppWalkask/selectType.vue   |  1 -
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/saas/AppSpecialPeople/detail.vue b/src/saas/AppSpecialPeople/detail.vue
index 9c220f01..8a045c50 100644
--- a/src/saas/AppSpecialPeople/detail.vue
+++ b/src/saas/AppSpecialPeople/detail.vue
@@ -39,15 +39,15 @@
       </div>
     </div>
     <div v-else>
-      <div class="item-content" v-for="(item, index) in userList" :key="index">
-        <div class="title" @click="showUserType(index)">
+      <div class="item-content" v-for="(item, index) in typeList" :key="index">
+        <div class="title" @click="showUserType(item)">
           <h2>
-            {{ $dict.getLabel('appSpecialTypeFive', item.label) }}
+            {{ item.dictName }}
           </h2>
-          <img src="./img/down-icon.png" alt="" :class="item.check ? 'img-active' : ''">
+          <img src="./img/down-icon.png" alt="" :class="type == item.dictValue ? 'img-active' : ''">
         </div>
-        <div class="user-list" v-if="item.check">
-          <div class="user-item" v-for="(e, indexs) in item.value" :key="indexs" v-if="item.value && item.value.length">
+        <div class="user-list" v-if="type == item.dictValue">
+          <div class="user-item" v-for="(e, indexs) in userList" :key="indexs">
             <div class="user-img">
               <img src="./img/user-img.png" alt="">
             </div>
@@ -64,7 +64,7 @@
               </div>
             </div>
           </div>
-          <p class="text" v-if="!item.value.length">{{'暂无' +  $dict.getLabel('appSpecialTypeFive', item.label) + '信息'}}</p>
+          <p class="text" v-if="!userList.length">{{'暂无' +  item.dictName + '信息'}}</p>
         </div>
       </div>
       <div class="footer" @click="toAdd">
@@ -88,12 +88,16 @@ export default {
       statisticsList: [],
       statisticsListMon: [],
       userList: [],
-      name: ''
+      name: '',
+      typeList: [],
+      type: '',
+      current: 1
     }
   },
   computed: { ...mapState(['user']) },
   created() {
     this.$dict.load('appSpecialTypeFive').then(() => {
+      this.typeList = this.$dict.getDict('appSpecialTypeFive')
       this.areaId = this.user.areaId
       this.areaName = this.user.areaName
       this.getStatistic()
@@ -151,17 +155,12 @@ export default {
     },
     getUserList() {
       this.userList = []
-      this.$http.post('app/appspecialadjustment/allList',{type: '', name: this.name}).then((res) => {
+      this.$http.post(`app/appspecialadjustment/allList?size=20&current=${this.current}`,{type: this.type, name: this.name}).then((res) => {
         if (res.code == 0) {
-          for(let i in res.data){
-            var obj = {
-              label: i,
-              value: res.data[i],
-              check: false
-            }
-            this.userList.push(obj)
-
+          if(this.current > res.data.total) {
+            return
           }
+          this.userList = this.current > 1 ? [...this.userList, ...res.data.records] : res.data.records
         }
       })
     },
@@ -176,15 +175,20 @@ export default {
       }
       return idNumber
     },
-    showUserType(index) {
-      if(this.userList[index].check) {
-        this.userList[index].check = false
-      }else {
-        this.userList.map((item) => {
-          item.check = false
-        })
-        this.userList[index].check = true
-      }
+    showUserType(item) {
+      // if(this.userList[index].check) {
+      //   this.userList[index].check = false
+      // }else {
+      //   this.userList.map((item) => {
+      //     item.check = false
+      //   })
+      //   this.userList[index].check = true
+      // }
+      console.log(item)
+      this.type = item.dictValue
+      this.current = 1
+      this.userList = []
+      this.getUserList()
 
     },
     toEdit(row,index) {
@@ -209,6 +213,10 @@ export default {
         })
       }).catch(() => {})
     }
+  },
+  onReachBottom() {
+    this.current ++
+    this.getUserList()
   }
 }
 </script>
diff --git a/src/saas/AppWalkask/selectType.vue b/src/saas/AppWalkask/selectType.vue
index 713f6423..1f395578 100644
--- a/src/saas/AppWalkask/selectType.vue
+++ b/src/saas/AppWalkask/selectType.vue
@@ -109,7 +109,6 @@ export default {
           res.data.records.map((item) => {
             item.isChecked = false
           })
-          uni.hideLoading()
           this.userList = this.current > 1 ? [...this.userList, ...res.data.records] : res.data.records
         }
       })