From 1755192ff6533145a6ed82da31d9f7816bbe00f5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 14 七月 2025 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/reportAnalysis/taxComparison/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/reportAnalysis/taxComparison/index.vue b/src/views/reportAnalysis/taxComparison/index.vue
index fc4c929..a97ca4f 100644
--- a/src/views/reportAnalysis/taxComparison/index.vue
+++ b/src/views/reportAnalysis/taxComparison/index.vue
@@ -4,7 +4,7 @@
<el-form-item label="鏃ユ湡">
<el-date-picker
style="width: 240px"
- v-model="filters.dateRange"
+ v-model="filters.month"
value-format="YYYY-MM"
format="YYYY-MM"
type="month"
@@ -20,6 +20,7 @@
</el-form>
<div class="table_list">
<PIMTable
+ rowKey="id"
:column="columns"
:tableData="dataList"
:page="{
@@ -27,7 +28,7 @@
size: pagination.pageSize,
total: pagination.total,
}"
- @pagination="onCurrentChange"
+ @pagination="changePage"
/>
</div>
</div>
@@ -54,7 +55,7 @@
} = usePaginationApi(
getTaxList,
{
- dateRange: [], // 鏉ョエ鏃ユ湡
+ month: [], // 鏉ョエ鏃ユ湡
},
[
{
@@ -81,6 +82,11 @@
{}
);
+const changePage = ({ page }) => {
+ pagination.currentPage = page;
+ onCurrentChange(page);
+};
+
onMounted(() => {
getTableData();
});
--
Gitblit v1.9.3