From 757bb11e7afbe2ddc8bae1604ca2ff6a93d67de8 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 14 Sep 2021 14:14:36 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=A8=A1=E5=9D=97=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectWorkingGroupProjectModule.vue | 8 +- .../packManagement/PackProjectMaintenance.vue | 8 +- .../WholeInstituteStatisticsList.vue | 71 +++- .../IndividualPaymentStatisticsDetail.vue | 286 +++++++++++++++ .../IndividualPaymentStatisticsList.vue | 330 ++++++++++++++++++ .../ProjectPaymentStatisticsList.vue | 288 +++++++++++++++ .../EnterprisePaymentStatisticsDetail.vue | 297 ++++++++++++++++ .../EnterprisePaymentStatisticsList.vue | 283 +++++++++++++++ .../WorkingGroupPaymentStatisticsDetail.vue | 310 ++++++++++++++++ .../WorkingGroupPaymentStatisticsList.vue | 294 ++++++++++++++++ 10 files changed, 2152 insertions(+), 23 deletions(-) create mode 100644 src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue create mode 100644 src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue create mode 100644 src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue create mode 100644 src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue create mode 100644 src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue create mode 100644 src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue create mode 100644 src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index 335eda8..d4b74bd 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -59,6 +59,11 @@ + + + @@ -82,10 +87,11 @@ import { JeroListMixin } from '../../../../mixins/JeroListMixin' import JYearDate from '../../../../components/jero/JYearDate' import WorkingGroupMemberUnitModule from '../../../projectManagement/modules/WorkingGroupMemberUnitModule' import { associatedProject } from '../../../../api/incomePaymentsApi' +import ProgressBar from '../../../../components/ProgressBar' export default { name: 'SelectWorkingGroupProjectModule', - components: { WorkingGroupMemberUnitModule, JYearDate }, + components: { WorkingGroupMemberUnitModule, JYearDate, ProgressBar }, mixins: [JeroListMixin], props: { // 打包状态 diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 7fb0346..0341715 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -39,17 +39,17 @@ - + - + - - + + diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 387e19f..f0c1ec8 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -39,19 +39,13 @@ - + - + + + - - - ~ - - - - - @@ -100,9 +94,8 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange" - class="j-table-force-nowrap"> + class="j-table-force-nowrap main-table">