|
@@ -64,6 +64,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="时间:">
|
|
|
<el-date-picker
|
|
|
+ ref="datePicker"
|
|
|
v-model="rangeTime"
|
|
|
type="datetimerange"
|
|
|
:picker-options="pickerOptions"
|
|
@@ -220,7 +221,7 @@
|
|
|
components:{LogisticsDialog},
|
|
|
data() {
|
|
|
return {
|
|
|
- rangeTime:'',//时间区间
|
|
|
+ rangeTime:[],//时间区间
|
|
|
listQuery: Object.assign({}, defaultListQuery),
|
|
|
listLoading: true,
|
|
|
list: null,
|
|
@@ -319,9 +320,27 @@
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
+ // let year = new Date().getFullYear()-1;
|
|
|
+ // let beginTime = new Date((year+'-01-01' + ' 00:00:00').replace(/-/g, '/')).getTime();
|
|
|
+ // let endTime = Number(new Date());
|
|
|
+ // this.listQuery.startTime = this.timeFormat( beginTime );
|
|
|
+ // this.listQuery.endTime = this.timeFormat( endTime );
|
|
|
+
|
|
|
+ let endTime = new Date();
|
|
|
+ let start = new Date();
|
|
|
+ start.setTime(start.getTime() - 3600 * 1000 * 24 *365);
|
|
|
+ this.rangeTime=[start,endTime];
|
|
|
+ this.listQuery.startTime = formatDate(start, 'yyyy-MM-dd hh:mm:ss');
|
|
|
+ this.listQuery.endTime = formatDate(endTime, 'yyyy-MM-dd hh:mm:ss');
|
|
|
+
|
|
|
+ console.log('start',start);
|
|
|
+
|
|
|
+
|
|
|
let storage = window.sessionStorage;
|
|
|
let currentPage = storage.getItem('orderPage');
|
|
|
if(currentPage){this.listQuery.pageNum = Number(currentPage)};
|
|
|
+ console.log(this.rangeTime);
|
|
|
+ // this.timeChange();
|
|
|
this.getList();
|
|
|
storage.removeItem('orderPage');//使用后删除,否则从其他页面进来也不一定是第一页
|
|
|
},
|
|
@@ -554,6 +573,11 @@
|
|
|
});
|
|
|
|
|
|
},
|
|
|
+ timeFormat(time){
|
|
|
+ var date = new Date(time + 8 * 3600 * 1000); // 增加8小时
|
|
|
+ return date.toJSON().substr(0, 19).replace('T', ' ');
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
}
|