|
@@ -306,7 +306,7 @@ export default {
|
|
|
this.$message.error("请设置url.list属性!")
|
|
this.$message.error("请设置url.list属性!")
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- this.queryParam = this.param
|
|
|
|
|
|
|
+ this.queryParam = Object.assign(this.queryParam, this.param);
|
|
|
|
|
|
|
|
//加载数据 若传入参数1则加载第一页的内容
|
|
//加载数据 若传入参数1则加载第一页的内容
|
|
|
if (arg === 1) {
|
|
if (arg === 1) {
|
|
@@ -378,7 +378,7 @@ export default {
|
|
|
searchReset() {
|
|
searchReset() {
|
|
|
this.$refs.JArea.allClear(),
|
|
this.$refs.JArea.allClear(),
|
|
|
|
|
|
|
|
- this.param={}
|
|
|
|
|
|
|
+ // this.param={}
|
|
|
this.queryParam = {}
|
|
this.queryParam = {}
|
|
|
this.loadData(1);
|
|
this.loadData(1);
|
|
|
},
|
|
},
|
