From 5d5ea5cd8c4cc06da24cec8442dba934e599f702 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 19 十月 2023 17:11:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zwf/style
---
src/components/makepager/CommonFormTableView.vue | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 01f181d..5bd8931 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -9,7 +9,9 @@
>
<el-table
:data="tableList.tableData"
+ border
style="width: 100%"
+ :height="'calc(100% - 0px)'"
:class="{ setHeight: isinventory || islistingrules }"
:header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
:row-class-name="tableRowClassName"
@@ -119,7 +121,6 @@
v-else
v-model="scope.row[item.prop]"
placeholder=""
- :min="0"
:precision="2"
:controls="false"
size="mini"
@@ -147,7 +148,7 @@
<!-- 浣嶇疆 -->
<el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
- <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop].label }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
@@ -552,9 +553,12 @@
.custom-name {
display: flex;
justify-content: center;
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
.common-select-btn {
margin-left: 5px;
- font-size: 18px;
+ font-size: 13px;
cursor: pointer;
}
}
@@ -564,21 +568,22 @@
.el-form-item__label {
display: none;
}
+ .el-form-item__content {
+ // height: 28px; /* 璁剧疆楂樺害 */
+ line-height: 22px; /* 璁剧疆琛岄珮 */
+ }
.el-table__footer-wrapper tbody td.el-table__cell {
background-color: #fff;
// text-align: right;
font-weight: bold;
}
- .el-input--suffix .el-input__inner {
- padding-right: 0px;
- }
.el-table .cell,
.el-table th.el-table__cell > .cell {
padding: 0 5px;
}
- .el-input__inner {
- text-align: left;
- }
+ // .el-input__inner {
+ // text-align: left;
+ // }
}
::v-deep .el-table .cell {
@@ -596,27 +601,5 @@
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