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 | 77 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 91e54a1..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">
@@ -46,20 +48,20 @@
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="220" align="center">
<template slot-scope="scope">
- <span @click="handleHistoryClick(scope.row)">
+ <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
<i class="el-icon-refresh-left"></i>
<span>鍘嗗彶</span>
</span>
- <span @click="handleAddGoods(scope)" class="margin_left_5px">
+ <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
<i class="el-icon-refresh"></i>
<span>琛ヨ揣</span>
</span>
<template>
- <span @click="handleLocation(scope)" class="margin_left_5px">
+ <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor">
<i class="el-icon-menu"></i>
<span>浣嶇疆</span>
</span>
- <span @click="handleForecast(scope)" class="margin_left_5px">
+ <span @click="handleForecast(scope)" class="margin_left_5px no-cursor">
<i class="el-icon-s-data"></i>
<span>棰勬祴</span>
</span>
@@ -146,7 +148,7 @@
pageSizes: [15, 30],
oldRadioBtn: "",
metaTitle: this.$route.meta.title,
- searchStr:""
+ searchStr: this.$route.params.name ?? ''
}
},
created() {
@@ -217,42 +219,48 @@
label: "鍗曚綅鎴愭湰",
prop: "cost",
default: false,
- isShowColumn: showcol.includes("鍗曚綅鎴愭湰")
+ isShowColumn: showcol.includes("鍗曚綅鎴愭湰"),
+ textAlign:"right"
},
{
label: "鎬讳环鍊�",
prop: "value",
default: false,
isShowColumn: showcol.includes("鎬讳环鍊�"),
- unit: "锟�"
+ unit: "锟�",
+ textAlign:"right"
},
{
label: "鍦ㄥ簱",
prop: "amount",
default: true,
isShowColumn: true,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "鍙敤搴撳瓨",
prop: "availableNumber",
default: true,
isShowColumn: true,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "鍏ュ簱",
prop: "in",
default: false,
isShowColumn: showcol.includes("鍏ュ簱"),
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "鍑哄簱",
prop: "out",
isShowColumn: showcol.includes("鍑哄簱"),
default: false,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "棰勬祴",
@@ -275,11 +283,11 @@
this.tableList.tableColumn = this.setTableColumn(val)
},
getList(val) {
- this.searchStr=val
+ this.searchStr = val
this.getInventoryData({
page: 1,
pageSize: this.pagerOptions.pageSize,
- keyWord:val,
+ keyWord: val
})
},
// 琛岀偣鍑�
@@ -323,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:"搴撳瓨鎶ヨ〃"
}
})
@@ -351,18 +361,18 @@
//鎺ュ彛璇锋眰-----------------------------------------------------------------------------------------------
// 鑾峰彇搴撳瓨鎶ヨ〃鏁版嵁
- async getInventoryData(params){
+ async getInventoryData(params) {
await getInventoryData(params).then((res) => {
- if (res.code === 200) {
- const list = res.data
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.total
- }
- })
+ if (res.code === 200) {
+ const list = res.data
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.total
+ }
+ })
},
getData() {
let params = {
- keyWord:this.searchStr,
+ keyWord: this.searchStr,
categoryIds: this.categoryListId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
@@ -389,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
}
})
}
@@ -407,6 +417,7 @@
.con_left {
width: 200px;
.el-checkbox-group {
+ width:100%;
display: flex;
flex-direction: column;
}
@@ -419,4 +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;
+ }
+}
+
</style>
--
Gitblit v1.8.0