diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js index beb1664..300ec41 100644 --- a/src/enums/commonEnum.js +++ b/src/enums/commonEnum.js @@ -31,3 +31,13 @@ export const MeetingSignUpTypeEnums = { canSignUp: { name: '可报名', index: 1 }, done: { name: '已报名', index: 2 } } + +// 会议类型 +export const MeetingTypeEnums = { + workGroup: { name: '工作组会议', index: 1 }, + standard: { name: '标协会议', index: 2 }, + internationalSeminar: { name: '国际研讨会', index: 3 }, + other: { name: '其他会议', index: 4 }, + committee: { name: '分标委会议', index: 5 }, + council: { name: '理事会会议', index: 6 } +} diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index f0bcabd..2993a06 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -50,13 +50,16 @@ - + - - {{ item.hotelContacts}} {{item.hotelContacts? ':' :''}} {{item.hotelContactsPhone + ' ' }} + + {{ item.hotelContacts}} {{item.hotelContacts? ':' :''}} {{item.hotelContactsPhone + ' ' }} + @@ -214,7 +217,7 @@ * 2、报名详情中的 registerProcess 代表报名状态,类型是 1-15 对应需求文档中的不同状态 * */ --> - + @@ -527,7 +530,7 @@ * 2、报名详情中的 registerProcess 代表报名状态,类型是 1-15 对应需求文档中的不同状态 * */ --> - + @@ -590,7 +593,7 @@ 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 { MeetingSignUpTypeEnums, MeetingTypeEnums } from '../../enums/commonEnum' import { compareCurrentTime } from '../../utils/meetingJudgeUtil' const columns = [ @@ -693,6 +696,14 @@ export default { }, // 是否显示文件查看 showDetailBool(){ + //todo 增加判断,等后端接口开发完成后再做处理 + //先判断当前的会议类型,如果会议是分标委会议或者理事会会议 需要判断当前人是否是 分标委成员或者理事会成员, + if(this.meetingInfo.meetingType === MeetingTypeEnums.committee.index || this.meetingInfo.meetingType === MeetingTypeEnums.council.index) { + // 判断是否是成员,如果是成员返回true 否则进行下面的判断 + // if(this.judgeIsMember()) { + // return true + // } + } if((this.situationInfo.checkResult == 1 && this.situationInfo.registerCheckResult == 1)){ return true }else{ @@ -706,6 +717,20 @@ export default { }, methods: { + // 判断是否是 分标委成员或者理事会成员 + judgeIsMember() { + return new Promise(resolve => { + getSingUpUserInfo().then(res => { + if (res.success) { + resolve(true) + } else { + resolve(false) + } + }).catch(() => { + resolve(false) + }) + }) + }, async open(param) { this.visible = true this.situationInfoLoading = true @@ -1029,4 +1054,16 @@ h3.title::before { padding: 0; margin: 0; } + +// 多个酒店联系人及手机号 换行显示 +.mul-row-row{ + display: flex; + clear: both; +} +.mul-row-content{ + display: block; + .content{ + display: block; + } +}