From 8f6029b1492a6ff0b256227a35389a6c99b604ec Mon Sep 17 00:00:00 2001
From: FightingN <18300240052@163.com>
Date: Tue, 14 Jul 2020 14:43:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90Pc=E7=AB=AF=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91-=E5=BC=A0=E6=99=93=E5=AE=8120200714?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/case/typicalcase-list.vue   | 12 ++++-----
 .../modules/custom/evaluatedeptcount.vue      |  4 +--
 src/views/modules/custom/gridoperatorinfo.vue | 26 ++++++++++---------
 src/views/modules/group/topic-list.vue        | 12 ++++-----
 src/views/modules/heart/actbanner.vue         |  8 +++---
 src/views/modules/heart/actinfo-list.vue      | 14 +++++-----
 src/views/modules/heart/actphrase.vue         | 18 ++++++-------
 src/views/modules/user/volunteerinfo.vue      | 24 ++++++++---------
 8 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/views/modules/case/typicalcase-list.vue b/src/views/modules/case/typicalcase-list.vue
index 3489aa6a..47158685 100644
--- a/src/views/modules/case/typicalcase-list.vue
+++ b/src/views/modules/case/typicalcase-list.vue
@@ -39,12 +39,12 @@
       </el-form>
       <!-- 列表-->
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" type="index"  header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="caseTitle" label="优秀案例标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="caseNumber" label="优秀案例数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column label="序号" type="index"  header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="caseTitle" label="优秀案例标题" header-align="center" align="center" width="400" show-overflow-tooltip title="caseTitle"></el-table-column>
+        <el-table-column prop="state" label="状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="caseNumber" label="优秀案例数" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width=“180“></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" min-width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('case:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.state) }}</el-button>
             <el-button type="text" size="small" @click="detailHandle(scope.row.id)">{{"查看详细"}}</el-button>
diff --git a/src/views/modules/custom/evaluatedeptcount.vue b/src/views/modules/custom/evaluatedeptcount.vue
index f4d728a9..4ab4707b 100644
--- a/src/views/modules/custom/evaluatedeptcount.vue
+++ b/src/views/modules/custom/evaluatedeptcount.vue
@@ -50,14 +50,14 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="街道名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" label="街道名称" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="officerCount" label="干部人数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="beEvaluatedCount" label="被评价干部人数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="evaluatePeopleCount" label="评价总人数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="evaluateCount" label="评价总次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="likeCount" label="被点赞总次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeCount" label="被吐槽总次数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" min-width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:evaluateCount:lookOfficer')" type="text" size="small" @click="officerAction(scope.row.deptId)">查看</el-button>
           </template>
diff --git a/src/views/modules/custom/gridoperatorinfo.vue b/src/views/modules/custom/gridoperatorinfo.vue
index 15dd5e16..5b913f21 100755
--- a/src/views/modules/custom/gridoperatorinfo.vue
+++ b/src/views/modules/custom/gridoperatorinfo.vue
@@ -39,24 +39,26 @@
         <el-table-column prop="realName"
                          label="姓名"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="100"></el-table-column>
         <el-table-column prop="sex"
                          label="性别"
                          header-align="center"
                          align="center"
-                         :formatter="showFlagFormat"></el-table-column>
+                         :formatter="showFlagFormat" width="50"></el-table-column>
         <el-table-column prop="mobile"
                          label="联系电话"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="identityNo"
+                         align="center" width="120"></el-table-column>
+        <!-- <el-table-column prop="identityNo"
                          label="身份证号"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"></el-table-column> -->
         <el-table-column prop="allDeptNames"
                          label="所属网格"
                          header-align="center"
-                         align="center"></el-table-column>Id
+                         align="center" min-width="200" show-overflow-tooltip
+                         
+         ></el-table-column>
         <el-table-column prop="dutyCategoryId"
                          label="网格员类型"
                          header-align="center"
@@ -65,20 +67,20 @@
         <el-table-column prop="workUnit"
                          label="工作单位"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="sort"
+                         align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="sort"
                          label="显示排序"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="remark"
+                         align="center"></el-table-column> -->
+        <!-- <el-table-column prop="remark"
                          label="备注"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"></el-table-column> -->
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="200">
+                         min-width="200">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:gridoperatorinfo:update')"
                        type="text"
diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue
index 1bdde25b..3fda7b1f 100644
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@@ -59,12 +59,12 @@
       </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="发言人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="topicContent" label="话题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <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="center" min-width="400"  show-overflow-tooltip title="topicContent"></el-table-column>
+        <el-table-column prop="commentNum" label="评论数" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" min-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>
diff --git a/src/views/modules/heart/actbanner.vue b/src/views/modules/heart/actbanner.vue
index 408c2e61..82d21c6a 100644
--- a/src/views/modules/heart/actbanner.vue
+++ b/src/views/modules/heart/actbanner.vue
@@ -35,12 +35,12 @@
       </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="title" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="title" label="标题" header-align="center" align="center" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="status" label="状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
         <el-table-column prop="statusTime" label="上下架时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="browseNum" label="浏览数量" header-align="center" align="center" width="100"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" min-width="150">
 
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('heart:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.status) }}</el-button>
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 87527c45..5fcdcc45 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -53,13 +53,13 @@
                 @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="title" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actStartTime" label="活动开始时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actEndTime" label="活动结束时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actStatus" label="活动发布状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="publishTime" label="活动发布时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column prop="title" label="标题" header-align="center" align="center" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="actStartTime" label="开始时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="actEndTime" label="结束时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="publishTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="actStatus" label="发布状态" :formatter="formatState" header-align="center" align="center" ></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" min-width="150">
           <template slot-scope="scope">
             <div>
               <el-button v-if="$hasPermission('heart:actinfo:cancel')" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="cancelHandle(scope.row)">取消活动</el-button>
diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index 3ccefaed..54f82b08 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -56,34 +56,34 @@
         <el-table-column prop="phrase"
                          label="常用语"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" show-overflow-tooltip title="phrase" min-width="400"></el-table-column>
         <el-table-column prop="code"
                          label="编码"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="showFlag"
+                         align="center" width="50"></el-table-column>
+        <!-- <el-table-column prop="showFlag"
                          label="是否显示"
                          header-align="center"
                          align="center"
-                         :formatter="showFlagFormat"></el-table-column>
+                         :formatter="showFlagFormat" width="50"></el-table-column> -->
         <el-table-column prop="sort"
                          label="显示顺序"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="100"></el-table-column>
         <!-- <el-table-column prop="usageNum" label="使用次数" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="updatedTime"
+                         align="center" width="180"></el-table-column>
+        <!-- <el-table-column prop="updatedTime"
                          label="更新时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="180"></el-table-column> -->
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="150">
+                         min-width="150">
           <template slot-scope="scope">
             <!-- <el-button type="text" size="small" @click="phraseDetailHandle(scope.row.id)">查看</el-button> -->
             <el-button type="text"
diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 4fc95d59..7e03915b 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -36,30 +36,30 @@
         <el-table-column prop="realName"
                          label="姓名"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="100"></el-table-column>
         <el-table-column prop="sex"
-                         width="140"
+                         width="50"
                          label="性别"
                          :formatter="sexState"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" ></el-table-column>
         <el-table-column prop="birthdayString"
-                         width="140"
+                         width="100"
                          label="出生日期"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="mobile"
                          label="联系电话"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="120"></el-table-column>
         <el-table-column prop="identityNo"
                          label="身份证"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="180"></el-table-column>
         <el-table-column prop="registTimeString"
                          label="认证时间"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="180"></el-table-column>
         <el-table-column prop="auditStatus"
                          label="状态"
                          :formatter="auditStatusState"
@@ -73,23 +73,23 @@
         <el-table-column prop="points"
                          label="积分"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" width="50"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="200">
+                         min-width="150">
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
                        @click="userDetailHandle(scope.row.id)">查看</el-button>
             <el-button type="text"
                        size="small"
-                       @click="checkHandle(scope.row.id,1)">审批</el-button>
-            <!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->
+                       @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
             <el-button type="text"
                        size="small"
-                       @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
+                       @click="checkHandle(scope.row.id,1)">审批</el-button>
+            <!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->
             <el-button type="text"
                        size="small"
                        @click="pointsLogs(scope.row.id)">积分记录</el-button>