From 0878a1db6507fa6306db17f3b91e89b03becbdb5 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Sep 2021 19:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=9A=84=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/MeetingDetailModal.vue  | 22 +++++++++++--------
 src/views/meetingActivity/MeetingActivity.vue | 13 ++++++++++-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 764a661..e42b4f4 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -12,47 +12,47 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <label>会议名称：</label>
-          <span><j-ellipsis :value="model.meetingName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.meetingName" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>会议类型：</label>
-          <span><j-ellipsis :value="generateMeetingType(model.meetingType)" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="generateMeetingType(meetingInfo.meetingType)" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>召开时间：</label>
-          <span>{{model.startTime + '~' + model.endTime}}</span>
+          <span>{{meetingInfo.startTime + '~' + meetingInfo.endTime}}</span>
         </a-col>
         <a-col :span="12">
           <label>年份：</label>
-          <span><j-ellipsis :value="model.particularYear" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.particularYear" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>召开地点：</label>
-          <span><j-ellipsis :value="model.venue + '/' + model.address"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.venue + '/' + meetingInfo.address"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>负责人：</label>
-          <span><j-ellipsis :value="model.directorName" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.directorName" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <label>报名截止时间：</label>
-          <span><j-ellipsis :value="model.registerDeadline" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.registerDeadline" :length="20"></j-ellipsis></span>
         </a-col>
         <a-col :span="12">
           <label>会议通知：</label>
-          <span><preview-file :file-id="model.meetingFiles"></preview-file></span>
+          <span><preview-file :file-id="meetingInfo.meetingFiles"></preview-file></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <label>会议内容：</label>
-          <span><j-ellipsis :value="model.meetingContent" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="meetingInfo.meetingContent" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
     </section>
@@ -156,11 +156,15 @@ export default {
       width: 800,
       visible: false,
       model: {},
+      // 会议信息
+      meetingInfo:{}
     }
   },
   methods: {
     open(param) {
       this.visible = true
+      this.meetingInfo = Object.assign({},param)
+
       if(param){
         this.queryMeetingInfoById(param.id).then(res => {
           // 会议详情
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 7755ed2..2330ecb 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -66,7 +66,7 @@
         <div class="list" v-if="tableData.length > 0">
           <div class="item-meeting" v-for="(item,index) of tableData" :key="index">
             <p class="item-meeting-meetingName">
-              <j-ellipsis :value="item.meetingName" :length="20"></j-ellipsis>
+              <j-ellipsis class="primary-color" @click="openMeetingDetail(item)" :value="item.meetingName" :length="20"></j-ellipsis>
             </p>
             <!--这里需要修改  会议费用分人显示不同的会议费用  2021-09-29 跟需求沟通说是不显示-->
             <!--            <p class="item-meeting-meetingCost"><span>￥</span>{{ item.meetingCosts }}</p>-->
@@ -123,6 +123,8 @@
     </div>
     <!--上传凭证-->
     <upload-meeting-certificate-modal ref="upload"></upload-meeting-certificate-modal>
+<!--    会议详情-->
+    <meeting-detail-modal ref="meetingDetail"></meeting-detail-modal>
   </div>
 </template>
 <script>
@@ -132,11 +134,13 @@ import JDate from '@comp/tools/JDate'
 import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
 import {getAction} from '@api/manage'
 import JEllipsis from '@comp/jero/JEllipsis'
+import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
 
 export default {
   name: 'MeetingActivity',
   mixins: [RangeDateMixin],
   components: {
+    MeetingDetailModal,
     JDictSelectTag,
     JDate,
     UploadMeetingCertificateModal,
@@ -281,6 +285,13 @@ export default {
         this.$refs.upload.open(item)
       }
     },
+    /*
+    *  打开会议详情
+    * */
+    openMeetingDetail(item){
+      debugger
+      this.$refs.meetingDetail.open(item)
+    }
   }
 }
 </script>