From 20d7eb7bf7355d114d6d6af4a07b8b9dcb39d6ed Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 22 Sep 2022 17:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fileList.vue                              |  0
 .../activivityList/detailActivity.vue         |  2 +-
 .../activivityList/yearplanList.vue           | 25 ++++++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)
 rename src/views/{modules/communityParty/orgActivity/activivityList => components}/fileList.vue (100%)

diff --git a/src/views/modules/communityParty/orgActivity/activivityList/fileList.vue b/src/views/components/fileList.vue
similarity index 100%
rename from src/views/modules/communityParty/orgActivity/activivityList/fileList.vue
rename to src/views/components/fileList.vue
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
index e60baf2fa..00130bd1d 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/detailActivity.vue
@@ -68,7 +68,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost, requestGet } from '@/js/dai/request'
-import fileList from './fileList'
+import fileList from '@/views/components/fileList'
 
 
 let loading // 加载动画
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index db33c74b3..54c8e4ddd 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -205,6 +205,20 @@
                     @handleClose="handleClose"></add-activity>
     </el-dialog>
 
+    <el-dialog v-if="detailShow"
+               :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'活动详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailShow = false">
+      <detail-activity ref="ref_add_form"
+                       :formType="formType"
+                       :icPartyActId="icPartyActId"></detail-activity>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -214,9 +228,10 @@ import { mapGetters } from "vuex";
 import axios from "axios";
 import addRule from "./addRule";
 import addActivity from "./addActivity";
+import detailActivity from "./detailActivity";
 
 export default {
-  components: { addRule, addActivity },
+  components: { addRule, addActivity, detailActivity },
 
   data () {
 
@@ -238,6 +253,7 @@ export default {
 
       showAdd: false,
       showEdit: false,
+      detailShow: false,
 
       formType: 'add',
       addDiaTitle: '添加规则',
@@ -346,9 +362,10 @@ export default {
     },
     async handleDetail (row) {
       this.icPartyActId = row.icPartyActId
-      this.editDiaTitle = '查看规则'
-      this.formType = 'detail'
-      this.showEdit = true
+      this.detailShow = true
+      // this.editDiaTitle = '查看规则'
+      // this.formType = 'detail'
+      // this.showEdit = true
 
     },