From ed409511a8054dc9a293a9db8b3b3f348f0578a1 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 8 Jul 2022 14:54:50 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=20-=20=E8=A7=A3=E5=86=B3=E4=B8=8B?= =?UTF-8?q?=E9=83=A8footer=E6=98=BE=E7=A4=BA1=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WholeInstituteStatisticsList.vue | 31 ++++++++++------- .../DepartmentAllStatistics.vue | 29 ++++++++++------ .../IndividualPaymentStatisticsDetail.vue | 30 +++++++++------- .../IndividualPaymentStatisticsList.vue | 34 +++++++++++-------- .../ProjectPaymentStatisticsList.vue | 32 ++++++++++------- .../EnterprisePaymentStatisticsDetail.vue | 31 ++++++++++------- .../EnterprisePaymentStatisticsList.vue | 31 ++++++++++------- .../WorkingGroupPaymentStatisticsDetail.vue | 27 ++++++++++----- .../WorkingGroupPaymentStatisticsList.vue | 32 ++++++++++------- 9 files changed, 172 insertions(+), 105 deletions(-) diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 19eee61..e82546d 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -220,16 +220,6 @@ import StatusSlot from '../../components/tools/StatusSlot' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 60, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '来款项目', align: 'center', @@ -305,6 +295,23 @@ const defaultTableColumns = [ width: 150 } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'WholeInstituteStatisticsList', @@ -325,8 +332,8 @@ export default { replaceFields: { value: 'orgCode' }, - columns: defaultTableColumns, - columnsFooter: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], + columnsFooter: [firstColumnFooter, ...defaultTableColumns], footerDataSource: [], // 给定当年作为来款年份默认查询条件 queryParam: { diff --git a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue index 359dde8..1d2ee3c 100644 --- a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue +++ b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue @@ -106,15 +106,6 @@ import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '部门', align: 'center', width: 300, @@ -163,6 +154,22 @@ const defaultTableColumns = [ } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'DepartmentAllStatistics', @@ -183,9 +190,9 @@ export default { list: '/statistics/allProjectStatistics/listDepartment', exportXlsUrl: '/statistics/allProjectStatistics/department/excelProject' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [], // 给定当年作为来款年份默认查询条件 diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue index f130440..51c9664 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue @@ -153,16 +153,6 @@ import StatusSlot from '../../../components/tools/StatusSlot' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '来款项目', align: 'center', @@ -225,6 +215,22 @@ const defaultTableColumns = [ scopedSlots: { customRender: 'text' } } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'IndividualPaymentStatisticsDetail', @@ -254,9 +260,9 @@ export default { filters: { principalNameId: this.$route.query.principalId }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [] } diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue index c79fc91..06847ad 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue @@ -147,16 +147,6 @@ import { getAllDepartTreeList } from '../../../api/incomePaymentsApi' import { getAction } from '@api/manage' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 60, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '项目负责人', align: 'center', @@ -202,10 +192,26 @@ const defaultTableColumns = [ align: 'center', dataIndex: 'finishRate', width: 140 - }, - + } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'IndividualPaymentStatisticsList', @@ -226,8 +232,8 @@ export default { replaceFields: { value: 'orgCode' }, - columns: defaultTableColumns, - columnsFooter: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], + columnsFooter: [firstColumnFooter, ...defaultTableColumns], footerDataSource: [], // 给定当年作为来款年份默认查询条件 queryParam: { diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index 3f877cc..c86305d 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -174,16 +174,6 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal' import StatusSlot from '../../../components/tools/StatusSlot' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '项目负责人', align: 'center', @@ -253,6 +243,24 @@ const defaultTableColumns = [ scopedSlots: { customRender: 'text' } } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} + export default { name: 'ProjectPaymentStatisticsList', @@ -273,9 +281,9 @@ export default { list: '/statistics/allProjectStatistics/listProject', exportXlsUrl: '/statistics/allProjectStatistics/statistics/excelProject' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [], // 给定当年作为来款年份默认查询条件 diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue index 8c96482..23d905c 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue @@ -155,16 +155,6 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal' import StatusSlot from '../../../components/tools/StatusSlot' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '来款项目', align: 'center', @@ -228,6 +218,23 @@ const defaultTableColumns = [ scopedSlots: { customRender: 'text' } } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'EnterprisePaymentStatisticsDetail', @@ -247,9 +254,9 @@ export default { list: '/statistics/companyComeMoney/listForDetail', exportXlsUrl: '/statistics/companyComeMoney/excelDetail' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, // 总计数据 + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [], // 给定当年作为来款年份默认查询条件 queryParam: { diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue index 36f7f92..ada9366 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue @@ -149,16 +149,6 @@ import CompanySelect from '@comp/company/CompanySelect' import { filterObj } from '../../../utils/util' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '来款企业', align: 'center', @@ -214,6 +204,23 @@ const defaultTableColumns = [ scopedSlots: { customRender: 'action' } } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'EnterprisePaymentStatisticsList', @@ -234,9 +241,9 @@ export default { list: '/statistics/companyComeMoney/list', exportXlsUrl: '/statistics/companyComeMoney/excel' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [], // 给定当年作为来款年份默认查询条件 diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index 9fc8a68..a2e777d 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -171,12 +171,6 @@ import { getAction } from '../../../api/manage' import StatusSlot from '../../../components/tools/StatusSlot' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: 'title', - width: 60, - align: 'center' - }, { title: '来款单位', align: 'center', @@ -239,6 +233,23 @@ const defaultTableColumns = [ scopedSlots: { customRender: 'text' } } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} export default { name: 'WorkingGroupPaymentStatisticsDetail', @@ -259,7 +270,7 @@ export default { list: '/project/payWorkingGroupStatistics/listSub', exportXlsUrl: '/project/payWorkingGroupStatistics/excelSub' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], dataSource: [ { id: 1, @@ -269,7 +280,7 @@ export default { } ], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 总计数据 footerDataSource: [], filters: { diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index d9f1bb8..e761fc4 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -156,16 +156,6 @@ import JYearDate from '../../../components/jero/JYearDate' import { getAction } from '../../../api/manage' import {formatMoney} from '@/utils/formatMoney' const defaultTableColumns = [ - { - title: '序号', - dataIndex: '', - key: 'rowIndex', - width: 100, - align: 'center', - customRender: function (t, r, index) { - return parseInt(index) + 1 - } - }, { title: '工作组', align: 'center', @@ -223,6 +213,24 @@ const defaultTableColumns = [ } ] +const firstColumnTop = { + title: '序号', + dataIndex: '', + key: 'rowIndex', + width: 60, + align: 'center', + customRender: function (t, r, index) { + return parseInt(index) + 1 + } +} + +const firstColumnFooter = { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 +} + export default { name: 'WorkingGroupPaymentStatisticsList', components: { PageHeaderTitle, JYearDate }, @@ -242,10 +250,10 @@ export default { list: '/project/payWorkingGroupStatistics/list', exportXlsUrl: '/project/payWorkingGroupStatistics/exportXls2' }, - columns: defaultTableColumns, + columns: [firstColumnTop, ...defaultTableColumns], dataSource: [], // 总计表头，与主表表头一致 - columnsFooter: defaultTableColumns, + columnsFooter: [firstColumnFooter, ...defaultTableColumns], // 给定当年作为来款年份默认查询条件 queryParam: { year: new Date().getFullYear().toString()