From f0af133bfc6732542c05a1191bb2d73546d02a1b 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, 17 Sep 2019 16:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/issue-add-or-update.vue    | 250 -----------------
 .../events/{change.vue => issue-change.vue}   |   5 +-
 .../events/{close.vue => issue-close.vue}     |   4 +-
 .../events/{detail.vue => issue-detail.vue}   |   2 +-
 .../modules/events/issue-process-deal.vue     | 130 +++++++++
 .../events/{process.vue => issue-process.vue} |  18 +-
 ...-or-update.vue => issue-reject-detail.vue} |   2 +-
 .../events/{reject.vue => issue-reject.vue}   |  16 +-
 ...-or-update.vue => issue-review-detail.vue} |   0
 .../{epdcevents.vue => issue-review.vue}      |  16 +-
 src/views/modules/events/issue.vue            |  90 ------
 .../modules/events/item-add-or-update.vue     | 264 ------------------
 src/views/modules/events/item-close.vue       |   4 -
 ...add-or-update.vue => item-deal-detail.vue} |   0
 .../events/{item.vue => item-deal.vue}        |  17 +-
 src/views/modules/events/item-end.vue         |   9 -
 16 files changed, 185 insertions(+), 642 deletions(-)
 delete mode 100644 src/views/modules/events/issue-add-or-update.vue
 rename src/views/modules/events/{change.vue => issue-change.vue} (98%)
 rename src/views/modules/events/{close.vue => issue-close.vue} (98%)
 rename src/views/modules/events/{detail.vue => issue-detail.vue} (97%)
 create mode 100644 src/views/modules/events/issue-process-deal.vue
 rename src/views/modules/events/{process.vue => issue-process.vue} (92%)
 rename src/views/modules/events/{reject-add-or-update.vue => issue-reject-detail.vue} (92%)
 rename src/views/modules/events/{reject.vue => issue-reject.vue} (91%)
 rename src/views/modules/events/{epdcevents-add-or-update.vue => issue-review-detail.vue} (100%)
 rename src/views/modules/events/{epdcevents.vue => issue-review.vue} (91%)
 delete mode 100644 src/views/modules/events/issue.vue
 delete mode 100755 src/views/modules/events/item-add-or-update.vue
 rename src/views/modules/events/{process-add-or-update.vue => item-deal-detail.vue} (100%)
 rename src/views/modules/events/{item.vue => item-deal.vue} (91%)

diff --git a/src/views/modules/events/issue-add-or-update.vue b/src/views/modules/events/issue-add-or-update.vue
deleted file mode 100644
index 878e9717..00000000
--- a/src/views/modules/events/issue-add-or-update.vue
+++ /dev/null
@@ -1,250 +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="事件ID" prop="eventId">
-          <el-input v-model="dataForm.eventId" placeholder="事件ID"></el-input>
-      </el-form-item>
-          <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
-      </el-form-item>
-          <el-form-item label="用户昵称" prop="nickName">
-          <el-input v-model="dataForm.nickName" placeholder="用户昵称"></el-input>
-      </el-form-item>
-          <el-form-item label="用户头像" prop="userFace">
-          <el-input v-model="dataForm.userFace" placeholder="用户头像"></el-input>
-      </el-form-item>
-          <el-form-item label="议题内容" prop="issueContent">
-          <el-input v-model="dataForm.issueContent" placeholder="议题内容"></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="议题位置地址" prop="issueAddress">
-          <el-input v-model="dataForm.issueAddress" placeholder="议题位置地址"></el-input>
-      </el-form-item>
-          <el-form-item label="议题分类ID" prop="issueCategoryId">
-          <el-input v-model="dataForm.issueCategoryId" placeholder="议题分类ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置纬度" prop="issusLatitude">
-          <el-input v-model="dataForm.issusLatitude" placeholder="议题位置纬度"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置经度" prop="issueLongitude">
-          <el-input v-model="dataForm.issueLongitude" placeholder="议题位置经度"></el-input>
-      </el-form-item>
-          <el-form-item label="友邻社区ID" prop="friendlyCommunityId">
-          <el-input v-model="dataForm.friendlyCommunityId" placeholder="友邻社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题状态 0-审核通过，2-已关闭，4-已转项目" prop="issueState">
-          <el-input v-model="dataForm.issueState" placeholder="议题状态 0-审核通过，2-已关闭，4-已转项目"></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: '',
-        eventId: '',
-        userId: '',
-        nickName: '',
-        userFace: '',
-        issueContent: '',
-        area: '',
-        areaId: '',
-        street: '',
-        streetId: '',
-        community: '',
-        communityId: '',
-        grid: '',
-        gridId: '',
-        issueAddress: '',
-        issueCategoryId: '',
-        issusLatitude: '',
-        issueLongitude: '',
-        friendlyCommunityId: '',
-        issueState: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        eventId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userFace: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueContent: [
-          { 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' }
-        ],
-        issueAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueCategoryId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issusLatitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueLongitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        friendlyCommunityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueState: [
-          { 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/issue/${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/issue/', 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/events/change.vue b/src/views/modules/events/issue-change.vue
similarity index 98%
rename from src/views/modules/events/change.vue
rename to src/views/modules/events/issue-change.vue
index bb4562f6..f86c4421 100644
--- a/src/views/modules/events/change.vue
+++ b/src/views/modules/events/issue-change.vue
@@ -88,8 +88,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './epdcevents-add-or-update'
-import Detail from './detail'
+import Detail from './issue-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -98,6 +97,7 @@ export default {
         getDataListURL: '/events/issue/page',
         getDataListIsPage: true
       },
+      detailVisible: false,
       dataForm: {
         startTime: '',
         endTime: '',
@@ -128,7 +128,6 @@ export default {
     }
   },
   components: {
-    AddOrUpdate,
     Detail
   },
   created: function () {
diff --git a/src/views/modules/events/close.vue b/src/views/modules/events/issue-close.vue
similarity index 98%
rename from src/views/modules/events/close.vue
rename to src/views/modules/events/issue-close.vue
index b59b4cd9..7eaa6575 100644
--- a/src/views/modules/events/close.vue
+++ b/src/views/modules/events/issue-close.vue
@@ -89,8 +89,7 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './epdcevents-add-or-update'
-import Detail from './detail'
+import Detail from './issue-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -130,7 +129,6 @@ export default {
     }
   },
   components: {
-    AddOrUpdate,
     Detail
   },
   created: function () {
diff --git a/src/views/modules/events/detail.vue b/src/views/modules/events/issue-detail.vue
similarity index 97%
rename from src/views/modules/events/detail.vue
rename to src/views/modules/events/issue-detail.vue
index 055961ea..e544fe6e 100644
--- a/src/views/modules/events/detail.vue
+++ b/src/views/modules/events/issue-detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="$t('verifyLabel')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible" :title="$t('look')" :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' ? '120px' : '80px'">
       <el-form-item label="发布人">
         <p>{{dataForm.nickName}}</p>
diff --git a/src/views/modules/events/issue-process-deal.vue b/src/views/modules/events/issue-process-deal.vue
new file mode 100644
index 00000000..6943dfe6
--- /dev/null
+++ b/src/views/modules/events/issue-process-deal.vue
@@ -0,0 +1,130 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('deal')" :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="nickName">
+        <p>{{dataForm.nickName}}</p>
+      </el-form-item>
+      <el-form-item label="发布时间" prop="distributeTime">
+        <p>{{dataForm.distributeTime}}</p>
+      </el-form-item>
+      <el-form-item label="议题内容" prop="eventContent">
+        <p>{{dataForm.issueContent}}</p>
+      </el-form-item>
+      <el-form-item label="工作反馈" prop="jobFeedback">
+        <el-timeline :reverse="false">
+          <el-timeline-item v-for="(jobFeedbackDTO, index) in dataForm.jobFeedbackDTOS" :key="index" :timestamp="jobFeedbackDTO.createdTime" placement="top">
+            <el-card>
+              <p>【{{jobFeedbackDTO.stateName}}】{{jobFeedbackDTO.createdTime}}</p>
+              <p>{{jobFeedbackDTO.advice}}</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </el-form-item>
+      <el-form-item label="处理意见" prop="advice">
+          <el-input v-model="dataForm.advice" placeholder="不超过50字"></el-input>
+      </el-form-item>
+      <el-form-item label="操作" prop="state">
+        <el-select v-model="dataForm.state" placeholder="请选择">
+          <el-option
+            v-for="item in verifyOptions"
+            :key="item.verifyFlag"
+            :label="item.verifyTitle"
+            :value="item.verifyFlag">
+          </el-option>
+        </el-select>
+      </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: '',
+        issueContent: '',
+        nickName: '',
+        distributeTime: '',
+        advice: '',
+        state: '',
+        jobFeedbackDTOS: []
+      },
+      verifyOptions: [{
+        verifyFlag: '1',
+        verifyTitle: '添加处理意见'
+      }, {
+        verifyFlag: '2',
+        verifyTitle: '关闭'
+      }, {
+        verifyFlag: '4',
+        verifyTitle: '转项目'
+      }]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        advice: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventState: [
+          { 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(`/events/issue/waitHandleIssueDetail/${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['post'](
+          '/events/issue/issueWaitHandleSubmit', 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/events/process.vue b/src/views/modules/events/issue-process.vue
similarity index 92%
rename from src/views/modules/events/process.vue
rename to src/views/modules/events/issue-process.vue
index 23dfeef9..23a7dcb8 100644
--- a/src/views/modules/events/process.vue
+++ b/src/views/modules/events/issue-process.vue
@@ -69,7 +69,7 @@
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('events:issue:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
-            <el-button v-if="$hasPermission('events:issue:deal')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('deal') }}</el-button>
+            <el-button v-if="$hasPermission('events:issue:deal')" type="text" size="small" @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -83,7 +83,7 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <process-deal v-if="processDealVisible" ref="processDeal" @refreshDataList="getDataList"></process-deal>
       <detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail>
     </div>
   </el-card>
@@ -91,8 +91,8 @@
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './process-add-or-update'
-import Detail from './detail'
+import ProcessDeal from './issue-process-deal'
+import Detail from './issue-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -102,6 +102,7 @@ export default {
         getDataListIsPage: true
       },
       detailVisible: false,
+      processDealVisible: false,
       dataForm: {
         startTime: '',
         endTime: '',
@@ -132,7 +133,7 @@ export default {
     }
   },
   components: {
-    AddOrUpdate,
+    ProcessDeal,
     Detail
   },
   created: function () {
@@ -146,6 +147,13 @@ export default {
         this.$refs.detail.init()
       })
     },
+    dealAction (id) {
+      this.processDealVisible = true
+      this.$nextTick(() => {
+        this.$refs.processDeal.dataForm.id = id
+        this.$refs.processDeal.init()
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/events/reject-add-or-update.vue b/src/views/modules/events/issue-reject-detail.vue
similarity index 92%
rename from src/views/modules/events/reject-add-or-update.vue
rename to src/views/modules/events/issue-reject-detail.vue
index 39f05893..a8f8bb0d 100644
--- a/src/views/modules/events/reject-add-or-update.vue
+++ b/src/views/modules/events/issue-reject-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" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="议题内容" prop="eventContent">
         <p>{{dataForm.eventContent}}</p>
         <img v-for="imgUrl in dataForm.images" :key="imgUrl" style='width: 70px;height: 70px;margin: 10px' :layer-src="imgUrl" :src="imgUrl" alt="image">
diff --git a/src/views/modules/events/reject.vue b/src/views/modules/events/issue-reject.vue
similarity index 91%
rename from src/views/modules/events/reject.vue
rename to src/views/modules/events/issue-reject.vue
index 840df5c1..8de2a904 100644
--- a/src/views/modules/events/reject.vue
+++ b/src/views/modules/events/issue-reject.vue
@@ -63,7 +63,7 @@
         <el-table-column prop="nickName" 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 v-if="$hasPermission('events:reject:look')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('events:reject:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -77,14 +77,14 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <reject-detail v-if="rejectDetailVisible" ref="rejectDetail" @refreshDataList="getDataList"></reject-detail>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './reject-add-or-update'
+import RejectDetail from './issue-reject-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -95,6 +95,7 @@ export default {
         deleteURL: '/events/epdcevents',
         deleteIsBatch: true
       },
+      rejectDetailVisible: false,
       dataForm: {
         startTime: '',
         endTime: '',
@@ -124,12 +125,19 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    RejectDetail
   },
   created: function () {
     this.getStreetList()
   },
   methods: {
+    detailAction (id) {
+      this.rejectDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.rejectDetail.dataForm.id = id
+        this.$refs.rejectDetail.init()
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/events/epdcevents-add-or-update.vue b/src/views/modules/events/issue-review-detail.vue
similarity index 100%
rename from src/views/modules/events/epdcevents-add-or-update.vue
rename to src/views/modules/events/issue-review-detail.vue
diff --git a/src/views/modules/events/epdcevents.vue b/src/views/modules/events/issue-review.vue
similarity index 91%
rename from src/views/modules/events/epdcevents.vue
rename to src/views/modules/events/issue-review.vue
index 5cc1dfcb..da4f07ee 100644
--- a/src/views/modules/events/epdcevents.vue
+++ b/src/views/modules/events/issue-review.vue
@@ -63,7 +63,7 @@
         <el-table-column prop="nickName" 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 v-if="$hasPermission('events:epdcevents:verify')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('verify') }}</el-button>
+            <el-button v-if="$hasPermission('events:epdcevents:verify')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('verify') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -77,14 +77,14 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <review-detail v-if="reviewDetailVisible" ref="reviewDetail" @refreshDataList="getDataList"></review-detail>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './epdcevents-add-or-update'
+import ReviewDetail from './issue-review-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -95,6 +95,7 @@ export default {
         deleteURL: '/events/epdcevents',
         deleteIsBatch: true
       },
+      reviewDetailVisible: false,
       dataForm: {
         startTime: '',
         endTime: '',
@@ -124,12 +125,19 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    ReviewDetail
   },
   created: function () {
     this.getStreetList()
   },
   methods: {
+    detailAction (id) {
+      this.reviewDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.reviewDetail.dataForm.id = id
+        this.$refs.reviewDetail.init()
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/events/issue.vue b/src/views/modules/events/issue.vue
deleted file mode 100644
index 8af0ecc8..00000000
--- a/src/views/modules/events/issue.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-news__issue}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:issue:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:issue:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</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="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="eventId" label="事件ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickName" label="用户昵称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userFace" label="用户头像" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="area" label="区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="areaId" label="区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="streetId" label="街道ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueAddress" label="议题位置地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueCategoryId" label="议题分类ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issusLatitude" label="议题位置纬度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueLongitude" label="议题位置经度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="friendlyCommunityId" label="友邻社区ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="issueState" label="议题状态 0-审核通过，2-已关闭，4-已转项目" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:issue:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:issue:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './issue-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/news/issue/page',
-        getDataListIsPage: true,
-        deleteURL: '/news/issue',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/events/item-add-or-update.vue b/src/views/modules/events/item-add-or-update.vue
deleted file mode 100755
index bed768bb..00000000
--- a/src/views/modules/events/item-add-or-update.vue
+++ /dev/null
@@ -1,264 +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="事件ID" prop="eventId">
-          <el-input v-model="dataForm.eventId" placeholder="事件ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题ID" prop="issueId">
-          <el-input v-model="dataForm.issueId" placeholder="议题ID"></el-input>
-      </el-form-item>
-          <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
-      </el-form-item>
-          <el-form-item label="用户昵称" prop="nickName">
-          <el-input v-model="dataForm.nickName" placeholder="用户昵称"></el-input>
-      </el-form-item>
-          <el-form-item label="用户头像" prop="userFace">
-          <el-input v-model="dataForm.userFace" placeholder="用户头像"></el-input>
-      </el-form-item>
-          <el-form-item label="议题内容" prop="issueContent">
-          <el-input v-model="dataForm.issueContent" placeholder="议题内容"></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="议题位置地址" prop="issueAddress">
-          <el-input v-model="dataForm.issueAddress" placeholder="议题位置地址"></el-input>
-      </el-form-item>
-          <el-form-item label="议题分类ID" prop="issueCategoryId">
-          <el-input v-model="dataForm.issueCategoryId" placeholder="议题分类ID"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置纬度" prop="issusLatitude">
-          <el-input v-model="dataForm.issusLatitude" placeholder="议题位置纬度"></el-input>
-      </el-form-item>
-          <el-form-item label="议题位置经度" prop="issueLongitude">
-          <el-input v-model="dataForm.issueLongitude" placeholder="议题位置经度"></el-input>
-      </el-form-item>
-          <el-form-item label="友邻社区ID" prop="friendlyCommunityId">
-          <el-input v-model="dataForm.friendlyCommunityId" placeholder="友邻社区ID"></el-input>
-      </el-form-item>
-          <el-form-item label="评价打分" prop="issueScore">
-          <el-input v-model="dataForm.issueScore" placeholder="评价打分"></el-input>
-      </el-form-item>
-          <el-form-item label="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题" prop="itemState">
-          <el-input v-model="dataForm.itemState" placeholder="项目状态 0-待网格长处理，5-待社区处理，10-待街道党建办处理，15-待街道处理，20-待区直部门党建办处理，25-待区直部门处理，30-处理，35-关闭，40-结束议题"></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: '',
-        eventId: '',
-        issueId: '',
-        userId: '',
-        nickName: '',
-        userFace: '',
-        issueContent: '',
-        area: '',
-        areaId: '',
-        street: '',
-        streetId: '',
-        community: '',
-        communityId: '',
-        grid: '',
-        gridId: '',
-        issueAddress: '',
-        issueCategoryId: '',
-        issusLatitude: '',
-        issueLongitude: '',
-        friendlyCommunityId: '',
-        issueScore: '',
-        itemState: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        eventId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        userFace: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueContent: [
-          { 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' }
-        ],
-        issueAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueCategoryId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issusLatitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueLongitude: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        friendlyCommunityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        issueScore: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        itemState: [
-          { 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(`/events/item/${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']('/events/item/', 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/events/item-close.vue b/src/views/modules/events/item-close.vue
index ebf3a6a8..f0de5b4b 100755
--- a/src/views/modules/events/item-close.vue
+++ b/src/views/modules/events/item-close.vue
@@ -81,15 +81,12 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './item-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -129,7 +126,6 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
   },
   created: function () {
     this.getStreetList()
diff --git a/src/views/modules/events/process-add-or-update.vue b/src/views/modules/events/item-deal-detail.vue
similarity index 100%
rename from src/views/modules/events/process-add-or-update.vue
rename to src/views/modules/events/item-deal-detail.vue
diff --git a/src/views/modules/events/item.vue b/src/views/modules/events/item-deal.vue
similarity index 91%
rename from src/views/modules/events/item.vue
rename to src/views/modules/events/item-deal.vue
index 2d497957..1c4430a6 100755
--- a/src/views/modules/events/item.vue
+++ b/src/views/modules/events/item-deal.vue
@@ -58,6 +58,7 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column>
         <el-table-column prop="itemContent" 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="nickName" label="提交人" header-align="center" align="center"></el-table-column>
@@ -68,7 +69,7 @@
         <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">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('deal') }}</el-button>
+            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('deal') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -82,14 +83,14 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <deal v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></deal>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './item-add-or-update'
+import Detail from './item-deal-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -98,6 +99,7 @@ export default {
         getDataListURL: '/events/item/page',
         getDataListIsPage: true
       },
+      detailVisible: false,
       dataForm: {
         id: '',
         itemState: '0',
@@ -129,12 +131,19 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    Detail
   },
   created: function () {
     this.getStreetList()
   },
   methods: {
+    detailAction (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.detail.dataForm.id = id
+        this.$refs.detail.init()
+      })
+    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/events/item-end.vue b/src/views/modules/events/item-end.vue
index 0873e327..e7dc4756 100755
--- a/src/views/modules/events/item-end.vue
+++ b/src/views/modules/events/item-end.vue
@@ -66,11 +66,6 @@
         <el-table-column prop="opposeNum" 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">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('deal') }}</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -81,15 +76,12 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './item-add-or-update'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -129,7 +121,6 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
   },
   created: function () {
     this.getStreetList()