提交

src/app/services/main.service.ts

@@ -150,7 +150,7 @@ export class MainService {
       headers: this.headers,
     });
   }
-	
+
 	// 通用操作configuration信息 有操作类型（新增/更新/删除）//coop:操作类型addData:新增，updData更新，rmvData删除
 	apiPublicData(coop, type, data): any {
 	  return this.http.post(
@@ -159,7 +159,7 @@ export class MainService {
 	    { headers: this.headers }
 	  );
 	}
-	
+
   // 权限相关
   getPermission(type): any {
     return this.http.get(host.host + "/permission/roleMenu/" + type, {
@@ -180,6 +180,15 @@ export class MainService {
       headers: this.headers,
     });
   }
+
+  // 自定义请求 post-导出
+  postExportCustom(type, info, data): any {
+    return this.http.post(host.host + "/" + type + "/" + info, data, {
+      headers: this.exportHeader,
+      responseType: "arraybuffer",
+    });
+  }
+
   // 科室二维码打印flag=1
   postCustomCode(type, info, data): any {
     return this.http.post(host.host + "/" + type + "/" + info + "/1", data, {

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -103,6 +103,7 @@ export class QueryRangeComponent implements OnInit {
   // 选择院区
   changeHospital(hosId){
     if(this.validateForm.value.queryType == 3){
+      this.dutyList = [];
       this.getDutyList(hosId);
     }
   }
@@ -140,6 +141,10 @@ export class QueryRangeComponent implements OnInit {
   // 获取所有的责任部门
   dutyList:any[] = [];
   getDutyList(parentId){
+    if(!parentId){
+      this.dutyList = [];
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 99999,

src/app/views/new-statistics/components/search-more/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">维&nbsp;&nbsp;修&nbsp;&nbsp;组</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修组!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择维修组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
+              <ng-container *ngFor="let option of groupList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
+          <nz-form-label [nzSpan]="6" nzFor="groupId">维修人员</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修人员!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择维修人员" (nzOpenChange)="openChangeUser($event)">
+              <ng-container *ngFor="let option of userList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item [hidden]="!fieldConfig.config.category123">
+          <nz-form-label [nzSpan]="6" nzFor="category1Id">一级分类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择一级分类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory1Inp($event)" formControlName="category1Id" nzPlaceHolder="请选择一级分类" (nzOpenChange)="openChangeCategory1($event)" (ngModelChange)="changeCategory1($event)">
+              <ng-container *ngFor="let option of category1List">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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.category123">
+          <nz-form-label [nzSpan]="6" nzFor="category2Id">二级分类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择二级分类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory2Inp($event)" formControlName="category2Id" nzPlaceHolder="请选择二级分类" (nzOpenChange)="openChangeCategory2($event)" (ngModelChange)="changeCategory2($event)">
+              <ng-container *ngFor="let option of category2List">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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.category123">
+          <nz-form-label [nzSpan]="6" nzFor="category3Id">三级分类</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择三级分类!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeCategory3Inp($event)" formControlName="category3Id" nzPlaceHolder="请选择三级分类" (nzOpenChange)="openChangeCategory3($event)">
+              <ng-container *ngFor="let option of category3List">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.category" [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.source">
+          <nz-form-label [nzSpan]="6" nzFor="sourceId">故障来源</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择故障来源!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="sourceId" nzPlaceHolder="请选择故障来源">
+              <ng-container *ngFor="let option of sourceList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nz-button nzType="default" (click)="hideModal()">取消</button>
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,116 @@
+.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%;
+        min-height: 166px;
+        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/search-more/search-more.component.ts

@@ -0,0 +1,318 @@
+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-search-more',
+  templateUrl: './search-more.component.html',
+  styleUrls: ['./search-more.component.less']
+})
+export class SearchMoreComponent 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.category1List = this.fieldConfig.fields.category1DTO ? [this.fieldConfig.fields.category1DTO] : [];
+    this.category2List = this.fieldConfig.fields.category2DTO ? [this.fieldConfig.fields.category2DTO] : [];
+    this.category3List = this.fieldConfig.fields.category3DTO ? [this.fieldConfig.fields.category3DTO] : [];
+    this.sourceList = this.fieldConfig.fields.sourceDTO ? [this.fieldConfig.fields.sourceDTO] : [];
+
+    this.validateForm = this.fb.group({
+      groupId: [this.fieldConfig.fields.groupId || null],
+      userId: [this.fieldConfig.fields.userId === undefined ? null : this.fieldConfig.fields.userId],
+      category1Id: [this.fieldConfig.fields.category1DTO ? this.fieldConfig.fields.category1DTO.id  : null],
+      category2Id: [this.fieldConfig.fields.category2DTO ? this.fieldConfig.fields.category2DTO.id  : null],
+      category3Id: [this.fieldConfig.fields.category3DTO ? this.fieldConfig.fields.category3DTO.id  : null],
+      sourceId: [this.fieldConfig.fields.sourceId || 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 categoryId, hierarchy;
+    if(this.validateForm.value.category3Id){
+      categoryId = this.validateForm.value.category3Id;
+      hierarchy = 3;
+    }else if(this.validateForm.value.category2Id){
+      categoryId = this.validateForm.value.category2Id;
+      hierarchy = 2;
+    }else if(this.validateForm.value.category1Id){
+      categoryId = this.validateForm.value.category1Id;
+      hierarchy = 1;
+    }
+    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.category123){
+      fields.categoryId = categoryId;
+      fields.hierarchy = hierarchy;
+      fields.category1DTO = this.category1List.find(item => item.id == this.validateForm.value.category1Id);
+      fields.category2DTO = this.category2List.find(item => item.id == this.validateForm.value.category2Id);
+      fields.category3DTO = this.category3List.find(item => item.id == this.validateForm.value.category3Id);
+    }
+    if(this.fieldConfig.config.source){
+      fields.sourceId = this.validateForm.value.sourceId;
+      fields.sourceDTO = this.sourceList.find(item => item.id == this.validateForm.value.sourceId);
+    }
+    this.submitEvent.emit(fields);
+    this.hideModal();
+  }
+
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
+  // 防抖
+  isLoading = false;
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // =================维修组===================
+
+  // 维修组搜索
+  changeGroupInp(e) {
+    this.searchTimer(this.getGroupList, e);
+  }
+
+  // 获取维修组列表
+  groupList:any[] = [];
+  getGroupList(keyword?){
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      group2: {
+        hospitals: this.getHosId,
+        groupName: keyword,
+        type: 3,
+      },
+    };
+    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.getGroupList();
+  }
+
+  changeGroup(id){
+    this.userList = [];
+    this.validateForm.controls.userId.setValue(null);
+    this.getUserList('', id);
+  }
+
+  // =================维修人员===================
+
+  // 维修人员搜索
+  changeUserInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+
+  // 获取维修人员列表
+  userList:any[] = [];
+  getUserList(keyword = '', groupId = ''){
+    if(!groupId){
+      this.isLoading = false;
+      this.userList = [];
+      return;
+    }
+    let postData: any = {
+      idx: 0,
+      sum: 20,
+      user: {
+        hospitals: this.getHosId,
+        groupName: keyword,
+        type: 3,
+      },
+    };
+    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.getUserList('', this.validateForm.value.groupId);
+  }
+
+  // =================一级分类===================
+
+  // 一级分类搜索
+  changeCategory1Inp(e) {
+    this.searchTimer(this.getCategory1List, e);
+  }
+
+  // 获取一级分类列表
+  category1List:any[] = [];
+  getCategory1List(keyword?){
+    let postData: any = {
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        dutyIds: this.queryType == 3 ? this.dutyId : undefined,
+        parentDutyId: this.queryType == 3 ? this.parentDutyId : undefined,
+        hierarchy: 1,
+      },
+    };
+    this.isLoading = true;
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.category1List = result.data || [];
+      }else{
+        this.category1List = [];
+      }
+    });
+  }
+  openChangeCategory1(flag){
+    flag && this.getCategory1List();
+  }
+
+  changeCategory1(id){
+    this.category2List = [];
+    this.validateForm.controls.category2Id.setValue(null);
+    this.getCategory2List('', id);
+
+    this.category3List = [];
+    this.validateForm.controls.category3Id.setValue(null);
+  }
+
+  // =================二级分类===================
+
+  // 二级分类搜索
+  changeCategory2Inp(e) {
+    this.searchTimer(this.getCategory2List, e);
+  }
+
+  // 获取二级分类列表
+  category2List:any[] = [];
+  getCategory2List(keyword = '', parentId = ''){
+    if(!parentId){
+      this.isLoading = false;
+      this.category2List = [];
+      return;
+    }
+    let postData: any = {
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        parent: { id: parentId },
+      },
+    };
+    this.isLoading = true;
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.category2List = result.data || [];
+      }else{
+        this.category2List = [];
+      }
+    });
+  }
+  openChangeCategory2(flag){
+    flag && this.getCategory2List('', this.validateForm.value.category1Id);
+  }
+
+  changeCategory2(id){
+    this.category3List = [];
+    this.validateForm.controls.category3Id.setValue(null);
+    this.getCategory3List('', id);
+  }
+
+  // =================三级分类===================
+
+  // 三级分类搜索
+  changeCategory3Inp(e) {
+    this.searchTimer(this.getCategory3List, e);
+  }
+
+  // 获取三级分类列表
+  category3List:any[] = [];
+  getCategory3List(keyword = '', parentId = ''){
+    if(!parentId){
+      this.isLoading = false;
+      this.category3List = [];
+      return;
+    }
+    let postData: any = {
+      category: {
+        category: keyword,
+        selectType: 'mutlQuery',
+        parent: { id: parentId },
+      },
+    };
+    this.isLoading = true;
+    this.mainService.incidentPost("listIncidentCategory", postData).subscribe(result => {
+      this.isLoading = false;
+      if(result.status == 200){
+        this.category3List = result.data || [];
+      }else{
+        this.category3List = [];
+      }
+    });
+  }
+  openChangeCategory3(flag){
+    flag && this.getCategory3List('', this.validateForm.value.category2Id);
+  }
+
+  // =================故障来源===================
+
+  // 获取故障来源列表
+  sourceList:any[] = [];
+  getSourceList(){
+    this.mainService.getDictionary("list", "incident_source").subscribe(result => {
+      this.sourceList = result;
+    });
+  }
+}

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

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

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

@@ -5,14 +5,34 @@
       <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.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">
-    <button nz-button class="btn default" (click)="search(1)">搜索</button>
-    <button nz-button class="btn default ml8" (click)="excelExport()">导出</button>
+    <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>
-<nz-table [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.category1DTO || fieldConfig.fields.category2DTO || fieldConfig.fields.category3DTO || fieldConfig.fields.sourceDTO">
+  <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>
+</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>
@@ -29,7 +49,7 @@
     </tr>
   </thead>
   <tbody>
-    <tr *ngFor="let data of listOfData; let index = index">
+    <tr *ngFor="let data of listOfData">
       <td>{{ data.startDate }}</td>
       <td>{{ data.sum }}</td>
       <td>{{ data.avgResponseTime }}</td>
@@ -43,7 +63,27 @@
       <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>
+      </tr>
+    </table>
+  </ng-template>
 </nz-table>
-<div>
-  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></nz-pagination>
+<div class="pagination">
+  <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"></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>

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

@@ -5,17 +5,67 @@
   right: 0;
   bottom: 0;
   left: 0;
+  ::ng-deep .ant-table-footer{
+    padding: 16px 0;
+    width: calc(100% - 16px);
+    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/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -1,26 +1,59 @@
-import { format, addMonths, startOfMonth, endOfMonth } from 'date-fns';
-import { Component, OnInit } from "@angular/core";
+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-incident-statistics",
   templateUrl: "./incident-statistics.component.html",
   styleUrls: ["./incident-statistics.component.less"],
 })
-export class IncidentStatisticsComponent implements OnInit {
+export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
   constructor(
     private mainService: MainService,
+    private message: NzMessageService,
+    private route: ActivatedRoute,
   ) {}
 
   listOfData: any[] = []; //表格数据
+  listOfDataEnd: any[] = []; //表格合计
   pageIndex: number = 1; //表格当前页码
-  pageSize: number = 10; //表格每页展示条数
-  listLength: number = 10; //表格总数据量
+  pageSize: number = 30; //表格每页展示条数
+  listLength: number = 0; //表格总数据量
+
+  repairDeptId;//报修科室id
+
+  searchTimerSubject = new Subject();
 
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.initSessionData();
     this.search();
   }
 
+  ngAfterViewInit(){
+    this.onResize();
+  }
+
+  tableHeight:number = 0;
+  @HostListener('window:resize')
+  onResize(): void {
+    setTimeout(() => {
+      this.tableHeight = window.innerHeight - 64 - 64 - 36 - 48 - 8 - 45 - 54 - this.getMoreFilter;
+      console.log('this.tableHeight:', this.tableHeight)
+    }, 0)
+  }
+
+  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;
+  }
+
   // 初始化缓存数据
   queryType:any;
   hosId:any;
@@ -56,6 +89,10 @@ export class IncidentStatisticsComponent implements OnInit {
     }
   }
 
+  get getHosId(){
+    return this.parentDutyId || this.dutyId || this.hosId;
+  }
+
   // 表格数据
   loading1 = false;
   getList(num?: number, field?: string, sort?: string) {
@@ -70,6 +107,12 @@ export class IncidentStatisticsComponent implements OnInit {
       hosId: this.hosId,
       dutyId: this.dutyId,
       parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId,
+      groupId: this.fieldConfig.fields.groupId,
+      userId: this.fieldConfig.fields.userId,
+      categoryId: this.fieldConfig.fields.categoryId,
+      sourceId: this.fieldConfig.fields.sourceId,
+      hierarchy: this.fieldConfig.fields.hierarchy,
     };
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
@@ -79,7 +122,8 @@ export class IncidentStatisticsComponent implements OnInit {
       .postCustom("itsm/report", "incidentWorkOrder", postData)
       .subscribe((result) => {
         this.loading1 = false;
-        this.listOfData = result.dataList || [];
+        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;
       });
   }
@@ -96,36 +140,137 @@ export class IncidentStatisticsComponent implements OnInit {
   }
 
   // 搜索
-  search(num?: number) {
-    if (num !== undefined) {
-      this.getList(num, this.sortCurrentKey, this.sortCurrentValue);
-    } else {
-      this.getList(this.pageIndex, this.sortCurrentKey, this.sortCurrentValue);
-    }
+  search() {
+    this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
   }
 
-  // 日期选择 日
-  dateRange: any = [format(startOfMonth(addMonths(new Date(), -2)), 'yyyy-MM-dd HH:mm:ss'), format(endOfMonth(addMonths(new Date(), -1)), 'yyyy-MM-dd HH:mm:ss')]; //发起时间区间 天
+  // 日期选择
+  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 {
-    console.log(this.dateRange);
-    console.log(result);
-    result[0] = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-    result[1] = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    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;
-    this.search();
   }
 
   onCalendarChangeDate(dateArr){
     console.log(dateArr)
     if(dateArr.length == 2){
-      let dateStart = new Date(dateArr[0]);
-      let dateEnd = new Date(dateArr[1]);
-      dateStart.setHours(0,0,0);
-      dateEnd.setHours(23,59,59);
-      this.dateRange = [dateStart,dateEnd];
+      this.dateRange = [format(startOfDay(dateArr[0]), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(dateArr[1]), 'yyyy-MM-dd HH:mm:ss')];
     }
   }
 
-  excelExport(){}
-  reset(){}
+  // 导出
+  excelExportLoading:any = false;
+  excelExport(){
+    this.excelExportLoading = this.message.loading("导出中..", {
+      nzDuration: 0,
+    }).messageId;
+    let postData:any = {
+      startDate: this.dateRange[0],
+      endDate: this.dateRange[1],
+      hosId: this.hosId,
+      dutyId: this.dutyId,
+      parentDutyId: this.parentDutyId,
+      repairDeptId: this.repairDeptId,
+      groupId: this.fieldConfig.fields.groupId,
+      userId: this.fieldConfig.fields.userId,
+      categoryId: this.fieldConfig.fields.categoryId,
+      sourceId: this.fieldConfig.fields.sourceId,
+      hierarchy: this.fieldConfig.fields.hierarchy,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    }
+    this.mainService
+      .postExportCustom("itsm/export", "incidentWorkOrder", 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.repairDeptId = undefined;
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: 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: {
+        cascadeHosId: 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},
+  }
+  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/maintenance-statistics/incident-statistics/incident-statistics.module.ts

@@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common';
 import { IncidentStatisticsRoutingModule } from './incident-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';
 
 
 @NgModule({
@@ -16,6 +17,7 @@ import { VirtualScrollerModule } from 'ngx-virtual-scroller';
     IncidentStatisticsRoutingModule,
     ShareModule,
     VirtualScrollerModule,
+    SearchMoreModule,
   ]
 })
 export class IncidentStatisticsModule { }

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

@@ -61,6 +61,7 @@
     flex: 1;
     min-height: 0;
 		overflow-x: hidden;
+    height: 100%;
     .secondMenu{
       width: 175px;
       height: 100%;