Commit adae47b6 by huaying

fix: 日期选择器

parent 19f5bbee
......@@ -2,8 +2,8 @@
<div>
<el-row>
<div class="leftBox">
<el-input class="w260 mr10" placeholder="请输入门店名称/code" v-model="pageParam.inFields.storeSelect" @keyup.native="value => toInput(value, searchInput)" prefix-icon="el-icon-search" clearable @clear="getTableList"></el-input>
<el-input class="w260 mr10" placeholder="请输入导购名称/code" v-model="pageParam.inFields.clerkSelect" @keyup.native="value => toInput(value, searchInput)" prefix-icon="el-icon-search" clearable @clear="getTableList"></el-input>
<el-input class="w260 mr10" placeholder="请输入门店名称/code" v-model="pageParam.inFields.storeSelect" @keyup.native="value => toInput(value, searchInput)" prefix-icon="el-icon-search" clearable @clear="getChartList"></el-input>
<el-input class="w260 mr10" placeholder="请输入导购名称/code" v-model="pageParam.inFields.clerkSelect" @keyup.native="value => toInput(value, searchInput)" prefix-icon="el-icon-search" clearable @clear="getChartList"></el-input>
</div>
<div class="rightBox">
......@@ -97,34 +97,34 @@ export default {
dateDefault: [],
totalCount: 0,
sortColumn: '',
sortType: ''
// pickerOptions() {
// let pickerMinDate;
// return {
// onPick(obj) {
// pickerMinDate = obj.minDate;
// },
// disabledDate(time) {
// let start = new Date();
// start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
// let start2 = new Date(pickerMinDate);
// let end = new Date();
// end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate() + 1}`);
// let end2 = new Date(pickerMinDate);
// if (pickerMinDate) {
// start = start.setFullYear(start.getFullYear() - 2);
// start2 = start2.setMonth(start2.getMonth() - 6);
// start = start > start2 ? start : start2;
// end2 = end2.setMonth(end2.getMonth() + 6);
// end = end.getTime() > end2 ? end2 : end.getTime();
// } else {
// start = start.setFullYear(start.getFullYear() - 2);
// end = end.getTime();
// }
// return time.getTime() <= start || time.getTime() >= end;
// }
// };
// }
sortType: '',
pickerOptions() {
let pickerMinDate;
return {
onPick(obj) {
pickerMinDate = obj.minDate;
},
disabledDate(time) {
let start = new Date();
start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
let start2 = new Date(pickerMinDate);
let end = new Date();
end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate() + 1}`);
let end2 = new Date(pickerMinDate);
if (pickerMinDate) {
start = start.setFullYear(start.getFullYear() - 2);
start2 = start2.setMonth(start2.getMonth() - 6);
start = start > start2 ? start : start2;
end2 = end2.setMonth(end2.getMonth() + 6);
end = end.getTime() > end2 ? end2 : end.getTime();
} else {
start = start.setFullYear(start.getFullYear() - 2);
end = end.getTime();
}
return time.getTime() <= start || time.getTime() >= end;
}
};
}
};
},
created() {
......@@ -133,7 +133,7 @@ export default {
},
methods: {
toInput: _debounce(function(e, value) {
this.getTableList();
this.getChartList();
}, 500),
// getDateRange(setEndDate) {
// const start = new Date();
......@@ -189,11 +189,11 @@ export default {
// const [start, end] = this.getDateRange(setDate);
// this.dateDefault.push(end);
// this.dateDefault.push(start);
// this.getTableList();
// this.getChartList();
// },
onDateChange() {
this.dateKey = -1;
if (this.dateDefault.length) this.getTableList();
if (this.dateDefault.length) this.getChartList();
},
// 当前页变化
handleCurrentChange(val) {
......@@ -204,7 +204,7 @@ export default {
handleSizeChange(val) {
this.pageParam.pageNo = 1;
this.pageParam.pageSize = val;
this.getTableList();
this.getChartList();
},
// 排序
sortChange(column) {
......@@ -212,10 +212,10 @@ export default {
that.sortColumn = column.prop;
that.sortType = column.order == 'ascending' ? 'asc' : 'desc';
this.pageParam.inFields.orderByField = `${that.sortColumn} ${that.sortType}`;
that.getTableList();
that.getChartList();
},
// 列表数据
async getTableList() {
async getChartList() {
const paras = JSON.parse(JSON.stringify(this.pageParam));
paras.inFields.startTime = this.dateDefault ? this.dateDefault[0] + ' 00:00:00' : '';
paras.inFields.endTime = this.dateDefault ? this.dateDefault[1] + ' 23:59:59' : '';
......
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