From b6e672aaa849996992ed5900030a353766fbb410 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Sep 2020 15:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=82=E5=8C=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=AE=89=E5=AE=81=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E9=82=BB=E9=87=8C=E5=85=9A=E7=BE=A4=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-09-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/gridpartymembergroup.vue    | 10 ++-
 src/views/modules/group/group-detail.vue      | 18 ++--
 src/views/modules/group/group.vue             | 21 +++--
 src/views/modules/group/leaderboard.vue       | 47 +++++-----
 src/views/modules/group/topic-list.vue        | 85 ++++++++++---------
 5 files changed, 105 insertions(+), 76 deletions(-)

diff --git a/src/views/modules/group/gridpartymembergroup.vue b/src/views/modules/group/gridpartymembergroup.vue
index f4c6ed9..678f2f6 100644
--- a/src/views/modules/group/gridpartymembergroup.vue
+++ b/src/views/modules/group/gridpartymembergroup.vue
@@ -1,12 +1,12 @@
 <template>
   <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 :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="网格">
-          <el-input v-model="dataForm.grid" placeholder="请输入网格名称" clearable></el-input>
+          <el-input v-model="dataForm.grid" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           <el-button @click="createPartys()" type="primary">批量生成党员群</el-button>
         </el-form-item>
       </el-form>
@@ -82,6 +82,10 @@ export default {
         })
       }).catch(() => { })
     },
+    btKeyUpGrid (e) {
+    e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+    this.dataForm.grid = e.target.value
+  },
     createPartys () {
       var postForm = this.dataList
       this.$http['post']('/group/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
diff --git a/src/views/modules/group/group-detail.vue b/src/views/modules/group/group-detail.vue
index 04f7902..e04cece 100644
--- a/src/views/modules/group/group-detail.vue
+++ b/src/views/modules/group/group-detail.vue
@@ -16,14 +16,14 @@
       </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 label="姓名">
+        <el-input v-model="dataForm.nickname" placeholder="姓名" clearable @keyup.native="btKeyUpNickname"></el-input>
       </el-form-item>
-      <el-form-item>
-        <el-input v-model="dataForm.mobile" placeholder="电话" clearable></el-input>
+      <el-form-item label="电话">
+        <el-input v-model="dataForm.mobile" placeholder="电话" clearable @keyup.native="btKeyUpMobile"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-button @click="getDataListSearch()" type='success'>{{ $t('query') }}</el-button>
       </el-form-item>
     </el-form>
     <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -102,6 +102,14 @@ export default {
       } else if (lordFlag === '1') {
         return '是'
       }
+    },
+    btKeyUpNickname(e){
+       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+       this.dataForm.nickname= e.target.value
+    },
+    btKeyUpMobile(e){
+       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+       this.dataForm.mobile = e.target.value
     }
   }
 }
diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index 463b24a..1192b8f 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -4,7 +4,7 @@
     <div class="mod-news__group}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader v-model="ids"
                        :options="options"
@@ -24,7 +24,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
@@ -32,9 +32,11 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column type="index"
-                         width="50"
-                         label="序号"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="groupName"
                          label="社群名称"
                          header-align="center"
@@ -43,21 +45,22 @@
                          label="性质"
                          header-align="center"
                          :formatter="formatGroupCategory"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"></el-table-column>
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="nickname"
                          label="群主"
-                         min-width="100"
-                         show-overflow-tooltip
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="state"
                          label="状态"
                          header-align="center"
                          align="center"
+                         width="120"
                          :formatter="formatState"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue
index fb83ca5..23787d3 100644
--- a/src/views/modules/group/leaderboard.vue
+++ b/src/views/modules/group/leaderboard.vue
@@ -1,19 +1,32 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="所属机构">
-          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="所属机构" label-width="80px">
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="时间"
+        <el-form-item label="排名类别" label-width="90px">
+          <el-select v-model="orderType" clearable
+                     placeholder="请选择" style="width:250px">
+            <el-option v-for="item in orderTypeOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="时间" label-width="80px" 
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px"
+                          @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -24,21 +37,13 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px"
+                          @change="changeTime">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="排名">
-          <el-select v-model="orderType" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in orderTypeOptions"
-                       :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-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-if="this.orderType === '0'" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -89,17 +94,17 @@ export default {
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.startTime
+          let beginDateVal = this.dataForm.endTime
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.endTime
+          let EndDateVal = this.dataForm.startTime
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
       },
diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue
index 33c19f9..7a22411 100644
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@@ -1,35 +1,14 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
-          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
+          <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:200px;">
           </el-cascader>
         </el-form-item>
-        <el-form-item label="时间"
-                      prop="startTime">
-          <el-date-picker v-model="dataForm.startTime"
-                          type="date"
-                          :picker-options="pickerBeginDateBefore"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至"
-                      label-width="25px"
-                      prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="群名">
           <el-select v-model="dataForm.groupId" clearable
-                     placeholder="请选择">
+                     placeholder="请选择" style="width:200px;">
             <el-option v-for="item in groupOptions"
                        :key="item.groupId"
                        :label="item.groupName"
@@ -38,10 +17,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关键词" prop="keyword">
-          <el-input v-model="dataForm.keyword" placeholder="" clearable ></el-input>
+          <el-input v-model="dataForm.keyword" placeholder="请输入关键词" clearable style="width:200px;" @keyup.native="btKeyUpKeyWord"></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="排序方式">
-          <el-select v-model="dataForm.orderType" clearable
+          <el-select v-model="dataForm.orderType" clearable style="width:200px;" 
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -50,21 +30,46 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px;"
+                          @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px;"
+                          @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('epdc:topic:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="nickname" label="发言人" width="200" show-overflow-tooltip header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="时间" width="160" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="topicContent" label="话题内容" min-width="390" show-overflow-tooltip header-align="center" align="left"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" width="65" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" width="65" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
+        <el-table-column prop="nickname" label="发言人" header-align="center" align="center" width="180" show-overflow-tooltip title="nickname"></el-table-column>
+        <el-table-column prop="createdTime" label="时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="topicContent" label="话题内容" header-align="center" align="left" min-width="400"  show-overflow-tooltip title="topicContent"></el-table-column>
+        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
             <el-button v-if="scope.row.state !== 20" type="text" size="small" @click="close(scope.row.id)">{{ $t('close') }}</el-button>
@@ -112,17 +117,17 @@ export default {
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.startTime
+          let beginDateVal = this.dataForm.endTime
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.endTime
+          let EndDateVal = this.dataForm.startTime
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
       },
@@ -199,6 +204,10 @@ export default {
         }
         this.options = res.data.options
       }).catch(() => {})
+    },
+      btKeyUpKeyWord(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      this.dataForm.keyword= e.target.value
     }
   }
 }