From ed57538f45c453d253ff4a52b2a37f1d5dcd699d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Tue, 24 Sep 2019 16:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BAbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/events/issue-detail.vue     | 35 ++++++++++---------
 .../modules/events/issue-review-detail.vue    |  2 +-
 src/views/modules/events/item-detail.vue      | 18 +++++-----
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/events/issue-detail.vue b/src/views/modules/events/issue-detail.vue
index f73f653e..d2aa3940 100644
--- a/src/views/modules/events/issue-detail.vue
+++ b/src/views/modules/events/issue-detail.vue
@@ -32,24 +32,26 @@
         </el-timeline>
       </el-form-item>
       <el-form-item label="评论:">
-        <el-collapse v-for="(commentsDTO, index) in commentsDTOs" :key="index" :name="index">
-          <el-collapse-item>
-            <template slot="title" style="height: 100px">
-              <span>{{commentsDTO.user.userName + '：'}}{{commentsDTO.content}}</span>
+        <el-table :data="commentsDTOs" border style="width: 100%;">
+          <el-table-column prop="user.userName" label="评论人" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="content" label="评论内容" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="replyComment.userName" label="回复人" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="replyComment.content" label="回复内容" header-align="center" align="center"></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="deleteComment(scope.row.commentId)">屏蔽</el-button>
             </template>
-            <div>{{commentsDTO.replyComment ? commentsDTO.replyComment.userName + '：' : ''}}{{commentsDTO.replyComment ? commentsDTO.replyComment.content : ''}}</div>
-          </el-collapse-item>
-          <el-button @click="deleteComment(commentsDTO.commentId)">屏蔽评论</el-button>
-        </el-collapse>
+          </el-table-column>
+        </el-table>
         <el-pagination
-        :current-page="pageIndex"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limitVal"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandleNew"
-        @current-change="pageCurrentChangeHandleNew">
-      </el-pagination>
+          :current-page="pageIndex"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limitVal"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandleNew"
+          @current-change="pageCurrentChangeHandleNew">
+        </el-pagination>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -91,6 +93,7 @@ export default {
       })
     },
     deleteComment (val) {
+      console.log(val)
       this.$http['post'](
         '/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/events/issue-review-detail.vue b/src/views/modules/events/issue-review-detail.vue
index 84b511b9..8d7dccae 100644
--- a/src/views/modules/events/issue-review-detail.vue
+++ b/src/views/modules/events/issue-review-detail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('verifyLabel')" :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 :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '140px' : '100px'">
       <el-form-item label="议题内容:" prop="eventContent">
         <div>{{dataForm.eventContent}}</div>
         <span v-for="(imgUrl, index) in urls" :key="index" style="margin: 5px">
diff --git a/src/views/modules/events/item-detail.vue b/src/views/modules/events/item-detail.vue
index 089c42d0..8a23832f 100644
--- a/src/views/modules/events/item-detail.vue
+++ b/src/views/modules/events/item-detail.vue
@@ -32,15 +32,17 @@
         </el-timeline>
       </el-form-item>
       <el-form-item label="评论:">
-        <el-collapse v-for="(commentsDTO, index) in commentsDTOs" :key="index" :name="index">
-          <el-collapse-item>
-            <template slot="title">
-              {{commentsDTO.user.userName + '：'}}{{commentsDTO.content}}
+        <el-table :data="commentsDTOs" border style="width: 100%;">
+          <el-table-column prop="user.userName" label="评论人" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="content" label="评论内容" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="replyComment.userName" label="回复人" header-align="center" align="center"></el-table-column>
+          <el-table-column prop="replyComment.content" label="回复内容" header-align="center" align="center"></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="deleteComment(scope.row.commentId)">屏蔽</el-button>
             </template>
-            <div>{{commentsDTO.replyComment.userName + '：'}}{{commentsDTO.replyComment ? commentsDTO.replyComment.content : ''}}</div>
-          </el-collapse-item>
-          <el-button @click="deleteComment(commentsDTO.commentId)">屏蔽评论</el-button>
-        </el-collapse>
+          </el-table-column>
+        </el-table>
         <el-pagination
         :current-page="pageIndex"
         :page-sizes="[10, 20, 50, 100]"