配送陪检统计

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

@@ -0,0 +1,97 @@
+<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.groupAndUser">
+          <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="userId">人<span style="visibility: hidden;">囧囧</span>员</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting(true)">
+              <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>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.statisticsType">
+          <nz-form-label [nzSpan]="6" nzFor="statisticsTypeId">统计分类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择统计分类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="statisticsTypeId" nzPlaceHolder="请选择统计分类">
+              <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>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.taskType">
+          <nz-form-label [nzSpan]="6" nzFor="taskTypeId">任务类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择任务类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeTaskTypeInp($event)" formControlName="taskTypeId" nzPlaceHolder="请选择任务类型" (nzOpenChange)="openChangeTaskType($event)" (ngModelChange)="setIsSelecting(true)">
+              <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>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.building">
+          <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)="setIsSelecting(true)">
+              <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.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)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($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>
+      </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/distribution-search-more/distribution-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/distribution-search-more/distribution-search-more.component.ts

@@ -0,0 +1,307 @@
+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-distribution-search-more',
+  templateUrl: './distribution-search-more.component.html',
+  styleUrls: ['./distribution-search-more.component.less']
+})
+export class DistributionSearchMoreComponent 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();
+    this.getSourceList();
+  }
+  // 隐藏模态框
+  hideModal() {
+    this.cancelEvent.emit()
+  }
+  // 初始化form表单
+  initForm() {
+    this.groupList = this.fieldConfig.fields.groupDTO ? [this.fieldConfig.fields.groupDTO] : [];
+    this.userList = this.fieldConfig.fields.userDTO ? [this.fieldConfig.fields.userDTO] : [];
+    this.statisticsTypeList = this.fieldConfig.fields.statisticsTypeDTO ? [this.fieldConfig.fields.statisticsTypeDTO] : [];
+    this.buildingList = this.fieldConfig.fields.buildingDTO ? [this.fieldConfig.fields.buildingDTO] : [];
+    this.taskTypeList = this.fieldConfig.fields.taskTypeDTO ? [this.fieldConfig.fields.taskTypeDTO] : [];
+    this.deptList = this.fieldConfig.fields.deptDTO ? [this.fieldConfig.fields.deptDTO] : [];
+
+    this.validateForm = this.fb.group({
+      groupId: [this.fieldConfig.fields.groupId || null],
+      userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
+      statisticsTypeId: [this.fieldConfig.fields.statisticsTypeId || null],
+      buildingId: [this.fieldConfig.fields.buildingId || null],
+      taskTypeId: [this.fieldConfig.fields.taskTypeDTO ? this.fieldConfig.fields.taskTypeDTO.id  : null],
+      deptId: [this.fieldConfig.fields.deptDTO ? this.fieldConfig.fields.deptDTO.id  : 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.groupAndUser){
+      fields.groupId = this.validateForm.value.groupId;
+      fields.groupDTO = this.groupList.find(item => item.id == this.validateForm.value.groupId);
+      fields.userId = this.validateForm.value.userId;
+      fields.userDTO = this.userList.find(item => item.id == this.validateForm.value.userId);
+    }
+
+    if(this.fieldConfig.config.statisticsType){
+      fields.statisticsTypeId = this.validateForm.value.statisticsTypeId;
+      fields.statisticsTypeDTO = this.statisticsTypeList.find(item => item.id == this.validateForm.value.statisticsTypeId);
+    }
+    if(this.fieldConfig.config.building){
+      fields.buildingId = this.validateForm.value.buildingId;
+      fields.buildingDTO = this.buildingList.find(item => item.id == this.validateForm.value.buildingId);
+    }
+    if(this.fieldConfig.config.taskType){
+      fields.taskTypeId = this.validateForm.value.taskTypeId;
+      fields.taskTypeDTO = this.taskTypeList.find(item => item.id == this.validateForm.value.taskTypeId);
+    }
+    if(this.fieldConfig.config.dept){
+      fields.deptId = this.validateForm.value.deptId;
+      fields.deptDTO = this.deptList.find(item => item.id == this.validateForm.value.deptId);
+    }
+    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; // 设置标志
+  }
+
+  // =================分组===================
+
+  // 分组搜索
+  changeGroupInp(e) {
+    this.searchTimer(this.getGroupList, e);
+  }
+
+  // 获取分组列表
+  groupList:any[] = [];
+  getGroupList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      group2: {
+        statisticalHosId: this.getHosId,
+        groupName: keyword,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "group2", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.groupList = result.list || [];
+      }else{
+        this.groupList = [];
+      }
+    });
+  }
+  openChangeGroup(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getGroupList();
+  }
+
+  changeGroup(id){
+    this.setIsSelecting(true);
+    this.userList = [];
+    this.validateForm.controls.userId.setValue(null);
+    this.getUserList();
+  }
+
+  // =================人员===================
+
+  // 人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+
+  // 获取人员列表
+  userList:any[] = [];
+  getUserList(keyword = ''){
+    if(!this.validateForm.value.groupId){
+      this.isLoading = false;
+      this.userList = [];
+      return;
+    }
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      user: {
+        name: keyword,
+        simpleQuery: true,
+        groupdata: { id: this.validateForm.value.groupId },
+      },
+    };
+    this.isLoading = true;
+    this.mainService.getFetchDataList("simple/data", "user", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.userList = result.list || [];
+      }else{
+        this.userList = [];
+      }
+    });
+  }
+  openChangeUser(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getUserList();
+  }
+
+  // =================统计分类===================
+
+  // 获取统计分类列表
+  statisticsTypeList:any[] = [];
+  getSourceList(){
+    this.mainService.getDictionary("list", "statistics_date_type").subscribe(result => {
+      this.statisticsTypeList = result;
+    });
+  }
+
+  // =================楼栋===================
+
+  // 楼栋搜索
+  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();
+  }
+
+  // =================任务类型===================
+
+  // 任务类型搜索
+  changeTaskTypeInp(e) {
+    this.searchTimer(this.getTaskTypeList, e);
+  }
+
+  // 获取任务类型列表
+  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(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.taskTypeList = result.list || [];
+      }else{
+        this.taskTypeList = [];
+      }
+    });
+  }
+  openChangeTaskType(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getTaskTypeList();
+  }
+
+  // =================科室===================
+
+  // 科室搜索
+  changeRepairDeptInp(e) {
+    this.searchTimer(this.getRepairDeptList, e);
+  }
+
+  // 获取科室列表
+  deptList:any[] = [];
+  getRepairDeptList(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 = [];
+      }
+    });
+  }
+  openChangeRepairDept(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getRepairDeptList();
+  }
+}

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

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

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

@@ -5,17 +5,6 @@
       <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)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-        <ng-container *ngFor="let option of repairDeptList">
-          <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>
-    </div>
   </div>
   <div class="operation">
     <i class="icon_transport transport-gengduo" (click)="showMore()"></i>
@@ -24,67 +13,58 @@
     <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.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
-  <span>{{fieldConfig.fields.category1DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category2DTO?.category}}</span>
-  <span>{{fieldConfig.fields.category3DTO?.category}}</span>
-  <span>{{fieldConfig.fields.sourceDTO?.name}}</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="startDate" [(nzSort)]="sortCurrent.startDate">时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData">
-      <td>{{ data.startDate }}</td>
-      <td>{{ data.sum }}</td>
-      <td>{{ data.avgResponseTime }}</td>
-      <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
-      <td>{{ data.consumablePrice }}</td>
-      <td>{{ data.workHourPrice }}</td>
-      <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
-      <td>{{ data.favorableRate }}</td>
-    </tr>
-  </tbody>
-  <ng-template #footerTpl>
-    <table class="footTable">
-      <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 10%">{{ data.startDate }}</td>
-        <td style="width: 9%">{{ data.sum }}</td>
-        <td style="width: 9%">{{ data.avgResponseTime }}</td>
-        <td style="width: 9%">{{ data.avgResolvedTime }}</td>
-        <td style="width: 9%">{{ data.resolvedOverNum }}</td>
-        <td style="width: 9%">{{ data.overTimeNum }}</td>
-        <td style="width: 9%">{{ data.consumablePrice }}</td>
-        <td style="width: 9%">{{ data.workHourPrice }}</td>
-        <td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.negativeNum }}</td>
-        <td style="width: 9%">{{ data.favorableRate }}</td>
+<div class="tableWrap">
+  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 20 + '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" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
+        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+      </tr>
+      <tr>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
+        </ng-container>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td>{{ data.date }}</td>
+        <td>{{ data.totalCount }}</td>
+        <td>{{ data.totalGrade }}</td>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <td>{{ data[dictionary.value + 'Count'] }}</td>
+          <td>{{ data[dictionary.value + 'Grade'] }}</td>
+        </ng-container>
       </tr>
-    </table>
-  </ng-template>
-</nz-table>
+    </tbody>
+    <ng-template #footerTpl>
+      <table class="footTable">
+        <tr *ngFor="let data of listOfDataEnd">
+          <td>{{ data.date }}</td>
+          <td>{{ data.totalCount }}</td>
+          <td>{{ data.totalGrade }}</td>
+          <ng-container *ngFor="let dictionary of dictionaryList">
+            <td>{{ data[dictionary.value + 'Count'] }}</td>
+            <td>{{ data[dictionary.value + 'Grade'] }}</td>
+          </ng-container>
+        </tr>
+      </table>
+    </ng-template>
+  </nz-table>
+</div>
 <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-search-more [fieldConfig]="fieldConfig" *ngIf="showSearchMore" [hosId]="hosId" [queryType]="queryType"  [dutyId]="dutyId"  [parentDutyId]="parentDutyId" (cancelEvent)="cancelEvent()" (submitEvent)="submitEvent($event)"></app-search-more>
+<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/date-business-statistics/date-business-statistics.component.less

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{
@@ -50,8 +50,19 @@
     }
   }
 
-  .table{
+  .tableWrap{
     margin: 0 8px;
+    overflow-x: auto;
+    .footTable, tbody{
+      td{
+        width: 100px;
+        max-width: 100px;
+        &.width150{
+          width: 150px;
+          max-width: 150px;
+        }
+      }
+    }
   }
 
   .moreFilter{

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

@@ -1,6 +1,4 @@
 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";
@@ -24,16 +22,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
-
-  repairDeptId;//报修科室id
-
-  searchTimerSubject = new Subject();
+  widthConfig: any[] = [];
 
   ngOnInit() {
-    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
-      let fun = v[0];
-      fun.call(this, v[1]);
-    });
     this.initSessionData();
     this.getQueryParams();
     this.search();
@@ -47,7 +38,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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 - 2;
 
     }, 0)
   }
@@ -61,8 +52,8 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
-    return flag ? 21 : 0;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.deptDTO;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据
@@ -106,37 +97,40 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 
   // 表格数据
   loading1 = false;
+  dictionaryList: any[] = [];
   getList(num?: number, field?: string, sort?: string) {
-    if (num !== undefined) {
-      this.pageIndex = num;
-    }
-    let postData:any = {
-      idx: this.pageIndex - 1,
-      sum: this.pageSize,
-      startDate: this.dateRange[0] || undefined,
-      endDate: this.dateRange[1] || undefined,
-      hosId: this.hosId || undefined,
-      dutyId: this.dutyId || undefined,
-      parentDutyId: this.parentDutyId || undefined,
-      repairDeptId: this.repairDeptId || undefined,
-      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
-      userId: this.fieldConfig.fields.userId || undefined,
-      categoryId: this.fieldConfig.fields.categoryId || undefined,
-      sourceId: this.fieldConfig.fields.sourceId || undefined,
-      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
-    };
-    if (field && sort) {
-      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
-    }
-    this.loading1 = true;
-    this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", 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;
-      });
+    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
+      let dictionaryList = data || [];
+      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      this.dictionaryList = dictionaryList;
+      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px');
+      if (num !== undefined) {
+        this.pageIndex = num;
+      }
+      let postData:any = {
+        idx: this.pageIndex - 1,
+        sum: this.pageSize,
+        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,
+        buildingId: this.fieldConfig.fields.buildingId || 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", "dateTransOrder", 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;
+        });
+    });
   }
 
   // 列表排序
@@ -179,21 +173,17 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     let postData:any = {
       startDate: this.dateRange[0] || undefined,
       endDate: this.dateRange[1] || undefined,
-      hosId: this.hosId || undefined,
-      dutyId: this.dutyId || undefined,
-      parentDutyId: this.parentDutyId || undefined,
-      repairDeptId: this.repairDeptId || undefined,
+      hosId: this.getHosId,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
-      categoryId: this.fieldConfig.fields.categoryId || undefined,
-      sourceId: this.fieldConfig.fields.sourceId || undefined,
-      hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/exportMergeTitle", "dateTransOrder", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -221,52 +211,17 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 		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.repairDeptId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
     this.search();
   }
 
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
-  }
-
   // 防抖
   isLoading = false;
-  searchTimer(fun, e) {
-    this.isLoading = true;
-    this.searchTimerSubject.next([fun, e]);
-  }
-
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
-  }
-
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        statisticalHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
-    this.isLoading = true;
-    this.mainService
-      .getFetchDataList("data", "department", data)
-      .subscribe((data) => {
-        this.isLoading = false;
-        this.repairDeptList = data.list;
-      });
-  }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+    fields: {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined},
+    config: {groupAndUser: true, building: true, dept: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common';
 import { DateBusinessStatisticsRoutingModule } from './date-business-statistics-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
-import { SearchMoreModule } from '../../components/search-more/search-more.module';
+import { DistributionSearchMoreModule } from '../../components/distribution-search-more/distribution-search-more.module';
 
 
 @NgModule({
@@ -17,7 +17,7 @@ import { SearchMoreModule } from '../../components/search-more/search-more.modul
     DateBusinessStatisticsRoutingModule,
     ShareModule,
     VirtualScrollerModule,
-    SearchMoreModule,
+    DistributionSearchMoreModule,
   ]
 })
 export class DateBusinessStatisticsModule { }

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

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

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

@@ -0,0 +1,83 @@
+<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>
+    <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" (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.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.deptDTO">
+  <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="12%" nzShowSort nzSortKey="date" [(nzSort)]="sortCurrent.date">日期</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="11%" 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.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_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: 12%">{{ data.date }}</td>
+        <td style="width: 11%">{{ data.totalCount }}</td>
+        <td style="width: 11%">{{ data.totalGrade }}</td>
+        <td style="width: 11%">{{ data.response_time_num }}</td>
+        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.aveper }}</td>
+        <td style="width: 11%">{{ data.total_time }}</td>
+        <td style="width: 11%">{{ data.five_count }}</td>
+        <td style="width: 11%">{{ 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/date-quality-control-statistics/date-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: 224px;
+        }
+      }
+    }
+    .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/date-quality-control-statistics/date-quality-control-statistics.component.ts

@@ -0,0 +1,257 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@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 {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  statisticsTypeId;//科室类型id
+
+  ngOnInit() {
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.buildingDTO || 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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      statisticsTypeId: this.statisticsTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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", "dateTransOrderQc", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      statisticsTypeId: this.statisticsTypeId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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/exportMergeTitle", "dateTransOrderQc", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]
+    this.statisticsTypeId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
+    this.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, taskTypeId: undefined, buildingId: undefined, deptId: undefined},
+    config: {groupAndUser: true, taskType: true, building: true, dept: 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/date-quality-control-statistics/date-quality-control-statistics.module.ts

@@ -0,0 +1,21 @@
+import { DateQualityControlStatisticsComponent } from './date-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    DateQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DateQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class DateQualityControlStatisticsModule { }

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

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

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

@@ -0,0 +1,79 @@
+<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>
+    <div class="searchDataItem">
+      <span class="label">楼栋</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
+        <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>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (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">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+</div>
+<div class="tableWrap">
+  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 50 * 1 + 20 + '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">科室(编码)</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
+        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+      </tr>
+      <tr>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
+        </ng-container>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td class="width150">{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+        <td>{{ data.totalCount }}</td>
+        <td>{{ data.totalGrade }}</td>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <td>{{ data[dictionary.value + 'Count'] }}</td>
+          <td>{{ data[dictionary.value + 'Grade'] }}</td>
+        </ng-container>
+      </tr>
+    </tbody>
+    <ng-template #footerTpl>
+      <table class="footTable">
+        <tr *ngFor="let data of listOfDataEnd">
+          <td class="width150">{{ data.code }}</td>
+          <td>{{ data.totalCount }}</td>
+          <td>{{ data.totalGrade }}</td>
+          <ng-container *ngFor="let dictionary of dictionaryList">
+            <td>{{ data[dictionary.value + 'Count'] }}</td>
+            <td>{{ data[dictionary.value + 'Grade'] }}</td>
+          </ng-container>
+        </tr>
+      </table>
+    </ng-template>
+  </nz-table>
+</div>
+<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/department-business-statistics/department-business-statistics.component.less

@@ -0,0 +1,82 @@
+@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: 224px;
+        }
+      }
+    }
+    .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;
+        }
+      }
+    }
+  }
+
+  .tableWrap{
+    margin: 0 8px;
+    overflow-x: auto;
+    .footTable, tbody{
+      td{
+        width: 100px;
+        max-width: 100px;
+        &.width150{
+          width: 150px;
+          max-width: 150px;
+        }
+      }
+    }
+  }
+
+  .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/department-business-statistics/department-business-statistics.component.ts

@@ -0,0 +1,285 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-department-business-statistics",
+  templateUrl: "./department-business-statistics.component.html",
+  styleUrls: ["./department-business-statistics.component.less"],
+})
+export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+  widthConfig: any[] = [];
+
+  buildingId;//楼栋id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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 - 2;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO;
+    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;
+  dictionaryList: any[] = [];
+  getList(num?: number, field?: string, sort?: string) {
+    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
+      let dictionaryList = data || [];
+      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      this.dictionaryList = dictionaryList;
+      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });;
+      if (num !== undefined) {
+        this.pageIndex = num;
+      }
+      let postData:any = {
+        idx: this.pageIndex - 1,
+        sum: this.pageSize,
+        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,
+        buildingId: this.buildingId || undefined,
+      };
+      if (field && sort) {
+        postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+      }
+      this.loading1 = true;
+      this.mainService
+        .postCustom("itsm/report", "deptTransOrder", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      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,
+      buildingId: this.buildingId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/exportMergeTitle", "deptTransOrder", 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 = [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.buildingId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined};
+    this.search();
+  }
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
+  }
+
+  // 获取报修科室列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?) {
+    let data = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.buildingList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined},
+    config: {groupAndUser: 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/department-business-statistics/department-business-statistics.module.ts

@@ -0,0 +1,23 @@
+import { DepartmentBusinessStatisticsComponent } from './department-business-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { DepartmentBusinessStatisticsRoutingModule } from './department-business-statistics-routing.module';
+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';
+
+
+@NgModule({
+  declarations: [
+    DepartmentBusinessStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DepartmentBusinessStatisticsRoutingModule,
+    ShareModule,
+    VirtualScrollerModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class DepartmentBusinessStatisticsModule { }

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

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

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

@@ -0,0 +1,82 @@
+<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>
+    <div class="searchDataItem">
+      <span class="label">楼栋</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
+        <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>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (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.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</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="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_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: 12%">{{ data.code }}</td>
+        <td style="width: 11%">{{ data.totalCount }}</td>
+        <td style="width: 11%">{{ data.totalGrade }}</td>
+        <td style="width: 11%">{{ data.response_time_num }}</td>
+        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.aveper }}</td>
+        <td style="width: 11%">{{ data.total_time }}</td>
+        <td style="width: 11%">{{ data.five_count }}</td>
+        <td style="width: 11%">{{ 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/department-quality-control-statistics/department-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: 224px;
+        }
+      }
+    }
+    .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/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -0,0 +1,281 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@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 {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  buildingId;//楼栋id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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", "deptTransOrderQc", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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/exportMergeTitle", "deptTransOrderQc", 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 = [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.buildingId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.search();
+  }
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
+  }
+
+  // 获取报修科室列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?) {
+    let data = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.buildingList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
+    config: {groupAndUser: true, statisticsType: 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/department-quality-control-statistics/department-quality-control-statistics.module.ts

@@ -0,0 +1,21 @@
+import { DepartmentQualityControlStatisticsComponent } from './department-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    DepartmentQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DepartmentQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class DepartmentQualityControlStatisticsModule { }

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

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

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

@@ -0,0 +1,82 @@
+<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>
+    <div class="searchDataItem">
+      <span class="label">楼栋</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
+        <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>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (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.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</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.name }}<ng-container *ngIf="data.code">({{ data.code }})</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.code }}</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/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-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: 224px;
+        }
+      }
+    }
+    .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/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -0,0 +1,281 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@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 {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  buildingId;//楼栋id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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", "deptDegreeTransOrder", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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/exportMergeTitle", "deptDegreeTransOrder", 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 = [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.buildingId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.search();
+  }
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
+  }
+
+  // 获取报修科室列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?) {
+    let data = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.buildingList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
+    config: {groupAndUser: true, statisticsType: 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/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.module.ts

@@ -0,0 +1,21 @@
+import { DistributionDepartmentEvaluateStatisticsComponent } from './distribution-department-evaluate-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    DistributionDepartmentEvaluateStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionDepartmentEvaluateStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class DistributionDepartmentEvaluateStatisticsModule { }

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

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

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

@@ -0,0 +1,70 @@
+<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>
+    <div class="searchDataItem">
+      <span class="label">楼栋</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
+        <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>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (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.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+  <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
+  <span>{{fieldConfig.fields.userDTO?.name}}</span>
+  <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
+  <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</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="20%">科室(编码)</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="service" [(nzSort)]="sortCurrent.service">服务台建单数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="nurse" [(nzSort)]="sortCurrent.nurse">护士端建单数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="system" [(nzSort)]="sortCurrent.system">系统自动建单数</th>
+      <th nzWidth="20%" nzShowSort nzSortKey="wechat" [(nzSort)]="sortCurrent.wechat">微信端建单数量</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.name }}<ng-container *ngIf="data.code">({{ data.code }})</ng-container></td>
+      <td>{{ data.service }}</td>
+      <td>{{ data.nurse }}</td>
+      <td>{{ data.system }}</td>
+      <td>{{ data.wechat }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 20%">{{ data.code }}</td>
+        <td style="width: 20%">{{ data.service }}</td>
+        <td style="width: 20%">{{ data.nurse }}</td>
+        <td style="width: 20%">{{ data.system }}</td>
+        <td style="width: 20%">{{ data.wechat }}</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/distribution-department-source-statistics/distribution-department-source-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: 224px;
+        }
+      }
+    }
+    .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/distribution-department-source-statistics/distribution-department-source-statistics.component.ts

@@ -0,0 +1,281 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@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 {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  buildingId;//楼栋id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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", "deptSourceTransOrder", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      buildingId: this.buildingId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || 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/exportMergeTitle", "deptSourceTransOrder", 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 = [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.buildingId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.search();
+  }
+
+  // 楼栋搜索
+  changeBuildingInp(e) {
+    this.searchTimer(this.getBuildingList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeBuilding(flag){
+    flag && this.getBuildingList();
+  }
+
+  // 获取报修科室列表
+  buildingList:any[] = [];
+  getBuildingList(keyword?) {
+    let data = {
+      building: {
+        simpleQuery: true,
+        buildingName: keyword,
+        statisticalHosId:this.getHosId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.buildingList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
+    config: {groupAndUser: true, statisticsType: 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/distribution-department-source-statistics/distribution-department-source-statistics.module.ts

@@ -0,0 +1,21 @@
+import { DistributionDepartmentSourceStatisticsComponent } from './distribution-department-source-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    DistributionDepartmentSourceStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    DistributionDepartmentSourceStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class DistributionDepartmentSourceStatisticsModule { }

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

@@ -17,6 +17,78 @@ const routes: Routes = [
           title: '日期业务统计'
         }
       },
+      {
+        // 日期质控统计
+        path: 'dateQualityControlStatistics',
+        loadChildren: () => import('./date-quality-control-statistics/date-quality-control-statistics.module').then(m => m.DateQualityControlStatisticsModule),
+        data: {
+          reuse: true,
+          title: '日期质控统计'
+        }
+      },
+      {
+        // 科室业务统计
+        path: 'departmentBusinessStatistics',
+        loadChildren: () => import('./department-business-statistics/department-business-statistics.module').then(m => m.DepartmentBusinessStatisticsModule),
+        data: {
+          reuse: true,
+          title: '科室业务统计'
+        }
+      },
+      {
+        // 科室质控统计
+        path: 'departmentQualityControlStatistics',
+        loadChildren: () => import('./department-quality-control-statistics/department-quality-control-statistics.module').then(m => m.DepartmentQualityControlStatisticsModule),
+        data: {
+          reuse: true,
+          title: '科室质控统计'
+        }
+      },
+      {
+        // 科室评价统计
+        path: 'distributionDepartmentEvaluateStatistics',
+        loadChildren: () => import('./distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.module').then(m => m.DistributionDepartmentEvaluateStatisticsModule),
+        data: {
+          reuse: true,
+          title: '科室评价统计'
+        }
+      },
+      {
+        // 科室来源统计
+        path: 'distributionDepartmentSourceStatistics',
+        loadChildren: () => import('./distribution-department-source-statistics/distribution-department-source-statistics.module').then(m => m.DistributionDepartmentSourceStatisticsModule),
+        data: {
+          reuse: true,
+          title: '科室来源统计'
+        }
+      },
+      {
+        // 人员业务统计
+        path: 'userBusinessStatistics',
+        loadChildren: () => import('./user-business-statistics/user-business-statistics.module').then(m => m.UserBusinessStatisticsModule),
+        data: {
+          reuse: true,
+          title: '人员业务统计'
+        }
+      },
+      {
+        // 人员质控统计
+        path: 'userQualityControlStatistics',
+        loadChildren: () => import('./user-quality-control-statistics/user-quality-control-statistics.module').then(m => m.UserQualityControlStatisticsModule),
+        data: {
+          reuse: true,
+          title: '人员质控统计'
+        }
+      },
+      {
+        // 来源统计
+        path: 'sourceStatistics',
+        loadChildren: () => import('./source-statistics/source-statistics.module').then(m => m.SourceStatisticsModule),
+        data: {
+          reuse: true,
+          title: '来源统计'
+        }
+      },
     ]
   }
 ];

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

@@ -3,7 +3,7 @@
 :host{
   background-color: #F0F2F5;
   width: 100%;
-  height: 100vh;
+  height: calc(100vh - 48px);
   font-size: 14px;
   display: flex;
   flex-direction: column;

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

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

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

@@ -0,0 +1,65 @@
+<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>
+    <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)">
+        <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>
+    </div>
+  </div>
+  <div class="operation">
+    <i class="icon_transport transport-gengduo" (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.taskTypeDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.statisticsTypeDTO">
+  <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.statisticsTypeDTO?.name}}</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="34%">来源名称</th>
+      <th nzWidth="33%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th nzWidth="33%" nzShowSort nzSortKey="percent" [(nzSort)]="sortCurrent.percent">占比</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.name }}</td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.percent }}</td>
+    </tr>
+  </tbody>
+  <ng-template #footerTpl>
+    <table class="footTable">
+      <tr *ngFor="let data of listOfDataEnd">
+        <td style="width: 34%">{{ data.name }}</td>
+        <td style="width: 33%">{{ data.totalCount }}</td>
+        <td style="width: 33%">{{ data.percent }}</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/source-statistics/source-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: 224px;
+        }
+      }
+    }
+    .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/source-statistics/source-statistics.component.ts

@@ -0,0 +1,283 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-source-statistics",
+  templateUrl: "./source-statistics.component.html",
+  styleUrls: ["./source-statistics.component.less"],
+})
+export class SourceStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  deptId;//科室id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      deptId: this.deptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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", "sourceTransOrder", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      deptId: this.deptId || undefined,
+      groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
+      userId: this.fieldConfig.fields.userId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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/exportMergeTitle", "sourceTransOrder", 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 = [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.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined};
+    this.search();
+  }
+
+  // 科室搜索
+  changeDeptInp(e) {
+    this.searchTimer(this.getDeptList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeDept(flag){
+    flag && this.getDeptList();
+  }
+
+  // 获取科室列表
+  deptList:any[] = [];
+  getDeptList(keyword?) {
+    let data = {
+      department: {
+        statisticalHosId: this.getHosId,
+        dept: keyword,
+        searchType: 1,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined},
+    config: {groupAndUser: true, taskType: true, building: 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/source-statistics/source-statistics.module.ts

@@ -0,0 +1,21 @@
+import { SourceStatisticsComponent } from './source-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    SourceStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    SourceStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class SourceStatisticsModule { }

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

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

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

@@ -0,0 +1,79 @@
+<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>
+    <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>
+        </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" (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.buildingDTO || fieldConfig.fields.deptDTO">
+  <span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+</div>
+<div class="tableWrap">
+  <nz-table class="table" [ngStyle]="{ width: widthConfig.length * 100 + 50 * 1 + 20 + '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">人员(编码)</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+        <th rowspan="2" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">积分总和</th>
+        <th colspan="2" *ngFor="let dictionary of dictionaryList">{{dictionary.name}}</th>
+      </tr>
+      <tr>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Count'" [(nzSort)]="sortCurrent[dictionary.value + 'Count']">工单量</th>
+          <th nzShowSort [nzSortKey]="dictionary.value + 'Grade'" [(nzSort)]="sortCurrent[dictionary.value + 'Grade']">积分数</th>
+        </ng-container>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let data of listOfData">
+        <td class="width150">{{ data.name }}<ng-container *ngIf="data.account">({{ data.account }})</ng-container></td>
+        <td>{{ data.totalCount }}</td>
+        <td>{{ data.totalGrade }}</td>
+        <ng-container *ngFor="let dictionary of dictionaryList">
+          <td>{{ data[dictionary.value + 'Count'] }}</td>
+          <td>{{ data[dictionary.value + 'Grade'] }}</td>
+        </ng-container>
+      </tr>
+    </tbody>
+    <ng-template #footerTpl>
+      <table class="footTable">
+        <tr *ngFor="let data of listOfDataEnd">
+          <td class="width150">{{ data.account }}</td>
+          <td>{{ data.totalCount }}</td>
+          <td>{{ data.totalGrade }}</td>
+          <ng-container *ngFor="let dictionary of dictionaryList">
+            <td>{{ data[dictionary.value + 'Count'] }}</td>
+            <td>{{ data[dictionary.value + 'Grade'] }}</td>
+          </ng-container>
+        </tr>
+      </table>
+    </ng-template>
+  </nz-table>
+</div>
+<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/user-business-statistics/user-business-statistics.component.less

@@ -0,0 +1,82 @@
+@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: 224px;
+        }
+      }
+    }
+    .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;
+        }
+      }
+    }
+  }
+
+  .tableWrap{
+    margin: 0 8px;
+    overflow-x: auto;
+    .footTable, tbody{
+      td{
+        width: 100px;
+        max-width: 100px;
+        &.width150{
+          width: 150px;
+          max-width: 150px;
+        }
+      }
+    }
+  }
+
+  .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/user-business-statistics/user-business-statistics.component.ts

@@ -0,0 +1,284 @@
+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 { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@Component({
+  selector: "app-user-business-statistics",
+  templateUrl: "./user-business-statistics.component.html",
+  styleUrls: ["./user-business-statistics.component.less"],
+})
+export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+  widthConfig: any[] = [];
+
+  groupId;//分组id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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 - 2;
+
+    }, 0)
+  }
+
+  getQueryParams(){
+    let queryParams = this.tabService.getQueryParams();
+    this.tabService.clearQueryParams();
+    if(queryParams.dateRange){
+      this.dateRange = queryParams.dateRange;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.buildingDTO || 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;
+  dictionaryList: any[] = [];
+  getList(num?: number, field?: string, sort?: string) {
+    this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
+      let dictionaryList = data || [];
+      dictionaryList.push({id: 0, name: '其他', value: 'dateOther'});
+      this.dictionaryList = dictionaryList;
+      this.widthConfig = new Array(this.dictionaryList.length * 2 + 3).fill('100px').map((v, i) => { return i == 0 ? '150px' : '100px' });
+      if (num !== undefined) {
+        this.pageIndex = num;
+      }
+      let postData:any = {
+        idx: this.pageIndex - 1,
+        sum: this.pageSize,
+        startDate: this.dateRange[0] || undefined,
+        endDate: this.dateRange[1] || undefined,
+        hosId: this.getHosId,
+        buildingId: this.fieldConfig.fields.buildingId || undefined,
+        deptId: this.fieldConfig.fields.deptId || undefined,
+        groupId: this.groupId || undefined,
+      };
+      if (field && sort) {
+        postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
+      }
+      this.loading1 = true;
+      this.mainService
+        .postCustom("itsm/report", "userTransOrder", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.getHosId,
+      buildingId: this.fieldConfig.fields.buildingId || undefined,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      groupId: this.groupId || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "userTransOrder", 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 = [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.search();
+  }
+
+  // 分组搜索
+  changeGroupInp(e) {
+    this.searchTimer(this.getGroupList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeGroup(flag){
+    flag && this.getGroupList();
+  }
+
+  // 获取分组列表
+  groupList:any[] = [];
+  getGroupList(keyword?) {
+    let data = {
+      group2: {
+        statisticalHosId: this.getHosId,
+        groupName: keyword,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "group2", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.groupList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {buildingId: undefined, deptId: undefined},
+    config: {building: true, dept: 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/user-business-statistics/user-business-statistics.module.ts

@@ -0,0 +1,23 @@
+import { UserBusinessStatisticsComponent } from './user-business-statistics.component';
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { UserBusinessStatisticsRoutingModule } from './user-business-statistics-routing.module';
+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';
+
+
+@NgModule({
+  declarations: [
+    UserBusinessStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    UserBusinessStatisticsRoutingModule,
+    ShareModule,
+    VirtualScrollerModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class UserBusinessStatisticsModule { }

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

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

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

@@ -0,0 +1,80 @@
+<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>
+    <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>
+        </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" (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.buildingDTO || fieldConfig.fields.deptDTO">
+  <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="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="arrive_time_num" [(nzSort)]="sortCurrent.arrive_time_num">平均送达时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+      <th nzWidth="11%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let data of listOfData">
+      <td>{{ data.name }}<ng-container *ngIf="data.account">({{ data.account }})</ng-container></td>
+      <td>{{ data.totalCount }}</td>
+      <td>{{ data.totalGrade }}</td>
+      <td>{{ data.response_time_num }}</td>
+      <td>{{ data.arrive_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: 12%">{{ data.account }}</td>
+        <td style="width: 11%">{{ data.totalCount }}</td>
+        <td style="width: 11%">{{ data.totalGrade }}</td>
+        <td style="width: 11%">{{ data.response_time_num }}</td>
+        <td style="width: 11%">{{ data.arrive_time_num }}</td>
+        <td style="width: 11%">{{ data.aveper }}</td>
+        <td style="width: 11%">{{ data.total_time }}</td>
+        <td style="width: 11%">{{ data.five_count }}</td>
+        <td style="width: 11%">{{ 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/user-quality-control-statistics/user-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: 224px;
+        }
+      }
+    }
+    .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/user-quality-control-statistics/user-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 { format, addMonths, startOfMonth, endOfMonth, startOfDay, endOfDay } from 'date-fns';
+import { Component, OnInit, HostListener, AfterViewInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ActivatedRoute } from '@angular/router';
+@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 {
+  constructor(
+    private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
+    private tabService: TabService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  groupId;//分组id
+
+  searchTimerSubject = new Subject();
+
+  ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.initSessionData();
+    this.getQueryParams();
+    this.search();
+  }
+
+  ngAfterViewInit(){
+    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;
+    }
+  }
+
+  get getMoreFilter(){
+    let flag = this.fieldConfig.fields.userDTO || this.fieldConfig.fields.deptDTO || this.fieldConfig.fields.buildingDTO;
+    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,
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      groupId: this.groupId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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", "userTransOrderQc", 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 = [format(startOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')];
+  changeDate(result?): void {
+    result[0] = format(startOfDay(result[0]), 'yyyy-MM-dd HH:mm:ss');
+    result[1] = format(endOfDay(result[1]), 'yyyy-MM-dd HH:mm:ss');
+    this.dateRange = result;
+  }
+
+  onCalendarChangeDate(dateArr){
+    console.log(dateArr)
+    if(dateArr.length == 2){
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
+    }
+  }
+
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0] || undefined,
+      endDate: this.dateRange[1] || undefined,
+      hosId: this.hosId || undefined,
+      groupId: this.groupId || undefined,
+      buildingId: this.fieldConfig.fields.buildingId || 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/exportMergeTitle", "userTransOrderQc", 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 = [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.search();
+  }
+
+  // 楼栋搜索
+  changeGroupInp(e) {
+    this.searchTimer(this.getGroupList, e);
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  openChangeGroup(flag){
+    flag && this.getGroupList();
+  }
+
+  // 获取分组列表
+  groupList:any[] = [];
+  getGroupList(keyword?) {
+    let data = {
+      group2: {
+        statisticalHosId: this.getHosId,
+        groupName: keyword,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "group2", data)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.groupList = data.list;
+      });
+  }
+
+  // 详细搜索
+  fieldConfig:any = {
+    fields: {buildingId: undefined, deptId: undefined},
+    config: {building: true, dept: 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/user-quality-control-statistics/user-quality-control-statistics.module.ts

@@ -0,0 +1,21 @@
+import { UserQualityControlStatisticsComponent } from './user-quality-control-statistics.component';
+import { NgModule } from '@angular/core';
+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';
+
+
+@NgModule({
+  declarations: [
+    UserQualityControlStatisticsComponent,
+  ],
+  imports: [
+    CommonModule,
+    UserQualityControlStatisticsRoutingModule,
+    ShareModule,
+    DistributionSearchMoreModule,
+  ]
+})
+export class UserQualityControlStatisticsModule { }

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -37,7 +37,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -52,7 +52,7 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -37,7 +37,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -52,7 +52,7 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -37,7 +37,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -52,7 +52,7 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -48,7 +48,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -63,7 +63,7 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -39,7 +39,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -54,7 +54,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -39,7 +39,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -54,7 +54,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -39,7 +39,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -54,7 +54,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -37,7 +37,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -52,7 +52,7 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.sourceDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -3,7 +3,7 @@
 :host{
   background-color: #F0F2F5;
   width: 100%;
-  height: 100vh;
+  height: calc(100vh - 48px);
   font-size: 14px;
   display: flex;
   flex-direction: column;

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -7,7 +7,7 @@
   left: 0;
   ::ng-deep .ant-table-footer{
     padding: 16px 0;
-    width: calc(100% - 16px);
+    width: calc(100% - 15px);
     font-weight: bold;
   }
   tr, th{

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

@@ -47,7 +47,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
   @HostListener('window:resize')
   onResize(): void {
     setTimeout(() => {
-      this.tableHeight = window.innerHeight - document.querySelector('.searchDataWrap').clientHeight - 64 - 36 - 48 - 8 - document.querySelector('.ant-table-header').clientHeight - 55 - this.getMoreFilter - 2;
+      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)
   }
@@ -62,7 +62,7 @@ export class WorkHourStatisticsComponent implements OnInit, AfterViewInit {
 
   get getMoreFilter(){
     let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.category1DTO || this.fieldConfig.fields.category2DTO || this.fieldConfig.fields.category3DTO || this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || this.fieldConfig.fields.companyDTO;
-    return flag ? 21 : 0;
+    return flag ? 37 : 0;
   }
 
   // 初始化缓存数据

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

@@ -1,4 +1,5 @@
 <div class="header">
+  <i class="icon_transport transport-fanhui" (click)="goBack()"></i>
   <a replaceUrl routerLinkActive="active" [routerLink]="'/newStatistics/' + data.link" class="title" *ngFor="let data of menuList">{{data.title}}</a>
   <div class="hospital" (click)="queryRangeClick()">
     <ng-container *ngIf="queryType == 1">查询范围:全院查询</ng-container>

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

@@ -11,14 +11,16 @@
     align-items: center;
     position: relative;
     .title{
-      margin-right: 16px;
       cursor: pointer;
       color: rgba(0,0,0,0.65);
-      &:last-of-type{
-        margin-right: 0;
-      }
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 104px;
+      height: 100%;
       &.active{
         color: @primary-color;
+        background: #F0F6ED;
       }
     }
     .hospital{
@@ -38,5 +40,14 @@
         top: 2px;
       }
     }
+    .transport-fanhui{
+      position: absolute;
+      left: 24px;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #666666;
+      font-size: 20px;
+      cursor: pointer;
+    }
   }
 }

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

@@ -114,4 +114,9 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   cancelQueryRange() {
     this.queryRangeFlag = false;
   }
+
+  // 返回
+  goBack(){
+    this.router.navigate(['/main/home']);
+  }
 }

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe67a;</span>
+                <div class="name">返回</div>
+                <div class="code-name">&amp;#xe67a;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe66c;</span>
                 <div class="name">top2</div>
                 <div class="code-name">&amp;#xe66c;</div>
@@ -1056,9 +1062,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1740462451907') format('woff2'),
-       url('iconfont.woff?t=1740462451907') format('woff'),
-       url('iconfont.ttf?t=1740462451907') format('truetype');
+  src: url('iconfont.woff2?t=1741080510824') format('woff2'),
+       url('iconfont.woff?t=1741080510824') format('woff'),
+       url('iconfont.ttf?t=1741080510824') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1085,6 +1091,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-fanhui"></span>
+            <div class="name">
+              返回
+            </div>
+            <div class="code-name">.transport-fanhui
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-top1"></span>
             <div class="name">
               top2
@@ -2589,6 +2604,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-fanhui"></use>
+                </svg>
+                <div class="name">返回</div>
+                <div class="code-name">#transport-fanhui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-top1"></use>
                 </svg>
                 <div class="name">top2</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1740462451907') format('woff2'),
-       url('iconfont.woff?t=1740462451907') format('woff'),
-       url('iconfont.ttf?t=1740462451907') format('truetype');
+  src: url('iconfont.woff2?t=1741080510824') format('woff2'),
+       url('iconfont.woff?t=1741080510824') format('woff'),
+       url('iconfont.ttf?t=1741080510824') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-fanhui:before {
+  content: "\e67a";
+}
+
 .transport-top1:before {
   content: "\e66c";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2569862",
+      "name": "返回",
+      "font_class": "fanhui",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
       "icon_id": "6020437",
       "name": "top2",
       "font_class": "top1",