diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue index 701ddd9..3ad2463 100644 --- a/src/components/detailPage/MeetingList.vue +++ b/src/components/detailPage/MeetingList.vue @@ -158,7 +158,7 @@ export default { }, props: { /** - * @Description: 会议类型 1-工作组会议 2-标协会议 3-国际研讨会 4-其他会议 5-分标委会议 6-理事会会议 + * @Description: 会议类型 1-工作组会议 2-标协会议 3-国际研讨会 4-其他会议 5-分标委会议 6-理事会会议 7-起草组会议 * @author:fengchenchen @Date:2021-12-15 */ meetingType: { diff --git a/src/config/router.config.js b/src/config/router.config.js index e64393a..fbee19d 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -120,6 +120,20 @@ export const routerData = [ name: 'work-team', id: '2' }, + { + redirect: null, + path: '/draftTeam/DraftTeam', + component: 'draftTeam/DraftTeam', + route: '1', + meta: { + icon: 'cus_member', // 菜单前图标 + componentName: 'DraftTeam', + keepAlive: false, + title: '起草组' // 菜单名称 + }, + name: 'draft-team', + id: '18' + }, { redirect: null, path: '/subBidCommittee/SubBidCommittee', @@ -530,6 +544,21 @@ export const routerData = [ name: 'work-team-detail', id: '14' }, + { + path: '/draftTeam/DraftTeamDetail', + component: 'draftTeam/DraftTeamDetail', + redirect: null, + hidden: true, + route: '1', + meta: { + icon: '', // 菜单前图标 + componentName: 'DraftTeamDetail', + keepAlive: false, + title: '起草组详情' // 菜单名称 + }, + name: 'draft-team-detail', + id: '19' + }, { path: "/standardsAssociation/problemCollection/problemCollectionDetailList", component: 'standardsAssociation/problemCollection/ProblemCollectionDetailList', diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 46d86b6..8e77773 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -1125,6 +1125,8 @@ export default { return '分标委会议' case '6': return '理事会会议' + case '7': + return '起草组会议' default: return '其他会议' } diff --git a/src/views/draftTeam/DraftTeam.vue b/src/views/draftTeam/DraftTeam.vue new file mode 100644 index 0000000..1ed1dc5 --- /dev/null +++ b/src/views/draftTeam/DraftTeam.vue @@ -0,0 +1,239 @@ + + + \ No newline at end of file diff --git a/src/views/draftTeam/DraftTeamDetail.vue b/src/views/draftTeam/DraftTeamDetail.vue new file mode 100644 index 0000000..ff3ec97 --- /dev/null +++ b/src/views/draftTeam/DraftTeamDetail.vue @@ -0,0 +1,417 @@ + + + + + diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue index f8309d2..e5611b0 100644 --- a/src/views/meetingActivity/MeetingActivity.vue +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -302,7 +302,8 @@ export default { {name: '理事会会议', value: '6'}, {name: '信息交流会', value: '7'}, {name: '培训会', value: '8'}, - {name: '宣贯会', value: '9'} + {name: '宣贯会', value: '9'}, + {name: '起草组会议', value: '10'} ] } }, @@ -474,6 +475,9 @@ export default { // 宣贯会 this.queryParam.meetingType = '2' this.queryParam.tbMeetingType = '1' + } else if (val === '10') { + // 起草组会议 + this.queryParam.meetingType = '7' } else { this.queryParam.meetingType = val this.queryParam.tbMeetingType = undefined diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index 6160a1c..6ae6cec 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -335,6 +335,8 @@ export default { return '分标委会议' case '6': return '理事会会议' + case '7': + return '起草组会议' } } else { return '' diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index 89603d3..8ae4841 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -638,6 +638,8 @@ export default { return '分标委会议' case '6': return '理事会会议' + case '7': + return '起草组会议' } } else { return ''