Commit 63ddaeb2 authored by dragondean@qq.com's avatar dragondean@qq.com

Merge remote-tracking branch 'origin/release' into release

parents 83fc3a21 f7b8db8b
...@@ -285,9 +285,9 @@ export default { ...@@ -285,9 +285,9 @@ export default {
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10, rows: 10,
orderNoKey:'eq', orderNoKey:'in',
marksKey:'eq', marksKey:'in',
goodsNameKey:'eq' goodsNameKey:'in'
}, },
tradeCityList:[], tradeCityList:[],
warehouseList:[], warehouseList:[],
...@@ -347,9 +347,9 @@ export default { ...@@ -347,9 +347,9 @@ export default {
this.queryParams = { this.queryParams = {
page: 1, page: 1,
rows: 10, rows: 10,
orderNoKey:'eq', orderNoKey:'in',
marksKey:'eq', marksKey:'in',
goodsNameKey:'eq' goodsNameKey:'in'
} }
this.getList() this.getList()
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment