diff --git a/src/views/cost/energyCostHis/index.vue b/src/views/cost/energyCostHis/index.vue index 952eb8f1..ddc263dd 100644 --- a/src/views/cost/energyCostHis/index.vue +++ b/src/views/cost/energyCostHis/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costEneryAutoReport'; import { getEnergyTypeListAll } from '@/api/base/energyType'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -109,7 +110,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -147,15 +148,25 @@ export default { this.listQuery.pageSize = 10; this.listQuery.reportType = val.reportType; 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(); break; case 'export': - const data = { - reportType: val.reportType, - energyTypeId: val.energyTypeId, - reportTime: val.searchTime ? val.searchTime : null - } + const data = { + reportType: val.reportType, + energyTypeId: val.energyTypeId, + reportTime: val.searchTime + ? [ + moment(val.searchTime[0]).startOf('day').format('x'), + moment(val.searchTime[1]).endOf('day').format('x'), + ] + : null, + }; this.handleExport(data); break; default: diff --git a/src/views/cost/rawMaterialConfig/index.vue b/src/views/cost/rawMaterialConfig/index.vue index 462fa142..2b1b33ae 100644 --- a/src/views/cost/rawMaterialConfig/index.vue +++ b/src/views/cost/rawMaterialConfig/index.vue @@ -70,7 +70,7 @@ const tableProps = [ }, { prop: 'dailyUse', - label: '单日消耗量(天)吨', + label: '单日消耗量(吨)', width: 130, }, { diff --git a/src/views/cost/rawMaterialCost/index.vue b/src/views/cost/rawMaterialCost/index.vue index fdeeb275..12759f01 100644 --- a/src/views/cost/rawMaterialCost/index.vue +++ b/src/views/cost/rawMaterialCost/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costMaterialAutoReport'; import { getHotMaterialList } from '@/api/base/coreHotMaterial'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -87,7 +88,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -140,8 +141,12 @@ export default { this.listQuery.pageSize = 10; this.listQuery.materialId = val.materialId; this.listQuery.searchTime = val.searchTime ? val.searchTime[0] : null; - this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null; - this.listQuery.endTime = val.searchTime ? val.searchTime[1] : 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.getDataList(); break; case 'export': diff --git a/src/views/cost/rawMaterialCostHis/index.vue b/src/views/cost/rawMaterialCostHis/index.vue index f865cf4b..bd01a55f 100644 --- a/src/views/cost/rawMaterialCostHis/index.vue +++ b/src/views/cost/rawMaterialCostHis/index.vue @@ -30,6 +30,7 @@ import { } from '@/api/cost/costMaterialAutoReport'; import { getHotMaterialList } from '@/api/base/coreHotMaterial'; import { publicFormatter } from '@/utils/dict'; +import moment from 'moment'; const tableProps = [ { @@ -73,7 +74,7 @@ export default { return { urlOptions: { getDataListURL: getCostMaterialAutoReportPage, - exportURL: exportCostMaterialAutoReportExcel + exportURL: exportCostMaterialAutoReportExcel, }, tableData: [], tableProps, @@ -108,7 +109,7 @@ export default { label: '时间范围', dateType: 'daterange', format: 'yyyy-MM-dd', - valueFormat: 'timestamp', + valueFormat: 'yyyy-MM-dd', rangeSeparator: '-', startPlaceholder: '开始时间', endPlaceholder: '结束时间', @@ -146,13 +147,23 @@ export default { this.listQuery.pageSize = 10; this.listQuery.reportType = val.reportType; 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(); break; case 'export': this.listQuery.reportType = val.reportType; 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(); break; default: