From 8d82477b54c8790ed1205ab4fc854be4793c2898 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 14 Oct 2021 16:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E4=B8=8A=E4=BC=A0=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81=E6=9D=A1=E4=BB=B6=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index c7d1876..e4e20f2 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -133,7 +133,9 @@ export default {
       // 会议名称
       meetingName: '',
       // 是否是线上缴费方式
-      payModeOnlineBool: false
+      payModeOnlineBool: false,
+      // 参会人id
+      singUpPerosnId:''
     }
   },
   components: {
@@ -151,12 +153,14 @@ export default {
   },
   methods: {
     open(param) {
+      this.singUpPerosnId = param.id
       this.form.resetFields()
       this.visible = true
       this.meetingName = param.meetingName
       // 是否是线上缴费
       this.payModeOnlineBool = param.payMode === 2 || false
       if (param.id) {
+        // 获取参会人信息
         this.querySingUpUserInfo(param.id).then(res => {
           this.model = {}
             this.model = res
@@ -174,6 +178,7 @@ export default {
           let method = 'post'
           let url = this.url.edit
           const formData = Object.assign({}, values)
+          formData.id = this.singUpPerosnId
           httpAction(url, formData, method).then(res => {
             if (res.success) {
               that.$message.success(res.message)
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 9c815bf..5cdfe40 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -87,8 +87,8 @@
             <p class="item-meeting-img item-meeting-meetingPaymode">
               <img src="../../assets/meetingImgs/meeting_paymode.png"/>
               缴费方式：{{ item.payMode_dictText }}
-              <!--  缴费方式为线上缴费的，只有在会议召开时间期间才显示”上传凭证“按钮  "-->
-              <a-button v-show="item.payMode === 2"  type="primary" @click="uploadPaymentRecord(item)">上传凭证</a-button>
+              <!--  缴费方式为线上缴费或者汇款的，只有在会议召开时间期间才显示”上传凭证“按钮  "-->
+              <a-button v-show="item.payMode === 2 || item.payMode === 1"  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" />