From 93d464ffab542ac5986ab32904dcef76f5182cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Fri, 18 Oct 2019 17:37:39 +0800
Subject: [PATCH] no message

---
 .../modules/group/group-add-or-update.vue     | 215 ------------------
 src/views/modules/group/group-detail.vue      |  89 ++++++++
 src/views/modules/group/group.vue             |  14 +-
 3 files changed, 100 insertions(+), 218 deletions(-)
 delete mode 100644 src/views/modules/group/group-add-or-update.vue
 create mode 100644 src/views/modules/group/group-detail.vue

diff --git a/src/views/modules/group/group-add-or-update.vue b/src/views/modules/group/group-add-or-update.vue
deleted file mode 100644
index 1d12d670..00000000
--- a/src/views/modules/group/group-add-or-update.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="社群名称" prop="groupName">
-          <el-input v-model="dataForm.groupName" placeholder="社群名称"></el-input>
-      </el-form-item>
-          <el-form-item label="社群头像" prop="groupAvatar">
-          <el-input v-model="dataForm.groupAvatar" placeholder="社群头像"></el-input>
-      </el-form-item>
-          <el-form-item label="社群介绍" prop="groupIntroduction">
-          <el-input v-model="dataForm.groupIntroduction" placeholder="社群介绍"></el-input>
-      </el-form-item>
-          <el-form-item label="社群类别 0：党员群，1：自建群" prop="groupCategory">
-          <el-input v-model="dataForm.groupCategory" placeholder="社群类别 0：党员群，1：自建群"></el-input>
-      </el-form-item>
-          <el-form-item label="区" prop="area">
-          <el-input v-model="dataForm.area" placeholder="区"></el-input>
-      </el-form-item>
-          <el-form-item label="区ID" prop="areaId">
-          <el-input v-model="dataForm.areaId" placeholder="区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="街道" prop="street">
-          <el-input v-model="dataForm.street" placeholder="街道"></el-input>
-      </el-form-item>
-          <el-form-item label="街道ID" prop="streetId">
-          <el-input v-model="dataForm.streetId" placeholder="街道ID"></el-input>
-      </el-form-item>
-          <el-form-item label="社区" prop="community">
-          <el-input v-model="dataForm.community" placeholder="社区"></el-input>
-      </el-form-item>
-          <el-form-item label="社区ID" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="网格" prop="grid">
-          <el-input v-model="dataForm.grid" placeholder="网格"></el-input>
-      </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散" prop="state">
-          <el-input v-model="dataForm.state" placeholder="状态 0：待审核，5：审核不通过，10：审核通过，15：禁言，20：已解散"></el-input>
-      </el-form-item>
-          <el-form-item label="处理意见" prop="processingOpinions">
-          <el-input v-model="dataForm.processingOpinions" placeholder="处理意见"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-      </el-form>
-    <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<script>
-import debounce from 'lodash/debounce'
-export default {
-  data () {
-    return {
-      visible: false,
-      dataForm: {
-        id: '',
-        groupName: '',
-        groupAvatar: '',
-        groupIntroduction: '',
-        groupCategory: '',
-        area: '',
-        areaId: '',
-        street: '',
-        streetId: '',
-        community: '',
-        communityId: '',
-        grid: '',
-        gridId: '',
-        state: '',
-        processingOpinions: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        groupName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        groupAvatar: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        groupIntroduction: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        groupCategory: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        area: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        areaId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        street: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        streetId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        community: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        grid: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        state: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        processingOpinions: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    init () {
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.getInfo()
-        }
-      })
-    },
-    // 获取信息
-    getInfo () {
-      this.$http.get(`/news/group/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
-        if (!valid) {
-          return false
-        }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/group/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/modules/group/group-detail.vue b/src/views/modules/group/group-detail.vue
new file mode 100644
index 00000000..862c4080
--- /dev/null
+++ b/src/views/modules/group/group-detail.vue
@@ -0,0 +1,89 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
+      <el-form-item label="群介绍:">
+        <div>{{dataForm.groupIntroduction}}</div>
+      </el-form-item>
+      <el-form-item label="状态:">
+        <div>{{dataForm.state}}</div>
+      </el-form-item>
+      <el-form-item label="备注:">
+        <div>{{dataForm.processingOpinions}}</div>
+      </el-form-item>
+    </el-form>
+    <el-form :inline="true" :model="dataForm" ref="dataForm">
+      <el-form-item>
+        <el-input v-model="dataForm.nickname" placeholder="姓名" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.mobile" placeholder="电话" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <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="index" width="50" label="序号"></el-table-column>
+      <el-table-column prop="nickname" label="成员名称" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="lordFlag" label="身份" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
+    </el-table>
+    <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/group/usergroup/page',
+        getDataListIsPage: true
+      },
+      visible: false,
+      dataForm: {
+        id: '',
+        mobile: '',
+        nickname: ''
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getDataList()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/group/group/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index 11739b16..ac0ed845 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -77,14 +77,14 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <group-detail v-if="groupDetailVisible" ref="groupDetail" @refreshDataList="getDataList"></group-detail>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './group-add-or-update'
+import GroupDetail from './group-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -95,6 +95,7 @@ export default {
         deleteURL: '/news/group',
         deleteIsBatch: true
       },
+      groupDetailVisible: false,
       dataForm: {
         id: '',
         streetId: '',
@@ -124,7 +125,7 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    GroupDetail
   },
   created: function () {
     this.getStreetList()
@@ -150,6 +151,13 @@ export default {
     formatGroupCategory: function (row, column) {
       return row.groupCategory === '0' ? '党员群' : row.groupCategory === '1' ? '自建群' : '未知'
     },
+    look (id) {
+      this.groupDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.groupDetail.dataForm.id = id
+        this.$refs.groupDetail.init()
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {