|
@@ -264,12 +264,8 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
- isEmptySearch() {
|
|
|
- return !Object.keys(cleanDeep({...this.searchForm})).length
|
|
|
- },
|
|
|
isEmptyQuery() {
|
|
|
- console.log(this.isEmptySearch, this.$route.query.search)
|
|
|
- return this.isEmptySearch && !this.$route.query.search
|
|
|
+ return !Object.keys(cleanDeep({...this.searchForm})).length
|
|
|
}
|
|
|
},
|
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
@@ -287,6 +283,7 @@ export default {
|
|
|
// this.organList = res.data;
|
|
|
// }
|
|
|
// });
|
|
|
+ this.$set(this.searchForm, 'search', this.$route.query.search)
|
|
|
this.$store.dispatch("setBranchs");
|
|
|
this.init();
|
|
|
},
|
|
@@ -301,7 +298,6 @@ export default {
|
|
|
let obj = {
|
|
|
page: this.rules.page,
|
|
|
rows: this.rules.limit,
|
|
|
- search: this.$route.query.search
|
|
|
};
|
|
|
Object.assign(obj, this.searchForm);
|
|
|
if (this.courseTime && this.courseTime.length > 0) {
|