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 | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 1313a7f..fd09e6c 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -60,7 +60,7 @@
data() {
return {
tableList: {},
- showcol: ["浜у搧绫诲埆","浠峰��",],
+ showcol: ["瀛樺偍绫诲埆", "浜у搧绫诲埆", "棰勭暀鏁伴噺", "浠峰��"],
// countcol: [
// { label: "鍦ㄥ簱鏁伴噺", unit: "" },
// { label: "棰勭暀鏁伴噺", unit: "" },
@@ -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() {
@@ -171,8 +172,8 @@
{
label: "棰勭暀鏁伴噺",
prop: "availableStore",
- default: false,
- isShowColumn: showcol.includes("棰勭暀鏁伴噺"),
+ isShowColumn: true,
+ default: true,
unit: "",
textAlign:"right"
},
@@ -186,6 +187,7 @@
{
label: "浠峰��",
prop: "value",
+ width: 120,
default: false,
isShowColumn: showcol.includes("浠峰��"),
textAlign:"right",
@@ -217,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