diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue index 6311f5e..773e63c 100644 --- a/src/views/meetingActivity/MeetingActivity.vue +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -98,6 +98,13 @@

负责人:{{ item.directorName }} + +

@@ -226,7 +233,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, MeetIdentifyTypeEnums} from '@/enums/commonEnum' +import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums, MeetingTypeEnums} from '@/enums/commonEnum' import { compareCurrentTime } from '../../utils/meetingJudgeUtil' export default { @@ -241,6 +248,7 @@ export default { }, data() { return { + MeetingTypeEnums, SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, @@ -347,6 +355,13 @@ export default { this.pageNo = pageNo this.initData() }, + canOpe(endTimeAddQuestion) { + if(!endTimeAddQuestion) { + return false + } else { + return !compareCurrentTime(endTimeAddQuestion) + } + }, /* * 初始化加载数据 * */ @@ -366,6 +381,16 @@ export default { getAction(this.url.list, params).then((res) => { if (res.success) { this.tableData = [...res.result.records] || res.result + // 判断当前的会议是否有问题征集的图标,用 hasQuestionIcon 做标识 + this.tableData.map(item => { + // 会议类型是标协会议 && 有问题征集 + if(item.meetingType === MeetingTypeEnums.standard.index && Number(item.isAddQuestion)) { + item.hasQuestionIcon = true + if(!this.canOpe(item.endTimeAddQuestion)) { + item.hasQuestionIcon = false + } + } + }) this.current = res.result.current if (res.result.total) { this.total = res.result.total @@ -602,4 +627,10 @@ export default { top: -4px; } } + +// 问题征集的图标 +.question-icon{ + color: #069F99; + font-size: 14px; +} diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue index 5320190..3263c6b 100644 --- a/src/views/standardsAssociation/meeting/MeetingList.vue +++ b/src/views/standardsAssociation/meeting/MeetingList.vue @@ -88,6 +88,13 @@

负责人:{{ item.directorName }} + +

@@ -324,6 +331,13 @@ export default { this.pageNo = pageNo this.initData() }, + canOpe(endTimeAddQuestion) { + if(!endTimeAddQuestion) { + return false + } else { + return !compareCurrentTime(endTimeAddQuestion) + } + }, /* * 初始化加载数据 * */ @@ -343,6 +357,16 @@ export default { getAction(this.url.list, params).then((res) => { if (res.success) { this.tableData = [...res.result.records] || res.result + // 判断当前的会议是否有问题征集的图标,用 hasQuestionIcon 做标识 + this.tableData.map(item => { + // 会议类型是标协会议 && 有问题征集 + if(item.meetingType === MeetingTypeEnums.standard.index && Number(item.isAddQuestion)) { + item.hasQuestionIcon = true + if(!this.canOpe(item.endTimeAddQuestion)) { + item.hasQuestionIcon = false + } + } + }) this.current = res.result.current if (res.result.total) { this.total = res.result.total @@ -549,4 +573,10 @@ export default { } } +// 问题征集的图标 +.question-icon{ + color: #069F99; + font-size: 14px; +} +