From f9dde5f2f75298ff2aa50f2f7ecff3b47ac570e9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 11:05:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into wn
---
src/components/makepager/TableCommonView.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 70254b3..a9b9ff0 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -42,10 +42,10 @@
<span
class="Badge"
:class="{
- greenSlot: scope.row.status == '4',
+ greenSlot: scope.row.status == '4'||scope.row.status == '瀹屾垚',
redSlot: scope.row.status == '5',
- blueSlot: scope.row.status == '3',
- graySlot: scope.row.status == '1'
+ blueSlot: scope.row.status == '3'||scope.row.status == '灏辩华',
+ graySlot: scope.row.status == '1',
}"
>{{
item.isCallMethod ? item.getCallMethod(scope.row[item.prop], scope.row) : scope.row[item.prop]
@@ -238,10 +238,11 @@
if (!isNaN(value)) {
return prev + curr
} else {
- return prev
+ return prev
}
}, 0)
- sums[index] = this.tableList.tableColumn[index - 1].unit + "" + sums[index]
+ let unitIndex = this.tableList.tableColumn.findIndex(obj => obj.label === column.label);
+ sums[index]+=this.tableList.tableColumn[unitIndex].unit
} else {
sums[index] = ""
}
@@ -298,16 +299,18 @@
.styleBtn {
position: absolute;
width: 30px;
- height: 48px;
+ height: 35px;
// line-height: 26px;
- background: #f1f3f8;
+ background: transparent;
border-top-right-radius: 8px;
top: 0px;
right: 2px;
+ display: flex;
+ align-items: center;
// z-index: 9999;
.label {
position: absolute;
- top: 12px;
+ top: 6px;
font-size: 20px;
cursor: pointer;
color: #000;
@@ -346,4 +349,43 @@
overflow: auto;
}
}
+
+::v-deep .el-table .cell {
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
+ color: rgba(0, 0, 0, 0.9);
+ .el-button--text {
+ width: auto;
+ height: auto;
+ font-family: PingFangSC-Medium, sans-serif;
+ }
+}
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
+
+::v-deep {
+ .el-table .cell .el-button--text.el-button--small {
+ padding: 4px 0;
+ }
+}
+
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
+
+.overSpread1 {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0);
+ z-index: 10;
+}
</style>
--
Gitblit v1.8.0