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 | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 8f96fb2..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">
@@ -86,7 +88,7 @@
import { getInventoryData, getProductCategoryList, getWarehouseList } from "@/api/reportForm/inventoryRwport"
export default {
- name: "InboundOutboundDetail",
+ name: "inventoryReport",
props: {},
components: { AddOverviewDialog },
mixins: [pageMixin],
@@ -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: "棰勬祴",
@@ -277,7 +285,7 @@
getList(val) {
this.searchStr = val
this.getInventoryData({
- page: this.pagerOptions.currPage,
+ page: 1,
pageSize: this.pagerOptions.pageSize,
keyWord: val
})
@@ -304,7 +312,10 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- id: row.produceId,
+ keyWord:row.productType,
+ produceId:row.produceId,
+ unit:row.unit,
+ productName:row.productName,
name: "鎶ヨ〃"
}
})
@@ -315,8 +326,17 @@
console.log(row)
},
// 浣嶇疆
- handleLocation() {
- this.$router.push("/reportForm/locationReport")
+ handleLocation(row) {
+ console.log(row,"rowwww")
+ this.$router.push({
+ name:"locationReport",
+ params:{
+ // keyWord:row.row.productName,
+ wareHouseCode:this.warehouseListName,
+ productId:row.row.produceId,
+ name:"搴撳瓨鎶ヨ〃"
+ }
+ })
},
// 棰勬祴
handleForecast() {},
@@ -379,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
}
})
}
@@ -397,6 +417,7 @@
.con_left {
width: 200px;
.el-checkbox-group {
+ width:100%;
display: flex;
flex-direction: column;
}
@@ -409,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