From 853d05b11f3ecc0edb93494d42eba29e10248340 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 13 十一月 2023 18:20:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/reportForm/locationReport/index.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 6efd9ed..fd09e6c 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -106,7 +106,8 @@
},
productId: this.$route.params.id,
productName: this.$route.params.name,
- metaTitle: this.$route.meta.title
+ metaTitle: this.$route.meta.title,
+ keyWord:''
}
},
created() {
@@ -218,20 +219,22 @@
pageSize: this.pagerOptions.pageSize
})
}else{
- this.getLocationData({
+ let params={
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ pageSize: this.pagerOptions.pageSize,
+ keyWord:this.keyWord,
+ }
+ if(this.$route.params.positionId){
+ params.positionId=this.$route.params.positionId
+ }
+ this.getLocationData(params)
}
},
// 鎼滅储
getList(val) {
- this.getLocationData({
- page: 1,
- pageSize: this.pagerOptions.pageSize,
- keyWord: val
- })
+ this.keyWord=val
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
--
Gitblit v1.8.0