|
|
@@ -1121,9 +1121,8 @@ export default {
|
|
|
this.tableTop = window.innerHeight - 230;
|
|
|
this.tableBot = window.innerHeight - 230;
|
|
|
let now = new Date();
|
|
|
- let start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 7, 0, 0);
|
|
|
- let end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 8, 0, 0);
|
|
|
- this.search.entrTime = [start, end]
|
|
|
+ let wkStart = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6, 0, 0, 0);
|
|
|
+ this.search.entrTime = [this.getYNM(wkStart) + ' 00:00:00', this.getYNM(now) + ' 23:59:59']
|
|
|
this.activeMenu = window.top.localStorage.getItem('activeMenu')
|
|
|
this.axios.post('pass/baseManagement/v1/limsbaseposts/queryLimsBasePostList', {}, { individualType: 'json' }).then(res => {
|
|
|
this.jobType = res.data
|
|
|
@@ -1566,9 +1565,8 @@ export default {
|
|
|
this.search.deptNo = ''
|
|
|
this.search.sectionNo = ''
|
|
|
let now = new Date();
|
|
|
- let start = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 7, 0, 0);
|
|
|
- let end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 8, 0, 0);
|
|
|
- this.search.entrTime = [start, end]
|
|
|
+ let wkStart = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 6, 0, 0, 0);
|
|
|
+ this.search.entrTime = [this.getYNM(wkStart) + ' 00:00:00', this.getYNM(now) + ' 23:59:59']
|
|
|
this.searchData();
|
|
|
},
|
|
|
transfer () {//转移
|