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/views/reportForm/inventoryReport/index.vue | 13 -------------
src/components/makepager/TableCommonView.vue | 25 ++++++++++++++++++-------
src/views/reportForm/locationReport/index.vue | 10 +++++++---
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 0d4ffcf..4c090ac 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -33,6 +33,7 @@
:min-width="item.min"
show-overflow-tooltip
:sortable="item.sortable"
+ header-align="center"
:align="item.textAlign"
v-if="item.isShowColumn"
>
@@ -372,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%;
@@ -389,4 +397,7 @@
background: rgba(0, 0, 0, 0);
z-index: 10;
}
+.el-table__cell{
+ text-align: unset !important;
+}
</style>
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index fe52f42..dc8e4fa 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -426,17 +426,4 @@
}
}
-::v-deep .el-table__body-wrapper{
- height: unset !important;
- // height: 100%;
-}
-::v-deep .table-view{
- height:unset !important;
-}
-.el-table__cell{
- text-align: unset !important;
-}
-::v-deep .el-table__cell.is-left{
- text-align: left !important;
-}
</style>
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 78866f9..a70bf23 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -165,14 +165,16 @@
prop: "amount",
isShowColumn: true,
default: true,
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
isShowColumn: true,
default: true,
- unit: ""
+ unit: "",
+ textAlign:"left"
},
{
label: "鍗曚綅",
@@ -187,6 +189,7 @@
width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
+ textAlign:"left",
unit: "锟�"
}
]
@@ -266,4 +269,5 @@
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
--
Gitblit v1.8.0