diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index c488a33c..f7b4d0d8 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -21,6 +21,9 @@ t.verify = '审核'
 t.verifyLabel = '议题审核'
 t.deal = '处理'
 t.look = '查看'
+t.ban = '禁言'
+t.liftTheBan = '解禁'
+t.disband = '解散'
 
 t.prompt = {}
 t.prompt.title = '提示'
diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index bc202036..7d6fc3b7 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -2,46 +2,68 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__group}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getCommunityList">
+            <el-option v-for="item in streetOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId"
+                     placeholder="请选择"
+                     clearable
+                     @change="getGridList">
+            <el-option v-for="item in communityOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:group:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in gridOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="dataForm.state" clearable
+                     placeholder="请选择">
+            <el-option v-for="item in stateOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:group:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index" width="50" label="序号"></el-table-column>
         <el-table-column prop="groupName" label="社群名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupAvatar" label="社群头像" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupIntroduction" label="社群介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupCategory" label="社群类别 0：党员群，1：自建群" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="area" label="区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="areaId" label="区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="streetId" label="街道ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="processingOpinions" label="处理意见" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="groupCategory" label="性质" header-align="center" :formatter="formatGroupCategory" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="state" label="状态" header-align="center" align="center" :formatter="formatState"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:group:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:group:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="scope.row.state === 0" type="text" size="small" @click="verify(scope.row.id)">{{ $t('verify') }}</el-button>
+            <el-button v-if="scope.row.state != 0" type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="scope.row.state === 10" type="text" size="small" @click="ban(scope.row.id)">{{ $t('ban') }}</el-button>
+            <el-button v-if="scope.row.state === 15" type="text" size="small" @click="liftTheBan(scope.row.id)">{{ $t('liftTheBan') }}</el-button>
+            <el-button v-if="scope.row.state === 10 || scope.row.state === 15" type="text" size="small" @click="disband(scope.row.id)">{{ $t('disband') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -68,18 +90,105 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/group/page',
+        getDataListURL: '/group/group/page',
         getDataListIsPage: true,
         deleteURL: '/news/group',
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        state: '0'
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      stateOptions: [{
+        id: '0',
+        name: '待审核'
+      }, {
+        id: '5',
+        name: '审核不通过'
+      }, {
+        id: '10',
+        name: '审核通过'
+      }, {
+        id: '15',
+        name: '禁言'
+      }, {
+        id: '20',
+        name: '已解散'
+      }]
     }
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getStreetList()
+  },
+  methods: {
+    formatState: function (row, column) {
+      if (row.state === 0) {
+        return '待审核'
+      }
+      if (row.state === 5) {
+        return '审核不通过'
+      }
+      if (row.state === 10) {
+        return '审核通过'
+      }
+      if (row.state === 15) {
+        return '禁言'
+      }
+      if (row.state === 20) {
+        return '已解散'
+      }
+    },
+    formatGroupCategory: function (row, column) {
+      return row.groupCategory === '0' ? '党员群' : row.groupCategory === '1' ? '自建群' : '未知'
+    },
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => { })
+    },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => { })
+    },
+    getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => { })
+    }
   }
 }
 </script>