修改成本bug
This commit is contained in:
parent
e039a3992d
commit
20f5a0d4c7
@ -30,6 +30,7 @@ import {
|
|||||||
} from '@/api/cost/costEneryAutoReport';
|
} from '@/api/cost/costEneryAutoReport';
|
||||||
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
import { getEnergyTypeListAll } from '@/api/base/energyType';
|
||||||
import { publicFormatter } from '@/utils/dict';
|
import { publicFormatter } from '@/utils/dict';
|
||||||
|
import moment from 'moment';
|
||||||
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
@ -109,7 +110,7 @@ export default {
|
|||||||
label: '时间范围',
|
label: '时间范围',
|
||||||
dateType: 'daterange',
|
dateType: 'daterange',
|
||||||
format: 'yyyy-MM-dd',
|
format: 'yyyy-MM-dd',
|
||||||
valueFormat: 'timestamp',
|
valueFormat: 'yyyy-MM-dd',
|
||||||
rangeSeparator: '-',
|
rangeSeparator: '-',
|
||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
@ -147,15 +148,25 @@ export default {
|
|||||||
this.listQuery.pageSize = 10;
|
this.listQuery.pageSize = 10;
|
||||||
this.listQuery.reportType = val.reportType;
|
this.listQuery.reportType = val.reportType;
|
||||||
this.listQuery.energyTypeId = val.energyTypeId;
|
this.listQuery.energyTypeId = val.energyTypeId;
|
||||||
this.listQuery.reportTime = val.searchTime ? val.searchTime : null;
|
this.listQuery.reportTime = val.searchTime
|
||||||
|
? [
|
||||||
|
moment(val.searchTime[0]).startOf('day').format('x'),
|
||||||
|
moment(val.searchTime[1]).endOf('day').format('x'),
|
||||||
|
]
|
||||||
|
: null;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
case 'export':
|
case 'export':
|
||||||
const data = {
|
const data = {
|
||||||
reportType: val.reportType,
|
reportType: val.reportType,
|
||||||
energyTypeId: val.energyTypeId,
|
energyTypeId: val.energyTypeId,
|
||||||
reportTime: val.searchTime ? val.searchTime : null
|
reportTime: val.searchTime
|
||||||
}
|
? [
|
||||||
|
moment(val.searchTime[0]).startOf('day').format('x'),
|
||||||
|
moment(val.searchTime[1]).endOf('day').format('x'),
|
||||||
|
]
|
||||||
|
: null,
|
||||||
|
};
|
||||||
this.handleExport(data);
|
this.handleExport(data);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -70,7 +70,7 @@ const tableProps = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
prop: 'dailyUse',
|
prop: 'dailyUse',
|
||||||
label: '单日消耗量(天)吨',
|
label: '单日消耗量(吨)',
|
||||||
width: 130,
|
width: 130,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -30,6 +30,7 @@ import {
|
|||||||
} from '@/api/cost/costMaterialAutoReport';
|
} from '@/api/cost/costMaterialAutoReport';
|
||||||
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
||||||
import { publicFormatter } from '@/utils/dict';
|
import { publicFormatter } from '@/utils/dict';
|
||||||
|
import moment from 'moment';
|
||||||
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
@ -87,7 +88,7 @@ export default {
|
|||||||
label: '时间范围',
|
label: '时间范围',
|
||||||
dateType: 'daterange',
|
dateType: 'daterange',
|
||||||
format: 'yyyy-MM-dd',
|
format: 'yyyy-MM-dd',
|
||||||
valueFormat: 'timestamp',
|
valueFormat: 'yyyy-MM-dd',
|
||||||
rangeSeparator: '-',
|
rangeSeparator: '-',
|
||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
@ -140,8 +141,12 @@ export default {
|
|||||||
this.listQuery.pageSize = 10;
|
this.listQuery.pageSize = 10;
|
||||||
this.listQuery.materialId = val.materialId;
|
this.listQuery.materialId = val.materialId;
|
||||||
this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
|
this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null;
|
||||||
this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
|
this.listQuery.startTime = val.searchTime
|
||||||
this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
|
? moment(val.searchTime[0]).startOf('day').format('x')
|
||||||
|
: null;
|
||||||
|
this.listQuery.endTime = val.searchTime
|
||||||
|
? moment(val.searchTime[1]).endOf('day').format('x')
|
||||||
|
: null;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
case 'export':
|
case 'export':
|
||||||
|
@ -30,6 +30,7 @@ import {
|
|||||||
} from '@/api/cost/costMaterialAutoReport';
|
} from '@/api/cost/costMaterialAutoReport';
|
||||||
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
import { getHotMaterialList } from '@/api/base/coreHotMaterial';
|
||||||
import { publicFormatter } from '@/utils/dict';
|
import { publicFormatter } from '@/utils/dict';
|
||||||
|
import moment from 'moment';
|
||||||
|
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
{
|
{
|
||||||
@ -73,7 +74,7 @@ export default {
|
|||||||
return {
|
return {
|
||||||
urlOptions: {
|
urlOptions: {
|
||||||
getDataListURL: getCostMaterialAutoReportPage,
|
getDataListURL: getCostMaterialAutoReportPage,
|
||||||
exportURL: exportCostMaterialAutoReportExcel
|
exportURL: exportCostMaterialAutoReportExcel,
|
||||||
},
|
},
|
||||||
tableData: [],
|
tableData: [],
|
||||||
tableProps,
|
tableProps,
|
||||||
@ -108,7 +109,7 @@ export default {
|
|||||||
label: '时间范围',
|
label: '时间范围',
|
||||||
dateType: 'daterange',
|
dateType: 'daterange',
|
||||||
format: 'yyyy-MM-dd',
|
format: 'yyyy-MM-dd',
|
||||||
valueFormat: 'timestamp',
|
valueFormat: 'yyyy-MM-dd',
|
||||||
rangeSeparator: '-',
|
rangeSeparator: '-',
|
||||||
startPlaceholder: '开始时间',
|
startPlaceholder: '开始时间',
|
||||||
endPlaceholder: '结束时间',
|
endPlaceholder: '结束时间',
|
||||||
@ -146,13 +147,23 @@ export default {
|
|||||||
this.listQuery.pageSize = 10;
|
this.listQuery.pageSize = 10;
|
||||||
this.listQuery.reportType = val.reportType;
|
this.listQuery.reportType = val.reportType;
|
||||||
this.listQuery.materialId = val.materialId;
|
this.listQuery.materialId = val.materialId;
|
||||||
this.listQuery.times = val.searchTime ? val.searchTime : null;
|
this.listQuery.times = val.searchTime
|
||||||
|
? [
|
||||||
|
moment(val.searchTime[0]).startOf('day').format('x'),
|
||||||
|
moment(val.searchTime[1]).endOf('day').format('x'),
|
||||||
|
]
|
||||||
|
: null;
|
||||||
this.getDataList();
|
this.getDataList();
|
||||||
break;
|
break;
|
||||||
case 'export':
|
case 'export':
|
||||||
this.listQuery.reportType = val.reportType;
|
this.listQuery.reportType = val.reportType;
|
||||||
this.listQuery.materialId = val.materialId;
|
this.listQuery.materialId = val.materialId;
|
||||||
this.listQuery.times = val.searchTime ? val.searchTime : null;
|
this.listQuery.times = val.searchTime
|
||||||
|
? [
|
||||||
|
moment(val.searchTime[0]).startOf('day').format('x'),
|
||||||
|
moment(val.searchTime[1]).endOf('day').format('x'),
|
||||||
|
]
|
||||||
|
: null;
|
||||||
this.handleExport();
|
this.handleExport();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Loading…
Reference in New Issue
Block a user