From 0618b2b0a6eb5497945db453fe60d898616f826b Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 13 一月 2026 15:47:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/components/PIMTable/PIMTable.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index d7bb422..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="page.total > 0"
:total="page.total"
:layout="page.layout"
:page="page.current"
--
Gitblit v1.9.3