diff --git a/frontend/src/modules/calculate/views/CalcList.vue b/frontend/src/modules/calculate/views/CalcList.vue index c54bfbe..eb57333 100644 --- a/frontend/src/modules/calculate/views/CalcList.vue +++ b/frontend/src/modules/calculate/views/CalcList.vue @@ -381,18 +381,22 @@ export default { closeDate(type) { if (type != undefined && type != null) { let initStartDate = new Date(); + let initEndDate = new Date(); initStartDate.setMonth(Number(moment(initStartDate).format('MM')) - 4) + initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 2) + + if (type == 'start') { this.disabledSDate = {to: initStartDate, from: new Date()}; if (this.startDate !== initStartDate) { - this.disabledEDate = {to: this.startDate, from: new Date()}; + this.disabledEDate = {to: this.startDate, from: initEndDate}; } } else if (type == 'end') { - this.disabledEDate = {to: initStartDate, from: new Date()}; - if (this.endDate !== new Date()) { + this.disabledEDate = {to: initStartDate, from: initEndDate}; + if (this.endDate !== initEndDate) { this.disabledSDate = {from: this.endDate}; - this.disabledSDate = {to: initStartDate, from: new Date()}; + this.disabledSDate = {to: initStartDate, from: initEndDate}; } } } @@ -483,7 +487,7 @@ export default { }, initSetEndDate() { let initEndDate = new Date(); - initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 1); + initEndDate.setMonth(Number(moment(initEndDate).format('MM')) - 2); this.endDate = initEndDate; // console.log(moment(this.endDate).format('YYYY-MM-DD')); },