From 394e2ff2b0197397cfde7a673730dcd26fe5914e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Tue, 7 Nov 2023 15:04:08 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8-=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/businessSupport.js | 17 +- src/common/lang/businessSupport/zh.js | 2 +- .../StandardizationActivityPage.vue | 25 ++- .../modules/ContactTableModal.vue | 56 +++++ .../modules/GroupTableModal.vue | 55 +++++ .../modules/MeetingTableModal.vue | 55 +++++ .../modules/PaymentTableModal.vue | 55 +++++ .../modules/StandardizationActivityDrawer.vue | 3 +- .../modules/StatisticalListDrawer.vue | 209 ++++++++++++++++++ .../tables/ContactTable.vue | 11 +- .../tables/GroupTable.vue | 11 +- .../tables/MeetingTable.vue | 11 +- .../tables/PaymentTable.vue | 11 +- 13 files changed, 504 insertions(+), 17 deletions(-) create mode 100644 src/views/businessSupport/standardizationActivity/modules/ContactTableModal.vue create mode 100644 src/views/businessSupport/standardizationActivity/modules/GroupTableModal.vue create mode 100644 src/views/businessSupport/standardizationActivity/modules/MeetingTableModal.vue create mode 100644 src/views/businessSupport/standardizationActivity/modules/PaymentTableModal.vue create mode 100644 src/views/businessSupport/standardizationActivity/modules/StatisticalListDrawer.vue diff --git a/src/api/businessSupport.js b/src/api/businessSupport.js index 1cdfed40..d88ea97d 100644 --- a/src/api/businessSupport.js +++ b/src/api/businessSupport.js @@ -19,6 +19,16 @@ const editNode = (params) => postAction('/laws/standardization/lawsStandardizati const queryById = (params) => getAction('/laws/standardization/lawsStandardization/queryById', params) // 标准化活动-通过id查询表格信息 const queryTableDataById = (params) => getAction('/laws/standardization/lawsStandardization/queryDetailById', params) +// 标准化活动-统计列表 +const queryStatisticalList = (params) => getAction('/laws/standardization/lawsStandardization/queryStatistics', params) +// 标准化活动-统计-联络人联系方式 +const queryContactList = (params) => getAction('/laws/standardization/lawsStandardization/queryLiaisonByStandardizationId', params) +// 标准化活动-统计-集团参与情况 +const queryGroupList = (params) => getAction('/laws/standardization/lawsStandardization/queryGroupByStandardizationId', params) +// 标准化活动-统计-支付信息 +const queryPaymentList = (params) => getAction('/laws/standardization/lawsStandardization/queryPaymentByStandardizationId', params) +// 标准化活动-统计-参会记录 +const queryMeetingList = (params) => getAction('/laws/standardization/lawsStandardization/queryMeetingByStandardizationId', params) export { getQuizById, @@ -31,5 +41,10 @@ export { addNode, editNode, queryById, - queryTableDataById + queryTableDataById, + queryStatisticalList, + queryContactList, + queryGroupList, + queryPaymentList, + queryMeetingList } diff --git a/src/common/lang/businessSupport/zh.js b/src/common/lang/businessSupport/zh.js index c2cfd81f..d1a74900 100644 --- a/src/common/lang/businessSupport/zh.js +++ b/src/common/lang/businessSupport/zh.js @@ -3,7 +3,7 @@ module.exports = { standardizationActivity: { nodeName: '节点名称', // 节点名称 currentNode: '当前节点', - conferenceStatisticsList: '会议统计列表', + conferenceStatisticsList: '统计列表', pleaseSelectNode: '请选择一个节点', parentNode: '上级节点', nodeTypes: '节点类型', diff --git a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue index 7d7c0f95..2d6d5ebb 100644 --- a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue +++ b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue @@ -11,13 +11,16 @@ @@ -72,10 +81,11 @@ import MindMap from '../../../components/MindMap.vue' import InternalDetailPage from '../../../components/InternalDetailPage' import { queryTreeList } from '../../../api/businessSupport' import StandardizationActivityDrawer from './modules/StandardizationActivityDrawer' +import StatisticalListDrawer from './modules/StatisticalListDrawer' export default { name: 'StandardizationActivityPage', - components: { InternalDetailPage, MindMap, StandardizationActivityDrawer }, + components: { InternalDetailPage, MindMap, StandardizationActivityDrawer, StatisticalListDrawer }, data () { return { nodeName: '', @@ -218,6 +228,9 @@ export default { return } this.$refs.modalForm.view(this.selectedNodeId) + }, + handleStatistical () { + this.$refs.statisticalDrawer.open() } } } diff --git a/src/views/businessSupport/standardizationActivity/modules/ContactTableModal.vue b/src/views/businessSupport/standardizationActivity/modules/ContactTableModal.vue new file mode 100644 index 00000000..d623d3c3 --- /dev/null +++ b/src/views/businessSupport/standardizationActivity/modules/ContactTableModal.vue @@ -0,0 +1,56 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessSupport/standardizationActivity/modules/GroupTableModal.vue b/src/views/businessSupport/standardizationActivity/modules/GroupTableModal.vue new file mode 100644 index 00000000..03f9b00b --- /dev/null +++ b/src/views/businessSupport/standardizationActivity/modules/GroupTableModal.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessSupport/standardizationActivity/modules/MeetingTableModal.vue b/src/views/businessSupport/standardizationActivity/modules/MeetingTableModal.vue new file mode 100644 index 00000000..6e4d2576 --- /dev/null +++ b/src/views/businessSupport/standardizationActivity/modules/MeetingTableModal.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessSupport/standardizationActivity/modules/PaymentTableModal.vue b/src/views/businessSupport/standardizationActivity/modules/PaymentTableModal.vue new file mode 100644 index 00000000..e9bbb7fe --- /dev/null +++ b/src/views/businessSupport/standardizationActivity/modules/PaymentTableModal.vue @@ -0,0 +1,55 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessSupport/standardizationActivity/modules/StandardizationActivityDrawer.vue b/src/views/businessSupport/standardizationActivity/modules/StandardizationActivityDrawer.vue index 1d2e1087..75ce389a 100644 --- a/src/views/businessSupport/standardizationActivity/modules/StandardizationActivityDrawer.vue +++ b/src/views/businessSupport/standardizationActivity/modules/StandardizationActivityDrawer.vue @@ -208,7 +208,7 @@ export default { add (record) { this.title = this.$t('newlyAdded') this.visible = true - record.standardizationType = StandardizedActivityType.nameOfIndex(record.level + 1 + '') + record.standardizationType = StandardizedActivityType.secondLevelBidCommittee.text this.model = Object.assign({}, record) this.$nextTick(() => { this.form.setFieldsValue(this.model) @@ -229,6 +229,7 @@ export default { queryTableDataById({ id }).then(res => { if (res.success) { const result = res.result || {} + // 基础信息 this.model = Object.assign({}, result.lawsStandardization || {}) this.$nextTick(() => { this.form.setFieldsValue(this.model) diff --git a/src/views/businessSupport/standardizationActivity/modules/StatisticalListDrawer.vue b/src/views/businessSupport/standardizationActivity/modules/StatisticalListDrawer.vue new file mode 100644 index 00000000..4303ef15 --- /dev/null +++ b/src/views/businessSupport/standardizationActivity/modules/StatisticalListDrawer.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file diff --git a/src/views/businessSupport/standardizationActivity/tables/ContactTable.vue b/src/views/businessSupport/standardizationActivity/tables/ContactTable.vue index e60c7355..5c9357fc 100644 --- a/src/views/businessSupport/standardizationActivity/tables/ContactTable.vue +++ b/src/views/businessSupport/standardizationActivity/tables/ContactTable.vue @@ -7,12 +7,13 @@ {{ $t('delete') }} - + :row-selection="needRowSelection ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null"> @@ -40,6 +41,12 @@ export default { type: Boolean, required: false, default: false + }, + // 是否需要行选中 + needRowSelection: { + type: Boolean, + required: false, + default: true } }, data () { diff --git a/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue b/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue index 0c58f6f6..e0be4774 100644 --- a/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue +++ b/src/views/businessSupport/standardizationActivity/tables/GroupTable.vue @@ -7,12 +7,13 @@ {{ $t('delete') }} - + :row-selection="needRowSelection ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange } : null">