|
|
|
|
@ -87,17 +87,16 @@
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
size="small"
|
|
|
|
|
:value="select.date_range ? select.date_range.split('~') : ''"
|
|
|
|
|
v-model="dateRange"
|
|
|
|
|
type="daterange"
|
|
|
|
|
align="right"
|
|
|
|
|
unlink-panels
|
|
|
|
|
clearable
|
|
|
|
|
range-separator="至"
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
|
@input="
|
|
|
|
|
([start, end]) => (select.date_range = `${start}~${end}`)
|
|
|
|
|
"
|
|
|
|
|
@change="changeDatePicker"
|
|
|
|
|
>
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
<el-select
|
|
|
|
|
@ -654,6 +653,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
dateRange:'',
|
|
|
|
|
select: {
|
|
|
|
|
page: 1,
|
|
|
|
|
page_size: 20,
|
|
|
|
|
@ -707,6 +707,15 @@ export default {
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
changeDatePicker(e){
|
|
|
|
|
console.log(e)
|
|
|
|
|
if(e){
|
|
|
|
|
this.select.date_range = e.join('~')
|
|
|
|
|
}else{
|
|
|
|
|
this.select.date_range = ''
|
|
|
|
|
}
|
|
|
|
|
console.log("this.select.date_range",this.select.date_range)
|
|
|
|
|
},
|
|
|
|
|
async getDepartments() {
|
|
|
|
|
try {
|
|
|
|
|
this.departments = await departmentListNoAuth({
|
|
|
|
|
|