From 71a9eef518f2f2f1a1eb2fb90f2eb8ab7b155bc8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 08 一月 2026 14:57:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/components/PIMTable/PIMTable.vue | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 12d73ad..9dcd440 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -40,7 +40,7 @@
:fixed="item.fixed"
:label="item.label"
:prop="item.prop"
- show-overflow-tooltip
+ :show-overflow-tooltip="item.dataType !== 'action'"
:align="item.align"
:sortable="!!item.sortable"
:type="item.type"
@@ -204,7 +204,6 @@
</el-table-column>
</el-table>
<pagination
- v-if="isShowPage"
:total="page.total"
:layout="page.layout"
:page="page.current"
@@ -267,10 +266,6 @@
isSelection: {
type: Boolean,
default: false,
- },
- isShowPage: {
- type: Boolean,
- default: true,
},
isShowSummary: {
type: Boolean,
--
Gitblit v1.9.3