From cfd32d788c31b2249a9fc93a48dcc8595f0e0ca0 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 18 Jul 2022 17:37:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90add=E3=80=91=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=BE=81=E9=9B=86=20=E5=8A=9F=E8=83=BD=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 18 +- src/views/MessagePage/MeetingDetailModal.vue | 46 ++- .../modules/ProblemCollectionTable.vue | 111 ++++++++ src/views/signUp/SignUpEntrance.vue | 19 ++ src/views/signUp/SignUpPage.vue | 8 +- .../meeting/MeetingList.vue | 2 + .../ProblemCollectionDetailList.vue | 269 ++++++++++++++++++ .../modules/ProblemCollectionModal.vue | 163 +++++++++++ 8 files changed, 630 insertions(+), 6 deletions(-) create mode 100644 src/views/MessagePage/modules/ProblemCollectionTable.vue create mode 100644 src/views/standardsAssociation/problemCollection/ProblemCollectionDetailList.vue create mode 100644 src/views/standardsAssociation/problemCollection/modules/ProblemCollectionModal.vue diff --git a/src/config/router.config.js b/src/config/router.config.js index 5ab41bc..52df426 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -74,6 +74,7 @@ export const constantRouterMap = [ component: SignUpPage, hidden: true, }, + ] /** @@ -471,5 +472,20 @@ export const routerData = [ }, name: 'work-team-detail', id: '14' - } + }, + { + path: "/standardsAssociation/problemCollection/problemCollectionDetailList", + component: 'standardsAssociation/problemCollection/ProblemCollectionDetailList', + redirect: null, + hidden: true, + route: '1', + meta: { + icon: '', // 菜单前图标 + componentName: 'WorkTeamDetail', + keepAlive: false, + title: '问题征集详情' // 菜单名称 + }, + name: 'problem-collection-detail-list', + id: '15' + }, ] diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 882b632..ee0eda0 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -110,6 +110,17 @@ + + + + + {{ model.isAddQuestion === '1' ? '需要' : '不需要'}} + + + + {{ model.endTimeAddQuestion }} + + @@ -588,6 +599,15 @@ :show-detail-bool="showDetailBool"> + +
+

问题征集

+ +
+ + + + + + \ No newline at end of file diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index 8da84cf..bb62ace 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -44,6 +44,25 @@ {{ item.meetingContactsName + (item.meetingContactsPhone ?':': '') + item.meetingContactsPhone + ' ' }}
+ + diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index 5d8722b..676adcd 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -513,10 +513,14 @@ export default { httpAction(url, submitData, method).then(res => { if (res.success) { that.$emit('ok') - + let messageText = '报名成功' + // 标协会议增加不同的提示语 + if(submitData.meetingType === '2') { + messageText = '报名成功!请到会议详情页-问题征集处进行提问' + } // that.$message.success(res.message) that.$notification.success({ - message: '报名成功', + message: messageText, }) setTimeout(() => { that.handleCancel() diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue index 8156aaa..5320190 100644 --- a/src/views/standardsAssociation/meeting/MeetingList.vue +++ b/src/views/standardsAssociation/meeting/MeetingList.vue @@ -293,6 +293,8 @@ export default { // this.meetingType = this.$route.query.meetingType // this.filter.meetingType = this.$route.query.meetingType } + // 先重置会议分类 + this.filter.meetingSignUpType = '0' this.initData(1) }, methods: { diff --git a/src/views/standardsAssociation/problemCollection/ProblemCollectionDetailList.vue b/src/views/standardsAssociation/problemCollection/ProblemCollectionDetailList.vue new file mode 100644 index 0000000..2817f7e --- /dev/null +++ b/src/views/standardsAssociation/problemCollection/ProblemCollectionDetailList.vue @@ -0,0 +1,269 @@ + + + + + + + \ No newline at end of file diff --git a/src/views/standardsAssociation/problemCollection/modules/ProblemCollectionModal.vue b/src/views/standardsAssociation/problemCollection/modules/ProblemCollectionModal.vue new file mode 100644 index 0000000..0586e49 --- /dev/null +++ b/src/views/standardsAssociation/problemCollection/modules/ProblemCollectionModal.vue @@ -0,0 +1,163 @@ + + + + + + + \ No newline at end of file