From 7a042222db5d3be3115c887c5c1a775f52a7c477 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 27 Mar 2023 11:24:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=BB=E9=87=8C=E4=BA=92=E5=8A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../fengdu/app/AppHelp/components/List.vue    | 24 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5b8a9670..d82ae3eb 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@jiaminghi/data-view": "^2.10.0",
     "bin-ace-editor": "^3.2.0",
     "dayjs": "^1.8.35",
-    "dui": "file:ui",
+    "dui": "^2.0.0",
     "echarts": "^5.1.2",
     "hash.js": "^1.1.7",
     "mp4box": "^0.4.1",
diff --git a/project/fengdu/app/AppHelp/components/List.vue b/project/fengdu/app/AppHelp/components/List.vue
index 177d48d0..7a9ed25c 100644
--- a/project/fengdu/app/AppHelp/components/List.vue
+++ b/project/fengdu/app/AppHelp/components/List.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list class="notice">
     <template slot="title">
-      <ai-title title="邻里互助" isShowBottomBorder>
+      <ai-title title="邻里互助" isShowBottomBorder isShowArea :disabledLevel="disabledLevel" v-model="search.areaId" @change="changeArea">
       </ai-title>
     </template>
     <template slot="content">
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+  import { mapState } from 'vuex'
   export default {
     name: 'List',
 
@@ -68,6 +69,7 @@
           current: 1,
           size: 10,
           createUserName: '',
+          areaId: ''
         },
         total: 10,
         colConfigs: [
@@ -76,15 +78,22 @@
           { prop: 'appreciateCount',  label: '点赞数', align: 'center', width: '120' },
           { prop: 'sharedCount',  label: '分享数', align: 'center', width: '120' },
           { prop: 'createUserName',  label: '发帖人', align: 'center', width: '120' },
+          { prop: 'createUserAreaName',  label: '所在地区', align: 'center', width: '120' },
           { prop: 'createTime',  label: '创建时间', align: 'center', width: '180' },
           { slot: 'options'},
         ],
         tableData: [],
-        dateList: []
+        dateList: [],
+        disabledLevel: 0
       }
     },
+    computed: {
+      ...mapState(['user']),
+    },
 
     created() {
+      this.disabledLevel = this.user.info.areaList.length - 1
+      this.search.areaId = this.user.info.areaId
       this.getList()
     },
 
@@ -93,8 +102,9 @@
         this.instance.post(`/app/appneighborhoodassistance/list`, null, {
           params: {
             ...this.search,
+            createUserAreaId: this.search.areaId,
             beginDate: this.dateList[0] || '',
-            endDate: this.dateList[1] || ''
+            endDate: this.dateList[1] || '',
           }
         }).then(res => {
           if (res.code == 0) {
@@ -104,6 +114,14 @@
         })
       },
 
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+        })
+      },
+
       remove (id) {
         this.$confirm('确定删除该帖子？').then(() => {
           this.instance.post(`/app/appneighborhoodassistance/delete?id=${id}`).then(res => {