diff --git a/src/views/statisticalReport/MeetingPackStatistics.vue b/src/views/statisticalReport/MeetingPackStatistics.vue index 59cdbab..d773b7e 100644 --- a/src/views/statisticalReport/MeetingPackStatistics.vue +++ b/src/views/statisticalReport/MeetingPackStatistics.vue @@ -54,6 +54,7 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, columnWidth: 60}" @change="handleTableChange" :class="dataSource.length === 0 ? 'show-scroll' : ''" class="j-table-force-nowrap main-table"> @@ -164,19 +165,35 @@ const defaultTableColumns = [ dataIndex: 'confirmAmount', scopedSlots: { customRender: 'allMoney' } }, + // { + // title: '开票金额', + // align: 'center', + // width: 150, + // sorter: true, + // dataIndex: 'billMoney', + // scopedSlots: { customRender: 'allMoney' } + // }, + // { + // title: '到账金额', + // align: 'center', + // width: 140, + // dataIndex: 'comeAllMoney', + // sorter: true, + // scopedSlots: {customRender: 'allMoney'} + // }, { - title: '开票金额', + title: '会议金额A', align: 'center', width: 150, sorter: true, - dataIndex: 'billMoney', + dataIndex: 'meetingCostsA', scopedSlots: { customRender: 'allMoney' } }, { - title: '到账金额', + title: '会议金额B', align: 'center', - width: 140, - dataIndex: 'comeAllMoney', + width: 150, + dataIndex: 'meetingCostsB', sorter: true, scopedSlots: {customRender: 'allMoney'} } @@ -199,6 +216,12 @@ const firstColumnFooter = { width: 60 } +// 防止错位和复选框同宽占位 +const selectionColumnFooter = { + width: 60, + dataIndex: 'selection' +} + export default { name: 'MeetingPackStatistics', components: { PageHeaderTitle, JYearDate }, @@ -216,7 +239,7 @@ export default { sm: { span: 10 } }, columns: [firstColumnTop, ...defaultTableColumns], - columnsFooter: [firstColumnFooter, ...defaultTableColumns], + columnsFooter: [firstColumnFooter, selectionColumnFooter, ...defaultTableColumns], footerDataSource: [], // 给定当年作为来款年份默认查询条件 queryParam: { @@ -280,7 +303,9 @@ export default { allMoney: res.result.sumOfMoney || '0.00' + '', comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '', billMoney: res.result.sumOfBillMoney || '0.00' + '', - confirmAmount: res.result.sumOfConfirmAmount || '0.00' + '' + confirmAmount: res.result.sumOfConfirmAmount || '0.00' + '', + meetingCostsA: res.result.sumOfMeetingCostsA || '0.00' + '', + meetingCostsB: res.result.sumOfMeetingCostsB || '0.00' + '' } this.footerDataSource = [obj] if (res.result.pageList.total) {