From a45fe9b54485ed750814317e511d1c64ec4daa9e Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 16 Oct 2021 23:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MessagePage/UploadMeetingCertificateModal.vue | 4 ++--
 src/views/meetingActivity/MeetingActivity.vue           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index e4e20f2..016c4ba 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -153,7 +153,7 @@ export default {
   },
   methods: {
     open(param) {
-      this.singUpPerosnId = param.id
+      this.singUpPerosnId = param.situationId
       this.form.resetFields()
       this.visible = true
       this.meetingName = param.meetingName
@@ -161,7 +161,7 @@ export default {
       this.payModeOnlineBool = param.payMode === 2 || false
       if (param.id) {
         // 获取参会人信息
-        this.querySingUpUserInfo(param.id).then(res => {
+        this.querySingUpUserInfo(param.situationId).then(res => {
           this.model = {}
             this.model = res
         })
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 1b8c49a..ec7269b 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -88,7 +88,7 @@
               <img src="../../assets/meetingImgs/meeting_paymode.png"/>
               缴费方式：{{ item.payMode_dictText }}
               <!--  缴费方式为线上缴费或者汇款的，只有在会议召开时间期间才显示”上传凭证“按钮  "-->
-              <a-button v-show="item.payMode === 2 || item.payMode === 1"  type="primary" @click="uploadPaymentRecord(item)">上传凭证</a-button>
+              <a-button v-show="(item.payMode === 2 || item.payMode === 1)&& (item.meetingStatus == 2 || item.meetingStatus === 3) "  type="primary" @click="uploadPaymentRecord(item)">上传凭证</a-button>
             </p>
             <img v-if="item.meetingStatus === 2 " class="meeting-img-status" src="../../assets/meetingImgs/no-start.png"/>
             <img v-if="item.meetingStatus === 3 " class="meeting-img-status" src="../../assets/meetingImgs/ing.png" />