From 99fc7cf835de477be0a2edcdd0b0838e354f381e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 17 Feb 2022 17:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=91=E6=B0=91=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppVillagersCircle/AppVillagersCircle.vue |  4 +-
 .../components/CommentsList.vue               | 24 ++--------
 .../AppVillagersCircle/components/List.vue    | 44 +++++++++++--------
 3 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue b/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
index 2e2512f5..cfb77510 100644
--- a/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
+++ b/packages/shandong/AppVillagersCircle/AppVillagersCircle.vue
@@ -44,8 +44,8 @@
 
       tabs () {
         const tabList = [
-          {label: '村民圈列表', name: 'List', comp: List, permission: ''},
-          {label: '评论列表', name: 'CommentsList', comp: CommentsList, permission: ''}
+          {label: '信息审核', name: 'List', comp: List, permission: ''},
+          {label: '评论审核', name: 'CommentsList', comp: CommentsList, permission: ''}
         ]
 
         return tabList
diff --git a/packages/shandong/AppVillagersCircle/components/CommentsList.vue b/packages/shandong/AppVillagersCircle/components/CommentsList.vue
index b6084f8c..740ef695 100644
--- a/packages/shandong/AppVillagersCircle/components/CommentsList.vue
+++ b/packages/shandong/AppVillagersCircle/components/CommentsList.vue
@@ -1,5 +1,5 @@
 <template>
-  <ai-list class="notice" isTabs>
+  <ai-list isTabs>
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
@@ -27,13 +27,6 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="tags" label="标签">
-          <template slot-scope="{ row }">
-            <div class="table-tags">
-              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
-            </div>
-          </template>
-        </el-table-column>
         <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -67,9 +60,7 @@
           title: '',
           areaId: ''
         },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
+        total: 0,
         colConfigs: [
           { prop: 'content',  label: '议事主题', align: 'left', width: '200px' },
           { prop: 'type', label: '议事类型', align: 'center', formart: v => this.dict.getLabel('discussType', v) },
@@ -80,8 +71,6 @@
           { prop: 'createTime', label: '发布时间', align: 'center' },
           { slot: 'options', label: '操作', align: 'center' }
         ],
-        areaName: '',
-        unitName: '',
         tableData: []
       }
     },
@@ -106,12 +95,7 @@
           }
         }).then(res => {
           if (res.code == 0) {
-            this.tableData = res.data.records.map(v => {
-              return {
-                ...v,
-                content: v.content || v.title
-              }
-            })
+            this.tableData = res.data.records
             this.total = res.data.total
           }
         })
@@ -141,6 +125,4 @@
 </script>
 
 <style lang="scss" scoped>
-  .notice {
-  }
 </style>
diff --git a/packages/shandong/AppVillagersCircle/components/List.vue b/packages/shandong/AppVillagersCircle/components/List.vue
index e820de87..38170771 100644
--- a/packages/shandong/AppVillagersCircle/components/List.vue
+++ b/packages/shandong/AppVillagersCircle/components/List.vue
@@ -1,10 +1,22 @@
 <template>
-  <ai-list class="notice" isTabs>
+  <ai-list isTabs>
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template #left>
-          <ai-select placeholder="请选择状态" v-model="search.type" clearable @change="search.current = 1, getList()" :selectList="dict.getDict('discussType')"></ai-select>
-          <ai-select placeholder="请选择话题" v-model="search.status" clearable @change="search.current = 1, getList()" :selectList="dict.getDict('discussStatus')"></ai-select>
+          <ai-select
+            placeholder="请选择状态"
+            v-model="search.status"
+            clearable
+            @change="search.current = 1, getList()"
+            :selectList="dict.getDict('auditStatus')">
+          </ai-select>
+          <ai-select
+            placeholder="请选择话题"
+            v-model="search.topic"
+            clearable
+            @change="search.current = 1, getList()"
+            :selectList="dict.getDict('villagerCircleTopic')">
+          </ai-select>
         </template>
         <template #right>
           <el-input
@@ -27,7 +39,7 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-        <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
@@ -56,25 +68,21 @@
           current: 1,
           size: 10,
           status: '',
-          type: '',
+          topic: '',
           title: '',
           areaId: ''
         },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
+        total: 0,
         colConfigs: [
-          { prop: 'content',  label: '议事主题', align: 'left', width: '200px' },
-          { prop: 'type', label: '议事类型', align: 'center', formart: v => this.dict.getLabel('discussType', v) },
-          { prop: 'createUserName', label: '话事人', align: 'center' },
-          { prop: 'msgCountTotal', label: '观点数量', align: 'center', formart: v => v === 0 ? '-' : v },
-          { prop: 'voteCount', label: '投票数量', align: 'center', formart: v => v === 0 ? '-' : v },
-          { prop: 'status', label: '发布状态', align: 'center', formart: v => this.dict.getLabel('discussStatus', v) },
+          { prop: 'createUserName',  label: '发布人', align: 'left' },
           { prop: 'createTime', label: '发布时间', align: 'center' },
+          { prop: 'content', label: '发布内容', align: 'center' },
+          { prop: 'topic', label: '话题类型', align: 'center', formart: v => this.dict.getLabel('villagerCircleTopic', v) },
+          { prop: 'status', label: '状态', align: 'center', formart: v => this.dict.getLabel('auditStatus', v) },
+          { prop: 'auditUserName', label: '审核人', align: 'center' },
+          { prop: 'auditTime', label: '审核时间', align: 'center' },
           { slot: 'options', label: '操作', align: 'center' }
         ],
-        areaName: '',
-        unitName: '',
         tableData: []
       }
     },
@@ -85,7 +93,7 @@
 
     created () {
       this.search.areaId = this.user.info.areaId
-      this.dict.load(['discussType', 'discussStatus']).then(() => {
+      this.dict.load(['villagerCircleTopic', 'auditStatus']).then(() => {
         this.getList()
       })
     },
@@ -134,6 +142,4 @@
 </script>
 
 <style lang="scss" scoped>
-  .notice {
-  }
 </style>