Compare commits
No commits in common. "2ead8c733ff1a266fac537867085ea732e18939c" and "af298409bf264f2eabe5cb9584c412a888903779" have entirely different histories.
2ead8c733f
...
af298409bf
@ -30,7 +30,6 @@ import {
|
||||
} from '@/api/cost/costEneryAutoReport';
|
||||
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
||||
import { publicFormatter } from '@/utils/dict';
|
||||
import moment from 'moment';
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -136,23 +135,15 @@ export default {
|
||||
this.listQuery.pageSize = 10;
|
||||
this.listQuery.energyTypeId = val.energyTypeId;
|
||||
this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.startTime = val.searchTime
|
||||
? moment(val.searchTime[0]).startOf('day').format('x')
|
||||
: null;
|
||||
this.listQuery.endTime = val.searchTime
|
||||
? moment(val.searchTime[1]).endOf('day').format('x')
|
||||
: null;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
|
||||
this.getDataList();
|
||||
break;
|
||||
case 'export':
|
||||
const data = {
|
||||
energyTypeId:val.energyTypeId,
|
||||
startTime : val.searchTime
|
||||
? moment(val.searchTime[0]).startOf('day').format('x')
|
||||
: null,
|
||||
endTime : val.searchTime
|
||||
? moment(val.searchTime[1]).endOf('day').format('x')
|
||||
: null,
|
||||
startTime : val.searchTime ? val.searchTime[0] : null,
|
||||
endTime : val.searchTime ? val.searchTime[1] : null,
|
||||
}
|
||||
this.handleExport(data);
|
||||
break;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2023-08-01 13:52:10
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2024-03-21 15:59:26
|
||||
* @LastEditTime: 2024-02-19 09:36:50
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -44,7 +44,7 @@
|
||||
v-for="item in urlOptions.dictList.dict0"
|
||||
:key="item.id"
|
||||
:label="item.label"
|
||||
:value="parseInt(item.value)"></el-option>
|
||||
:value="item.value"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
@ -152,12 +152,8 @@ export default {
|
||||
case 'export':
|
||||
this.listQuery.materialId = val.materialId;
|
||||
this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.startTime = val.searchTime
|
||||
? moment(val.searchTime[0]).startOf('day').format('x')
|
||||
: null;
|
||||
this.listQuery.endTime = val.searchTime
|
||||
? moment(val.searchTime[1]).endOf('day').format('x')
|
||||
: null;
|
||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
|
||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
|
||||
this.handleExport();
|
||||
break;
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user