From 864bed7bbe34a5eb579fe1f0a66d18fc47beac47 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 22 Jul 2020 16:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/activity/actinfo.vue                    | 2 ++
 src/views/modules/activity/activityinfo-add-or-update.vue | 4 +++-
 src/views/modules/activity/activityinfo.vue               | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/activity/actinfo.vue b/src/views/modules/activity/actinfo.vue
index 26de3da..b942044 100644
--- a/src/views/modules/activity/actinfo.vue
+++ b/src/views/modules/activity/actinfo.vue
@@ -6,6 +6,7 @@
 <script>
 import ActInfoList from './activityinfo'
 import ActInfoAdd from './activityinfo-add'
+import ActInfoUpdate from './activityinfo-add-or-update'
 import ActInfoDetailView from './actinfo-detail-view'
 export default {
   data () {
@@ -16,6 +17,7 @@ export default {
   components: {
     ActInfoList,
     ActInfoAdd,
+    ActInfoUpdate,
     ActInfoDetailView
   },
   methods: {
diff --git a/src/views/modules/activity/activityinfo-add-or-update.vue b/src/views/modules/activity/activityinfo-add-or-update.vue
index e13f6b2..bdf9d7e 100644
--- a/src/views/modules/activity/activityinfo-add-or-update.vue
+++ b/src/views/modules/activity/activityinfo-add-or-update.vue
@@ -244,7 +244,7 @@ import debounce from 'lodash/debounce'
 import 'quill/dist/quill.snow.css'
 import Quill from 'quill'
 export default {
-  name: 'ActInfoAdd',
+  name: 'ActInfoUpdate',
   data () {
     return {
       visible: false,
@@ -344,6 +344,8 @@ export default {
   },
   mounted () {
     this.getOptions()
+    this.dataForm.id = this.$route.query.id
+    this.init()
   },
   computed: {
     dataRule () {
diff --git a/src/views/modules/activity/activityinfo.vue b/src/views/modules/activity/activityinfo.vue
index afea486..10b7460 100644
--- a/src/views/modules/activity/activityinfo.vue
+++ b/src/views/modules/activity/activityinfo.vue
@@ -78,6 +78,7 @@
         <el-table-column prop="sponsor" 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('activity:activityinfo:update')" type="text" size="small" @click="updateAction(scope.row.id)">{{ $t('update') }} </el-button>
             <el-button v-if="$hasPermission('activity:activityinfo:update')" type="text" size="small" @click="detailAction(scope.row.id)">查看详情</el-button>
             <el-button v-if="$hasPermission('activity:activityinfo:cancel') && new Date() < new Date(scope.row.actEndTime)" type="text" :disabled="scope.row.actStatus ==='0'? true :false" size="small" @click="cancelHandle(scope.row)">下架</el-button>
             <el-button v-if="$hasPermission('activity:activityinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">报名情况</el-button>
@@ -162,6 +163,10 @@ export default {
       this.$parent.selectComponent = 'ActInfoDetailView'
       this.$router.push({ path: '/activity-actinfo', query: { id: id } })
     },
+    updateAction (id) {
+      this.$parent.selectComponent = 'ActInfoUpdate'
+      this.$router.push({ path: '/activityinfo-add-or-update', query: { id: id } })
+    },
     cancelHandle (row) {
       let state = row.actStatus
       if (state === '1') {