年月日组件封装

src/app/services/date.service.ts

@@ -10,6 +10,8 @@ import {
   addYears,
   endOfYear,
   endOfWeek,
+  endOfDay,
+  format,
 } from "date-fns";
 
 @Injectable({
@@ -17,10 +19,66 @@ import {
 })
 export class DateService {
   constructor() {}
+  // 获取日期快捷类型
+  getDateType(dateRange){
+    console.log('dateRange:', dateRange)
+    let [startDate, endDate] = dateRange;
+    if(startDate == format(this.date().yesterdayStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().yesterdayEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 1;
+    }else if(startDate == format(this.date().thisWeekStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisWeekEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 2;
+    }else if(startDate == format(this.date().thisMonthStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisMonthEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 3;
+    }else if(startDate == format(this.date().thisYearStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().thisYearEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 4;
+    }else if(startDate == format(this.date().lastWeekStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastWeekEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 5;
+    }else if(startDate == format(this.date().lastMonthStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastMonthEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 6;
+    }else if(startDate == format(this.date().lastYearStartDate, 'yyyy-MM-dd HH:mm:ss') && endDate == format(this.date().lastYearEndDate, 'yyyy-MM-dd HH:mm:ss')){
+      return 7;
+    }
+  }
   /**
    * 日期操作
    */
   date() {
+    //获得昨日的开始日期(昨日 00:00:00)
+    function getYesterdayStartDate() {
+      return addDays(startOfDay(new Date()), -1);
+    }
+    //获得昨日的结束日期(昨日 23:59:59)
+    function getYesterdayEndDate() {
+      return addDays(endOfDay(new Date()), -1);
+    }
+
+    //获得本周的开始日期(本周一 00:00:00)
+    function getThisWeekStartDate() {
+      return startOfWeek(new Date());
+    }
+    //获得本周的结束日期(本周日 23:59:59)
+    function getThisWeekEndDate() {
+      return endOfWeek(new Date());
+    }
+
+    //获得本月开始时间(本月1号 00：00：00)
+    function getThisMonthStartDate() {
+      return startOfMonth(new Date());
+    }
+    //获得本月结束时间(本月底 23:59:59)
+    function getThisMonthEndDate() {
+      return endOfMonth(new Date());
+    }
+
+    //获得本年的开始日期(本年1月1日 00：00：00)
+    function getThisYearStartDate() {
+      return startOfYear(new Date());
+    }
+    //获得本年的结束日期(本年12月31日 23:59:59)
+    function getThisYearEndDate() {
+      return endOfYear(new Date());
+    }
+
     //获得上周的开始日期(上周一 00:00:00)
     function getLastWeekStartDate() {
       return addDays(startOfWeek(new Date()), -6);
@@ -29,6 +87,7 @@ export class DateService {
     function getLastWeekEndDate() {
       return addDays(endOfWeek(new Date()), -6);
     }
+
     //获得上月开始时间(上月1号 00：00：00)
     function getLastMonthStartDate() {
       return startOfMonth(addMonths(new Date(), -1));
@@ -37,6 +96,7 @@ export class DateService {
     function getLastMonthEndDate() {
       return endOfMonth(addMonths(new Date(), -1));
     }
+
     //获得上年的开始日期(去年1月1日 00：00：00)
     function getLastYearStartDate() {
       return startOfYear(addYears(new Date(), -1));
@@ -45,7 +105,16 @@ export class DateService {
     function getLastYearEndDate() {
       return endOfYear(addYears(new Date(), -1));
     }
+
     return {
+      yesterdayStartDate: getYesterdayStartDate(),
+      yesterdayEndDate: getYesterdayEndDate(),
+      thisWeekStartDate: getThisWeekStartDate(),
+      thisWeekEndDate: getThisWeekEndDate(),
+      thisMonthStartDate: getThisMonthStartDate(),
+      thisMonthEndDate: getThisMonthEndDate(),
+      thisYearStartDate: getThisYearStartDate(),
+      thisYearEndDate: getThisYearEndDate(),
       lastWeekStartDate: getLastWeekStartDate(),
       lastWeekEndDate: getLastWeekEndDate(),
       lastMonthStartDate: getLastMonthStartDate(),

src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.html

@@ -1,33 +1,33 @@
 <div class="customChangeDate">
-  <div class="searchDataItem">
+  <div class="searchDataItem" *ngIf="isShowType">
     <nz-radio-group [(ngModel)]="dateType" (ngModelChange)="changeDateType($event)">
       <label *ngFor="let data of dateTypes" nz-radio-button [nzValue]="data.value">{{data.label}}</label>
     </nz-radio-group>
   </div>
   <div class="searchDataItem">
     <span class="label">建单时间</span>：
-    <nz-range-picker *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
+    <nz-range-picker [ngStyle]="{width: '260px'}" [nzAllowClear]="false" *ngIf="dateType=='day'" [(ngModel)]="dateRange" [nzAllowClear]='false'
       [nzDisabledDate]="disabledDate" (ngModelChange)="changeDate($event)">
     </nz-range-picker>
-    <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
+    <nz-month-picker [ngStyle]="{width: '121px'}" [nzAllowClear]="false" *ngIf="dateType=='month'" [(ngModel)]="monthRangeStart" [nzDisabledDate]="disabledMonthStart"
       (ngModelChange)="changeMonthStart($event)" nzPlaceHolder="请选择开始月份">
     </nz-month-picker>
     <span *ngIf="dateType=='month'"> ~ </span>
-    <nz-month-picker *ngIf="dateType=='month'" [(ngModel)]="monthRangeEnd" [nzDisabledDate]="disabledMonthEnd"
+    <nz-month-picker [ngStyle]="{width: '121px'}" [nzAllowClear]="false" *ngIf="dateType=='month'" [(ngModel)]="monthRangeEnd" [nzDisabledDate]="disabledMonthEnd"
       (ngModelChange)="changeMonthEnd($event)" nzPlaceHolder="请选择截止月份">
     </nz-month-picker>
-    <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeStart" [nzDisabledDate]="disabledYearStart"
+    <nz-year-picker [ngStyle]="{width: '121px'}" [nzAllowClear]="false" *ngIf="dateType=='year'" [(ngModel)]="yearRangeStart" [nzDisabledDate]="disabledYearStart"
       (ngModelChange)="changeYearStart($event)" nzPlaceHolder="请选择开始年份">
     </nz-year-picker>
     <span *ngIf="dateType=='year'"> ~ </span>
-    <nz-year-picker *ngIf="dateType=='year'" [(ngModel)]="yearRangeEnd" (ngModelChange)="changeYearEnd($event)"
+    <nz-year-picker [ngStyle]="{width: '121px'}" [nzAllowClear]="false" *ngIf="dateType=='year'" [(ngModel)]="yearRangeEnd" (ngModelChange)="changeYearEnd($event)"
       [nzDisabledDate]="disabledYearEnd" nzPlaceHolder="请选择截止年份">
     </nz-year-picker>
   </div>
   <div class="searchDataItem ml8">
     <nz-select class="formItem" [ngStyle]="{width: '92px'}" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false"
-      nzPlaceHolder="请选择时间" [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
-      <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
+      nzPlaceHolder="请选择" [(ngModel)]="defRange" (ngModelChange)="changeDateRange($event)">
+      <nz-option [nzLabel]="data.label" [nzValue]="data.id" *ngFor="let data of defRanges"></nz-option>
     </nz-select>
   </div>
 </div>

src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.less

@@ -4,7 +4,7 @@
   margin-right: 24px;
   .searchDataItem{
     margin-left: 16px;
-    &:last-of-type{
+    &:first-of-type{
       margin-left: 0;
     }
     .label{

src/app/views/new-statistics/components/custom-change-date/custom-change-date.component.ts

@@ -9,8 +9,8 @@ import { DateService } from 'src/app/services/date.service';
   styleUrls: ['./custom-change-date.component.less']
 })
 export class CustomChangeDateComponent implements OnInit {
-  @Output() customChangeDateEmit = new EventEmitter();
-  @Input() queryType: number;
+  // @Output() customChangeDateEmit = new EventEmitter();
+  @Input() isShowType: boolean = true;
   constructor(
     private dateService: DateService,
   ) { }
@@ -30,20 +30,36 @@ export class CustomChangeDateComponent implements OnInit {
       value: "year",
     },
   ]; //时间维度
-  defRange = "1"; //默认上周
+  defRange = 6; //默认上月
   defRanges = [
     {
-      label: "上周",
+      label: "昨日",
       id: 1,
     },
     {
-      label: "上月",
+      label: "本周",
       id: 2,
     },
     {
-      label: "上年",
+      label: "本月",
       id: 3,
     },
+    {
+      label: "本年",
+      id: 4,
+    },
+    {
+      label: "上周",
+      id: 5,
+    },
+    {
+      label: "上月",
+      id: 6,
+    },
+    {
+      label: "上年",
+      id: 7,
+    },
   ]; //时间默认区间
 
   dateRange: any = []; //发起时间区间 天
@@ -52,9 +68,27 @@ export class CustomChangeDateComponent implements OnInit {
   yearRangeStart: any; //发起时间 年 起
   yearRangeEnd: any; //发起时间 年 止
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.dateType = 'day';
+    this.defRange = 6;
+    this.changeDateRange(this.defRange);
+  }
 
-  // this.customChangeDateEmit.emit({queryType, hospital, duty, parent});
+  // 根据时间区间重置
+  reset(dateRange:any[]){
+    this.dateType = 'day';
+    if(
+      this.dateService.getDateType(dateRange) == 1 ||
+      this.dateService.getDateType(dateRange) == 2 ||
+      this.dateService.getDateType(dateRange) == 3 ||
+      this.dateService.getDateType(dateRange) == 5 ||
+      this.dateService.getDateType(dateRange) == 6 ||
+      this.dateService.getDateType(dateRange) == 7
+    ){
+      this.defRange = this.dateService.getDateType(dateRange);
+    }
+    this.changeDateRange(this.defRange);
+  }
 
   // 修改时间展示维度
   changeDateType(res) {
@@ -64,44 +98,64 @@ export class CustomChangeDateComponent implements OnInit {
       case "day":
         this.defRanges = [
           {
-            label: "上周",
+            label: "昨日",
             id: 1,
           },
           {
-            label: "上月",
+            label: "本周",
             id: 2,
           },
           {
-            label: "上年",
+            label: "本月",
             id: 3,
           },
+          {
+            label: "上周",
+            id: 5,
+          },
+          {
+            label: "上月",
+            id: 6,
+          },
+          {
+            label: "上年",
+            id: 7,
+          },
         ]; //时间默认区间
-        this.defRange = "1"; //默认上周
-        this.changeDateRange("1");
+        this.defRange = this.defRanges[0].id;
+        this.changeDateRange(this.defRanges[0].id);
         break;
       case "month":
         this.defRanges = [
           {
+            label: "本月",
+            id: 3,
+          },
+          {
             label: "上月",
-            id: 2,
+            id: 6,
           },
           {
             label: "上年",
-            id: 3,
+            id: 7,
           },
         ]; //时间默认区间
-        this.defRange = "2"; //上月
-        this.changeDateRange("2");
+        this.defRange = this.defRanges[0].id;
+        this.changeDateRange(this.defRanges[0].id);
         break;
       case "year":
         this.defRanges = [
           {
+            label: "本年",
+            id: 4,
+          },
+          {
             label: "上年",
-            id: 3,
+            id: 7,
           },
         ]; //时间默认区间
-        this.defRange = "3"; //默认上周
-        this.changeDateRange("3");
+        this.defRange = this.defRanges[0].id;
+        this.changeDateRange(this.defRanges[0].id);
         break;
     }
   }
@@ -109,7 +163,7 @@ export class CustomChangeDateComponent implements OnInit {
   // 禁选日期
   disabledDate = (current: Date): boolean => {
     // Can not select days before today and today
-    return differenceInCalendarDays(current, this.today) > 0;
+    return false;
   };
 
   // 禁选月份开始
@@ -122,9 +176,8 @@ export class CustomChangeDateComponent implements OnInit {
   // 禁选月份结束
   disabledMonthEnd = (current: Date): boolean => {
     // Can not select days before today and today
-    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
     let staEnd = differenceInCalendarDays(this.monthRangeStart, current) > 0;
-    return cur || staEnd;
+    return staEnd;
   };
 
   // 禁选年份开始
@@ -138,17 +191,14 @@ export class CustomChangeDateComponent implements OnInit {
   // 禁选年份结束
   disabledYearEnd = (current: Date): boolean => {
     // Can not select days before today and today
-    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
     let staEnd = differenceInCalendarDays(this.yearRangeStart, current) > 0;
-    return cur || staEnd;
+    return staEnd;
   };
 
   // 日期选择 日
   startDate: string; //发起时间开始
   endDate: string; //发起时间结束
-  changeDate(result?): void {
-    console.log(this.dateRange);
-    console.log(result);
+  changeDate(result): void {
     this.dateRange = result;
     if (!this.quick) {
       // 不是快捷选择
@@ -158,22 +208,12 @@ export class CustomChangeDateComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate =
-      result[0].getFullYear() +
-      "-" +
-      (result[0].getMonth() + 1) +
-      "-" +
-      result[0].getDate();
-    this.endDate =
-      result[1].getFullYear() +
-      "-" +
-      (result[1].getMonth() + 1) +
-      "-" +
-      result[1].getDate();
+    this.startDate = format(startOfDay(result[0]), "yyyy-MM-dd HH:mm:ss");
+    this.endDate = format(endOfDay(result[1]), "yyyy-MM-dd HH:mm:ss");
   }
 
   // 月份选择
-  changeMonthStart(result?) {
+  changeMonthStart(result) {
     console.log(result);
     this.monthRangeStart = result;
     if (!this.quick) {
@@ -184,9 +224,9 @@ export class CustomChangeDateComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd');
+    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
   }
-  changeMonthEnd(result?) {
+  changeMonthEnd(result) {
     console.log(result);
     this.monthRangeEnd = result;
     if (!this.quick) {
@@ -197,10 +237,10 @@ export class CustomChangeDateComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd');
+    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
   }
   // 年份选择
-  changeYearStart(result?) {
+  changeYearStart(result) {
     console.log(result);
     this.yearRangeStart = result;
     if (!this.quick) {
@@ -211,10 +251,9 @@ export class CustomChangeDateComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate = format(startOfYear(result), 'yyyy-MM-dd');
-    // this.endDate = result.getFullYear() + '-01-01';
+    this.startDate = format(startOfYear(result), 'yyyy-MM-dd HH:mm:ss');
   }
-  changeYearEnd(result?) {
+  changeYearEnd(result) {
     console.log(result);
     this.yearRangeEnd = result;
     if (!this.quick) {
@@ -225,7 +264,7 @@ export class CustomChangeDateComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.endDate = format(endOfYear(result), 'yyyy-MM-dd');
+    this.endDate = format(endOfYear(result), 'yyyy-MM-dd HH:mm:ss');
   }
 
   // 日期选择 快速修改时间区间
@@ -235,14 +274,48 @@ export class CustomChangeDateComponent implements OnInit {
     console.log(res);
     this.quick = true;
     switch (res) {
-      case "1":
+      case 1:
+        // 昨日
+        let yesterdaystartdate = this.dateService.date().yesterdayStartDate;
+        let yesterdayenddate = this.dateService.date().yesterdayEndDate;
+        console.log(yesterdaystartdate, yesterdayenddate);
+        this.changeDate([yesterdaystartdate, yesterdayenddate]);
+        break;
+      case 2:
+        // 本周
+        let thisweekstartdate = this.dateService.date().thisWeekStartDate;
+        let thisweekenddate = this.dateService.date().thisWeekEndDate;
+        console.log(thisweekstartdate, thisweekenddate);
+        this.changeDate([thisweekstartdate, thisweekenddate]);
+        break;
+      case 3:
+        // 本月
+        let thismonthstartdate = this.dateService.date().thisMonthStartDate;
+        let thismonthenddate = this.dateService.date().thisMonthEndDate;
+        console.log(thismonthstartdate, thismonthenddate);
+        this.changeDate([thismonthstartdate, thismonthenddate]);
+        this.changeMonthStart(thismonthstartdate);
+        this.changeMonthEnd(thismonthenddate);
+        break;
+      case 4:
+        // 本年
+        let thisyearstartdate = this.dateService.date().thisYearStartDate;
+        let thisyearenddate = this.dateService.date().thisYearEndDate;
+        console.log(thisyearstartdate, thisyearenddate);
+        this.changeDate([thisyearstartdate, thisyearenddate]);
+        this.changeMonthStart(thisyearstartdate);
+        this.changeMonthEnd(thisyearenddate);
+        this.changeYearStart(thisyearstartdate);
+        this.changeYearEnd(thisyearenddate);
+        break;
+      case 5:
         // 上周
         let lastweekstartdate = this.dateService.date().lastWeekStartDate;
         let lastweekenddate = this.dateService.date().lastWeekEndDate;
         console.log(lastweekstartdate, lastweekenddate);
         this.changeDate([lastweekstartdate, lastweekenddate]);
         break;
-      case "2":
+      case 6:
         // 上月
         let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
         let lastmonthenddate = this.dateService.date().lastMonthEndDate;
@@ -251,7 +324,7 @@ export class CustomChangeDateComponent implements OnInit {
         this.changeMonthStart(lastmonthstartdate);
         this.changeMonthEnd(lastmonthenddate);
         break;
-      case "3":
+      case 7:
         // 上年
         let lastyearstartdate = this.dateService.date().lastYearStartDate;
         let lastyearenddate = this.dateService.date().lastYearEndDate;

src/app/views/new-statistics/phone-statistics/date-phone-statistics/date-phone-statistics.component.html

@@ -1,11 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <app-custom-change-date (customChangeDateEmit)="customChangeDateEmit($event)"></app-custom-change-date>
-    <!-- <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div> -->
+    <app-custom-change-date #customChangeDate [isShowType]="true"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">统计分类</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">

src/app/views/new-statistics/phone-statistics/date-phone-statistics/date-phone-statistics.component.ts

@@ -1,15 +1,17 @@
 import { TabService } from './../../services/tab.service';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
-import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { ActivatedRoute } from '@angular/router';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-date-phone-statistics",
   templateUrl: "./date-phone-statistics.component.html",
   styleUrls: ["./date-phone-statistics.component.less"],
 })
 export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -25,13 +27,14 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
 
   statisticsTypeId;//统计分类id
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -44,13 +47,12 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
     }, 0)
   }
 
-  customChangeDateEmit(){}
-
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.reset(this.dateRange);
     }
   }
 
@@ -107,8 +109,8 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       statisticsTypeId: this.statisticsTypeId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
@@ -149,18 +151,6 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
 
   // 日期选择
   dateRange: any = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
-  changeDate(result?): void {
-    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
-    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
-    this.dateRange = result;
-  }
-
-  onCalendarChangeDate(dateArr){
-    console.log(dateArr)
-    if(dateArr.length == 2){
-      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
-    }
-  }
 
   // 导出
   excelExportLoading:any = false;
@@ -213,6 +203,7 @@ export class DatePhoneStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
+    this.customChangeDateComponent.reset(this.dateRange);
     this.search();
   }