From 4277ec260a15ef59f0deef5dff2d4b877247427f Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Wed, 12 Nov 2025 18:45:34 +0800 Subject: [PATCH] v1.9 优化报表相关页面的布局以及bug --- src/components/fee/aOwnerDetailAcctReceipt.vue | 9 ++------- src/components/fee/aRoomDetailReceipt.vue | 15 ++++----------- src/components/report/ChooseReportCustomComponent.vue | 80 ++++++++++++++++---------------------------------------------------------------- src/components/report/commonReportTable.vue | 2 +- src/components/report/reportFeeDetailCar.vue | 62 +++++++++++++++++--------------------------------------------- src/components/report/reportFeeDetailContract.vue | 2 ++ src/components/report/reportFeeDetailOwner.vue | 2 ++ src/components/report/reportFeeDetailRoom.vue | 3 +++ src/views/report/feeRemindList.vue | 3 --- src/views/report/reportFeeDetailList.vue | 2 +- src/views/report/reportHuaningList.vue | 2 +- src/views/report/reportNoFeeRoomList.vue | 2 ++ src/views/report/reportPayFeeDepositList.vue | 2 +- src/views/report/reportQuestionAnswerDetailList.vue | 2 +- src/views/report/reportRepairList.vue | 2 +- 15 files changed, 54 insertions(+), 136 deletions(-) diff --git a/src/components/fee/aOwnerDetailAcctReceipt.vue b/src/components/fee/aOwnerDetailAcctReceipt.vue index d85f6d3..c6b85bb 100644 --- a/src/components/fee/aOwnerDetailAcctReceipt.vue +++ b/src/components/fee/aOwnerDetailAcctReceipt.vue @@ -31,12 +31,6 @@ import { listAdminAccountReceipt } from '@/api/fee/adminRoomFeeApi' export default { name: 'AOwnerDetailAcctReceipt', - props: { - ownerId: { - type: String, - default: '' - } - }, data() { return { feeReceipts: [], @@ -48,7 +42,8 @@ export default { } }, methods: { - open() { + open(params) { + this.ownerId = params.ownerId this.page.current = 1 this.loadData() }, diff --git a/src/components/fee/aRoomDetailReceipt.vue b/src/components/fee/aRoomDetailReceipt.vue index f4f5857..6437851 100644 --- a/src/components/fee/aRoomDetailReceipt.vue +++ b/src/components/fee/aRoomDetailReceipt.vue @@ -36,19 +36,11 @@ import {dateFormat} from '@/utils/dateUtil' export default { name: 'ARoomDetailReceipt', - props: { - ownerId: { - type: String, - default: '' - }, - feeId: { - type: String, - default: '' - } - }, data() { return { feeReceipts: [], + ownerId: '', + feeId: '', page: { current: 1, size: 10, @@ -57,7 +49,8 @@ export default { } }, methods: { - open() { + open(params) { + this.ownerId = params.ownerId this.page.current = 1 this.loadData() }, diff --git a/src/components/report/ChooseReportCustomComponent.vue b/src/components/report/ChooseReportCustomComponent.vue index 7cbce83..2481865 100644 --- a/src/components/report/ChooseReportCustomComponent.vue +++ b/src/components/report/ChooseReportCustomComponent.vue @@ -1,81 +1,33 @@  @@ -111,9 +63,9 @@ export default { row: this.pagination.size, name: this.searchText } - const { data, records } = await listReportCustomComponent(params) + const { data, total } = await listReportCustomComponent(params) this.tableData = data - this.pagination.total = records + this.pagination.total = total } catch (error) { this.$message.error(this.$t('chooseReportCustomComponent.fetchError')) } finally { diff --git a/src/components/report/commonReportTable.vue b/src/components/report/commonReportTable.vue index ed5cc6e..3d36570 100644 --- a/src/components/report/commonReportTable.vue +++ b/src/components/report/commonReportTable.vue @@ -6,7 +6,7 @@ {{ $t('commonReportTable.queryConditions') }} - +
- + {{ $t('common.export') }}
- - + + - + - + - + - @@ -138,6 +108,8 @@ export default { } await exportReportFeeDetailCar(params) this.$message.success(this.$t('common.operationSuccess')) + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') + } catch (error) { console.error('导出失败:', error) this.$message.error(this.$t('common.exportFailed')) @@ -161,7 +133,7 @@ export default { margin-bottom: 20px; text-align: right; } - + .el-pagination { margin-top: 20px; text-align: right; diff --git a/src/components/report/reportFeeDetailContract.vue b/src/components/report/reportFeeDetailContract.vue index f76c0f1..181d9d3 100644 --- a/src/components/report/reportFeeDetailContract.vue +++ b/src/components/report/reportFeeDetailContract.vue @@ -138,6 +138,8 @@ export default { } await exportReportFeeDetailContract(params) this.$message.success(this.$t('common.operationSuccess')) + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') + } catch (error) { console.error('导出失败:', error) this.$message.error(this.$t('common.exportFailed')) diff --git a/src/components/report/reportFeeDetailOwner.vue b/src/components/report/reportFeeDetailOwner.vue index 8938496..8b7b51e 100644 --- a/src/components/report/reportFeeDetailOwner.vue +++ b/src/components/report/reportFeeDetailOwner.vue @@ -141,6 +141,8 @@ export default { } await exportReportFeeDetailOwner(params) this.$message.success(this.$t('common.operationSuccess')) + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') + } catch (error) { console.error('导出失败:', error) this.$message.error(this.$t('common.exportFailed')) diff --git a/src/components/report/reportFeeDetailRoom.vue b/src/components/report/reportFeeDetailRoom.vue index 58821f5..071d942 100644 --- a/src/components/report/reportFeeDetailRoom.vue +++ b/src/components/report/reportFeeDetailRoom.vue @@ -151,7 +151,10 @@ export default { pagePath: 'reportFeeDetailRoom' } await exportReportFeeDetailRoom(params) + this.$message.success(this.$t('common.operationSuccess')) + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') + } catch (error) { console.error('导出失败:', error) this.$message.error(this.$t('common.exportFailed')) diff --git a/src/views/report/feeRemindList.vue b/src/views/report/feeRemindList.vue index 486dad2..cdd581b 100644 --- a/src/views/report/feeRemindList.vue +++ b/src/views/report/feeRemindList.vue @@ -3,9 +3,6 @@
{{ $t('feeRemind.queryCondition') }} - - {{ feeRemindInfo.moreCondition ? $t('feeRemind.hide') : $t('feeRemind.more') }} -
diff --git a/src/views/report/reportFeeDetailList.vue b/src/views/report/reportFeeDetailList.vue index 869cdb1..6e868ad 100644 --- a/src/views/report/reportFeeDetailList.vue +++ b/src/views/report/reportFeeDetailList.vue @@ -37,7 +37,7 @@ - + diff --git a/src/views/report/reportHuaningList.vue b/src/views/report/reportHuaningList.vue index d97d910..3887c49 100644 --- a/src/views/report/reportHuaningList.vue +++ b/src/views/report/reportHuaningList.vue @@ -6,7 +6,7 @@
{{ $t('reportHuaning.search.title') }}
-
+
diff --git a/src/views/report/reportNoFeeRoomList.vue b/src/views/report/reportNoFeeRoomList.vue index 2948f61..383bc23 100644 --- a/src/views/report/reportNoFeeRoomList.vue +++ b/src/views/report/reportNoFeeRoomList.vue @@ -213,6 +213,8 @@ export default { } await exportData(params) this.$message.success(this.$t('common.operationSuccess')) + this.$router.push('/pages/property/downloadTempFile?tab=下载中心') + } catch (error) { console.error('导出失败:', error) this.$message.error(this.$t('reportNoFeeRoom.exportFailed')) diff --git a/src/views/report/reportPayFeeDepositList.vue b/src/views/report/reportPayFeeDepositList.vue index fa1e46d..e3c470d 100644 --- a/src/views/report/reportPayFeeDepositList.vue +++ b/src/views/report/reportPayFeeDepositList.vue @@ -54,7 +54,7 @@ - + diff --git a/src/views/report/reportQuestionAnswerDetailList.vue b/src/views/report/reportQuestionAnswerDetailList.vue index 15765d8..fa321e1 100644 --- a/src/views/report/reportQuestionAnswerDetailList.vue +++ b/src/views/report/reportQuestionAnswerDetailList.vue @@ -38,7 +38,7 @@ - +
diff --git a/src/views/report/reportRepairList.vue b/src/views/report/reportRepairList.vue index 0924ca8..9b206e7 100644 --- a/src/views/report/reportRepairList.vue +++ b/src/views/report/reportRepairList.vue @@ -50,7 +50,7 @@ - + -- libgit2 0.21.4