From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/reportForm/inventoryReport/index.vue | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index fe52f42..eaef51d 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -31,8 +31,10 @@
</div>
<p style="margin-top: 30px">绫诲埆</p>
<el-checkbox-group v-model="checkList" @change="checkListHandler">
- <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
- </el-checkbox-group>
+ <el-checkbox v-for="item in categoryList" :key="item.id" :label="item.id">
+ {{ item.name }}
+ </el-checkbox>
+ </el-checkbox-group>
</div>
<div class="list-view">
<div class="table">
@@ -218,7 +220,7 @@
prop: "cost",
default: false,
isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
- textAlign:"left"
+ textAlign:"right"
},
{
label: "鎬讳环鍊�",
@@ -226,7 +228,7 @@
default: false,
isShowColumn: showcol.includes("鎬讳环鍊�"),
unit: "锟�",
- textAlign:"left"
+ textAlign:"right"
},
{
label: "鍦ㄥ簱",
@@ -234,7 +236,7 @@
default: true,
isShowColumn: true,
unit: "",
- textAlign:"left"
+ textAlign:"right"
},
{
label: "鍙敤搴撳瓨",
@@ -242,7 +244,7 @@
default: true,
isShowColumn: true,
unit: "",
- textAlign:"left"
+ textAlign:"right"
},
{
label: "鍏ュ簱",
@@ -250,7 +252,7 @@
default: false,
isShowColumn: showcol.includes("鍏ュ簱"),
unit: "",
- textAlign:"left"
+ textAlign:"right"
},
{
label: "鍑哄簱",
@@ -258,7 +260,7 @@
isShowColumn: showcol.includes("鍑哄簱"),
default: false,
unit: "",
- textAlign:"left"
+ textAlign:"right"
},
{
label: "棰勬祴",
@@ -329,7 +331,9 @@
this.$router.push({
name:"locationReport",
params:{
- keyWord:row.row.productName,
+ // keyWord:row.row.productName,
+ wareHouseCode:this.warehouseListName,
+ productId:row.row.produceId,
name:"搴撳瓨鎶ヨ〃"
}
})
@@ -395,8 +399,8 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.data.code === 200) {
- this.warehouseList = res.data.data
+ if (res.code === 200) {
+ this.warehouseList = res.data
}
})
}
@@ -413,6 +417,7 @@
.con_left {
width: 200px;
.el-checkbox-group {
+ width:100%;
display: flex;
flex-direction: column;
}
@@ -425,18 +430,18 @@
flex: 1;
}
}
+::v-deep {
+ .el-checkbox {
+ padding: 5px;
+ }
+ .el-checkbox__label {
+ width: 95%;
+ box-sizing: border-box;
+ padding-right: 5px;
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: pre-wrap !important;
+ }
+}
-::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>
--
Gitblit v1.8.0