From 6b2aa7f0bb3f43e040ae2e659009e3bee3f3db1c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期四, 19 十月 2023 11:14:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/views/reportForm/locationReport/index.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 8e357aa..78866f9 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -207,16 +207,24 @@
})
},
getData() {
- this.getLocationData({
+ if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){
+ this.getLocationData({
+ keyWord:this.$route.params.keyWord,
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
})
@@ -243,8 +251,10 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- row: row,
- // id: row.produceId,
+ keyWord:row.productTypeName,
+ produceId:row.id,
+ productName:row.productName,
+ unit:row.unit,
name: "鎶ヨ〃"
}
})
--
Gitblit v1.8.0