From f73080c69548aba58d6a58e7e049d8eb79f9f7ed Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 19 十月 2023 17:25:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/components/makepager/TableCommonView.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index a9b9ff0..4c090ac 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -33,6 +33,8 @@
:min-width="item.min"
show-overflow-tooltip
:sortable="item.sortable"
+ header-align="center"
+ :align="item.textAlign"
v-if="item.isShowColumn"
>
<template slot-scope="scope">
@@ -115,7 +117,7 @@
highlight: false,
tableColumn: [
// table琛ㄥ崟
- { label: "", prop: "", min: 200, tooltip: true }
+ { label: "", prop: "", min: 200, tooltip: true,textAlign:"center"}
]
}
},
@@ -242,7 +244,7 @@
}
}, 0)
let unitIndex = this.tableList.tableColumn.findIndex(obj => obj.label === column.label);
- sums[index]+=this.tableList.tableColumn[unitIndex].unit
+ sums[index]=this.tableList.tableColumn[unitIndex].unit+sums[index]
} else {
sums[index] = ""
}
@@ -371,14 +373,21 @@
.el-table .cell .el-button--text.el-button--small {
padding: 4px 0;
}
+ .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+ }
+ .el-table__body-wrapper{
+ height: unset !important;
+ }
+ .el-table__cell.is-left{
+ text-align: left !important;
+ }
+ .el-table__cell.is-right{
+ text-align: right !important;
+ }
}
-
-::v-deep .el-table .el-table__cell {
- padding: 6px 0 !important;
- height: 35px;
- text-align: center;
-}
-
.overSpread1 {
width: 100%;
height: 100%;
@@ -388,4 +397,7 @@
background: rgba(0, 0, 0, 0);
z-index: 10;
}
+.el-table__cell{
+ text-align: unset !important;
+}
</style>
--
Gitblit v1.8.0