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/locationReport/index.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 8e357aa..6efd9ed 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:"right"
},
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
isShowColumn: true,
default: true,
- unit: ""
+ unit: "",
+ textAlign:"right"
},
{
label: "鍗曚綅",
@@ -187,6 +189,7 @@
width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
+ textAlign:"right",
unit: "锟�"
}
]
@@ -207,16 +210,25 @@
})
},
getData() {
- this.getLocationData({
+ if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){
+ this.getLocationData({
+ wareHouseCode:this.$route.params.wareHouseCode,
+ productId:this.$route.params.productId,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
+ }else{
+ this.getLocationData({
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ }
},
// 鎼滅储
getList(val) {
this.getLocationData({
- page: this.pagerOptions.currPage,
+ page: 1,
pageSize: this.pagerOptions.pageSize,
keyWord: val
})
@@ -240,11 +252,14 @@
},
// 鍘嗗彶
handleHistoryClick(row) {
+ console.log(row)
this.$router.push({
name: "inboundOutboundDetail",
params: {
- row: row,
- // id: row.produceId,
+ keyWord:row.productTypeName,
+ produceId:row.produceId,
+ productName:row.productName,
+ unit:row.unit,
name: "鎶ヨ〃"
}
})
@@ -256,4 +271,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