mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zhp #370

Merged
juzi merged 7 commits from projects/mesxc-zhp into projects/mesxc-test 2024-04-26 08:49:54 +08:00
Conversation 0 Commits 7 Files Changed 6 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec550f22ec - Show all commits

8
src/views/report/ingredientReport/day.vue
View File

@ -169,8 +169,8 @@ export default {
}, },
mounted() { mounted() {
// this.formConfig[1].defaultSelect[] // this.formConfig[1].defaultSelect[]
this.listQuery.startTime = Date.now() - 24 * 60 * 60 * 1000 this.listQuery.startTime = Date.now()
this.time = moment(new Date((Date.now() - 24 * 60 * 60 * 1000)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now()).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') this.time = moment(new Date((Date.now())).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(Date.now())).format('YYYY-MM-DD HH:mm:ss')
this.listQuery.endTime = Date.now() this.listQuery.endTime = Date.now()
// this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000 // this.formConfig[0].defaultSelect[0] = Date.now()-24*60*60-1000
this.getDataList() this.getDataList()
@ -536,8 +536,8 @@ export default {
switch (val.btnName) { switch (val.btnName) {
case 'search': case 'search':
this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined; this.listQuery.startTime = val.checkTime ? new Date(new Date(val.checkTime).setHours(8, 0, 0, 0)).getTime() : undefined;
this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') this.time = moment(new Date((val.checkTime)).setHours(8, 0, 0, 0)).format('YYYY-MM-DD HH:mm:ss') + moment(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).format('YYYY-MM-DD HH:mm:ss')
this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(8, 0, 0, 0)).getTime() : undefined; this.listQuery.endTime = val.checkTime ? new Date(new Date(val.checkTime + 24 * 60 * 60 * 1000).setHours(7, 59, 59)).getTime() : undefined;
this.getDataList(); this.getDataList();
break; break;
case 'export': case 'export':