diff --git a/src/views/cost/energyCost/index.vue b/src/views/cost/energyCost/index.vue index a0e122aa..7d7ec099 100644 --- a/src/views/cost/energyCost/index.vue +++ b/src/views/cost/energyCost/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 = [ { @@ -135,15 +136,23 @@ 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 ? 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': const data = { energyTypeId:val.energyTypeId, - startTime : val.searchTime ? val.searchTime[0] : null, - endTime : val.searchTime ? val.searchTime[1] : null, + startTime : val.searchTime + ? moment(val.searchTime[0]).startOf('day').format('x') + : null, + endTime : val.searchTime + ? moment(val.searchTime[1]).endOf('day').format('x') + : null, } this.handleExport(data); break; diff --git a/src/views/cost/rawMaterialConfig/add-or-updata.vue b/src/views/cost/rawMaterialConfig/add-or-updata.vue index 1196e9ae..c2387006 100644 --- a/src/views/cost/rawMaterialConfig/add-or-updata.vue +++ b/src/views/cost/rawMaterialConfig/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-01 13:52:10 * @LastEditors: zwq - * @LastEditTime: 2024-02-19 09:36:50 + * @LastEditTime: 2024-03-21 15:59:26 * @Description: -->