From b98416304d8fe48aa6d8e8f11be94c887a0631c3 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 29 Oct 2021 15:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E7=9A=84=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/PreviewFile.vue                 | 13 ++++++++++++-
 src/views/MessagePage/MeetingDetailModal.vue        |  2 +-
 .../MessagePage/UploadMeetingCertificateModal.vue   | 12 +++++++-----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue
index 0863936..de2d858 100644
--- a/src/components/jero/PreviewFile.vue
+++ b/src/components/jero/PreviewFile.vue
@@ -32,6 +32,12 @@ export default {
     fileId: {
       type: String,
       required: false
+    },
+    /* 是否是会议资料 会议资料有下载的限制 */
+    isMeetingDataBool:{
+      type:Boolean,
+      required: false,
+      default:false
     }
   },
   components: {
@@ -89,7 +95,12 @@ export default {
     },
     handleDownLoad(file) {
       console.log(file)
-      downloadFile(`sys/common/download/${file.id}`, file.name)
+      if(this.isMeetingDataBool){
+        // 会议资料更换了接口
+        downloadFile(`sys/common/userDownload/${file.id}`, file.name)
+      }else {
+        downloadFile(`sys/common/download/${file.id}`, file.name)
+      }
     },
     handlePreview(file) {
       if (file && file.id) {
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 1688c73..54b0015 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -117,7 +117,7 @@
       <a-row :gutter="24" class="flex-col">
         <a-col :span="12">
           <label>会议资料：</label>
-          <span><preview-file :file-id="model.meetingData"></preview-file></span>
+          <span><preview-file :file-id="model.meetingData" :is-meeting-data-bool="true"></preview-file></span>
         </a-col>
       </a-row>
     </section>
diff --git a/src/views/MessagePage/UploadMeetingCertificateModal.vue b/src/views/MessagePage/UploadMeetingCertificateModal.vue
index ebb2f2e..f611c25 100644
--- a/src/views/MessagePage/UploadMeetingCertificateModal.vue
+++ b/src/views/MessagePage/UploadMeetingCertificateModal.vue
@@ -67,7 +67,7 @@
         <!--上传了付款凭证才显示 -->
         <a-row :gutter="24" v-if="model.paymentRecord" class="flex-col">
           <a-col :span="12">
-            <label>缴费状态：</label>
+            <label>审核凭证p'te状态：</label>
             <span>{{ model.checkResult_dictText }}</span>
           </a-col>
         </a-row>
@@ -99,7 +99,7 @@
 
         </a-form>
       </section>
-    </a-spin>
+    </a-spin>l
 
     <template slot="footer">
       <a-button @click="handleCancel">关闭</a-button>
@@ -183,20 +183,22 @@ export default {
       this.form.resetFields()
       this.visible = true
       this.meetingName = param.meetingName
-      // 是否是线上缴费
-      this.payModeOnlineBool = param.payMode === 2 || false
       if (param.id) {
         // 获取参会人信息
         this.querySingUpUserInfo(this.singUpPerosnId).then(res => {
           this.model = {}
           this.model = res
+          // 是否是线上缴费
+          this.payModeOnlineBool =   this.model.payMode === 2 || false
           // 如果缴费方式为汇款的并且上传了缴费凭证 回显缴费凭证
           if (this.model.paymentRecord && this.model.payMode === 1) {
             this.form.setFieldsValue({'paymentRecord': this.model.paymentRecord})
           }
           // 如果缴费方式为线上缴费并且上传了缴费凭证和订单后四位 需要回显
           if (this.model.paymentRecord && this.model.payMode === 2) {
-            this.form.setFieldsValue({'paymentRecord': this.model.paymentRecord, 'orderCode': this.model.orderCode})
+            this.$nextTick(() => {
+              this.form.setFieldsValue({'paymentRecord': this.model.paymentRecord, 'orderCode': this.model.orderCode})
+            })
           }
           // 审核通过以后不可在上传
           if (this.model.checkResult === 1) {