diff --git a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue index 8d3f754c..9fc97cd9 100644 --- a/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue +++ b/src/views/emis/emisCustomerUser/monthlyShipmentStatQuery.vue @@ -127,6 +127,7 @@ import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue'; +import { timeFormat } from '@/utils/dateUtils'; export default { name: "MonthlyShipmentStatQuery", components: { EmpNamePicker1,EmpNamePicker2,EmpNamePicker3,elDateAdvPicker,AllMonthpayAccountPicker,CountryPicker1,CountryPicker2 }, @@ -210,18 +211,18 @@ export default { }; }, created() { - // let start = new Date() - // start.setDate(1) - // start.setHours(0, 0, 0, 0) - // let end = new Date() - // var currentMonth = end.getMonth() - // var nextMonth = ++currentMonth - // var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) - // var oneDay = 1000 * 60 * 60 * 24 - // end = new Date(nextMonthFirstDay - oneDay) - // end.setHours(23, 59, 59, 0) - // this.dateTimeRange = [timeFormat(start), timeFormat(end)] - // this.getList(); + let start = new Date() + start.setDate(1) + start.setHours(0, 0, 0, 0) + let end = new Date() + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end = new Date(nextMonthFirstDay - oneDay) + end.setHours(23, 59, 59, 0) + this.dateTimeRange = [timeFormat(start), timeFormat(end)] + this.getList(); }, methods: { initQueryParams(){