From 69f618f49b948e1f37011233d2080966869b61f8 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 10 May 2023 17:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/wuxi/AppHandSnapshot/Content.vue |  2 +-
 src/project/wuxi/AppHandSnapshot/List.vue    | 28 +++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/project/wuxi/AppHandSnapshot/Content.vue b/src/project/wuxi/AppHandSnapshot/Content.vue
index eae5da41..db463895 100644
--- a/src/project/wuxi/AppHandSnapshot/Content.vue
+++ b/src/project/wuxi/AppHandSnapshot/Content.vue
@@ -83,7 +83,7 @@ export default {
   },
   methods: {
     typeList() {
-      this.$http.post(`/app/appclapeventgroup/list`, null, {
+      this.$http.post(`/app/appresidentreportgroup/list`, null, {
         params: {
           size: 9999,
         },
diff --git a/src/project/wuxi/AppHandSnapshot/List.vue b/src/project/wuxi/AppHandSnapshot/List.vue
index 74778fa7..51450d55 100644
--- a/src/project/wuxi/AppHandSnapshot/List.vue
+++ b/src/project/wuxi/AppHandSnapshot/List.vue
@@ -5,8 +5,11 @@
               @change="change"></u-tabs>
       <div class="select-top">
         <div class="tab-item">
-          <AiPagePicker type="gird" valueObj nodeKey="id" @select="handleSelectGird" formType="2">
+          <AiPagePicker type="gird" valueObj nodeKey="id" @select="handleSelectGird" action="/app/appgirdmemberinfo/queryMyGirdList">
             <AiMore v-model="searchGrid.girdName" icon="arrow-down" placeholder="所属网格"/>
+            <!-- <span :class="searchGrid.girdName ? 'grid-name' : 'grid-name color-999'">{{searchGrid.girdName || '所属网格'}}</span>
+            <u-icon name="close-circle" color="#999" size="34" style="margin-left: 4px" v-if="searchGrid.girdName" @click.stop="clearGrid" />
+            <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px" v-else /> -->
           </AiPagePicker>
         </div>
         <div class="tab-item" @click="showType = true">
@@ -67,7 +70,7 @@ export default {
       currentTabs: 0,
       current: 1,
       pages: 0,
-      searchGrid: {},
+      searchGrid: {girdName: ''},
       showType: false,
       eventStatus: '',
       eventStatusText: '',
@@ -101,14 +104,15 @@ export default {
   methods: {
     getList() {
       let {current, eventStatus, searchGrid: {id: girdId}} = this
-      this.$http.post(`/app/appresidentreportinfo/list`, null, {
+      this.$http.post(`/app/appresidentreportinfo/listByGirdMember`, null, {
         params: {
           size: 10,
-          current, searchType: this.currentTabs == 1 ? '1' : '0',
-          eventStatus, girdId
+          current, 
+          eventStatus, 
+          girdId,
+          searchType: this.currentTabs,
         },
-      })
-      .then((res) => {
+      }).then((res) => {
         if (res.code == 0) {
           this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
           this.pages = res.data.pages
@@ -131,6 +135,11 @@ export default {
       this.current = 1
       this.getList()
     },
+    clearGrid() {
+      this.searchGrid = {girdName: ''}
+      this.current = 1
+      this.getList()
+    },
 
     goDetail(item) {
       uni.navigateTo({url: `./Detail?id=${item.id}`})
@@ -282,5 +291,10 @@ export default {
     background-color: #f3f6f9;
     padding-bottom: 120px;
   }
+  .grid-name {
+    display: inline-block;
+    font-size: 32px;
+    color: #333;
+  }
 }
 </style>