From b7a4ea9595b85fb536184060605a3c16b2b065b0 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 6 Jan 2022 17:52:45 +0800
Subject: [PATCH] =?UTF-8?q?[bug]-=20=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E4=BC=9A=E8=AE=AE=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81=20?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/detailPage/MeetingList.vue     | 19 ++++++++++++++-----
 src/enums/commonEnum.js                       |  5 +++++
 src/utils/meetingJudgeUtil.js                 | 14 ++++++++++++++
 src/views/MessagePage/MeetingDetailModal.vue  | 18 +++++++-----------
 src/views/meetingActivity/MeetingActivity.vue |  8 +++++---
 .../meeting/MeetingList.vue                   |  9 ++++++---
 6 files changed, 51 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/meetingJudgeUtil.js

diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue
index f234bfc..ae8afb5 100644
--- a/src/components/detailPage/MeetingList.vue
+++ b/src/components/detailPage/MeetingList.vue
@@ -37,7 +37,8 @@
 
       <template slot="action" class="action-span-cell" slot-scope="text, record">
         <!-- 可报名 或者不存在会议报名状态 且 会议未结束 有报名按钮 -->
-        <a v-if="record.meetingStatus !== MeetingStatusEnums.ended.index && (record.signUpStatus === SignUpStatusEnum.canReport.index || !record.signUpStatus)" class="action-btn" @click="signUpRecord(record)">报名</a>
+<!--        <a v-if="record.meetingStatus !== MeetingStatusEnums.ended.index && (record.signUpStatus === SignUpStatusEnum.canReport.index || !record.signUpStatus)" class="action-btn" @click="signUpRecord(record)">报名</a>-->
+        <a v-if="Number(record.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(record.registerDeadline)" class="action-btn" @click="signUpRecord(record)">报名</a>
         <!-- 凭证待审核 状态有查看凭证按钮 -->
         <a v-if="record.signUpStatus === SignUpStatusEnum.pendingReviewVoucher.index" class="action-btn" @click="uploadPaymentRecord(record)">查看凭证</a>
         <!-- 待上传凭证 | 凭证被拒绝 状态有上传凭证按钮 -->
@@ -48,7 +49,7 @@
     </a-table>
 
     <!--  会议详情 -->
-    <meeting-detail-modal ref="meetingDetail"></meeting-detail-modal>
+    <meeting-detail-modal ref="meetingDetail" is-meeting-bool></meeting-detail-modal>
     <!--上传凭证-->
     <upload-meeting-certificate-modal ref="upload" @ok="loadData"></upload-meeting-certificate-modal>
 
@@ -59,7 +60,8 @@
 import { getAction } from '../../api/manage'
 import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
 import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
-import { SignUpStatusEnum, MeetingStatusEnums } from '../../enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '../../enums/commonEnum'
+import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
 
 // 表格的列配置
 const columns = [
@@ -162,6 +164,7 @@ export default {
       columns,
       SignUpStatusEnum,
       MeetingStatusEnums,
+      MeetingSignUpTypeEnums,
       dataSource: [],
       loading: false,
       /* 分页参数 */
@@ -183,10 +186,16 @@ export default {
       // 其他的查询条件
       filter: {
         meetingType: this.meetingType
-      }
+      },
+      /* 排序参数 */
+      isorter:{
+        column: 'createTime',
+        order: 'desc',
+      },
     }
   },
   methods: {
+    compareCurrentTime,
     loadData(arg) {
       if (!this.url.list) {
         this.$message.error('请设置url.list属性!')
@@ -196,7 +205,7 @@ export default {
       if (arg === 1) {
         this.ipagination.pageNo = 1
       }
-      const params = Object.assign({}, this.queryParam, this.filter, this.otherParams)
+      const params = Object.assign({}, this.queryParam, this.filter, this.otherParams, this.isorter)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
       this.loading = true
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index bebd97f..beb1664 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -26,3 +26,8 @@ export const MeetingStatusEnums = {
   onGoing: { name: '进行中', index: 3 },
   ended: { name: '已结束', index: 4 },
 }
+// 会议报名状态
+export const MeetingSignUpTypeEnums = {
+  canSignUp: { name: '可报名', index: 1 },
+  done: { name: '已报名', index: 2 }
+}
diff --git a/src/utils/meetingJudgeUtil.js b/src/utils/meetingJudgeUtil.js
new file mode 100644
index 0000000..571e367
--- /dev/null
+++ b/src/utils/meetingJudgeUtil.js
@@ -0,0 +1,14 @@
+/*会议判断的公用方法*/
+/**
+ * @Description: 判断会议的报名时间是否超过当前时间，超过后不可报名
+ * @author:fengchenchen @Date:2022-01-06
+ */
+export const compareCurrentTime = function(time) {
+  let date = new Date()
+  let compareTime = new Date(time)
+  if (date.getTime() > compareTime.getTime()) {
+    return true
+  } else {
+    return false
+  }
+}
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index ee708ff..f0bcabd 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -134,7 +134,6 @@
       <!--开票邮寄信息end-->
 
       <!--报名信息begin-->
-
       <!--  除开国际研讨会嘉宾身份个人信息的显示   -->
       <section class="base-info" v-if="!(model.meetingType === 3 && situationInfo.identity === 1 )">
         <h3 class="title">报名信息</h3>
@@ -540,7 +539,9 @@
 
         </template>
       </section>
-      <div v-if=" (model.meetingSignUpType+'' === '1' && !compareCurrentTime(model.registerDeadline)) ">
+      <section>
+      </section>
+      <div v-if=" (Number(model.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(model.registerDeadline)) ">
         <a-button type="primary" @click="goSignUpPage" >报名 </a-button>
       </div>
     </a-spin>
@@ -589,6 +590,8 @@ import { getSingUpUserInfo } from '@api/incomePaymentsApi'
 import JImageUpload from '@comp/jero/JImageUpload'
 import '@/assets/less/TableExpand.less'
 import SignStep from './modules/SignStep'
+import { MeetingSignUpTypeEnums } from '../../enums/commonEnum'
+import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
 
 const columns = [
   {
@@ -657,6 +660,7 @@ export default {
   },
   data() {
     return {
+      MeetingSignUpTypeEnums,
       title: '会议详情',
       width: 800,
       visible: false,
@@ -801,15 +805,7 @@ export default {
     /*
     * 当前时间是否超过会议报名时间
     * */
-    compareCurrentTime(time) {
-      let date = new Date()
-      let compareTime = new Date(time)
-      if (date.getTime() > compareTime.getTime()) {
-        return true
-      } else {
-        return false
-      }
-    },
+    compareCurrentTime,
     /*
     * 通过会议id获取会议性情
     * */
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 9ac6b10..e02b967 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -117,7 +117,7 @@
               <!-- A 缴费方式 为 汇款 或者现场缴费 B 会议状态为 未开始 或 进行中 C 报名审核信息通过 D 会议的状态 不是待签到 -->
             <!--  -->
               <!-- 可报名 状态有报名按钮 -->
-              <a-button v-if="Number(item.signUpStatus) === SignUpStatusEnum.canReport.index" class="cell-btn"
+              <a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn"
                         type="primary"
                         @click.stop="signUpRecord(item)">报名
               </a-button>
@@ -205,8 +205,8 @@ 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} from '@/enums/commonEnum'
-
+import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums} from '@/enums/commonEnum'
+import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
 
 export default {
   name: 'MeetingActivity',
@@ -222,6 +222,7 @@ export default {
     return {
       SignUpStatusEnum,
       MeetingStatusEnums,
+      MeetingSignUpTypeEnums,
       // 会议分类 全部 0  可报名 1 已报名 2
       meetingStatusArr: [
         {
@@ -296,6 +297,7 @@ export default {
     this.initData(1)
   },
   methods: {
+    compareCurrentTime,
     /*
     *  会议分类筛选
     * */
diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue
index bef51b5..c5b7a17 100644
--- a/src/views/standardsAssociation/meeting/MeetingList.vue
+++ b/src/views/standardsAssociation/meeting/MeetingList.vue
@@ -111,7 +111,7 @@
                 && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index"
               >
                 <!-- 可报名 状态有报名按钮 -->
-                <a-button v-if="Number(item.signUpStatus) === SignUpStatusEnum.canReport.index" class="cell-btn" type="primary"
+                <a-button v-if="Number(item.meetingSignUpType) === MeetingSignUpTypeEnums.canSignUp.index && !compareCurrentTime(item.registerDeadline)" class="cell-btn" type="primary"
                           @click.stop="signUpRecord(item)">报名
                 </a-button>
                 <!-- 凭证待审核 状态有查看凭证按钮 -->
@@ -168,7 +168,7 @@
       </div>
     </div>
     <!--  会议详情 -->
-    <meeting-detail-modal ref="meetingDetail"></meeting-detail-modal>
+    <meeting-detail-modal ref="meetingDetail" is-meeting-bool></meeting-detail-modal>
     <!--上传凭证-->
     <upload-meeting-certificate-modal ref="upload" @ok="initData"></upload-meeting-certificate-modal>
   </div>
@@ -182,7 +182,8 @@ 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 } from '@/enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '@/enums/commonEnum'
+import { compareCurrentTime } from '../../../utils/meetingJudgeUtil'
 
 
 export default {
@@ -221,6 +222,7 @@ export default {
     return {
       SignUpStatusEnum,
       MeetingStatusEnums,
+      MeetingSignUpTypeEnums,
       // 会议分类 全部 0  可报名 1 已报名 2
       meetingStatusArr: [
         {
@@ -287,6 +289,7 @@ export default {
     this.initData(1)
   },
   methods: {
+    compareCurrentTime,
     /*
     *  会议分类筛选
     * */