|
@@ -132,6 +132,7 @@
|
|
|
next(vm => {
|
|
|
//const pm = to.param;
|
|
|
Object.assign(vm, to.params);
|
|
|
+ vm.inCurrentPage=to.params.currentPage;
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
@@ -191,6 +192,10 @@
|
|
|
this.canModiId = this.list[0].id;
|
|
|
}
|
|
|
this.flag = false;
|
|
|
+ if(this.inCurrentPage!==undefined){
|
|
|
+ this.currentPage=this.inCurrentPage;
|
|
|
+ this.inCurrentPage = undefined;
|
|
|
+ }
|
|
|
}
|
|
|
}).catch((error) => {
|
|
|
console.log(error);
|
|
@@ -209,7 +214,7 @@
|
|
|
};
|
|
|
const param = {
|
|
|
name: this.filter.name.trim(),
|
|
|
- current: this.currentPage,
|
|
|
+ current: this.inCurrentPage||this.currentPage,
|
|
|
size: this.pageSize,
|
|
|
productType:this.filter.type?this.filter.type:0
|
|
|
};
|