|
@@ -132,6 +132,7 @@ export default {
|
|
next(vm => {
|
|
next(vm => {
|
|
//const pm = to.param;
|
|
//const pm = to.param;
|
|
Object.assign(vm, to.params);
|
|
Object.assign(vm, to.params);
|
|
|
|
+ vm.inCurrentPage=to.params.currentPage;
|
|
})
|
|
})
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -153,6 +154,10 @@ export default {
|
|
if(res.data.code == '0') {
|
|
if(res.data.code == '0') {
|
|
this.list = res.data.data.records
|
|
this.list = res.data.data.records
|
|
this.total = res.data.data.total;
|
|
this.total = res.data.data.total;
|
|
|
|
+ if(this.inCurrentPage!==undefined){
|
|
|
|
+ this.currentPage=this.inCurrentPage;
|
|
|
|
+ this.inCurrentPage = undefined;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -207,7 +212,7 @@ export default {
|
|
this.filter.conceptName='';
|
|
this.filter.conceptName='';
|
|
};
|
|
};
|
|
const param = {
|
|
const param = {
|
|
- current: this.currentPage,
|
|
|
|
|
|
+ current: this.inCurrentPage||this.currentPage,
|
|
size: this.pageSize,
|
|
size: this.pageSize,
|
|
name:this.filter.conceptName.trim(),
|
|
name:this.filter.conceptName.trim(),
|
|
relationId:17,
|
|
relationId:17,
|