From 269de4dc2adc326b45f25ac576a2288873a196e5 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 31 Mar 2022 11:51:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=B0=86=E6=9D=A5=E6=AC=BE?= =?UTF-8?q?=E5=B9=B4=E4=BB=BD=E4=BF=AE=E6=94=B9=E6=88=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B9=B4=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 7 ++++ .../WholeInstituteStatisticsList.vue | 38 ++++++++++++------- .../IndividualPaymentStatisticsDetail.vue | 2 +- .../IndividualPaymentStatisticsList.vue | 2 +- .../ProjectPaymentStatisticsList.vue | 2 +- .../EnterprisePaymentStatisticsDetail.vue | 2 +- .../EnterprisePaymentStatisticsList.vue | 18 +++++++-- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 2 +- 9 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index b8535a3..8f7cae3 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -109,4 +109,11 @@ /*表格滚动条*/ .ant-table-body { overflow-x: auto!important; +} + +/*列表自适应超出隐藏*/ +.table-text { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } \ No newline at end of file diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 1e1ae83..5b5d54b 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -67,7 +67,7 @@ - + @@ -124,12 +124,17 @@ @@ -152,12 +157,17 @@ @@ -213,19 +223,19 @@ export default { }, { title: '来款项目', align: 'center', - width: 300, + width: 280, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { title: '项目负责人', align: 'center', - width: 300, + width: 150, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 300, + width: 150, dataIndex: 'depart', scopedSlots: { customRender: 'text' } }, { @@ -268,19 +278,19 @@ export default { }, { title: '来款项目', align: 'center', - width: 300, + width: 280, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { title: '项目负责人', align: 'center', - width: 300, + width: 150, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 300, + width: 150, dataIndex: 'depart', scopedSlots: { customRender: 'text' } }, { @@ -294,7 +304,7 @@ export default { align: 'center', width: 100, dataIndex: 'pack', - scopedSlots: { customRender: 'status-pack' } + scopedSlots: { customRender: 'pack' } }, { title: '应收金额', align: 'center', diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue index 0b7b2e3..498da09 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue @@ -18,7 +18,7 @@ - + diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue index 959e49c..f123dc3 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue @@ -13,7 +13,7 @@ - + diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index 85a7dde..e604caf 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -23,7 +23,7 @@ - + diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue index 4a7ba21..f0c500b 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue @@ -18,7 +18,7 @@ - + diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue index 411bb93..f5f87ff 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue @@ -14,7 +14,7 @@ - + @@ -64,7 +64,7 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :scroll="{x: 1100}" + :scroll="{x: 1000}" @change="handleTableChange" :class="dataSource.length === 0 ? 'show-scroll' : ''" class="j-table-force-nowrap main-table"> @@ -93,7 +93,7 @@ :dataSource="footerDataSource" :showHeader="false" :pagination="false" - :scroll="{x: 1100}" + :scroll="{x: 1000}" class="j-table-force-nowrap footer-table"> @@ -170,6 +170,12 @@ export default { width: 160, dataIndex: 'comeAllMoney', scopedSlots: { customRender: 'text' } + }, { + title: '来款率', + align: 'center', + width: 160, + dataIndex: 'finishRate', + scopedSlots: { customRender: 'text' } }, { title: '操作', dataIndex: 'action', @@ -203,6 +209,12 @@ export default { width: 160, dataIndex: 'comeAllMoney', scopedSlots: { customRender: 'text' } + }, { + title: '来款率', + align: 'center', + width: 160, + dataIndex: 'finishRate', + scopedSlots: { customRender: 'text' } }, { title: '操作', dataIndex: 'action', diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index 037ae4f..de0a865 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -24,7 +24,7 @@ - + diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index 12c908f..e0738ea 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -13,7 +13,7 @@ - +