From ed5b2584cd8aba929d43aae7f449f235f263e9fb Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 08 一月 2024 16:27:40 +0800
Subject: [PATCH] Merge branch 'zzq' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/components/makepager/TableCommonView.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 11e0d00..584763a 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -7,6 +7,7 @@
:data="tableList.tableInfomation"
tooltip-effect="dark"
:height="'calc(100% - 0px)'"
+ :max-height="tableList.maxHeight"
style="width: 100%"
:lazy="tableList.lazy"
:show-summary="showSummary.show"
@@ -18,8 +19,8 @@
@row-click="tableRowClick"
:row-class-name="tableRowClassName"
>
- <el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"></el-table-column>
<el-table-column v-if="selectBox" type="selection" width="40"> </el-table-column>
+ <el-table-column v-if="tableList.selectIndex" type="index" label="搴忓彿" width="50"></el-table-column>
<el-table-column
v-for="(item, i) in tableList.tableColumn"
:key="i"
--
Gitblit v1.8.0