Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc into maotao

src/app/services/date.service.ts

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

src/app/views/fuwutai/fuwutai.component.html

@@ -118,7 +118,7 @@
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($event, data.data.id)"></label></span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -315,7 +315,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -500,7 +500,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -787,7 +787,7 @@
       </div>
       <div class="fixedMenu">
         <div class="menuItems">
-          <div class="others" [ngStyle]="{ height: showLastItems ? mainRole ? 35 * 6 + 'px' : 35 * 5 + 'px' : 0 }">
+          <div class="others" [ngStyle]="{ height: showLastItems ? mainRole ? 35 * 5 + 'px' : 35 * 4 + 'px' : 0 }">
             <div [ngClass]="{ item: true, checked: fixedTab == 'orderScope' }" (click)="showOrderScope()">
               工单范围
             </div>
@@ -797,9 +797,9 @@
             <div [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }" (click)="checkFixedTab('nucleicAcidPrinting')" *ngIf="isShowNucleicAcidPrinting">
               核酸打印
             </div>
-            <div [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }" (click)="checkFixedTab('queueNum')">
+            <!-- <div [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }" (click)="checkFixedTab('queueNum')">
               叫号信息
-            </div>
+            </div> -->
             <div [ngClass]="{ item: true, checked: fixedTab == 'toSystem' }" *ngIf="mainRole" (click)="checkFixedTab('toSystem')">
               返回系统
             </div>
@@ -1097,7 +1097,7 @@
                               <nz-form-control class="control" [nzSpan]="16" nzErrorTip="请选择患者信息！">
                                 <nz-select style="width: 160px" formControlName="patient" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchPatientList(radioValueZy == deathTasktypeId && endDeptZy !== null ? endDeptZy : applyDept, $event)" nzAllowClear nzPlaceHolder="请选择患者信息" [(ngModel)]="patientZy" (ngModelChange)="selectPatientZy($event)">
                                   <ng-container *ngFor="let option of patientList">
-                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum || '') + '床 ' + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
+                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="(option.bednum ? option.bednum + '床 ' : '') + (option.patientname || '') + ' ' + (option.residenceNo || '')" [nzValue]="option.patientCode"></nz-option>
                                   </ng-container>
                                   <nz-option *ngIf="isLoadingPatient" nzDisabled nzCustomContent>
                                     <i nz-icon nzType="loading" class="loading-icon"></i>

src/app/views/fuwutai/fuwutai.component.ts

@@ -2745,9 +2745,9 @@ export class FuwutaiComponent implements OnInit {
       this.isLoadingPatient = false;
       if (result["state"] == 200) {
         this.patientList = result["data"];
-        if (this.patientList.length) {
-          this.patientList = this.patientList.filter((item) => !!item.bednum);
-        }
+        // if (this.patientList.length) {
+        //   this.patientList = this.patientList.filter((item) => !!item.bednum);
+        // }
       }
     });
   }
@@ -3619,7 +3619,7 @@ export class FuwutaiComponent implements OnInit {
     this.endDeptZy = null;
     this.patientZy = null;
     this.goodsNow = [];
-    this.patientList = [];
+    // this.patientList = [];
     this.workOrderRemark = "";
     this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
@@ -3738,12 +3738,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-		
+
 		if(!this.incidentModel.source){
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3799,7 +3799,7 @@ export class FuwutaiComponent implements OnInit {
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;
@@ -3986,12 +3986,12 @@ export class FuwutaiComponent implements OnInit {
       this.msg.warning('请选择优先级!');
       return;
     }
-		
+
 		if(!this.incidentModel.source){
 		  this.msg.warning('请选择事件来源!');
 		  return;
 		}
-		
+
     if(!this.incidentModel.description){
       this.msg.warning('请选择故障描述!');
       return;

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1331,7 +1331,7 @@
                         <div class="info">
                           <div class="row" nz-row>
                             <div nz-col nzSpan="12" class="col txtL">
-                              {{ item.isHalfInspect === 1 ? "半程陪检" : item.taskType.taskName }}
+                              {{ item.taskType.taskName }}
                               <ng-container *ngIf="item.taskType.associationType.value == 'drugsBag' && item.drugs">
                                 ({{ item.drugs.packid }})
                               </ng-container>

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

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

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

@@ -0,0 +1,15 @@
+.customChangeDate{
+  display: flex;
+  align-items: center;
+  margin-right: 24px;
+  .searchDataItem{
+    margin-left: 16px;
+    &:first-of-type{
+      margin-left: 0;
+    }
+    .label{
+      font-size: 16px;
+    }
+  }
+}
+

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

@@ -0,0 +1,341 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { differenceInCalendarDays, endOfMonth, endOfYear, startOfDay, format, endOfDay, startOfMonth, startOfYear } from "date-fns";
+import { DateService } from 'src/app/services/date.service';
+
+@Component({
+  selector: 'app-custom-change-date',
+  templateUrl: './custom-change-date.component.html',
+  styleUrls: ['./custom-change-date.component.less']
+})
+export class CustomChangeDateComponent implements OnInit {
+  @Input() isShowType: boolean = true;
+  @Input() name: string = '建单时间';
+  constructor(
+    private dateService: DateService,
+  ) { }
+
+  dateType: string = "day"; //选中时间维度
+  dateTypes: any = [
+    {
+      label: "按天",
+      value: "day",
+    },
+    {
+      label: "按月",
+      value: "month",
+    },
+    {
+      label: "按年",
+      value: "year",
+    },
+  ]; //时间维度
+  defRange = 6; //默认上月
+  defRanges = [
+    {
+      label: "昨日",
+      id: 1,
+    },
+    {
+      label: "本周",
+      id: 2,
+    },
+    {
+      label: "本月",
+      id: 3,
+    },
+    {
+      label: "本年",
+      id: 4,
+    },
+    {
+      label: "上周",
+      id: 5,
+    },
+    {
+      label: "上月",
+      id: 6,
+    },
+    {
+      label: "上年",
+      id: 7,
+    },
+  ]; //时间默认区间
+
+  dateRange: any = []; //发起时间区间 天
+  monthRangeStart: any; //发起时间 月 起
+  monthRangeEnd: any; //发起时间 月 止
+  yearRangeStart: any; //发起时间 年 起
+  yearRangeEnd: any; //发起时间 年 止
+
+  ngOnInit() {
+    this.resetByDate();
+  }
+
+  // 根据时间区间重置
+  resetByDate(){
+    this.dateType = 'day';
+    this.changeDateType(this.dateType, 6);
+  }
+
+  // 根据时间区间初始化
+  initByDate(dateRange:any[]){
+    setTimeout(() => {
+      this.dateType = 'day';
+      this.dateRange = dateRange;
+      this.changeDateType(this.dateType, null);
+    }, 0)
+  }
+
+  // 修改时间展示维度
+  changeDateType(res, defRange) {
+    console.log(res, this.dateType);
+    this.dateType = res;
+    switch (res) {
+      case "day":
+        this.defRanges = [
+          {
+            label: "昨日",
+            id: 1,
+          },
+          {
+            label: "本周",
+            id: 2,
+          },
+          {
+            label: "本月",
+            id: 3,
+          },
+          {
+            label: "上周",
+            id: 5,
+          },
+          {
+            label: "上月",
+            id: 6,
+          },
+          {
+            label: "上年",
+            id: 7,
+          },
+        ]; //时间默认区间
+        this.defRange = defRange === undefined ? this.defRanges[0].id : defRange;
+        this.changeDateRange(defRange === undefined ? this.defRanges[0].id : defRange);
+        break;
+      case "month":
+        this.defRanges = [
+          {
+            label: "本月",
+            id: 3,
+          },
+          {
+            label: "上月",
+            id: 6,
+          },
+          {
+            label: "上年",
+            id: 7,
+          },
+        ]; //时间默认区间
+        this.defRange = defRange === undefined ? this.defRanges[0].id : defRange;
+        this.changeDateRange(defRange === undefined ? this.defRanges[0].id : defRange);
+        break;
+      case "year":
+        this.defRanges = [
+          {
+            label: "本年",
+            id: 4,
+          },
+          {
+            label: "上年",
+            id: 7,
+          },
+        ]; //时间默认区间
+        this.defRange = defRange === undefined ? this.defRanges[0].id : defRange;
+        this.changeDateRange(defRange === undefined ? this.defRanges[0].id : defRange);
+        break;
+    }
+  }
+
+  // 禁选日期
+  disabledDate = (current: Date): boolean => {
+    // Can not select days before today and today
+    return false;
+  };
+
+  // 禁选月份开始
+  disabledMonthStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfMonth(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.monthRangeEnd) > 0;
+    return cur || staEnd;
+  };
+  // 禁选月份结束
+  disabledMonthEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let staEnd = differenceInCalendarDays(this.monthRangeStart, current) > 0;
+    return staEnd;
+  };
+
+  // 禁选年份开始
+  disabledYearStart = (current: Date): boolean => {
+    // Can not select days before today and today
+    let cur = differenceInCalendarDays(current, endOfYear(this.today)) > 0;
+    let staEnd = differenceInCalendarDays(current, this.yearRangeEnd) > 0;
+    return cur || staEnd;
+  };
+
+  // 禁选年份结束
+  disabledYearEnd = (current: Date): boolean => {
+    // Can not select days before today and today
+    let staEnd = differenceInCalendarDays(this.yearRangeStart, current) > 0;
+    return staEnd;
+  };
+
+  // 日期选择 日
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result): void {
+    this.dateRange = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result || !result.length) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfDay(result[0]), "yyyy-MM-dd HH:mm:ss");
+    this.endDate = format(endOfDay(result[1]), "yyyy-MM-dd HH:mm:ss");
+  }
+
+  // 月份选择
+  changeMonthStart(result) {
+    console.log(result);
+    this.monthRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  changeMonthEnd(result) {
+    console.log(result);
+    this.monthRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.endDate = format(endOfMonth(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  // 年份选择
+  changeYearStart(result) {
+    console.log(result);
+    this.yearRangeStart = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate = format(startOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+  changeYearEnd(result) {
+    console.log(result);
+    this.yearRangeEnd = result;
+    if (!this.quick) {
+      // 不是快捷选择
+      this.defRange = null;
+    }
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.endDate = format(endOfYear(result), 'yyyy-MM-dd HH:mm:ss');
+  }
+
+  // 日期选择 快速修改时间区间
+  today = new Date();
+  quick: boolean = false;
+  changeDateRange(res) {
+    console.log(res);
+    this.quick = true;
+    switch (res) {
+      case 1:
+        // 昨日
+        let yesterdaystartdate = this.dateService.date().yesterdayStartDate;
+        let yesterdayenddate = this.dateService.date().yesterdayEndDate;
+        console.log(yesterdaystartdate, yesterdayenddate);
+        this.changeDate([yesterdaystartdate, yesterdayenddate]);
+        break;
+      case 2:
+        // 本周
+        let thisweekstartdate = this.dateService.date().thisWeekStartDate;
+        let thisweekenddate = this.dateService.date().thisWeekEndDate;
+        console.log(thisweekstartdate, thisweekenddate);
+        this.changeDate([thisweekstartdate, thisweekenddate]);
+        break;
+      case 3:
+        // 本月
+        let thismonthstartdate = this.dateService.date().thisMonthStartDate;
+        let thismonthenddate = this.dateService.date().thisMonthEndDate;
+        console.log(thismonthstartdate, thismonthenddate);
+        this.changeDate([thismonthstartdate, thismonthenddate]);
+        this.changeMonthStart(thismonthstartdate);
+        this.changeMonthEnd(thismonthenddate);
+        break;
+      case 4:
+        // 本年
+        let thisyearstartdate = this.dateService.date().thisYearStartDate;
+        let thisyearenddate = this.dateService.date().thisYearEndDate;
+        console.log(thisyearstartdate, thisyearenddate);
+        this.changeDate([thisyearstartdate, thisyearenddate]);
+        this.changeMonthStart(thisyearstartdate);
+        this.changeMonthEnd(thisyearenddate);
+        this.changeYearStart(thisyearstartdate);
+        this.changeYearEnd(thisyearenddate);
+        break;
+      case 5:
+        // 上周
+        let lastweekstartdate = this.dateService.date().lastWeekStartDate;
+        let lastweekenddate = this.dateService.date().lastWeekEndDate;
+        console.log(lastweekstartdate, lastweekenddate);
+        this.changeDate([lastweekstartdate, lastweekenddate]);
+        break;
+      case 6:
+        // 上月
+        let lastmonthstartdate = this.dateService.date().lastMonthStartDate;
+        let lastmonthenddate = this.dateService.date().lastMonthEndDate;
+        console.log(lastmonthstartdate, lastmonthenddate);
+        this.changeDate([lastmonthstartdate, lastmonthenddate]);
+        this.changeMonthStart(lastmonthstartdate);
+        this.changeMonthEnd(lastmonthenddate);
+        break;
+      case 7:
+        // 上年
+        let lastyearstartdate = this.dateService.date().lastYearStartDate;
+        let lastyearenddate = this.dateService.date().lastYearEndDate;
+        console.log(lastyearstartdate, lastyearenddate);
+        this.changeDate([lastyearstartdate, lastyearenddate]);
+        this.changeMonthStart(lastyearstartdate);
+        this.changeMonthEnd(lastyearenddate);
+        this.changeYearStart(lastyearstartdate);
+        this.changeYearEnd(lastyearenddate);
+        break;
+      default:
+        // 回显initByDate
+        this.changeDate([new Date(this.dateRange[0]), new Date(this.dateRange[1])]);
+        break;
+    }
+    this.quick = false;
+  }
+}

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

@@ -0,0 +1,20 @@
+import { CustomChangeDateComponent } from './custom-change-date.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    CustomChangeDateComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    CustomChangeDateComponent,
+  ]
+})
+export class CustomChangeDateModule { }

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html

@@ -4,6 +4,20 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="!fieldConfig.config.group">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择分组!">

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.ts

@@ -66,6 +66,11 @@ export class DistributionSearchMoreComponent implements OnInit {
     if (this.validateForm.invalid) return;
 
     let fields:any = {}
+    if(this.fieldConfig.config.group){
+      fields.groupId = this.validateForm.value.groupId;
+      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
+    }
+
     if(this.fieldConfig.config.groupAndUser){
       fields.groupId = this.validateForm.value.groupId;
       fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);

src/app/views/new-statistics/components/phone-search-more/phone-search-more.component.html

@@ -0,0 +1,70 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">更多搜索<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateForm" class="addForm">
+
+        <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
+          <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼栋!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="changeBuilding($event)">
+              <ng-container *ngFor="let option of buildingList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.buildingAndFloor">
+          <nz-form-label [nzSpan]="6" nzFor="floorId">楼<span style="visibility: hidden;">囧囧</span>层</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择楼层!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeFloorInp($event)" formControlName="floorId" nzPlaceHolder="请选择楼层" (nzOpenChange)="openChangeFloor($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of floorList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.dept">
+          <nz-form-label [nzSpan]="6" nzFor="deptId">科<span style="visibility: hidden;">囧囧</span>室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+				<nz-form-item [hidden]="!fieldConfig.config.deptType">
+				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="deptTypeId" nzPlaceHolder="请选择科室类型" (nzOpenChange)="openChangeDeptType($event)">
+				      <ng-container *ngFor="let option of deptTypeList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="default" (click)="hideModal()">取消</button>
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+    </div>
+  </div>
+</div>

src/app/views/new-statistics/components/phone-search-more/phone-search-more.component.less

@@ -0,0 +1,115 @@
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 16px;
+      position: relative;
+      padding: 16px 0;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 50%;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        transform: translateY(-50%);
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+      margin-bottom: 10px;
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 400px;
+      padding: 0 24px;
+
+      .content {
+        width: 100%;
+        padding: 10px 24px 0;
+        height: auto;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+            .ant-form-item-label {
+              text-align: left;
+            }
+            &.mb0{
+              margin-bottom: 6px;
+            }
+            .ant-radio-wrapper{
+              margin-right: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 8px;
+      }
+    }
+  }
+}

src/app/views/new-statistics/components/phone-search-more/phone-search-more.component.ts

@@ -0,0 +1,235 @@
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { ToolService } from './../../../../services/tool.service';
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { EventEmitter } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+
+@Component({
+  selector: 'app-phone-search-more',
+  templateUrl: './phone-search-more.component.html',
+  styleUrls: ['./phone-search-more.component.less']
+})
+export class PhoneSearchMoreComponent implements OnInit {
+  @Output() submitEvent = new EventEmitter();
+  @Output() cancelEvent = new EventEmitter();
+  @Input() fieldConfig: any = { fields: [], config: [] };
+  @Input() hosId: any;
+  @Input() parentDutyId: any;
+  @Input() dutyId: any;
+  @Input() queryType: any;
+  validateForm: FormGroup;//表单
+  searchTimerSubject = new Subject();
+  constructor(
+    private fb: FormBuilder,
+    private tool: ToolService,
+    private mainService: MainService,
+  ) { }
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initForm();
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.cancelEvent.emit()
+  }
+  // 初始化form表单
+  initForm() {
+    this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
+    this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
+    this.deptList = this.fieldConfig.fields.deptDTO ? [this.fieldConfig.fields.deptDTO] : [];
+		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
+
+    this.validateForm = this.fb.group({
+      buildingId: [this.fieldConfig.fields.buildingId || null],
+      floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
+      deptId: [this.fieldConfig.fields.deptDTO ? this.fieldConfig.fields.deptDTO.id  : null],
+			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
+		});
+  }
+  // 表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty({ onlySelf: true });
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+
+    let fields:any = {}
+    if(this.fieldConfig.config.buildingAndFloor){
+      fields.buildingId = this.validateForm.value.buildingId;
+      fields.buildingDTO = this.buildingList.find(item => item.id == this.validateForm.value.buildingId);
+      fields.floorId = this.validateForm.value.floorId;
+      fields.floorDTO = this.floorList.find(item => item.id == this.validateForm.value.floorId);
+    }
+    if(this.fieldConfig.config.dept){
+      fields.deptId = this.validateForm.value.deptId;
+      fields.deptDTO = this.deptList.find(item => item.id == this.validateForm.value.deptId);
+    }
+		if(this.fieldConfig.config.deptType){
+		  fields.deptTypeId = this.validateForm.value.deptTypeId;
+		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
+		}
+
+    this.submitEvent.emit(fields);
+    this.hideModal();
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 防抖
+  isLoading = false;
+  isSelecting:boolean = false; // 是否在选中状态
+  searchTimer(fun, e) {
+    if (this.isSelecting) {
+      this.isSelecting = false; // 重置标志
+      return; // 跳过处理
+    }
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 设置标志
+  setIsSelecting(flag){
+    this.isSelecting = flag; // 设置标志
+  }
+
+	// =================科室类型===================
+
+	// 科室类型
+	openChangeDeptType(flag){
+	  flag && this.getDeptTypeList();
+	}
+
+	// 获取科室类型列表
+	deptTypeList:any[] = [];
+	getDeptTypeList(keyword?) {
+	  this.isLoading = true;
+	  this.mainService
+	    .getDictionary("list", "dept_type")
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      this.deptTypeList = data;
+	    });
+	}
+
+  // =================楼栋===================
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 获取楼栋列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "building", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.buildingList = result.list || [];
+      }else{
+        this.buildingList = [];
+      }
+    });
+  }
+  openChangeBuilding(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getBuildingList();
+  }
+
+  changeBuilding(id){
+    this.setIsSelecting(true);
+    this.floorList = [];
+    this.validateForm.controls.floorId.setValue(null);
+    this.getFloorList();
+  }
+
+  // =================楼层===================
+
+  // 楼层搜索
+  changeFloorInp(e) {
+    this.searchTimer(this.getFloorList, e);
+  }
+
+  // 获取楼层列表
+  floorList:any[] = [];
+  getFloorList(keyword = ''){
+    if(!this.validateForm.value.buildingId){
+      this.isLoading = false;
+      this.floorList = [];
+      return;
+    }
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      floor: {
+        floorName: keyword,
+        buildId : this.validateForm.value.buildingId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "floor", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.floorList = result.list || [];
+      }else{
+        this.floorList = [];
+      }
+    });
+  }
+  openChangeFloor(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getFloorList();
+  }
+
+  // =================科室===================
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 获取科室列表
+  deptList:any[] = [];
+  getDeptList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "department", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.deptList = result.list || [];
+      }else{
+        this.deptList = [];
+      }
+    });
+  }
+  openChangeDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptList();
+  }
+}

src/app/views/new-statistics/components/phone-search-more/phone-search-more.module.ts

@@ -0,0 +1,20 @@
+import { PhoneSearchMoreComponent } from './phone-search-more.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    PhoneSearchMoreComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    PhoneSearchMoreComponent,
+  ]
+})
+export class PhoneSearchMoreModule { }

src/app/views/new-statistics/components/search-more/search-more.component.html

@@ -4,6 +4,34 @@
     </div>
     <div class="content">
       <form nz-form [formGroup]="validateForm" class="addForm">
+        <nz-form-item [hidden]="!fieldConfig.config.workHourParent">
+          <nz-form-label [nzSpan]="6" nzFor="workHourParentId">工时大类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时大类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeWorkHourParentInp($event)" formControlName="workHourParentId" nzPlaceHolder="请选择工时大类" (nzOpenChange)="openChangeWorkHourParent($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of workHourParentList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.group">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
@@ -143,7 +171,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-				
+
 				<nz-form-item [hidden]="!fieldConfig.config.deptType">
 				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
 				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">

src/app/views/new-statistics/components/search-more/search-more.component.ts

@@ -50,9 +50,10 @@ export class SearchMoreComponent implements OnInit {
     this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
     this.floorList = this.fieldConfig.fields.floorDTO ? [this.fieldConfig.fields.floorDTO] : [];
     this.companyList = this.fieldConfig.fields.companyDTO ? [this.fieldConfig.fields.companyDTO] : [];
+    this.workHourParentList = this.fieldConfig.fields.workHourParentDTO ? [this.fieldConfig.fields.workHourParentDTO] : [];
     this.repairDeptList = this.fieldConfig.fields.repairDeptDTO ? [this.fieldConfig.fields.repairDeptDTO] : [];
 		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
-		 
+
     this.validateForm = this.fb.group({
       groupId: [this.fieldConfig.fields.groupId || null],
       userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
@@ -63,6 +64,7 @@ export class SearchMoreComponent implements OnInit {
       buildingId: [this.fieldConfig.fields.buildingId || null],
       floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
       companyId: [this.fieldConfig.fields.companyDTO ? this.fieldConfig.fields.companyDTO.id  : null],
+      workHourParentId: [this.fieldConfig.fields.workHourParentDTO ? this.fieldConfig.fields.workHourParentDTO.id  : null],
       repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
 			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
 		});
@@ -87,6 +89,11 @@ export class SearchMoreComponent implements OnInit {
       hierarchy = 1;
     }
     let fields:any = {}
+    if(this.fieldConfig.config.group){
+      fields.groupId = this.validateForm.value.groupId;
+      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
+    }
+
     if(this.fieldConfig.config.groupAndUser){
       fields.groupId = this.validateForm.value.groupId;
       fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
@@ -114,6 +121,10 @@ export class SearchMoreComponent implements OnInit {
       fields.companyId = this.validateForm.value.companyId;
       fields.companyDTO = this.companyList.find(item => item.id == this.validateForm.value.companyId);
     }
+    if(this.fieldConfig.config.workHourParent){
+      fields.workHourParentId = this.validateForm.value.workHourParentId;
+      fields.workHourParentDTO = this.workHourParentList.find(item => item.id == this.validateForm.value.workHourParentId);
+    }
     if(this.fieldConfig.config.repairDept){
       fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
@@ -122,7 +133,7 @@ export class SearchMoreComponent implements OnInit {
 		  fields.deptTypeId = this.validateForm.value.deptTypeId;
 		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
 		}
-		
+
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -188,14 +199,14 @@ export class SearchMoreComponent implements OnInit {
     this.validateForm.controls.userId.setValue(null);
     this.getUserList();
   }
-	
+
 	// =================科室类型===================
-	
+
 	// 科室类型
 	openChangeDeptType(flag){
 	  flag && this.getDeptTypeList();
 	}
-	
+
 	// 获取科室类型列表
 	deptTypeList:any[] = [];
 	getDeptTypeList(keyword?) {
@@ -207,7 +218,7 @@ export class SearchMoreComponent implements OnInit {
 	      this.deptTypeList = data;
 	    });
 	}
-	
+
   // =================维修人员===================
 
   // 维修人员搜索
@@ -529,4 +540,38 @@ export class SearchMoreComponent implements OnInit {
     flag && this.setIsSelecting(false);
     flag && this.getRepairDeptList();
   }
+
+  // =================工时大类===================
+
+  // 工时大类搜索
+  changeWorkHourParentInp(e) {
+    this.searchTimer(this.getWorkHourParentList, e);
+  }
+
+  // 获取工时大类列表
+  workHourParentList:any[] = [];
+  getWorkHourParentList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      workHourManagement: {
+        keyWords: keyword,
+        treeLevel: 1,
+        statisticalHosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "workHourManagement", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.workHourParentList = result.list || [];
+      }else{
+        this.workHourParentList = [];
+      }
+    });
+  }
+  openChangeWorkHourParent(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getWorkHourParentList();
+  }
 }

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,11 +1,7 @@
 <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)">
@@ -34,8 +30,8 @@
   <nz-table class="table" [ngStyle]="{ width: widthValue + 'px' }" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl" [nzWidthConfig]="widthConfig" nzBordered>
     <thead (nzSortChange)="sort($event)" nzSingleSort>
       <tr>
-				<th rowspan="2" *ngIf="parent==1">父级科室(编码)</th>
-        <th rowspan="2">科室(编码)</th>
+				<th rowspan="2" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+        <th rowspan="2" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
         <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
         <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
         <th rowspan="2" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>

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?) {
@@ -285,7 +278,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)">
@@ -35,8 +31,8 @@
 	<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]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
-				<th [nzWidth]="widthStyle">科室(编码)</th>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
 				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
 				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
 				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>

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,15 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
       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 DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
@@ -126,8 +130,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,
@@ -174,19 +178,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;
@@ -198,8 +190,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,
@@ -237,9 +229,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();
   }
 
@@ -258,12 +251,12 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
   openChangeBuilding(flag){
     flag && this.getBuildingList();
   }
-	
+
 	// 科室搜索
 	changeInp(e) {
 	  this.searchTimer(this.getDeparts, e);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -283,7 +276,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" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
@@ -34,8 +30,8 @@
 <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]="widthStyle" *ngIf="parent==1">父级科室(编码)</th>
-      <th [nzWidth]="widthStyle">科室(编码)</th>
+			<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
       <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
       <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
       <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>

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,23 +2,22 @@ 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-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,
     private route: ActivatedRoute,
     private tabService: TabService,
-		private tool: ToolService,
   ) {}
 
   listOfData: any[] = []; //表格数据
@@ -38,13 +37,15 @@ export class DistributionDepartmentEvaluateStatisticsComponent 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,11 +63,12 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO || this.fieldConfig.fields.buildingDTO;
     return flag ? 37 : 0;
   }
 
@@ -122,11 +124,11 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			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,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -171,19 +173,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;
@@ -192,11 +182,11 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			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,
       hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -234,9 +224,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.deptId = undefined;
+    this.dateRange = []
+    this.buildingId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
@@ -244,12 +235,12 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   changeBuildingInp(e) {
     this.searchTimer(this.getBuildingList, e);
   }
-	
+
 	// 科室搜索
 	changeInp(e) {
 	  this.searchTimer(this.getDeparts, e);
 	}
-	
+
 	// 获取所有科室
 	alldepart:any;
 	getDeparts(dept?) {
@@ -269,7 +260,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 	      this.alldepart = data.list;
 	    });
 	}
-	
+
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {

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)">
@@ -34,8 +30,8 @@
 <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="20%" *ngIf="parent==1">父级科室(编码)</th>
-      <th nzWidth="20%">科室(编码)</th>
+			<th nzWidth="20%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
       <th nzWidth="15%" nzShowSort nzSortKey="service" [(nzSort)]="sortCurrent.service">服务台建单数</th>
       <th nzWidth="15%" nzShowSort nzSortKey="nurse" [(nzSort)]="sortCurrent.nurse">护士端建单数</th>
       <th nzWidth="15%" nzShowSort nzSortKey="system" [(nzSort)]="sortCurrent.system">系统自动建单数</th>

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?) {
@@ -260,7 +253,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-inspection-statistics-routing.module.ts

@@ -107,6 +107,33 @@ const routes: Routes = [
 			    title: '配-业务分类统计'
 			  }
 			},
+			{
+			  // 任务类型质控统计
+			  path: 'taskTypeQualityControlStatistics',
+			  loadChildren: () => import('./taskType-quality-control-statistics/taskType-quality-control-statistics.module').then(m => m.TaskTypeQualityControlStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-任务类型质控统计'
+			  }
+			},
+			{
+			  // 人员评价统计
+			  path: 'distributionUserEvaluateStatistics',
+			  loadChildren: () => import('./distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.module').then(m => m.DistributionUserEvaluateStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-人员评价统计'
+			  }
+			},
+      {
+			  // 24小时质控统计
+			  path: 'hourQualityControlStatistics',
+			  loadChildren: () => import('./hour-quality-control-statistics/hour-quality-control-statistics.module').then(m => m.HourQualityControlStatisticsModule),
+			  data: {
+			    reuse: true,
+			    title: '配-24小时质控统计'
+			  }
+			},
     ]
   }
 ];

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

@@ -1,170 +1,168 @@
-<div class="synthesize-box" *ngIf="!isLoading">
+<div class="synthesize-box">
 	<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" name="选择日期"></app-custom-change-date>
 		</div>
 		<div class="operation">
 			<button nz-button class="btn default" (click)="search()">搜索</button>
 			<button nz-button class="btn default ml8" (click)="reset()">重置</button>
 		</div>
 	</div>
-	<div class="top1-statistics">
-		<div class="top-list">
-			<div class="special-box">
-				<div class="num">{{workData.totalCount || 0}}</div>
-				<div class="describe">工单总数</div>
-			</div>
-			<div class="special-box-right">
-				<div class="sign-describe">已完成: <span class="sign-num">{{workData.doneCount || 0}}</span></div>
-				<div class="sign-describe">待接单: <span class="sign-num">{{workData.waitCount || 0}}</span></div>
-				<div class="sign-describe">处理中: <span class="sign-num">{{workData.doingCount || 0}}</span></div>
-			</div>
-			<div class="border"></div>
-		</div>
-		<div class="top-list">
-			<div class="special-box">
-				<div class="num">{{workData.workerCount || 0}}</div>
-				<div class="describe">总人数</div>
-			</div>
-			<div class="border"></div>
-		</div>
-		<div class="top-list">
-			<div class="special-box">
-				<div class="num">{{workData.totalGrade || 0}}</div>
-				<div class="describe">总积分</div>
-			</div>
-			<div class="border"></div>
-		</div>
-		<div class="top-list">
-			<div class="special-box">
-				<div class="num">{{workData.badCount || 0}}</div>
-				<div class="describe">差评单数</div>
-			</div>
-			<div class="border"></div>
-		</div>
-		<div class="top-list">
-			<div class="special-box">
-				<div class="num">{{workData.doneRate || 0}}%</div>
-				<div class="describe">按时完成率</div>
-			</div>
-		</div>
-	</div>
-<!--  <div class="top0-statistics">
-    <div>标本<span class="num">{{businessData.specimenCount || 0}}</span></div>
-    <div>病理<span class="num">{{businessData.pathologyCount || 0}}</span></div>
-    <div>陪检<span class="num">{{businessData.inspectCount || 0}}</span></div>
-    <div>药品<span class="num">{{businessData.drugsCount || 0}}</span></div>
-    <div>静配<span class="num">{{businessData.drugsJpCount || 0}}</span></div>
-    <div>中药<span class="num">{{businessData.drugsHerbalCount || 0}}</span></div>
-    <div>血制品<span class="num">{{businessData.bloodCount || 0}}</span></div>
-  </div> -->
-	<div class="top2-statistics">
-    <div class="statistics width-60 mar-right-8">
-			<div class="statistics-box">
-				<div class="sign-green"></div>
-				<div class="statistics-title">业务分类top5</div>
-				<div class="more" *ngIf="showMore('businessClassifyStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/businessClassifyStatistics')">更多></div>
-			</div>
-			<div class="echarts-repairs">
-				<div echarts class="echarts" [options]='businessOptions'></div>
-			</div>
-		</div>
-		<div class="statistics width-40">
-			<div class="statistics-box">
-				<div class="sign-green"></div>
-				<div class="statistics-title">申请来源</div>
-				<div class="more" *ngIf="showMore('sourceStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/sourceStatistics')">更多></div>
-			</div>
-			<div class="echarts-repairs">
-			  <div echarts class="echarts" [options]='applyOptions'></div>
-			</div>
-		</div>
-	</div>
-  <div class="top2-statistics">
-		<div class="statistics width-49 mar-right-8">
-			<div class="statistics-box">
-				<div class="sign-green"></div>
-				<div class="statistics-title">科室Top5</div>
-				<div class="more" *ngIf="showMore('departmentQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/departmentQualityControlStatistics')">更多></div>
-			</div>
-			<div class="table">
-				<div class="td">
-					<div class="table-td-4">排名</div>
-					<div class="table-td-4">科室名称</div>
-					<div class="table-td-4">工单量</div>
-					<div class="table-td-4">好评率</div>
-				</div>
-				<div class="th" *ngFor="let item of deptTopData; let index = index;">
-          <div class="table-list-4">
-						<img src="../../assets/images/top1.png" alt="" class="img" *ngIf="index==0">
-						<img src="../../assets/images/top2.png" alt="" class="img" *ngIf="index==1">
-						<img src="../../assets/images/top3.png" alt="" class="img" *ngIf="index==2">
-						<span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
-					</div>
-					<div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
-					<div class="table-list-4">{{item.sum || 0}}</div>
-					<div class="table-list-4">{{item.goodRate || '0%'}}</div>
-				</div>
-			</div>
-		</div>
-		<div class="statistics width-50">
-			<div class="statistics-box">
-				<div class="sign-green"></div>
-				<div class="statistics-title">人员Top5</div>
-				<div class="more" *ngIf="showMore('userQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/userQualityControlStatistics')">更多></div>
-			</div>
-			<div class="table">
-				<div class="td">
-					<div class="table-td-4">排名</div>
-					<div class="table-td-4">人员名称</div>
-					<div class="table-td-4">工单量</div>
-					<div class="table-td-4">积分总数</div>
-				</div>
-				<div class="th" *ngFor="let item of userTopData; let index = index;">
-					<div class="table-list-4">
-						<img src="../../assets/images/top1.png" alt="" class="img" *ngIf="index==0">
-						<img src="../../assets/images/top2.png" alt="" class="img" *ngIf="index==1">
-						<img src="../../assets/images/top3.png" alt="" class="img" *ngIf="index==2">
-						<span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
-					</div>
-					<div class="table-list-4 ellipsis-oneline" title="{{item.userName}}({{item.userAccount}})">{{item.userName}}<ng-container *ngIf="item.userAccount">({{item.userAccount}})</ng-container></div>
-					<div class="table-list-4">{{item.sum || 0}}</div>
-					<div class="table-list-4">{{item.totalGrade || 0}}</div>
-				</div>
-			</div>
-		</div>
-	</div>
-  <div class="top2-statistics">
-    <div class="statistics width-100">
-      <div class="statistics-box">
-        <div class="sign-green"></div>
-        <div class="statistics-title">日趋势图</div>
-        <div class="statistics-select">
-					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 'day'}" (click)="selectCheck('day')">日</div>
-					<div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 'hour'}" (click)="selectCheck('hour')">时</div>
-				</div>
-        <div class="searchDataItem ml8">
-          <span class="label">统计分类</span>：
-          <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (ngModelChange)="changeStatisticsType($event)">
-            <ng-container *ngFor="let option of statisticsTypeList">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-            </ng-container>
-            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-            </nz-option>
-          </nz-select>
-        </div>
-        <div class="more" *ngIf="showMore('dateQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/dateQualityControlStatistics')">更多></div>
+  <ng-container *ngIf="!isLoading">
+    <div class="top1-statistics">
+      <div class="top-list">
+        <div class="special-box">
+          <div class="num">{{workData.totalCount || 0}}</div>
+          <div class="describe">工单总数</div>
+        </div>
+        <div class="special-box-right">
+          <div class="sign-describe">已完成: <span class="sign-num">{{workData.doneCount || 0}}</span></div>
+          <div class="sign-describe">待接单: <span class="sign-num">{{workData.waitCount || 0}}</span></div>
+          <div class="sign-describe">处理中: <span class="sign-num">{{workData.doingCount || 0}}</span></div>
+        </div>
+        <div class="border"></div>
+      </div>
+      <div class="top-list">
+        <div class="special-box">
+          <div class="num">{{workData.workerCount || 0}}</div>
+          <div class="describe">总人数</div>
+        </div>
+        <div class="border"></div>
+      </div>
+      <div class="top-list">
+        <div class="special-box">
+          <div class="num">{{workData.totalGrade || 0}}</div>
+          <div class="describe">总积分</div>
+        </div>
+        <div class="border"></div>
+      </div>
+      <div class="top-list">
+        <div class="special-box">
+          <div class="num">{{workData.badCount || 0}}</div>
+          <div class="describe">差评单数</div>
+        </div>
+        <div class="border"></div>
       </div>
-      <div class="echarts-repairs">
-        <div echarts class="echarts" [options]='trendOptions'></div>
+      <div class="top-list">
+        <div class="special-box">
+          <div class="num">{{workData.doneRate || 0}}%</div>
+          <div class="describe">按时完成率</div>
+        </div>
+      </div>
+    </div>
+    <!--  <div class="top0-statistics">
+      <div>标本<span class="num">{{businessData.specimenCount || 0}}</span></div>
+      <div>病理<span class="num">{{businessData.pathologyCount || 0}}</span></div>
+      <div>陪检<span class="num">{{businessData.inspectCount || 0}}</span></div>
+      <div>药品<span class="num">{{businessData.drugsCount || 0}}</span></div>
+      <div>静配<span class="num">{{businessData.drugsJpCount || 0}}</span></div>
+      <div>中药<span class="num">{{businessData.drugsHerbalCount || 0}}</span></div>
+      <div>血制品<span class="num">{{businessData.bloodCount || 0}}</span></div>
+    </div> -->
+    <div class="top2-statistics">
+      <div class="statistics width-60 mar-right-8">
+        <div class="statistics-box">
+          <div class="sign-green"></div>
+          <div class="statistics-title">业务分类top5</div>
+          <div class="more" *ngIf="showMore('businessClassifyStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/businessClassifyStatistics')">更多></div>
+        </div>
+        <div class="echarts-repairs">
+          <div echarts class="echarts" [options]='businessOptions'></div>
+        </div>
+      </div>
+      <div class="statistics width-40">
+        <div class="statistics-box">
+          <div class="sign-green"></div>
+          <div class="statistics-title">申请来源</div>
+          <div class="more" *ngIf="showMore('sourceStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/sourceStatistics')">更多></div>
+        </div>
+        <div class="echarts-repairs">
+          <div echarts class="echarts" [options]='applyOptions'></div>
+        </div>
+      </div>
+    </div>
+    <div class="top2-statistics">
+      <div class="statistics width-49 mar-right-8">
+        <div class="statistics-box">
+          <div class="sign-green"></div>
+          <div class="statistics-title">科室Top5</div>
+          <div class="more" *ngIf="showMore('departmentQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/departmentQualityControlStatistics')">更多></div>
+        </div>
+        <div class="table">
+          <div class="td">
+            <div class="table-td-4">排名</div>
+            <div class="table-td-4">科室名称</div>
+            <div class="table-td-4">工单量</div>
+            <div class="table-td-4">好评率</div>
+          </div>
+          <div class="th" *ngFor="let item of deptTopData; let index = index;">
+            <div class="table-list-4">
+              <img src="../../assets/images/top1.png" alt="" class="img" *ngIf="index==0">
+              <img src="../../assets/images/top2.png" alt="" class="img" *ngIf="index==1">
+              <img src="../../assets/images/top3.png" alt="" class="img" *ngIf="index==2">
+              <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
+            </div>
+            <div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
+            <div class="table-list-4">{{item.sum || 0}}</div>
+            <div class="table-list-4">{{item.goodRate || '0%'}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="statistics width-50">
+        <div class="statistics-box">
+          <div class="sign-green"></div>
+          <div class="statistics-title">人员Top5</div>
+          <div class="more" *ngIf="showMore('userQualityControlStatistics')" (click)="toPath('/newStatistics/distributionInspectionStatistics/userQualityControlStatistics')">更多></div>
+        </div>
+        <div class="table">
+          <div class="td">
+            <div class="table-td-4">排名</div>
+            <div class="table-td-4">人员名称</div>
+            <div class="table-td-4">工单量</div>
+            <div class="table-td-4">积分总数</div>
+          </div>
+          <div class="th" *ngFor="let item of userTopData; let index = index;">
+            <div class="table-list-4">
+              <img src="../../assets/images/top1.png" alt="" class="img" *ngIf="index==0">
+              <img src="../../assets/images/top2.png" alt="" class="img" *ngIf="index==1">
+              <img src="../../assets/images/top3.png" alt="" class="img" *ngIf="index==2">
+              <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
+            </div>
+            <div class="table-list-4 ellipsis-oneline" title="{{item.userName}}({{item.userAccount}})">{{item.userName}}<ng-container *ngIf="item.userAccount">({{item.userAccount}})</ng-container></div>
+            <div class="table-list-4">{{item.sum || 0}}</div>
+            <div class="table-list-4">{{item.totalGrade || 0}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="top2-statistics">
+      <div class="statistics width-100">
+        <div class="statistics-box">
+          <div class="sign-green"></div>
+          <div class="statistics-title">日趋势图</div>
+          <div class="statistics-select">
+            <div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 'day'}" (click)="selectCheck('day')">日</div>
+            <div class="statistics-select-list" [ngClass]="{'activeClass': activeIndex == 'hour'}" (click)="selectCheck('hour')">时</div>
+          </div>
+          <div class="searchDataItem ml8">
+            <span class="label">统计分类</span>：
+            <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (ngModelChange)="changeStatisticsType($event)">
+              <ng-container *ngFor="let option of statisticsTypeList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </div>
+          <div class="more" *ngIf="showMore(activeIndex == 'hour' ? 'hourQualityControlStatistics' : 'dateQualityControlStatistics')" (click)="toPath(activeIndex == 'hour' ? '/newStatistics/distributionInspectionStatistics/hourQualityControlStatistics' : '/newStatistics/distributionInspectionStatistics/dateQualityControlStatistics')">更多></div>
+        </div>
+        <div class="echarts-repairs">
+          <div echarts class="echarts" [options]='trendOptions'></div>
+        </div>
       </div>
     </div>
-  </div>
+  </ng-container>
 </div>
 <div class="mask-style" *ngIf="isLoading">
 	<nz-spin nzSimple class="spin-style"></nz-spin>

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

@@ -23,6 +23,9 @@
 		      .label{
 		        font-size: 16px;
 		      }
+          .selectItem{
+            width: 160px;
+          }
 		    }
 		  }
 		}
@@ -144,7 +147,7 @@
 					}
           .searchDataItem{
             .selectItem{
-              width: 224px;
+              width: 160px;
             }
           }
 					.more{

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

@@ -1,14 +1,15 @@
 import { Router } from '@angular/router';
-import { format, addMonths, startOfMonth, endOfMonth } from 'date-fns';
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild, AfterViewInit } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
 import { TabService } from '../../services/tab.service';
+import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-distribution-synthesize-statistics",
   templateUrl: "./distribution-synthesize-statistics.component.html",
   styleUrls: ["./distribution-synthesize-statistics.component.less"],
 })
-export class DistributionSynthesizeStatisticsComponent implements OnInit {
+export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
   constructor(
     private mainService: MainService,
     private tabService: TabService,
@@ -60,8 +61,12 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 			name:'王'
 		}
 	] //人员top5
-  ngOnInit() {
-    this.search();
+  ngOnInit() {}
+
+  ngAfterViewInit(){
+    setTimeout(() => {
+      this.search();
+    }, 0)
   }
 
 	// 维修处理类型切换
@@ -73,8 +78,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	// 申请来源
 	applyChart() {
 		let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'sourceCount',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -148,8 +153,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	// 日趋势图
 	trendChart(){
 		let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'dateTimeTrend',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -234,8 +239,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
   // 业务分类
 	businessChart(){
     let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'statisticsDateTypeTop5',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -316,8 +321,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	// 科室Top5
 	getDeptTopData() {
 	  let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'deptTop5',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -332,8 +337,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	// 人员Top5
 	getUserTopData() {
 	  let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'userTop5',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -350,7 +355,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	toPath(path){
     let flag = this.tabService.tabs.some(v => v.path === path);
     flag && this.tabService.deleteRouteSnapshot(path);
-    this.tabService.setQueryParams('dateRange', this.dateRange);
+    this.tabService.setQueryParams('dateRange', [this.customChangeDateComponent.startDate, this.customChangeDateComponent.endDate]);
     this.router.navigate([path], { replaceUrl: true });
 	}
 
@@ -418,8 +423,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      startDate: this.dateRange[0],
-      endDate: this.dateRange[1],
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
       hosId: this.hosId,
       dutyId: this.dutyId,
       parentDutyId: this.parentDutyId,
@@ -437,8 +442,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 	// 头部工单数据
 	getWorkData() {
 	  let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'headerCount',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -453,8 +458,8 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
   // 头部业务数据
 	getBusinessData() {
 	  let postData:any = {
-	    startDate: this.dateRange[0],
-	    endDate: this.dateRange[1],
+	    startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
 			type: 'businessCount',
 	    hosId: this.getHosId,
 	    businessType: 'hsms',
@@ -468,8 +473,9 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit {
 
 	// 重置
 	reset(){
-		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.activeIndex = 'day';
+    this.customChangeDateComponent.resetByDate();
 		this.search();
 	}
 
@@ -479,25 +485,7 @@ export class DistributionSynthesizeStatisticsComponent 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(result[0], 'yyyy-MM-dd') + ' ' + '00:00:00';
-    result[1] = format(result[1], 'yyyy-MM-dd') + ' ' + '23:59:59';
-    this.dateRange = result;
-    // this.search();
-		console.log(this.dateRange);
-  }
-
-  onCalendarChangeDate(dateArr){
-    // console.log(dateArr)
-    // if(dateArr.length == 2){
-    //   let dateStart = new Date(dateArr[0]);
-    //   let dateEnd = new Date(dateArr[1]);
-    //   dateStart.setHours(0,0,0);
-    //   dateEnd.setHours(23,59,59);
-    //   this.dateRange = [dateStart,dateEnd];
-    // }
-  }
+  dateRange: any = []; //发起时间区间 天
 
   // 获取统计分类列表
   statisticsTypeList:any[] = [];

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

@@ -6,6 +6,7 @@ import { DistributionSynthesizeStatisticsRoutingModule } from './distribution-sy
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { NgxEchartsModule } from 'ngx-echarts';
+import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
 
 @NgModule({
@@ -17,7 +18,8 @@ import { NgxEchartsModule } from 'ngx-echarts';
     DistributionSynthesizeStatisticsRoutingModule,
     ShareModule,
     VirtualScrollerModule,
-		NgxEchartsModule
+		NgxEchartsModule,
+    CustomChangeDateModule,
   ]
 })
 export class DistributionSynthesizeStatisticsModule { }

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { DistributionUserEvaluateStatisticsComponent } from './distribution-user-evaluate-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: DistributionUserEvaluateStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DistributionUserEvaluateStatisticsRoutingModule { }

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

@@ -0,0 +1,79 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <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)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<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="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>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.userName }}<ng-container *ngIf="data.userAccount">({{ data.userAccount }})</ng-container></td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.evaCount }}</td>
+      <td>{{ data.eva1 }}</td>
+      <td>{{ data.eva2 }}</td>
+      <td>{{ data.eva3 }}</td>
+      <td>{{ data.eva4 }}</td>
+      <td>{{ data.eva5 }}</td>
+      <td>{{ data.avgCount }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 12%">{{ data.userName }}</td>
+        <td style="width: 11%">{{ data.totalCount }}</td>
+        <td style="width: 11%">{{ data.evaCount }}</td>
+        <td style="width: 11%">{{ data.eva1 }}</td>
+        <td style="width: 11%">{{ data.eva2 }}</td>
+        <td style="width: 11%">{{ data.eva3 }}</td>
+        <td style="width: 11%">{{ data.eva4 }}</td>
+        <td style="width: 11%">{{ data.eva5 }}</td>
+        <td style="width: 11%">{{ data.avgCount }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

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

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

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

@@ -0,0 +1,278 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+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-user-evaluate-statistics",
+  templateUrl: "./distribution-user-evaluate-statistics.component.html",
+  styleUrls: ["./distribution-user-evaluate-statistics.component.less"],
+})
+export class DistributionUserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  userId;//人员id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			userId: this.userId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "userDegreeTransOrder", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			userId: this.userId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+      startDate: this.customChangeDateComponent.startDate || undefined,
+      endDate: this.customChangeDateComponent.endDate || undefined,
+      hosId: this.getHosId,
+      groupId: this.fieldConfig.fields.groupId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "userDegreeTransOrder", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.userId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeUser(flag){
+    flag && this.getUserList();
+  }
+
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.userList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined},
+    config: {group: true, dept: true, building: true, taskType: true, statisticsType: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,23 @@
+import { DistributionUserEvaluateStatisticsComponent } from './distribution-user-evaluate-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DistributionUserEvaluateStatisticsRoutingModule } from './distribution-user-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({
+  declarations: [
+    DistributionUserEvaluateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionUserEvaluateStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class DistributionUserEvaluateStatisticsModule { }

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { HourQualityControlStatisticsComponent } from './hour-quality-control-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: HourQualityControlStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class HourQualityControlStatisticsRoutingModule { }

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

@@ -0,0 +1,85 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <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)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
+        <ng-container *ngFor="let option of statisticsTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<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="10%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">时</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均单量</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+			<th nzWidth="9%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.date }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.avgCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
+      <td>{{ data.aveper }}</td>
+      <td>{{ data.total_time }}</td>
+      <td>{{ data.five_count }}</td>
+      <td>{{ data.special_close }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.date }}</td>
+        <td style="width: 9%">{{ data.totalCount }}</td>
+        <td style="width: 9%">{{ data.avgCount }}</td>
+        <td style="width: 9%">{{ data.totalGrade }}</td>
+        <td style="width: 9%">{{ data.response_time_num }}</td>
+        <td style="width: 9%">{{ data.arrive_time_num }}</td>
+        <td style="width: 9%">{{ data.execution_time_num }}</td>
+        <td style="width: 9%">{{ data.aveper }}</td>
+        <td style="width: 9%">{{ data.total_time }}</td>
+        <td style="width: 9%">{{ data.five_count }}</td>
+        <td style="width: 9%">{{ data.special_close }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

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

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,252 @@
+import { TabService } from './../../services/tab.service';
+import { NzMessageService } from 'ng-zorro-antd/message';
+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-hour-quality-control-statistics",
+  templateUrl: "./hour-quality-control-statistics.component.html",
+  styleUrls: ["./hour-quality-control-statistics.component.less"],
+})
+export class HourQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  statisticsTypeId;//统计分类id
+
+
+  ngOnInit() {}
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.taskTypeDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			statisticsTypeId: this.statisticsTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || 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,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "hourTransOrderQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			statisticsTypeId: this.statisticsTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || 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,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "hourTransOrderQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.statisticsTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 防抖
+  isLoading = false;
+
+  openChangeStatisticsType(flag){
+    flag && this.getStatisticsTypeList();
+  }
+
+  // 获取统计分类列表
+  statisticsTypeList:any[] = [];
+  getStatisticsTypeList(keyword?) {
+    this.isLoading = true;
+    this.mainService
+      .getDictionary("list", "statistics_date_type")
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.statisticsTypeList = data;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined},
+    config: {groupAndUser: true, dept: true, building: true, taskType: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,23 @@
+import { HourQualityControlStatisticsComponent } from './hour-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { HourQualityControlStatisticsRoutingModule } from './hour-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({
+  declarations: [
+    HourQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    HourQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class HourQualityControlStatisticsModule { }

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/taskType-quality-control-statistics/taskType-quality-control-statistics-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { TaskTypeQualityControlStatisticsComponent } from './taskType-quality-control-statistics.component';
+
+
+const routes: Routes = [
+  { path: '', component: TaskTypeQualityControlStatisticsComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class TaskTypeQualityControlStatisticsRoutingModule { }

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

@@ -0,0 +1,81 @@
+<div class="searchDataWrap">
+  <div class="searchData">
+    <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)="changeTaskTypeInp($event)" nzAllowClear nzPlaceHolder="请选择任务类型" [(ngModel)]="taskTypeId" (nzOpenChange)="openChangeTaskType($event)">
+        <ng-container *ngFor="let option of taskTypeList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosId.hosName + '-' + option.taskName" [nzValue]="option.id"></nz-option>
+        </ng-container>
+        <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+          <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+        </nz-option>
+      </nz-select>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" nz-tooltip nzTooltipTitle="更多搜索" (click)="showMore()"></i>
+    <button nz-button class="btn default" (click)="search()">查询</button>
+    <button nz-button class="btn default ml8" (click)="reset()">重置</button>
+    <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
+  </div>
+</div>
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+</div>
+<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="10%">任务类型名称</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+			<th nzWidth="10%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均到达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时达标率</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="10%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.taskName }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_time_num }}</td>
+      <td>{{ data.execution_time_num }}</td>
+      <td>{{ data.aveper }}</td>
+      <td>{{ data.total_time }}</td>
+      <td>{{ data.five_count }}</td>
+      <td>{{ data.special_close }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 10%">{{ data.taskName }}</td>
+        <td style="width: 10%">{{ data.totalCount }}</td>
+        <td style="width: 10%">{{ data.totalGrade }}</td>
+        <td style="width: 10%">{{ data.response_time_num }}</td>
+        <td style="width: 10%">{{ data.arrive_time_num }}</td>
+        <td style="width: 10%">{{ data.execution_time_num }}</td>
+        <td style="width: 10%">{{ data.aveper }}</td>
+        <td style="width: 10%">{{ data.total_time }}</td>
+        <td style="width: 10%">{{ data.five_count }}</td>
+        <td style="width: 10%">{{ data.special_close }}</td>
+      </tr>
+    </table>
+  </ng-template>
+</nz-table>
+<div class="pagination">
+  <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>
+</div>
+
+<!-- 详细搜索 -->
+<app-distribution-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-distribution-search-more>

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

@@ -0,0 +1,71 @@
+@import "../../../../../../src/theme.less";
+:host{
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 15px);
+    font-weight: bold;
+  }
+  tr, th{
+    text-align: center;
+  }
+  .searchDataWrap{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .searchData{
+      padding: 16px;
+      display: flex;
+      align-items: center;
+      .searchDataItem{
+        margin-right: 24px;
+        .label{
+          font-size: 16px;
+        }
+        .selectItem{
+          width: 160px;
+        }
+      }
+    }
+    .operation{
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      .icon_transport{
+        margin-right: 16px;
+        font-size: 24px;
+      }
+      .btn{
+        &.default{
+          height: 32px;
+          line-height: 32px;
+          min-width: 70px;
+        }
+      }
+    }
+  }
+
+  .table{
+    margin: 0 8px;
+  }
+
+  .moreFilter{
+    margin-bottom: 16px;
+    span{
+      margin-left: 16px;
+      color: @primary-color;
+    }
+  }
+
+  .pagination{
+    padding: 16px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
+}

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

@@ -0,0 +1,276 @@
+import { TabService } from './../../services/tab.service';
+import { debounceTime } from 'rxjs/operators';
+import { Subject } from 'rxjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
+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-taskType-quality-control-statistics",
+  templateUrl: "./taskType-quality-control-statistics.component.html",
+  styleUrls: ["./taskType-quality-control-statistics.component.less"],
+})
+export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterViewInit {
+  @ViewChild('customChangeDate', { static: false }) customChangeDateComponent!: CustomChangeDateComponent;
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+		private tool: ToolService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  taskTypeId;//任务类型id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+  }
+
+  ngAfterViewInit(){
+    this.initSessionData();
+    this.getQueryParams();
+    setTimeout(() => {
+      this.search();
+    }, 0)
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - 55 - this.getMoreFilter + 14;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
+  }
+
+  // 初始化缓存数据
+  queryType:any;
+  hosId:any;
+  dutyId:any;
+  parentDutyId:any;
+  initSessionData(){
+    let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
+    let queryType:any = newStatistics.queryType;
+    let hosId:any = newStatistics.hospitalId;
+    let dutyId:any = newStatistics.dutyId;
+
+    queryType = queryType ? +queryType : undefined;
+    hosId = hosId ? +hosId : undefined;
+    dutyId = dutyId ? +dutyId : undefined;
+
+    this.queryType = queryType;
+    if(queryType == 1){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 2){
+      this.hosId = hosId;
+      this.dutyId = undefined;
+      this.parentDutyId = undefined;
+    }else if(queryType == 3){
+      this.hosId = undefined;
+      this.dutyId = dutyId;
+      this.parentDutyId = undefined;
+    }else if(queryType == 4){
+      this.hosId = undefined;
+      this.dutyId = undefined;
+      this.parentDutyId = dutyId;
+    }
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList(num?: number, field?: string, sort?: string) {
+    if (num !== undefined) {
+      this.pageIndex = num;
+    }
+    let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+			taskTypeId: this.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || 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,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (field && sort) {
+      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+    }
+    this.loading1 = true;
+    this.mainService
+      .postCustom("itsm/report", "taskTypeTransOrderQc", postData)
+      .subscribe((result) => {
+        this.loading1 = false;
+        this.listOfData = result.dataList.filter((v, i) => { return i != result.dataList.length - 1 });
+        this.listOfDataEnd = result.dataList.filter((v, i) => { return i == result.dataList.length - 1 });
+        this.listLength = result.totalCount;
+      });
+  }
+
+  // 列表排序
+  sortCurrent:any = {};
+  sortCurrentKey: string = "";
+  sortCurrentValue: string | null = "";
+  sort(e) {
+    const { key, value } = e;
+    this.sortCurrentKey = key;
+    this.sortCurrentValue = value;
+    this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 搜索
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
+  }
+
+  // 日期选择
+  dateRange: any = [];
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+			taskTypeId: this.taskTypeId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || 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,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "taskTypeTransOrderQc", postData)
+      .subscribe((data) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.success('导出成功');
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = `${this.route.parent.routeConfig.data.title}.xls`;
+        document.body.appendChild(a);
+        a.click();
+      },(err) => {
+        this.message.remove(this.excelExportLoading);
+        this.excelExportLoading = false;
+        this.message.error('导出失败');
+      });
+  }
+  // 重置
+  reset(){
+    this.sortCurrentKey = "";
+		this.sortCurrentValue = "";
+		this.sortCurrent = {};
+    this.dateRange = []
+    this.taskTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined};
+    this.customChangeDateComponent.resetByDate();
+    this.search();
+  }
+
+  // 任务类型搜索
+  changeTaskTypeInp(e) {
+    this.searchTimer(this.getTaskTypeList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeTaskType(flag){
+    flag && this.getTaskTypeList();
+  }
+
+  // 获取任务类型列表
+  taskTypeList:any[] = [];
+  getTaskTypeList(keyword?) {
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      taskType: {
+        simpleQuery: true,
+        taskName: keyword,
+        statisticalHosId: this.getHosId,
+      },
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.taskTypeList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, dept: true, building: true},
+  }
+  showSearchMore:boolean = false;
+  showMore(){
+    this.showSearchMore = true;
+  }
+
+  cancelEvent(){
+    this.showSearchMore = false;
+  }
+
+  submitEvent(fields){
+    this.showSearchMore = false;
+    this.fieldConfig.fields = fields;
+    console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
+    this.search();
+    this.onResize();
+  }
+}

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

@@ -0,0 +1,23 @@
+import { TaskTypeQualityControlStatisticsComponent } from './taskType-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { TaskTypeQualityControlStatisticsRoutingModule } from './taskType-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({
+  declarations: [
+    TaskTypeQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    TaskTypeQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule,
+  ]
+})
+export class TaskTypeQualityControlStatisticsModule { }

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

@@ -1,15 +1,11 @@
 <div class="searchDataWrap">
   <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div>
-    <div class="searchDataItem">
-      <span class="label">分组</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
-        <ng-container *ngFor="let option of groupList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+      <span class="label">人员</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +20,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>

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,
@@ -27,7 +28,7 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
   listLength: number = 0; //表格总数据量
   widthConfig: any[] = [];
 
-  groupId;//分组id
+  userId;//人员id
 
   searchTimerSubject = new Subject();
 
@@ -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,11 +62,12 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.groupDTO;
     return flag ? 37 : 0;
   }
 
@@ -123,12 +127,13 @@ 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,
         deptId: this.fieldConfig.fields.deptId || undefined,
-        groupId: this.groupId || undefined,
+        userId: this.userId || undefined,
       };
       if (field && sort) {
         postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -162,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;
@@ -183,12 +176,13 @@ 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,
       deptId: this.fieldConfig.fields.deptId || undefined,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
@@ -221,15 +215,16 @@ 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.groupId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined};
+    this.dateRange = []
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
-  // 分组搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
   }
 
   // 防抖
@@ -239,35 +234,35 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeGroup(flag){
-    flag && this.getGroupList();
+  openChangeUser(flag){
+    flag && this.getUserList();
   }
 
-  // 获取分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?) {
-    let data = {
-      group2: {
-        statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 1,
-      },
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let postData: any = {
       idx: 0,
       sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+      },
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "group2", data)
+      .getFetchDataList("simple/data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list;
+        this.userList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, deptId: undefined},
-    config: {building: true, dept: true},
+    fields: {buildingId: undefined, deptId: undefined, groupId: undefined},
+    config: {building: true, dept: true, group: undefined},
   }
   showSearchMore:boolean = false;
   showMore(){

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,15 +1,11 @@
 <div class="searchDataWrap">
   <div class="searchData">
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">建单时间</span>：
-      <nz-range-picker [(ngModel)]="dateRange" [nzAllowClear]="false" (ngModelChange)="changeDate($event)" (nzOnCalendarChange)="onCalendarChangeDate($event)">
-      </nz-range-picker>
-    </div>
-    <div class="searchDataItem">
-      <span class="label">分组</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" nzAllowClear nzPlaceHolder="请选择分组" [(ngModel)]="groupId" (nzOpenChange)="openChangeGroup($event)">
-        <ng-container *ngFor="let option of groupList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+      <span class="label">人员</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" nzAllowClear nzPlaceHolder="请选择人员" [(ngModel)]="userId" (nzOpenChange)="openChangeUser($event)">
+        <ng-container *ngFor="let option of userList">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -24,7 +20,8 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
   <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
 </div>

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,
@@ -25,7 +26,7 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  groupId;//分组id
+  userId;//人员id
 
   searchTimerSubject = new Subject();
 
@@ -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,11 +60,12 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.tabService.clearQueryParams();
     if(queryParams.dateRange){
       this.dateRange = queryParams.dateRange;
+      this.customChangeDateComponent.initByDate(this.dateRange);
     }
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO;
+    let flag = this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.groupDTO;
     return flag ? 37 : 0;
   }
 
@@ -113,11 +117,12 @@ 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,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
       deptId: this.fieldConfig.fields.deptId || undefined,
     };
     if (field && sort) {
@@ -151,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;
@@ -172,11 +165,12 @@ 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,
-      groupId: this.groupId || undefined,
+      userId: this.userId || undefined,
       buildingId: this.fieldConfig.fields.buildingId || undefined,
+      groupId: this.fieldConfig.fields.groupId || undefined,
       deptId: this.fieldConfig.fields.deptId || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
@@ -210,15 +204,16 @@ 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.groupId = undefined;
-    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined};
+    this.dateRange = []
+    this.userId = undefined;
+    this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
+    this.customChangeDateComponent.resetByDate();
     this.search();
   }
 
-  // 楼栋搜索
-  changeGroupInp(e) {
-    this.searchTimer(this.getGroupList, e);
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
   }
 
   // 防抖
@@ -228,35 +223,35 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.searchTimerSubject.next([fun, e]);
   }
 
-  openChangeGroup(flag){
-    flag && this.getGroupList();
+  openChangeUser(flag){
+    flag && this.getUserList();
   }
 
-  // 获取分组列表
-  groupList:any[] = [];
-  getGroupList(keyword?) {
-    let data = {
-      group2: {
-        statisticalHosId: this.getHosId,
-        groupName: keyword,
-        type: 1,
-      },
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword?) {
+    let postData: any = {
       idx: 0,
       sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        statisticalHosId: this.getHosId,
+      },
     };
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "group2", data)
+      .getFetchDataList("simple/data", "user", postData)
       .subscribe((data) => {
         this.isLoading = false;
-        this.groupList = data.list;
+        this.userList = data.list;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {buildingId: undefined, deptId: undefined},
-    config: {building: true, dept: true},
+    fields: {buildingId: undefined, deptId: undefined, groupId: undefined},
+    config: {building: true, dept: true, group: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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();
   }