From 1789ce3650a2665b5abca7a3028611190d1983df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 09:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/common/ztt-table.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 41c2e5b..64d8045 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -397,6 +397,7 @@
@size-change="sizeChangeHandle"
:page-sizes="[10, 20, 50, 100]"
:page-size="pagination.pageSize"
+ :page-count="pagination.size"
:layout="
size
? 'total, prev, pager, next'
@@ -718,6 +719,7 @@
currentPage:
this.table.currentPage == null ? 1 : this.table.currentPage,
pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
+ size: this.table.size == null ? 7 : this.table.size,
total: this.table.total == null ? 0 : this.table.total
}, // 鍒嗛〉淇℃伅
inMemoryColWidth: {}, // 璁板繂涓垪瀹斤紝榛樿鍒楀
@@ -1576,7 +1578,7 @@
if (response.code != '0') {
this.$message.warning(response.msg)
} else {
- if(response.data!=""&&response.data!=[]){
+ if(response.data!=""&&response.data!=[]&&response.data!=null){
this.$message({
message: response.data,
type: 'success'
--
Gitblit v1.9.3