diff --git a/src/pages/analysis/AddCustomerTable.vue b/src/pages/analysis/AddCustomerTable.vue index 2a81a04..b38f932 100644 --- a/src/pages/analysis/AddCustomerTable.vue +++ b/src/pages/analysis/AddCustomerTable.vue @@ -232,14 +232,22 @@ this.endTime = this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD HH:mm:ss"); break; case '本周': - this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + if (nowDate.startOf('week').format("YYYY-MM-DD") === this.$moment(new Date()).format("YYYY-MM-DD")){ + this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + }else{ + this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD"); + } this.selectStartTime = this.$moment(new Date()).startOf("week").format("YYYY-MM-DD 00:00:00"); this.selectEndTime = this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss"); this.startTime = this.selectStartTime; this.endTime = this.$moment(new Date()).endOf("week").format("YYYY-MM-DD HH:mm:ss"); break; case '本月': - this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + if (nowDate.startOf('month').format("YYYY-MM-DD") === this.$moment(new Date()).format("YYYY-MM-DD")){ + this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + }else{ + this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD"); + } this.selectStartTime = this.$moment(new Date()).startOf("month").format("YYYY-MM-DD 00:00:00"); this.selectEndTime = this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss"); this.startTime = this.selectStartTime; diff --git a/src/pages/analysis/ApplyCustomerTable.vue b/src/pages/analysis/ApplyCustomerTable.vue index 3c75e61..c0eaf13 100644 --- a/src/pages/analysis/ApplyCustomerTable.vue +++ b/src/pages/analysis/ApplyCustomerTable.vue @@ -35,7 +35,7 @@ 累计拓客报表 - 拓客以内门店数量 + 拓客以内门店数量 @@ -200,15 +200,21 @@ this.endTime = this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD HH:mm:ss"); break; case '本周': - this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); - this.selectStartTime = this.$moment(new Date()).startOf("week").format("YYYY-MM-DD 00:00:00"); + if (nowDate.startOf('week').format("YYYY-MM-DD") === this.$moment(new Date()).format("YYYY-MM-DD")){ + this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + }else{ + this.viewDate = nowDate.startOf('week').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD"); + } this.selectStartTime = this.$moment(new Date()).startOf("week").format("YYYY-MM-DD 00:00:00"); this.selectEndTime = this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss"); this.startTime = this.selectStartTime; this.endTime = this.$moment(new Date()).endOf("week").format("YYYY-MM-DD HH:mm:ss"); break; case '本月': - this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); - this.selectStartTime = this.$moment(new Date()).startOf("month").format("YYYY-MM-DD 00:00:00"); + if (nowDate.startOf('month').format("YYYY-MM-DD") === this.$moment(new Date()).format("YYYY-MM-DD")){ + this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).format("YYYY-MM-DD"); + }else{ + this.viewDate = nowDate.startOf('month').format("YYYY-MM-DD") + ' 至 ' + this.$moment(new Date()).add(-1, "days").format("YYYY-MM-DD"); + } this.selectStartTime = this.$moment(new Date()).startOf("month").format("YYYY-MM-DD 00:00:00"); this.selectEndTime = this.$moment(new Date()).format("YYYY-MM-DD HH:mm:ss"); this.startTime = this.selectStartTime; this.endTime = this.$moment(new Date()).endOf("month").format("YYYY-MM-DD HH:mm:ss");