Merge pull request '添加过滤条件' (#8) from huku into master

Reviewed-on: http://git.gxwebsoft.com/shengtaiting/shengtai-admin/pulls/8
This commit is contained in:
南宁网宿科技
2021-12-10 11:23:31 +08:00
2 changed files with 9 additions and 2 deletions

View File

@@ -201,7 +201,7 @@ export default {
emitData(val){ emitData(val){
if(val && this.where.startTime && this.where.endTime){ if(val && this.where.startTime && this.where.endTime){
this.$emit("search", this.where); this.searchData();
} }
}, },
@@ -253,9 +253,12 @@ export default {
this.where = { this.where = {
checked: 1, checked: 1,
}; };
this.filter = innerFilterColumns.map((item) => item.dataIndex);
this.handleOk()
this.searchData(); this.searchData();
}, },
searchData() { searchData() {
this.where.filter = [...this.filter]
this.$emit("search", this.where); this.$emit("search", this.where);
}, },
exportFile() { exportFile() {

View File

@@ -201,7 +201,7 @@ export default {
emitData(val){ emitData(val){
if(val && this.where.startTime && this.where.endTime){ if(val && this.where.startTime && this.where.endTime){
this.$emit("search", this.where); this.searchData()
} }
}, },
@@ -253,9 +253,13 @@ export default {
this.where = { this.where = {
checked: 1, checked: 1,
}; };
this.filter = innerFilterColumns.map((item) => item.dataIndex);
this.handleOk()
this.searchData(); this.searchData();
}, },
searchData() { searchData() {
this.where.filter = [...this.filter]
this.$emit("search", this.where); this.$emit("search", this.where);
}, },
exportFile() { exportFile() {