Merge remote-tracking branch 'origin/branch1210' into branch1210

src/components/jero/PreviewFile.vue

@@ -97,14 +97,15 @@ export default {
       console.log(file)
       if(this.isMeetingDataBool){
         // 会议资料更换了接口
-        downloadFile(`sys/common/userDownload/${file.id}`, file.name)
+        downloadFile(`sys/common/userDownload/${file.id}?type=download`, file.name)
+        // downloadFile('/meeting/payMeeting/userDownload/{+'file.id'+}/{+'meetingId+}')
       }else {
-        downloadFile(`sys/common/download/${file.id}`, file.name)
+        downloadFile(`sys/common/download/${file.id}?type=download`, file.name)
       }
     },
     handlePreview(file) {
       if (file && file.id) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view`
         let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)

src/views/MessagePage/MeetingDetailModal.vue

@@ -41,6 +41,24 @@
             <span><j-ellipsis :value="model.directorName" :length="20"></j-ellipsis></span>
           </a-col>
         </a-row>
+        <a-row  :gutter="24" class="flex-col">
+          <a-col :span="12">
+            <label>酒店名称：</label><span>{{ model.hotelName }}</span>
+          </a-col>
+          <a-col :span="12">
+            <label>酒店地址：</label><span>{{ model.hotelAddress }}</span>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="24"  class="flex-col">
+          <a-col>
+            <label class="label">酒店联系人及手机号：</label>
+            <span class="content"
+                  v-for="(item,index) of model.hotelContactsList"
+                  :key="index">
+          {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }}</span>
+          </a-col>
+        </a-row>
         <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>报名截止时间：</label>
@@ -522,8 +540,7 @@
 
         </template>
       </section>
-
+      <div v-if=" (model.meetingSignUpType+'' === '1' && !compareCurrentTime(model.registerDeadline)) ">
-      <div v-if="model.meetingSignUpType+'' === '1' ">
         <a-button type="primary" @click="goSignUpPage" >报名 </a-button>
       </div>
     </a-spin>
@@ -782,6 +799,18 @@ export default {
       window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
     },
     /*
+    * 当前时间是否超过会议报名时间
+    * */
+    compareCurrentTime(time) {
+      let date = new Date()
+      let compareTime = new Date(time)
+      if (date.getTime() > compareTime.getTime()) {
+        return true
+      } else {
+        return false
+      }
+    },
+    /*
     * 通过会议id获取会议性情
     * */
     queryMeetingInfoById(id) {

src/views/MessagePage/modules/FileTable.vue

@@ -129,14 +129,14 @@ export default {
       console.log(file)
       if(this.hasLimitBool){
         // 会议资料更换了接口
-        downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}`, file.name)
+        downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}?type=download`, file.name)
       }else {
-        downloadFile(`sys/common/download/${file.id}`, file.name)
+        downloadFile(`sys/common/download/?type=download${file.id}`, file.name)
       }
     },
     handlePreview(file) {
       if (file && file.id) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view`
         let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)

src/views/MessagePage/modules/UnderStudyFilesModal.vue

@@ -98,7 +98,7 @@ export default {
     handlePreview(record) {
       if (this.isCommittee) {
         if (record && record.FILE_ID) {
-          const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ record.FILE_ID }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ record.FILE_NAME }`
+          const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/payResearchProject/payResearchProject/downLoad/?fileId=${record.FILE_ID}&token=${Vue.ls.get(ACCESS_TOKEN)}&fileName=${record.FILE_NAME}`
           let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }`
           window.open(url)
         }

src/views/dashboard/Analysis.vue

@@ -113,7 +113,7 @@ export default {
           title: '提醒时间',
           align: 'center',
           width: 180,
-          dataIndex: 'createTime',
+          dataIndex: 'sendTime',
           scopedSlots: {customRender: 'text'}
         }, {
           title: '操作',

src/views/meetingActivity/MeetingActivity.vue

@@ -109,23 +109,24 @@
               召开时间：{{ item.startTime }}~{{ item.endTime }}
               <!--              <j-ellipsis :value="item.startTime + '~' + item.endTime" :length="30"></j-ellipsis>-->
             </p>
+
             <!-- 报名状态  缴费方式为打包 不显示 item.signUpStatus !== null-->
-            <p class="item-meeting-img item-meeting-meetingTime item-sign-up-status"
+            <p class="item-meeting-img item-meeting-meetingTime item-sign-up-status">
-               v-show="item.payMode !== 3 ">
               <img src="../../assets/meetingImgs/meeting-audit.png"
                    class="audit-img"/>报名状态：{{ item.signUpStatus_dictText || '无' }}
               <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
+            <!--  -->
+              <!-- 可报名 状态有报名按钮 -->
+              <a-button v-if="Number(item.signUpStatus) === SignUpStatusEnum.canReport.index" class="cell-btn"
+                        type="primary"
+                        @click.stop="signUpRecord(item)">报名
+              </a-button>
               <template
-                v-if="(item.payMode === 2 || item.payMode === 1)
+                v-if="(item.payMode === 2 || item.payMode === 1) && (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
-                && (item.meetingStatus == MeetingStatusEnums.noStart.index || item.meetingStatus === MeetingStatusEnums.onGoing.index)
                 && item.registerCheckResult === 1
                 && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
               >
-                <!-- 可报名 状态有报名按钮 -->
+
-                <a-button v-if="Number(item.signUpStatus) === SignUpStatusEnum.canReport.index" class="cell-btn"
-                          type="primary"
-                          @click.stop="signUpRecord(item)">报名
-                </a-button>
                 <!-- 凭证待审核 状态有查看凭证按钮 -->
                 <a-button v-if="item.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="cell-btn"
                           type="primary"