From 257c5e7f8e798b55ae45b355d2235bb3964757c2 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Tue, 11 Jan 2022 13:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E5=8A=A0type=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=9B=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=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/api/standardsAssociationApi.js                     | 2 +-
 src/views/standardsAssociation/meeting/MeetingList.vue | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js
index 8a034b1..ba92412 100644
--- a/src/api/standardsAssociationApi.js
+++ b/src/api/standardsAssociationApi.js
@@ -17,7 +17,7 @@ const previewPdf = (file) => {
   // return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf'
   const token = Vue.ls.get(ACCESS_TOKEN)
   // const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA'
-  const fileFullUrl = `${window._CONFIG['memberDomianWebSocketURL']}/sys/common/download/${file.id}?token=${token}&fullfilename=${file.fileName}`
+  const fileFullUrl = `${window._CONFIG['memberDomianWebSocketURL']}/sys/common/download/${file.id}?type=view&token=${token}&fullfilename=${file.fileName}`
   console.log(fileFullUrl, '$$$$$$$$')
   let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
   return url
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index 7df882d..46ee13b 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -51,9 +51,10 @@
             </a-col>
 
             <a-col :xl="7" :lg="8" :md="8" :sm="24">
+              <!-- 标协会议少“报名信息审核中”、“不可参会” 状态-->
               <a-form-item label="报名状态">
                 <j-dict-select-tag
-                  dict-code="sign_up_status"
+                  :dict-code=" meetingType=== MeetingTypeEnums.standard.index ? 'sign_up_status_standard':'sign_up_status'"
                   placeholder="请选择报名状态"
                   v-model="queryParam.signUpStatus"
                 ></j-dict-select-tag>
@@ -181,7 +182,7 @@ import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCerti
 import { getAction } from '@api/manage'
 import JEllipsis from '@comp/jero/JEllipsis'
 import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
-import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '@/enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetingTypeEnums } from '@/enums/commonEnum'
 import { compareCurrentTime } from '../../../utils/meetingJudgeUtil'
 
 
@@ -214,7 +215,7 @@ export default {
     meetingType: {
       type: Number,
       required: false,
-      default: 2
+      default: MeetingTypeEnums.standard.index
     }
   },
   data() {
@@ -222,6 +223,7 @@ export default {
       SignUpStatusEnum,
       MeetingStatusEnums,
       MeetingSignUpTypeEnums,
+      MeetingTypeEnums,
       // 会议分类 全部 0  可报名 1 已报名 2
       meetingStatusArr: [
         {