From 41490d6a55c4d9d33cbbedaad5d3c0ee07eb0c0a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 二月 2025 11:03:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/performance/manHour/workTimeStatistics.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index 4425caf..daffdf6 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -45,6 +45,8 @@
:table-loading="tableLoading"
:page="page"
style="padding: 0 15px"
+ :height="'calc(100vh - 290px)'"
+ @pagination="pagination"
>
</limsTable>
</template>
@@ -132,12 +134,9 @@
this.refreshTable();
},
// 鍒嗛〉
- handleCurrent(page) {
- this.pagination.curent = page;
- this.refreshTable();
- },
- handleSizeChange(size) {
- this.pagination.pageSize = size;
+ pagination({ page, limit }) {
+ this.page.current = page;
+ this.page.size = limit;
this.refreshTable();
},
},
--
Gitblit v1.9.3