diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue index 68deb4a4..e6b86864 100644 --- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue +++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue @@ -423,12 +423,14 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue index b2272595..0011da94 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue @@ -394,12 +394,13 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue index e0405a11..4e60936c 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue @@ -339,12 +339,14 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue index 5b76c3b8..2d9099d4 100644 --- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue @@ -360,12 +360,15 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + + this.dateTimeRange=[timeFormat(start), timeFormat(end)] diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue index 30d6b8e9..70361ec0 100644 --- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue @@ -362,12 +362,14 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index 7c67d045..56ce17c9 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -396,12 +396,15 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) + var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue index d9369d18..d39dfd24 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue @@ -388,12 +388,15 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) + var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue index 7eca9aa3..86399d34 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue @@ -862,7 +862,10 @@ export default { var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] } diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue index 06732f96..d121f78e 100644 --- a/src/views/emis/emisTmsSiteBatchMiss/index.vue +++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue @@ -283,12 +283,14 @@ export default { start.setHours(0,0,0,0) let end = new Date() - end.setHours(23,59,59,0) var currentMonth = end.getMonth() var nextMonth = ++currentMonth var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 - end=Date(nextMonthFirstDay - oneDay) + + end=new Date(nextMonthFirstDay - oneDay) + end.setHours(23,59,59,0) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList();