[bug]- 统一修改 会议报名状态 的判断条件

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获取会议性情
     * */

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,
     /*
     *  会议分类筛选
     * */

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,
     /*
     *  会议分类筛选
     * */