From df047d91f524a61c3c8f0f591f5d831e4a796c3c Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 3 Apr 2024 14:25:01 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"[fix=2082959]=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E6=8A=A4-=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=80=BB=E8=AE=A1=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 015b5d78ec64f9404af0ddc8a80a123d475e15ba. --- .../packManagement/PackProjectMaintenance.vue | 94 ++++++++++++++++++- 1 file changed, 89 insertions(+), 5 deletions(-) diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index f750bde..6133c1e 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -86,11 +86,14 @@ bordered rowKey="id" :columns="columns" + :scroll="{x: 1000}" :dataSource="dataSource" :pagination="false" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" - @change="handleTableChange"> + @change="handleTableChange" + :class="dataSource.length === 0 ? 'show-scroll' : ''" + class="j-table-force-nowrap main-table"> + + 取消打包 + + + + + + + + @@ -237,7 +270,7 @@ const defaultTableColumns = [ { title: '打包项目名称', align: 'center', - width: 200, + width: 280, dataIndex: 'chargeProject', scopedSlots: { customRender: 'projectName' } }, { @@ -249,7 +282,7 @@ const defaultTableColumns = [ }, { title: '待确收金额', align: 'center', - width: 100, + width: 120, dataIndex: 'receivableAmount', scopedSlots: { customRender: 'allMoney' } }, { @@ -274,12 +307,27 @@ const defaultTableColumns = [ title: '操作', dataIndex: 'action', align: 'center', - // fixed: 'right', + fixed: 'right', width: 100, scopedSlots: { customRender: 'action' } } ] +const firstColumnFooter = [ + { + title: '多选', + dataIndex: 'selection', + align: 'center', + width: 60 + }, + { + title: '序号', + dataIndex: 'title', + align: 'center', + width: 60 + } +] + export default { name: 'PackProjectMaintenance', components: { @@ -342,6 +390,7 @@ export default { sm: { span: 10 } }, columns: [firstColumnTop, ...defaultTableColumns], + columnsFooter: [...firstColumnFooter, ...defaultTableColumns], disableMixinCreated: true, selectPackProjectVisible: false, selectedProject: [], // 选中的项目 @@ -358,7 +407,8 @@ export default { url: { list: '/pack/payPackCompanyProject/listAll', exportXlsUrl: '/pack/payPackCompanyProject/exportXls' - } + }, + footerDataSource: [] } }, created() { @@ -589,6 +639,25 @@ export default { this.$refs.changeInvoiceInfo.open(record) }, + /** + * 同步表与footer滚动,保留底部滚动条 + */ + setScroll() { + if (this.dataSource.length === 0) { + return + } + let dom = this.$refs.footTable.$el.querySelectorAll('.ant-table-body')[0] + dom.addEventListener( + 'scroll', + () => { + this.$refs.table.$el.querySelectorAll( + '.ant-table-body' + )[0].scrollLeft = dom.scrollLeft + }, + true + ) + this.$forceUpdate() + }, // 重写加载的方法 loadData(arg) { if (!this.url.list) { @@ -607,6 +676,13 @@ export default { //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ this.dataSource = pageListObj.list + let obj = { + id: '1', + title: '总计', + receivableAmount: pageListObj.sumOfReceivableAmount || '0.00' + '', + paidAmount: pageListObj.sumOfPaidAmount || '0.00' + '' + } + this.footerDataSource = [obj] if (pageListObj.total) { this.ipagination.total = pageListObj.total //清空列表选中 @@ -616,6 +692,11 @@ export default { } //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------ } + if (this.dataSource.length > 0) { + this.$nextTick(() => { + this.setScroll() + }) + } if (res.code === 510) { this.$message.warning(res.message) } @@ -625,6 +706,9 @@ export default { }) } + }, + mounted() { + this.setScroll() } }