From a596796da50852698c528f34fc28aa0fbcb841d0 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 14 Jul 2022 17:00:19 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20-=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=BE=81=E9=9B=86=20=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomeMeetingApi.js | 7 +- .../meetManage/AddOrDetailMeet.vue | 38 +++- .../incomePayments/meetManage/Attendance.vue | 16 ++ .../modules/ProblemCollectionList.vue | 203 ++++++++++++++++++ .../modules/ProblemCollectionModal.vue | 58 +++++ .../projectManagement/CommitteeMeeting.vue | 16 +- 6 files changed, 328 insertions(+), 10 deletions(-) create mode 100644 src/views/incomePayments/meetManage/modules/ProblemCollectionList.vue create mode 100644 src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue diff --git a/src/api/incomeMeetingApi.js b/src/api/incomeMeetingApi.js index 523539e..fe46d65 100644 --- a/src/api/incomeMeetingApi.js +++ b/src/api/incomeMeetingApi.js @@ -26,6 +26,10 @@ const addGenerateCodeList = (params) => postAction('/meeting/randomCode/add', pa // 国际研讨会--列表页编辑一条随机码数据 const editGenerateCodeList = (params) => postAction('/meeting/randomCode/edit', params) +// 标协会议-问题征集详情-查询标准号下拉框数据 +const getStandardNumberList = (params) => getAction('/meeting/standardsMeeting/getStandardNumberList', params) + + export { getUserInfo, getMeetInfoById, @@ -37,5 +41,6 @@ export { getGeneratedCodeList, generateCode, addGenerateCodeList, - editGenerateCodeList + editGenerateCodeList, + getStandardNumberList } diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 6ac199c..73b1120 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -46,9 +46,12 @@ @@ -139,8 +142,8 @@ - -
+ +
@@ -568,6 +571,8 @@ export default { meetingType: '', // 是否需要 问题征集 isAddQuestion: 0, + // 标协会议类型 + tbMeetingType: undefined, } }, computed: { @@ -706,10 +711,6 @@ export default { if (this.meetingType === '2') { console.log('this.model', this.model) let otherKeys = [] - if(this.model.isAddQuestion) { - otherKeys = ['endTimeAddQuestion', 'questionList'] - } - this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip', 'isAddQuestion', ...otherKeys)) // 编辑情况下 判断类型改变“标协会议类型”选择框的下拉框数 if (this.model.id) { let arr = this.$refs.standardMeetingType.getCurrentDictOptions() @@ -717,10 +718,18 @@ export default { // 信息交流会议 this.$refs.standardMeetingType.setCurrentDictOptions(arr.splice(2, 1)) }else { + this.model.isAddQuestion = Number(this.model.isAddQuestion) + this.isAddQuestion = this.model.isAddQuestion + if(this.model.isAddQuestion) { + otherKeys = ['endTimeAddQuestion', 'questionList'] + } // 标准宣贯或者学习培训 this.$refs.standardMeetingType.setCurrentDictOptions(arr.splice(0, 2)) } } + setTimeout(() => { + this.form.setFieldsValue(pick(this.model, 'signInTime', 'tbMeetingType', 'meetingCostsVip', 'isAddQuestion', ...otherKeys)) + }) } // 如果是工作组会议 赋值工作组 if (this.meetingType === '1') { @@ -843,6 +852,19 @@ export default { } }, /* + * 监听标协会议类型变化 + * */ + tbMeetingTypeChange(val) { + this.tbMeetingType = Number(val) + // 标准宣贯、学习培训 有问题征集功能 + if (this.tbMeetingType === 1 || this.tbMeetingType === 2) { + this.isAddQuestion = 0 + this.$nextTick(() => { + this.form.setFieldsValue({ isAddQuestion: this.isAddQuestion }) + }) + } + }, + /* * 会议负责人 * */ selectPerson(val) { diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index be2414f..38e0e6d 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -47,6 +47,21 @@ {{ currentMeetingInfo.estimatedNumber }} + + {{ currentMeetingInfo.hotelName }} @@ -965,6 +980,7 @@ export default { display: block; .content{ display: block; + white-space: pre-wrap; } } diff --git a/src/views/incomePayments/meetManage/modules/ProblemCollectionList.vue b/src/views/incomePayments/meetManage/modules/ProblemCollectionList.vue new file mode 100644 index 0000000..a589f12 --- /dev/null +++ b/src/views/incomePayments/meetManage/modules/ProblemCollectionList.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file diff --git a/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue b/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue new file mode 100644 index 0000000..ea9fbfc --- /dev/null +++ b/src/views/incomePayments/meetManage/modules/ProblemCollectionModal.vue @@ -0,0 +1,58 @@ + + + + + + \ No newline at end of file diff --git a/src/views/projectManagement/CommitteeMeeting.vue b/src/views/projectManagement/CommitteeMeeting.vue index d5aecff..b99bd4c 100644 --- a/src/views/projectManagement/CommitteeMeeting.vue +++ b/src/views/projectManagement/CommitteeMeeting.vue @@ -143,12 +143,15 @@ 编辑 删除 + + 问题征集 + @@ -163,6 +166,8 @@ import PublishRemindModal from '@views/projectManagement/modules/PublishRemindMo import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' import '@/assets/less/TableExpand.less' +// 问题征集 组件 +import ProblemCollectionModal from '../incomePayments/meetManage/modules/ProblemCollectionModal' export default { name: 'CommitteeMeeting', @@ -172,7 +177,8 @@ export default { JDictSelectTag, PublishRemindModal, UploadMeetFileModal, - PageHeaderTitle + PageHeaderTitle, + ProblemCollectionModal }, mixins: [JeroListMixin, RangeDateMixin], data() { @@ -497,6 +503,14 @@ export default { this.lastQueryParam = {...this.queryParam} this.loadData(1) }, + /* + * 问题征集按钮点击后的回调 + * */ + problemCollectionDetail(record) { + if(!record.isAddQuestion || !this.meetingType === '2') return + if(!(record.tbMeetingType === 1 || record.tbMeetingType === 2)) return + this.$refs.problemCollectionModal.show(record) + } } }