Commit ccc334e8 by 姜雷

Merge branch 'develop' into 'test'

修改储值区域为多选 See merge request !131
parents c8e3c00d 851a51c4
......@@ -6,6 +6,7 @@
filterable
:value="value"
@change="changeHandle"
@visible-change="resetFilterText"
:multiple="multiple"
ref="select"
>
......@@ -14,6 +15,7 @@
<el-input
v-if="multiple"
class="out-input"
:value="filterText"
clearable
@click.stop
@input="debouncedQueryChange"
......@@ -111,6 +113,9 @@ export default {
handleQueryChange(val) {
this.filterText = val;
},
resetFilterText(visible) {
if (!visible) this.filterText = '';
},
},
};
</script>
......
......@@ -12,6 +12,7 @@
<dashboard-area-select
:operateId="filters.operateId"
:value="filters.areaId"
multiple
@input="val => updateFilters({areaId: val})"
/>
</search-item>
......@@ -114,6 +115,21 @@ export default {
flex: 1;
}
}
.el-select {
.el-select__tags {
height: 90%;
overflow: hidden;
input {
display: none;
}
}
.el-input {
overflow: hidden;
}
.el-input__inner {
height: 100% !important;
}
}
}
</style>
......@@ -4,7 +4,7 @@ import initFiltersStore from '@/store/modules/filters';
const initFilters = () => ({
operateId: undefined,
areaId: undefined,
areaId: [],
timeType: 0, // 0 本日,1 本月, 2 本年
});
const filtersStore = initFiltersStore(initFilters);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment