按天月年及快捷选择

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.4.163",
+		"target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts

@@ -1,15 +1,16 @@
 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-business-classify-statistics",
   templateUrl: "./business-classify-statistics.component.html",
   styleUrls: ["./business-classify-statistics.component.less"],
 })
 export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -25,13 +26,14 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
 
   statisticsTypeId;//统计分类id
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -49,6 +51,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -105,8 +108,8 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     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,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -144,19 +147,7 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -165,8 +156,8 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -204,8 +195,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { BusinessClassifyStatisticsRoutingModule } from './business-classify-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     BusinessClassifyStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class BusinessClassifyStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts

@@ -1,16 +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 cloneDeep from 'lodash-es/cloneDeep'
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-date-business-statistics",
   templateUrl: "./date-business-statistics.component.html",
   styleUrls: ["./date-business-statistics.component.less"],
 })
 export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -25,13 +26,14 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   listLength: number = 0; //表格总数据量
   widthConfig: any[] = [];
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -49,6 +51,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +116,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
       let postData:any = {
         idx: this.pageIndex - 1,
         sum: this.pageSize,
-        startDate: this.dateRange[0] || undefined,
-        endDate: this.dateRange[1] || undefined,
+        dateType: this.customChangeDateComponent.dateType,
+        startDate: this.customChangeDateComponent.startDate || undefined,
+        endDate: this.customChangeDateComponent.endDate || undefined,
         hosId: this.getHosId,
         groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
         userId: this.fieldConfig.fields.userId || undefined,
@@ -153,19 +157,7 @@ export class DateBusinessStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -174,8 +166,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      dateType: this.customChangeDateComponent.dateType,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -213,8 +206,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.module.ts

@@ -6,6 +6,7 @@ import { DateBusinessStatisticsRoutingModule } from './date-business-statistics-
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     ShareModule,
     VirtualScrollerModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DateBusinessStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts

@@ -1,15 +1,16 @@
 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-quality-control-statistics",
   templateUrl: "./date-quality-control-statistics.component.html",
   styleUrls: ["./date-quality-control-statistics.component.less"],
 })
 export class DateQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -25,13 +26,14 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
 
   statisticsTypeId;//统计分类id
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -49,6 +51,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -105,8 +108,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      dateType: this.customChangeDateComponent.dateType,
+      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),
@@ -146,19 +150,7 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -167,8 +159,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      dateType: this.customChangeDateComponent.dateType,
+      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),
@@ -208,9 +201,10 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DateQualityControlStatisticsRoutingModule } from './date-quality-control-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     DateQualityControlStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DateQualityControlStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
 
 		<div class="searchDataItem">
 		  <span class="label">科室</span>：

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts

@@ -2,12 +2,12 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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 cloneDeep from 'lodash-es/cloneDeep'
 import { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 
 @Component({
   selector: "app-department-business-statistics",
@@ -15,6 +15,7 @@ import { ToolService } from "../../../../services/tool.service";
   styleUrls: ["./department-business-statistics.component.less"],
 })
 export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -41,13 +42,15 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-		this.getDeparts();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -65,6 +68,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -140,8 +144,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 				showParentDept: this.parent==1 ? 'true' : undefined,
 				deptId: this.deptId || undefined,
 				buildingId: this.fieldConfig.fields.buildingId || undefined,
-        startDate: this.dateRange[0] || undefined,
-        endDate: this.dateRange[1] || undefined,
+        startDate: this.customChangeDateComponent.startDate || undefined,
+        endDate: this.customChangeDateComponent.endDate || undefined,
         hosId: this.getHosId,
         groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
         userId: this.fieldConfig.fields.userId || undefined
@@ -178,19 +182,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -202,8 +194,8 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 			showParentDept: this.parent==1 ? 'true' : undefined,
 			deptId: this.deptId || undefined,
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -239,9 +231,10 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -260,12 +253,12 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
   openChangeBuilding(flag){
     flag && this.getBuildingList();
   }
-	
+
 	// 科室搜索
 	changeInp(e) {
 	  this.searchTimer(this.getDeparts, e);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -284,7 +277,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 	      this.alldepart = data.list;
 	    });
 	}
-	
+
   // 获取报修科室列表
   buildingList:any[] = [];
   getBuildingList(keyword?) {

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.module.ts

@@ -6,6 +6,7 @@ import { DepartmentBusinessStatisticsRoutingModule } from './department-business
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     ShareModule,
     VirtualScrollerModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentBusinessStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -2,17 +2,18 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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 { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-department-quality-control-statistics",
   templateUrl: "./department-quality-control-statistics.component.html",
   styleUrls: ["./department-quality-control-statistics.component.less"],
 })
 export class DepartmentQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -38,13 +39,17 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-		this.getDeparts();
-    this.search();
   }
 
+  ngOnInit() {}
+
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -62,6 +67,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -123,8 +129,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 			showParentDept: this.parent==1 ? 'true' : undefined,
 			deptId: this.deptId || undefined,
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -162,19 +168,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -186,8 +180,8 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 			showParentDept: this.parent==1 ? 'true' : undefined,
 			deptId: this.deptId || undefined,
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -225,9 +219,10 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -246,12 +241,12 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   openChangeBuilding(flag){
     flag && this.getBuildingList();
   }
-	
+
 	// 科室搜索
 	changeInp(e) {
 	  this.searchTimer(this.getDeparts, e);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -270,7 +265,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 	      this.alldepart = data.list;
 	    });
 	}
-	
+
   // 获取报修科室列表
   buildingList:any[] = [];
   getBuildingList(keyword?) {

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DepartmentQualityControlStatisticsRoutingModule } from './department-quality-control-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     DepartmentQualityControlStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentQualityControlStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">楼栋</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-distribution-department-evaluate-statistics",
   templateUrl: "./distribution-department-evaluate-statistics.component.html",
   styleUrls: ["./distribution-department-evaluate-statistics.component.less"],
 })
 export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     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,
       buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
@@ -153,19 +157,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -174,8 +166,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
@@ -214,9 +206,10 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.buildingId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DistributionDepartmentEvaluateStatisticsRoutingModule } from './distribution-department-evaluate-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     DistributionDepartmentEvaluateStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DistributionDepartmentEvaluateStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts

@@ -2,17 +2,18 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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 { ToolService } from "../../../../services/tool.service";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-distribution-department-source-statistics",
   templateUrl: "./distribution-department-source-statistics.component.html",
   styleUrls: ["./distribution-department-source-statistics.component.less"],
 })
 export class DistributionDepartmentSourceStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -38,13 +39,15 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-		this.getDeparts();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -62,6 +65,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -123,8 +127,8 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 			showParentDept: this.parent==1 ? 'true' : undefined,
 			deptId: this.deptId || undefined,
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -162,19 +166,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -186,8 +178,8 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 			showParentDept: this.parent==1 ? 'true' : undefined,
 			deptId: this.deptId || undefined,
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -225,9 +217,10 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
 		this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -235,12 +228,12 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
   changeBuildingInp(e) {
     this.searchTimer(this.getBuildingList, e);
   }
-	
+
 	// 科室搜索
 	changeInp(e) {
 	  this.searchTimer(this.getDeparts, e);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -259,7 +252,7 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 	      this.alldepart = data.list;
 	    });
 	}
-	
+
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DistributionDepartmentSourceStatisticsRoutingModule } from './distribution-department-source-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     DistributionDepartmentSourceStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DistributionDepartmentSourceStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.html

@@ -30,7 +30,7 @@
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%">人员姓名(工号)</th>
+      <th nzWidth="12%">人员(编码)</th>
       <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th nzWidth="11%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
       <th nzWidth="11%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" (nzOpenChange)="openChangeDept($event)">

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-source-statistics",
   templateUrl: "./source-statistics.component.html",
   styleUrls: ["./source-statistics.component.less"],
 })
 export class SourceStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class SourceStatisticsComponent 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,
       deptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
@@ -154,19 +158,7 @@ export class SourceStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -175,8 +167,8 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       deptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
@@ -216,9 +208,10 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { SourceStatisticsRoutingModule } from './source-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     SourceStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class SourceStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">人员</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts

@@ -2,17 +2,18 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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 cloneDeep from 'lodash-es/cloneDeep'
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-user-business-statistics",
   templateUrl: "./user-business-statistics.component.html",
   styleUrls: ["./user-business-statistics.component.less"],
 })
 export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -36,12 +37,14 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -59,6 +62,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -123,8 +127,8 @@ export class UserBusinessStatisticsComponent 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,
         buildingId: this.fieldConfig.fields.buildingId || undefined,
         groupId: this.fieldConfig.fields.groupId || undefined,
@@ -163,19 +167,7 @@ export class UserBusinessStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -184,8 +176,8 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
       groupId: this.fieldConfig.fields.groupId || undefined,
@@ -223,9 +215,10 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.module.ts

@@ -6,6 +6,7 @@ import { UserBusinessStatisticsRoutingModule } from './user-business-statistics-
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     ShareModule,
     VirtualScrollerModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class UserBusinessStatisticsModule { }

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">人员</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-user-quality-control-statistics",
   templateUrl: "./user-quality-control-statistics.component.html",
   styleUrls: ["./user-quality-control-statistics.component.less"],
 })
 export class UserQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     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,
       userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -152,19 +156,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -173,8 +165,8 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.getHosId,
       userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
@@ -212,9 +204,10 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { UserQualityControlStatisticsRoutingModule } from './user-quality-control-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { DistributionSearchMoreModule } from '../../components/distribution-sear
     UserQualityControlStatisticsRoutingModule,
     ShareModule,
     DistributionSearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class UserQualityControlStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts

@@ -1,15 +1,16 @@
 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-building-statistics",
   templateUrl: "./building-statistics.component.html",
   styleUrls: ["./building-statistics.component.less"],
 })
 export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -23,13 +24,14 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -47,6 +49,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -103,8 +106,8 @@ export class BuildingStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -142,19 +145,7 @@ export class BuildingStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -163,8 +154,8 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -202,8 +193,9 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {category123: true};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { BuildingStatisticsRoutingModule } from './building-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     BuildingStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class BuildingStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -1,15 +1,16 @@
 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-category-one-statistics",
   templateUrl: "./category-one-statistics.component.html",
   styleUrls: ["./category-one-statistics.component.less"],
 })
 export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -23,13 +24,14 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -47,6 +49,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -103,8 +106,8 @@ export class CategoryOneStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -147,19 +150,7 @@ export class CategoryOneStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -168,8 +159,8 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -212,8 +203,9 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { CategoryOneStatisticsRoutingModule } from './category-one-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     CategoryOneStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class CategoryOneStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -1,15 +1,16 @@
 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-category-source-statistics",
   templateUrl: "./category-source-statistics.component.html",
   styleUrls: ["./category-source-statistics.component.less"],
 })
 export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -23,13 +24,14 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -47,6 +49,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -103,8 +106,8 @@ export class CategorySourceStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -146,19 +149,7 @@ export class CategorySourceStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -167,8 +158,8 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -210,8 +201,9 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { CategorySourceStatisticsRoutingModule } from './category-source-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     CategorySourceStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class CategorySourceStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" nzAllowClear nzPlaceHolder="请选择一级分类" [(ngModel)]="category1Id" (nzOpenChange)="openChangeCategory1($event)" (ngModelChange)="changeCategory1($event)">
         <ng-container *ngFor="let option of category1List">

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-category-three-statistics",
   templateUrl: "./category-three-statistics.component.html",
   styleUrls: ["./category-three-statistics.component.less"],
 })
 export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -35,12 +36,13 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
-
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -58,6 +60,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -114,8 +117,8 @@ export class CategoryThreeStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -160,19 +163,7 @@ export class CategoryThreeStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -181,8 +172,8 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -227,10 +218,11 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.category1Id = undefined;
     this.category2Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { CategoryThreeStatisticsRoutingModule } from './category-three-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     CategoryThreeStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class CategoryThreeStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" nzAllowClear nzPlaceHolder="请选择一级分类" [(ngModel)]="category1Id" (nzOpenChange)="openChangeCategory1($event)">
         <ng-container *ngFor="let option of category1List">

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-category-two-statistics",
   templateUrl: "./category-two-statistics.component.html",
   styleUrls: ["./category-two-statistics.component.less"],
 })
 export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class CategoryTwoStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -159,19 +163,7 @@ export class CategoryTwoStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -180,8 +172,8 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -226,9 +218,10 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.category1Id = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { CategoryTwoStatisticsRoutingModule } from './category-two-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     CategoryTwoStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class CategoryTwoStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-consumable-statistics",
   templateUrl: "./consumable-statistics.component.html",
   styleUrls: ["./consumable-statistics.component.less"],
 })
 export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class ConsumableStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -158,19 +162,7 @@ export class ConsumableStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -179,8 +171,8 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -224,9 +216,10 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { ConsumableStatisticsRoutingModule } from './consumable-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     ConsumableStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class ConsumableStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -1,12 +1,12 @@
 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 { ToolService } from "../../../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 
 @Component({
   selector: "app-department-evaluate-statistics",
@@ -14,6 +14,7 @@ import { debounceTime } from "rxjs/operators";
   styleUrls: ["./department-evaluate-statistics.component.less"],
 })
 export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -31,20 +32,22 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 	deptTypeId;//科室类型id
 	deptId;
 	searchTimerSubject = new Subject();
-	
+
   ngOnInit() {
 		this.hospital = this.tool.getCurrentHospital().id
 		this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  let fun = v[0];
 		  fun.call(this, v[1]);
 		});
-    this.initSessionData();
-    this.getQueryParams();
-		this.getDeparts();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -62,6 +65,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -82,7 +86,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
 		this.parent = newStatistics.parent;
-		
+
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
     dutyId = dutyId ? +dutyId : undefined;
@@ -121,8 +125,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       idx: this.pageIndex - 1,
       sum: this.pageSize,
 			showParentDept: this.parent==1 ? 'true' : undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       repairDeptId: this.deptId || undefined,
@@ -166,19 +170,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -188,8 +180,8 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     }).messageId;
     let postData:any = {
 			showParentDept: this.parent==1 ? 'true' : undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -233,9 +225,10 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -244,18 +237,18 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
-	
+
 	// 科室搜索
   changeInp(e) {
     this.searchTimer(this.getDeparts, e);
   }
-	
+
 	// 边输入边搜索节流阀
 	searchTimer(fun, e) {
 	  this.isLoading = true;
 	  this.searchTimerSubject.next([fun, e]);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DepartmentEvaluateStatisticsRoutingModule } from './department-evaluate-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     DepartmentEvaluateStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentEvaluateStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
 		<div class="searchDataItem">
 		  <span class="label">科室</span>：
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -1,12 +1,12 @@
 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 { ToolService } from "../../../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 
 @Component({
   selector: "app-department-incident-statistics",
@@ -14,6 +14,7 @@ import { debounceTime } from "rxjs/operators";
   styleUrls: ["./department-incident-statistics.component.less"],
 })
 export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -31,20 +32,22 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   deptTypeId;//科室类型id
 	deptId;
 	searchTimerSubject = new Subject();
-	
+
   ngOnInit() {
 		this.hospital = this.tool.getCurrentHospital().id
 		this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
 		  let fun = v[0];
 		  fun.call(this, v[1]);
 		});
-    this.initSessionData();
-    this.getQueryParams();
-		this.getDeparts();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+		this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -62,6 +65,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -82,7 +86,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
 		this.parent = newStatistics.parent;
-		
+
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
     dutyId = dutyId ? +dutyId : undefined;
@@ -121,8 +125,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       idx: this.pageIndex - 1,
       sum: this.pageSize,
 			showParentDept: this.parent==1 ? 'true' : undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
 			repairDeptId: this.deptId || undefined,
@@ -166,19 +170,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -188,8 +180,8 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     }).messageId;
     let postData:any = {
 			showParentDept: this.parent==1 ? 'true' : undefined,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -233,9 +225,10 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -244,18 +237,18 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
-	
+
 	// 科室搜索
   changeInp(e) {
     this.searchTimer(this.getDeparts, e);
   }
-	
+
 	// 边输入边搜索节流阀
 	searchTimer(fun, e) {
 	  this.isLoading = true;
 	  this.searchTimerSubject.next([fun, e]);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -274,7 +267,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 	      this.alldepart = data.list;
 	    });
 	}
-	
+
   // 获取科室类型列表
   deptTypeList:any[] = [];
   getDeptTypeList(keyword?) {

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DepartmentIncidentStatisticsRoutingModule } from './department-incident-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     DepartmentIncidentStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentIncidentStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -1,18 +1,19 @@
 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 { ToolService } from "../../../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-department-source-statistics",
   templateUrl: "./department-source-statistics.component.html",
   styleUrls: ["./department-source-statistics.component.less"],
 })
 export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -38,13 +39,15 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 		  let fun = v[0];
 		  fun.call(this, v[1]);
 		});
-		this.initSessionData();
-		this.getQueryParams();
-		this.getDeparts();
-		this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    this.getDeparts();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -62,6 +65,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -121,8 +125,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 			idx: this.pageIndex - 1,
 			sum: this.pageSize,
 			showParentDept: this.parent==1 ? 'true' : undefined,
-			startDate: this.dateRange[0] || undefined,
-			endDate: this.dateRange[1] || undefined,
+			startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			hosId: this.hosId || undefined,
 			dutyId: this.dutyId || undefined,
 			repairDeptId: this.deptId || undefined,
@@ -166,19 +170,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -188,8 +180,8 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     }).messageId;
     let postData:any = {
 			showParentDept: this.parent==1 ? 'true' : undefined,
-			startDate: this.dateRange[0] || undefined,
-			endDate: this.dateRange[1] || undefined,
+			startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			hosId: this.hosId || undefined,
 			dutyId: this.dutyId || undefined,
 			parentDutyId: this.parentDutyId || undefined,
@@ -233,9 +225,10 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -244,18 +237,18 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   openChangeDeptType(flag){
     flag && this.getDeptTypeList();
   }
-  
+
   // 科室搜索
   changeInp(e) {
     this.searchTimer(this.getDeparts, e);
   }
-  
+
   // 边输入边搜索节流阀
   searchTimer(fun, e) {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-  
+
   // 获取所有科室
   alldepart:any;
   getDeparts(dept?) {

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DepartmentSourceStatisticsRoutingModule } from './department-source-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     DepartmentSourceStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class DepartmentSourceStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">楼栋</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-floor-statistics",
   templateUrl: "./floor-statistics.component.html",
   styleUrls: ["./floor-statistics.component.less"],
 })
 export class FloorStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class FloorStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -153,19 +157,7 @@ export class FloorStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -174,8 +166,8 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -214,9 +206,10 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.buildingId = undefined;
     this.fieldConfig.fields = {categoryId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { FloorStatisticsRoutingModule } from './floor-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     FloorStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class FloorStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts

@@ -1,15 +1,16 @@
 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-group-statistics",
   templateUrl: "./group-statistics.component.html",
   styleUrls: ["./group-statistics.component.less"],
 })
 export class GroupStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -23,13 +24,14 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  ngOnInit() {
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
-  }
+  ngOnInit() {}
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -47,6 +49,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -103,8 +106,8 @@ export class GroupStatisticsComponent 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.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -144,19 +147,7 @@ export class GroupStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -165,8 +156,8 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -206,8 +197,9 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { GroupStatisticsRoutingModule } from './group-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     GroupStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class GroupStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -117,6 +117,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      dateType: this.customChangeDateComponent.dateType,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
@@ -169,6 +170,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      dateType: this.customChangeDateComponent.dateType,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">三方公司</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择三方公司" [(ngModel)]="companyId" (nzOpenChange)="openChangeRepairDept($event)">

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-tripartite-company-statistics",
   templateUrl: "./tripartite-company-statistics.component.html",
   styleUrls: ["./tripartite-company-statistics.component.less"],
 })
 export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -33,12 +34,14 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -56,6 +59,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -113,8 +117,8 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
       idx: this.pageIndex - 1,
       sum: this.pageSize,
 			companyId: this.companyId,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -155,19 +159,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   }
 
   // 日期选择
-  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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -177,8 +169,8 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     }).messageId;
     let postData:any = {
 			companyId: this.companyId,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -219,9 +211,10 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.companyId = undefined;
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -261,7 +254,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
         this.repairDeptList = data.list;
       });
   }
-	
+
 	// 获取三方公司列表
 	companyId:any;
 	companyList:any[] = [];
@@ -285,7 +278,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 	    }
 	  });
 	}
-	
+
   // 详细搜索
   fieldConfig:any = {
     fields: {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: true},

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { TripartiteCompanyStatisticsRoutingModule } from './tripartite-company-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     TripartiteCompanyStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class TripartiteCompanyStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from '../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-work-hour-big-statistics",
   templateUrl: "./work-hour-big-statistics.component.html",
   styleUrls: ["./work-hour-big-statistics.component.less"],
 })
 export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -114,8 +118,8 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       treeLevel: 1,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -159,19 +163,7 @@ export class WorkHourBigStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -181,8 +173,8 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
     }).messageId;
     let postData:any = {
       treeLevel: 1,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -226,9 +218,10 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { WorkHourBigStatisticsRoutingModule } from './work-hour-big-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     WorkHourBigStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class WorkHourBigStatisticsModule { }

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.component.html

@@ -1,10 +1,6 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <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]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">报修科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.component.less

@@ -27,7 +27,7 @@
           font-size: 16px;
         }
         .selectItem{
-          width: 224px;
+          width: 160px;
         }
       }
     }

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.component.ts

@@ -2,16 +2,17 @@ import { TabService } from './../../services/tab.service';
 import { debounceTime } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 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-work-hour-small-statistics",
   templateUrl: "./work-hour-small-statistics.component.html",
   styleUrls: ["./work-hour-small-statistics.component.less"],
 })
 export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
@@ -34,12 +35,14 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
-    this.initSessionData();
-    this.getQueryParams();
-    this.search();
   }
 
   ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
     this.onResize();
   }
 
@@ -57,6 +60,7 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -114,8 +118,8 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       treeLevel: 2,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -160,19 +164,7 @@ export class WorkHourSmallStatisticsComponent 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')];
-    }
-  }
+  dateRange: any = [];
 
   // 导出
   excelExportLoading:any = false;
@@ -182,8 +174,8 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
     }).messageId;
     let postData:any = {
       treeLevel: 2,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
@@ -228,9 +220,10 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
     this.sortCurrentKey = "";
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
-    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.dateRange = []
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, workHourParentId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { WorkHourSmallStatisticsRoutingModule } from './work-hour-small-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     WorkHourSmallStatisticsRoutingModule,
     ShareModule,
     SearchMoreModule,
+    CustomChangeDateModule,
   ]
 })
 export class WorkHourSmallStatisticsModule { }