From efdfa4cdeffffa811b254e871c5f744440845cc5 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 13:24:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=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     | 17 ++++++++---
 .../modules/events/issue-process-deal.vue     |  9 +++++-
 .../modules/events/issue-reject-detail.vue    |  7 ++++-
 .../modules/events/issue-review-detail.vue    | 17 +++++++----
 src/views/modules/events/item-deal-detail.vue | 30 +++++++++++--------
 src/views/modules/events/item-detail.vue      |  9 +++++-
 6 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/events/issue-detail.vue b/src/views/modules/events/issue-detail.vue
index 98809242..c238edd4 100644
--- a/src/views/modules/events/issue-detail.vue
+++ b/src/views/modules/events/issue-detail.vue
@@ -8,7 +8,13 @@
         <div>{{dataForm.distributeTime}}</div>
       </el-form-item>
       <el-form-item label="议题内容">
-        {{dataForm.issueContent}}
+        <div>{{dataForm.issueContent}}</div>
+        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
       <el-form-item>
         <span>支持 {{dataForm.approveNum}}</span>
@@ -28,8 +34,10 @@
       <el-form-item label="评论">
         <el-collapse v-for="(commentsDTO, index) in commentsDTOs" :key="index" :name="index">
           <el-collapse-item>
-            <template slot="title">
-              {{commentsDTO.content}}
+            <template slot="title" style="height: 100px">
+              <span>
+                {{commentsDTO.content}}
+              </span>
             </template>
             <div>{{commentsDTO.replyComment ? commentsDTO.replyComment.content : ''}}</div>
           </el-collapse-item>
@@ -62,7 +70,8 @@ export default {
         nickName: '',
         distributeTime: '',
         issueContent: '',
-        feedbackDTOList: []
+        feedbackDTOList: [],
+        images: []
       },
       order: '',
       orderField: '',
diff --git a/src/views/modules/events/issue-process-deal.vue b/src/views/modules/events/issue-process-deal.vue
index 187f05ef..bd54e5ac 100644
--- a/src/views/modules/events/issue-process-deal.vue
+++ b/src/views/modules/events/issue-process-deal.vue
@@ -11,6 +11,12 @@
       </el-form-item>
       <el-form-item label="议题内容" prop="eventContent">
         <div>{{dataForm.issueContent}}</div>
+        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
       <el-form-item label="工作反馈" prop="jobFeedback">
         <el-timeline :reverse="false">
@@ -56,7 +62,8 @@ export default {
         distributeTime: '',
         advice: '',
         state: '',
-        jobFeedbackDTOS: []
+        jobFeedbackDTOS: [],
+        images: []
       },
       verifyOptions: [{
         verifyFlag: '1',
diff --git a/src/views/modules/events/issue-reject-detail.vue b/src/views/modules/events/issue-reject-detail.vue
index 8d35e093..8d189881 100644
--- a/src/views/modules/events/issue-reject-detail.vue
+++ b/src/views/modules/events/issue-reject-detail.vue
@@ -3,7 +3,12 @@
     <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="议题内容" prop="eventContent">
         <div>{{dataForm.eventContent}}</div>
-        <img v-for="imgUrl in dataForm.images" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
+        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
       <el-form-item label="地址" prop="address">
         <div>{{dataForm.address}}</div>
diff --git a/src/views/modules/events/issue-review-detail.vue b/src/views/modules/events/issue-review-detail.vue
index a3206fb1..4cab40b9 100644
--- a/src/views/modules/events/issue-review-detail.vue
+++ b/src/views/modules/events/issue-review-detail.vue
@@ -1,14 +1,19 @@
 <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-item label="议题内容" prop="eventContent">
+      <el-form-item label="议题内容:" prop="eventContent">
         <div>{{dataForm.eventContent}}</div>
-        <img v-for="imgUrl in urls" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
+        <span v-for="(imgUrl, index) in urls" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
-      <el-form-item label="提交人" prop="nickName">
+      <el-form-item label="提交人:" prop="nickName">
         <div>{{dataForm.nickName}}</div>
       </el-form-item>
-      <el-form-item label="审核操作" prop="eventState">
+      <el-form-item label="审核操作:" prop="eventState">
         <el-select v-model="dataForm.eventState" placeholder="请选择">
           <el-option
             v-for="item in verifyOptions"
@@ -18,7 +23,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="类别" prop="categoryId" v-if="categoryVisible">
+      <el-form-item label="类别:" prop="categoryId" v-if="categoryVisible">
         <el-select v-model="dataForm.categoryId" placeholder="请选择">
           <el-option
             v-for="item in categoryOptions"
@@ -28,7 +33,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="处理意见" prop="advice">
+      <el-form-item label="处理意见:" prop="advice">
           <el-input v-model="dataForm.advice" placeholder="处理意见"></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/events/item-deal-detail.vue b/src/views/modules/events/item-deal-detail.vue
index 2855344e..7e41f8b9 100644
--- a/src/views/modules/events/item-deal-detail.vue
+++ b/src/views/modules/events/item-deal-detail.vue
@@ -1,36 +1,42 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('deal')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '130px' : '90px'">
-      <el-form-item label="发布人" prop="nickName">
+    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '180px' : '140px'">
+      <el-form-item label="发布人:" prop="nickName">
         <div>{{dataForm.nickName}}</div>
       </el-form-item>
-      <el-form-item label="发布时间" prop="distributeTime">
+      <el-form-item label="发布时间:" prop="distributeTime">
         <div>{{dataForm.distributeTime}}</div>
       </el-form-item>
-      <el-form-item label="议题内容" prop="eventContent">
+      <el-form-item label="议题内容:" prop="eventContent">
         <div>{{dataForm.itemContent}}</div>
-        <img v-for="imgUrl in dataForm.images" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
+        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
-      <el-form-item label="地址" prop="issueAddress">
+      <el-form-item label="地址:" prop="issueAddress">
         <div>{{dataForm.issueAddress}}</div>
       </el-form-item>
-      <el-form-item label="处理进度" prop="jobFeedback">
+      <el-form-item label="处理进度:" prop="jobFeedback">
         <el-timeline :reverse="false">
           <el-timeline-item v-for="(handleProgressResultDTO, index) in dataForm.handleProgressResultDTOS" :key="index" :timestamp="handleProgressResultDTO.createdTime" placement="top">
             <el-card>
+              <div>{{handleProgressResultDTO.handlerDeptName}}</div>
               <div>{{handleProgressResultDTO.progressName}}{{handleProgressResultDTO.createdTime}}</div>
               <div>{{handleProgressResultDTO.advice}}</div>
             </el-card>
           </el-timeline-item>
         </el-timeline>
       </el-form-item>
-      <el-form-item label="处理意见(内部)" prop="handleAdvice" :required="true">
+      <el-form-item label="处理意见(内部):" prop="handleAdvice" :required="true">
           <el-input v-model="postDataForm.handleAdvice" placeholder="不超过50字"></el-input>
       </el-form-item>
-      <el-form-item label="处理意见(外部)" prop="outHandleAdvice" :required="true">
+      <el-form-item label="处理意见(外部):" prop="outHandleAdvice" :required="true">
           <el-input v-model="postDataForm.outHandleAdvice" placeholder="不超过50字"></el-input>
       </el-form-item>
-      <el-form-item label="处理" prop="handleCategory" :required="true">
+      <el-form-item label="处理:" prop="handleCategory" :required="true">
         <el-select v-model="postDataForm.handleCategory" placeholder="请选择">
           <el-option
             v-for="handleResultDTO in dataForm.handleResultDTOS"
@@ -40,12 +46,12 @@
           </el-option>
         </el-select>
       </el-form-item>
-     <el-form-item label="流转对象" prop="deptResultDTOS" v-if="deptResultDTOSVisible" :required="true">
+     <el-form-item label="流转对象:" prop="deptResultDTOS" v-if="deptResultDTOSVisible" :required="true">
         <el-checkbox-group v-model="postDataForm.deptResultDTOS">
           <el-checkbox v-for="deptResultDTO in dataForm.deptResultDTOS" :label="deptResultDTO" :key="deptResultDTO.deptName">{{deptResultDTO.deptName}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item label="满意度评价" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible" :required="true">
+      <el-form-item label="满意度评价:" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible" :required="true">
         <div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
           <label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
           <el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
diff --git a/src/views/modules/events/item-detail.vue b/src/views/modules/events/item-detail.vue
index 8bedbb13..3ae317ba 100644
--- a/src/views/modules/events/item-detail.vue
+++ b/src/views/modules/events/item-detail.vue
@@ -9,6 +9,12 @@
       </el-form-item>
       <el-form-item label="议题内容">
         <div>{{dataForm.itemContent}}</div>
+        <span v-for="(imgUrl, index) in dataForm.images" :key="index" style="margin: 5px">
+          <el-popover placement="bottom" title="" trigger="click">
+            <img :src="imgUrl" style='width: 300px;height: 300px;'>
+            <img slot="reference" :src="imgUrl" :alt="imgUrl" style="max-height: 100px;max-width: 100px">
+          </el-popover>
+        </span>
       </el-form-item>
       <el-form-item>
         <span>支持 {{dataForm.approveNum}}</span>
@@ -62,7 +68,8 @@ export default {
         nickName: '',
         distributeTime: '',
         itemContent: '',
-        handleProgressResultDTOS: []
+        handleProgressResultDTOS: [],
+        images: []
       },
       order: '',
       orderField: '',