配置更新

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

@@ -101,6 +101,111 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.source">
+				  <nz-form-label [nzSpan]="6" nzFor="sourceId">来<span style="visibility: hidden;">囧囧</span>源</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 [nzLabel]="option.name " [nzValue]="option.name"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.minute">
+				  <nz-form-label [nzSpan]="7" nzFor="minuteClose">分钟内关单</nz-form-label>
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入分钟内关单!">
+						<nz-input-number
+							class="width-200"
+							formControlName="minuteClose"
+						 	[nzMin]="0"
+							[nzPrecision]="0"
+						 	[nzMax]="999999"
+						 	[nzStep]="1"
+						 	[nzPlaceHolder]="'请输入分钟内关单'"
+						 ></nz-input-number>
+					</nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.special">
+				  <nz-form-label [nzSpan]="8" nzFor="specialId">特殊情况关闭</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择特殊情况关闭!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊情况关闭">
+				      <ng-container *ngFor="let option of specialList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.overtime">
+				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择超时工单!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="overtimeId" nzPlaceHolder="请选择超时工单">
+				      <ng-container *ngFor="let option of overtimeList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.abnormal">
+				  <nz-form-label [nzSpan]="6" nzFor="abnormalId">异常工单</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择异常工单!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="abnormalId" nzPlaceHolder="请选择异常工单">
+				      <ng-container *ngFor="let option of abnormalList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
+				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评<span style="visibility: hidden;">囧囧</span>价</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择评价!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="evaluateId" nzPlaceHolder="请选择评价">
+				      <ng-container *ngFor="let option of evaluateList">
+				        <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.executeUser">
+				  <nz-form-label [nzSpan]="6" nzFor="executeUserId">执行人</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeExecuteUserInp($event)" formControlName="executeUserId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeExecuteUser($event)" (ngModelChange)="setIsSelecting(true)">
+				      <ng-container *ngFor="let option of executeUserList">
+				        <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.timeFrame">
+				  <nz-form-label [nzSpan]="6" nzFor="timeFrameId">时<span style="visibility: hidden;">囧囧</span>段</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择人员!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="timeFrameId" nzPlaceHolder="请选择时段">
+				      <ng-container *ngFor="let option of timeFrameList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.code">
+				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单<span style="visibility: hidden;">囧囧</span>号</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入单号!">
+				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -34,7 +34,7 @@
 
     .content {
       width: 100%;
-      height: 117px;
+      // height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
@@ -88,8 +88,8 @@
       .content {
         width: 100%;
         padding: 10px 24px 0;
-        height: auto;
-        overflow-y: auto;
+				 max-height: calc(100vh - 120px);
+				 overflow-y: auto;
 
         .addForm {
           .ant-form-item {
@@ -103,6 +103,9 @@
             .ant-radio-wrapper{
               margin-right: 0;
             }
+						.ant-input-number{
+							width: 100%;
+						}
           }
         }
       }

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

@@ -26,7 +26,20 @@ export class DistributionSearchMoreComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService,
   ) { }
-
+	
+	minuteClose:any;
+	specialList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
+	overtimeList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
+	abnormalList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
   ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
@@ -34,6 +47,9 @@ export class DistributionSearchMoreComponent implements OnInit {
     });
     this.initForm();
     this.getSourceList();
+		this.getSourceDataList();
+		this.getWorkHourEvaluateList();
+		this.getTimeFrameList();
   }
   // 隐藏模态框
   hideModal() {
@@ -47,15 +63,31 @@ export class DistributionSearchMoreComponent implements OnInit {
     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({
+		this.sourceList = this.fieldConfig.fields.sourceDTO ? [this.fieldConfig.fields.sourceDTO] : [];
+		this.specialList = [{name:'是',id:1},{name:'否',id:0}];
+		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
+		this.abnormalList = [{name:'是',id:1},{name:'否',id:0}];
+		this.evaluateList = this.fieldConfig.fields.evaluateDTO ? [this.fieldConfig.fields.evaluateDTO] : [];
+		this.executeUserList =  this.fieldConfig.fields.executeUserDTO ? [this.fieldConfig.fields.executeUserDTO] : [];
+		this.timeFrameList = this.fieldConfig.fields.timeFrameDTO ? [this.fieldConfig.fields.timeFrameDTO] : [];
+		
+		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],
-    });
+			sourceId: [this.fieldConfig.fields.sourceId || null],
+			minuteClose: [this.fieldConfig.fields.minuteClose || null],
+			specialId: [this.fieldConfig.fields.specialDTO ? this.fieldConfig.fields.specialDTO.id  : null],
+			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
+			abnormalId: [this.fieldConfig.fields.abnormalDTO ? this.fieldConfig.fields.abnormalDTO.id  : null],
+			evaluateId: [this.fieldConfig.fields.evaluateId || null],
+			executeUserId: [this.fieldConfig.fields.executeUserId || null],
+			codeNum: [this.fieldConfig.fields.codeNum || null],
+			timeFrameId: [this.fieldConfig.fields.timeFrameDTO ? this.fieldConfig.fields.timeFrameDTO.id  : null],
+		});
   }
   // 表单提交
   submitForm(): void {
@@ -94,6 +126,43 @@ export class DistributionSearchMoreComponent implements OnInit {
       fields.deptId = this.validateForm.value.deptId;
       fields.deptDTO = this.deptList.find(item => item.id == this.validateForm.value.deptId);
     }
+		if(this.fieldConfig.config.source){
+		  fields.sourceId = this.validateForm.value.sourceId;
+		  fields.sourceDTO = this.sourceList.find(item => item.name == this.validateForm.value.sourceId);
+		}
+		if(this.fieldConfig.config.minute){
+		  fields.minuteClose = this.validateForm.value.minuteClose;
+		  fields.minuteDTO = this.validateForm.value.minuteClose;
+		}
+		if(this.fieldConfig.config.special){
+		  fields.specialId = this.validateForm.value.specialId;
+		  fields.specialDTO = this.specialList.find(item => item.id == this.validateForm.value.specialId);
+		}
+		if(this.fieldConfig.config.overtime){
+		  fields.overtimeId = this.validateForm.value.overtimeId;
+		  fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
+		}
+		if(this.fieldConfig.config.abnormal){
+		  fields.abnormalId = this.validateForm.value.abnormalId;
+		  fields.abnormalDTO = this.abnormalList.find(item => item.id == this.validateForm.value.abnormalId);
+		}
+		if(this.fieldConfig.config.evaluate){
+		  fields.evaluateId = this.validateForm.value.evaluateId;
+		  fields.evaluateDTO = this.evaluateList.find(item => item.id == this.validateForm.value.evaluateId);
+		}
+		if(this.fieldConfig.config.executeUser){
+		  fields.executeUserId = this.validateForm.value.executeUserId;
+		  fields.executeUserDTO = this.executeUserList.find(item => item.id == this.validateForm.value.executeUserId);
+		}
+		if(this.fieldConfig.config.code){
+			fields.codeNum = this.validateForm.value.codeNum;
+			fields.codeNumDTO = this.validateForm.value.codeNum;
+		}
+		if(this.fieldConfig.config.timeFrame){
+		  fields.timeFrameId = this.validateForm.value.timeFrameId;
+		  fields.timeFrameDTO = this.timeFrameList.find(item => item.id == this.validateForm.value.timeFrameId);
+		}
+		
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -310,4 +379,87 @@ export class DistributionSearchMoreComponent implements OnInit {
     flag && this.setIsSelecting(false);
     flag && this.getRepairDeptList();
   }
+	
+	// =================来源===================
+	
+	// 获取来源列表
+	sourceList:any[] = [];
+	getSourceDataList(keyword?){
+	  let postData:any = {
+	    idx: 0,
+	    sum: 9999,
+	    hosId: this.getHosId,
+	  };
+
+	  this.isLoading = true;
+	  this.mainService
+	    .postCustom("itsm/report", "sourceTransOrder", postData)
+	    .subscribe((result) => {
+	      this.isLoading = false;
+	      this.sourceList = result.dataList;
+	    });
+	}
+	
+	// =================评价===================
+	
+	// 获取评价列表 
+	evaluateList:any[] = [];
+	getWorkHourEvaluateList(){
+		this.isLoading = true;
+		this.mainService
+		  .getDictionary("list", "workorderEvaluation")
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.evaluateList = data;
+		  });
+	}
+	
+	// =================执行人===================
+	
+	// 执行人搜索
+	changeExecuteUserInp(e) {
+	  this.searchTimer(this.getExecuteUserList, e);
+	}
+	
+	// 获取执行人列表
+	executeUserList:any[] = [];
+	getExecuteUserList(keyword?){
+	  let postData = {
+	    user: {
+	      name: keyword,
+	      hospital: { id: this.getHosId },
+	      usertype: { id: 106 }, //配送人员
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .getFetchDataList("data", "user", postData)
+	    .subscribe((data) => {
+				this.isLoading = false;
+				if(data.status == 200){
+				  this.executeUserList = data.list || [];
+				}else{
+				  this.executeUserList = [];
+				}
+	    });
+	}
+	openChangeExecuteUser(flag){
+	  flag && this.setIsSelecting(false);
+	  flag && this.getExecuteUserList();
+	}
+	
+	// =================时段===================
+	
+	// 获取时段列表
+	timeFrameList:any[] = [];
+	getTimeFrameList(){
+	  for(let i=0; i<24; i++){
+			this.timeFrameList.push({
+				name: i,
+				id: i
+			})
+		}
+	}
 }

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

@@ -17,7 +17,21 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-
+				
+				<nz-form-item [hidden]="!fieldConfig.config.workHourSmall">
+				  <nz-form-label [nzSpan]="6" nzFor="workHourSmallId">工时小类</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择工时小类!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeWorkHourSmallInp($event)" formControlName="workHourSmallId" nzPlaceHolder="请选择工时小类" (nzOpenChange)="openChangeWorkHourSmall($event)" (ngModelChange)="setIsSelecting(true)">
+				      <ng-container *ngFor="let option of workHourSmallList">
+				        <nz-option *ngIf="!isLoading" [nzLabel]="option.workName" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				      <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+				        <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+				      </nz-option>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
         <nz-form-item [hidden]="!fieldConfig.config.group">
           <nz-form-label [nzSpan]="6" nzFor="groupId">维修分组</nz-form-label>
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择维修分组!">
@@ -171,7 +185,21 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-
+				
+				<nz-form-item [hidden]="!fieldConfig.config.repairUser">
+				  <nz-form-label [nzSpan]="6" nzFor="repairUserId">报修人</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择报修人!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changerepairUserInp($event)" formControlName="repairUserId" nzPlaceHolder="请选择报修人" (nzOpenChange)="openChangerepairUser($event)" (ngModelChange)="setIsSelecting(true)">
+				      <ng-container *ngFor="let option of repairUserList">
+				        <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.deptType">
 				  <nz-form-label [nzSpan]="6" nzFor="deptTypeId">科室类型</nz-form-label>
 				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择科室类型!">
@@ -185,6 +213,63 @@
 				    </nz-select>
 				  </nz-form-control>
 				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
+				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评价</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择评价!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="evaluateId" nzPlaceHolder="请选择评价">
+				      <ng-container *ngFor="let option of evaluateList">
+				        <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.consumable">
+				  <nz-form-label [nzSpan]="6" nzFor="consumableId">耗材</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择耗材!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeConsumableInp($event)" formControlName="consumableId" nzPlaceHolder="请选择耗材" (nzOpenChange)="openChangeConsumable($event)" (ngModelChange)="setIsSelecting(true)">
+				      <ng-container *ngFor="let option of consumableList">
+				        <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.isHang">
+				  <nz-form-label [nzSpan]="6" nzFor="isHangId">是否挂起</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择是否挂起!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="isHangId" nzPlaceHolder="请选择是否挂起">
+				      <ng-container *ngFor="let option of isHangList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.code">
+				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单号</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请输入单号!">
+				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
+				  </nz-form-control>
+				</nz-form-item>
+				
+				<nz-form-item [hidden]="!fieldConfig.config.overtime">
+				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
+				  <nz-form-control [nzSpan]="18" nzErrorTip="请选择超时工单!">
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="overtimeId" nzPlaceHolder="请选择超时工单">
+				      <ng-container *ngFor="let option of overtimeList">
+				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+				      </ng-container>
+				    </nz-select>
+				  </nz-form-control>
+				</nz-form-item>
       </form>
     </div>
     <div class="display_flex justify-content_flex-center">

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

@@ -34,7 +34,7 @@
 
     .content {
       width: 100%;
-      height: 117px;
+      // height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;
@@ -88,7 +88,7 @@
       .content {
         width: 100%;
         padding: 10px 24px 0;
-        height: auto;
+        max-height: calc(100vh - 120px);
         overflow-y: auto;
 
         .addForm {

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

@@ -26,14 +26,25 @@ export class SearchMoreComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService,
   ) { }
-
+	
+	isHangList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
+	overtimeList:any = [
+		{name:'是',id:1},
+		{name:'否',id:0}
+	]
+	
   ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
       fun.call(this, v[1]);
     });
+		console.log(4444,this.fieldConfig)
     this.initForm();
     this.getSourceList();
+		this.getWorkHourEvaluateList();
   }
   // 隐藏模态框
   hideModal() {
@@ -53,8 +64,13 @@ export class SearchMoreComponent implements OnInit {
     this.workHourParentList = this.fieldConfig.fields.workHourParentDTO ? [this.fieldConfig.fields.workHourParentDTO] : [];
     this.repairDeptList = this.fieldConfig.fields.repairDeptDTO ? [this.fieldConfig.fields.repairDeptDTO] : [];
 		this.deptTypeList = this.fieldConfig.fields.deptTypeDTO ? [this.fieldConfig.fields.deptTypeDTO] : [];
-
-    this.validateForm = this.fb.group({
+		this.evaluateList = this.fieldConfig.fields.evaluateDTO ? [this.fieldConfig.fields.evaluateDTO] : [];
+		this.workHourSmallList = this.fieldConfig.fields.workHourSmallDTO ? [this.fieldConfig.fields.workHourSmallDTO] : [];
+		this.repairUserList = this.fieldConfig.fields.repairUserDTO ? [this.fieldConfig.fields.repairUserDTO] : [];
+		this.isHangList = [{name:'是',id:1},{name:'否',id:0}];
+		this.overtimeList = [{name:'是',id:1},{name:'否',id:0}];
+		
+		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],
@@ -65,8 +81,15 @@ export class SearchMoreComponent implements OnInit {
       floorId: [this.fieldConfig.fields.floorId === undefined ? null : this.fieldConfig.fields.floorId],
       companyId: [this.fieldConfig.fields.companyDTO ? this.fieldConfig.fields.companyDTO.id  : null],
       workHourParentId: [this.fieldConfig.fields.workHourParentDTO ? this.fieldConfig.fields.workHourParentDTO.id  : null],
-      repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
+			workHourSmallId: [this.fieldConfig.fields.workHourSmallDTO ? this.fieldConfig.fields.workHourSmallDTO.id  : null],
+			repairDeptId: [this.fieldConfig.fields.repairDeptDTO ? this.fieldConfig.fields.repairDeptDTO.id  : null],
 			deptTypeId: [this.fieldConfig.fields.deptTypeId || null],
+			evaluateId: [this.fieldConfig.fields.evaluateId || null],
+			repairUserId: [this.fieldConfig.fields.repairUserId === undefined ? null : this.fieldConfig.fields.repairUserId],
+			consumableId: [this.fieldConfig.fields.consumableId || null],
+			isHangId: [this.fieldConfig.fields.isHangDTO ? this.fieldConfig.fields.isHangDTO.id  : null],
+			codeNum: [this.fieldConfig.fields.codeNum || null],
+			overtimeId: [this.fieldConfig.fields.overtimeDTO ? this.fieldConfig.fields.overtimeDTO.id  : null],
 		});
   }
   // 表单提交
@@ -125,6 +148,10 @@ export class SearchMoreComponent implements OnInit {
       fields.workHourParentId = this.validateForm.value.workHourParentId;
       fields.workHourParentDTO = this.workHourParentList.find(item => item.id == this.validateForm.value.workHourParentId);
     }
+		if(this.fieldConfig.config.workHourSmall){
+		  fields.workHourSmallId = this.validateForm.value.workHourSmallId;
+		  fields.workHourSmallDTO = this.workHourSmallList.find(item => item.id == this.validateForm.value.workHourSmallId);
+		}
     if(this.fieldConfig.config.repairDept){
       fields.repairDeptId = this.validateForm.value.repairDeptId;
       fields.repairDeptDTO = this.repairDeptList.find(item => item.id == this.validateForm.value.repairDeptId);
@@ -133,7 +160,38 @@ export class SearchMoreComponent implements OnInit {
 		  fields.deptTypeId = this.validateForm.value.deptTypeId;
 		  fields.deptTypeDTO = this.deptTypeList.find(item => item.id == this.validateForm.value.deptTypeId);
 		}
-
+		
+		if(this.fieldConfig.config.evaluate){
+			fields.evaluateId = this.validateForm.value.evaluateId;
+			fields.evaluateDTO = this.evaluateList.find(item => item.id == this.validateForm.value.evaluateId);
+		}
+		
+		if(this.fieldConfig.config.repairUser){
+			fields.repairUserId = this.validateForm.value.repairUserId;
+			fields.repairUserDTO = this.repairUserList.find(item => item.id == this.validateForm.value.repairUserId);
+		}
+		
+		if(this.fieldConfig.config.consumable){
+			fields.consumableId = this.validateForm.value.consumableId;
+			fields.consumableDTO = this.consumableList.find(item => item.id == this.validateForm.value.consumableId);
+		}
+		
+		if(this.fieldConfig.config.isHang){
+			fields.isHangId = this.validateForm.value.isHangId;
+			fields.isHangDTO = this.isHangList.find(item => item.id == this.validateForm.value.isHangId);
+		}
+		
+		
+		if(this.fieldConfig.config.code){
+			fields.codeNum = this.validateForm.value.codeNum;
+			fields.codeNumDTO = this.validateForm.value.codeNum;
+		}
+		
+		if(this.fieldConfig.config.overtime){
+			fields.overtimeId = this.validateForm.value.overtimeId;
+			fields.overtimeDTO = this.overtimeList.find(item => item.id == this.validateForm.value.overtimeId);
+		}
+				
     this.submitEvent.emit(fields);
     this.hideModal();
   }
@@ -571,7 +629,131 @@ export class SearchMoreComponent implements OnInit {
     });
   }
   openChangeWorkHourParent(flag){
+		this.validateForm.controls.workHourSmallId.setValue(null);
     flag && this.setIsSelecting(false);
     flag && this.getWorkHourParentList();
   }
+	
+	// =================工时小类===================
+	
+	// 工时小类搜索
+	changeWorkHourSmallInp(e) {
+	  this.searchTimer(this.getWorkHourSmallList, e);
+	}
+	
+	// 获取工时小类列表
+	workHourSmallList:any[] = [];
+	getWorkHourSmallList(keyword?){
+	  let postData: any = {
+	    idx: 0,
+	    sum: 20,
+	    workHourManagement: {
+	      keyWords: keyword,
+	      treeLevel: 2,
+				parent:{
+					id: this.validateForm.value.workHourParentId
+				},
+				quoteOther:0,
+	      statisticalHosId: this.getHosId,
+	    },
+	  };
+	  this.isLoading = true;
+	  this.mainService.getFetchDataList("simple/data", "workHourManagement", postData).subscribe(result => {
+	    this.isLoading = false;
+	    if(result.status == 200){
+	      this.workHourSmallList = result.list || [];
+	    }else{
+	      this.workHourSmallList = [];
+	    }
+	  });
+	}
+	openChangeWorkHourSmall(flag){
+	  flag && this.setIsSelecting(false);
+	  flag && this.getWorkHourSmallList();
+	}
+	
+	// =================评价===================
+	
+	// 获取评价列表 
+	evaluateList:any[] = [];
+	getWorkHourEvaluateList(){
+		this.isLoading = true;
+		this.mainService
+		  .getDictionary("list", "incident_degree")
+		  .subscribe((data) => {
+		    this.isLoading = false;
+		    this.evaluateList = data;
+		  });
+	}
+	
+	// =================申请人员===================
+	
+	// 申请人员搜索
+	changerepairUserInp(e) {
+	  this.searchTimer(this.getrepairUserList, e);
+	}
+	
+	// 获取申请人员列表
+	repairUserList:any[] = [];
+	getrepairUserList(keyword = ''){
+	  let postData: any = {
+	    idx: 0,
+	    sum: 20,
+			user: {
+			  name: keyword,
+			  hospital: { id: this.tool.getCurrentHospital().id },
+			  engineer: 1,
+			  simpleQuery: true,
+			},
+	  };
+	  this.isLoading = true;
+	  this.mainService.getFetchDataList("simple/data", "user", postData).subscribe(result => {
+	    this.isLoading = false;
+	    if(result.status == 200){
+	      this.repairUserList = result.list || [];
+	    }else{
+	      this.repairUserList = [];
+	    }
+	  });
+	}
+	openChangerepairUser(flag){
+	  flag && this.setIsSelecting(false);
+	  flag && this.getrepairUserList();
+	}
+	
+	// =================耗材===================
+	
+	// 耗材搜索
+	changeConsumableInp(e) {
+	  this.searchTimer(this.getConsumableList, e);
+	}
+	
+	// 获取耗材列表
+	consumableList:any[] = [];
+	getConsumableList(keyword = ''){
+	  let data = {
+	    idx: 0,
+	    sum: 20,
+	    consumable: {
+				name: keyword,
+	      hosId: this.tool.getCurrentHospital().id,
+	      quoteOther: 0,
+	    },
+	  };
+	  this.isLoading = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "consumable", data)
+	    .subscribe((data) => {
+	      this.isLoading = false;
+	      if (data.status == 200) {
+	        this.consumableList = data.list || [];
+	      }else{
+					this.repairUserList = [];
+				}
+	    });
+	}
+	openChangeConsumable(flag){
+	  flag && this.setIsSelecting(false);
+	  flag && this.getConsumableList();
+	}
 }

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

@@ -30,7 +30,7 @@
 		overflow-x: hidden;
     height: 100%;
     .secondMenu{
-      width: 175px;
+      width: 160px;
       height: 100%;
       background-color: #fff;
       margin-right: 8px;

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

@@ -1,10 +1,19 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { IncidentListComponent } from './incident-list.component';
-
+import { OrderDetailComponent } from '../../../../share/order-detail/order-detail.component';
 
 const routes: Routes = [
-  { path: '', component: IncidentListComponent }
+  { 
+		path: '', component: IncidentListComponent ,
+		children: [
+		  {
+		    // 查看详情
+		    path: 'orderDetail/:id',
+		    component: OrderDetailComponent,
+		  }
+		]
+	}
 ];
 
 @NgModule({

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

@@ -1,11 +1,11 @@
 <div class="searchDataWrap">
   <div class="searchData">
-    <app-custom-change-date #customChangeDate [isShowType]="true"></app-custom-change-date>
+    <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">报修科室</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" nzAllowClear nzPlaceHolder="请选择报修科室" [(ngModel)]="repairDeptId" (nzOpenChange)="openChangeRepairDept($event)">
-        <ng-container *ngFor="let option of repairDeptList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
+      <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> 搜索中...
@@ -20,62 +20,73 @@
     <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">
-  <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 class="moreFilter" *ngIf="fieldConfig.fields.deptDTO|| fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.abnormalDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.executeUserDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
+	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+  <span>{{fieldConfig.fields.deptDTO?.dept}}</span>
+	<span>{{fieldConfig.fields.sourceDTO?.name}}</span>
+	<span>{{fieldConfig.fields.minuteDTO}}</span>
+	<span>{{fieldConfig.fields.specialDTO?.name}}</span>
+	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
+	<span>{{fieldConfig.fields.abnormalDTO?.name}}</span>
+	<span>{{fieldConfig.fields.evaluateDTO?.name}}</span>
+	<span>{{fieldConfig.fields.executeUserDTO?.name}}</span>
+	<span>{{fieldConfig.fields.codeNumDTO}}</span>
+	<span>{{fieldConfig.fields.timeFrameDTO?.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>
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1400px'}">
+  <thead>
     <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>
+      <th nzWidth="150px">序号|单号</th>
+      <th nzWidth="200px">起点|终点科室</th>
+      <th nzWidth="150px">统计|任务类型</th>
+      <th nzWidth="200px">时间过程</th>
+      <th nzWidth="100px">时长</th>
+      <th nzWidth="200px">时间考核</th>
+      <th nzWidth="150px">状态|评价</th>
+      <th nzWidth="150px">费用|积分</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 *ngFor="let data of listOfData; let index = index;">
+      <td (click)="viewDetail(data)">
+				<div>{{index+(pageIndex-1) * pageSize + 1}}</div>
+				<div class="text-style">{{data.gdcode}}</div>
+			</td>
+      <td>
+				<div>{{ data.startDept }}</div>
+				<div>{{ data.endDept }}</div>
+			</td>
+      <td>
+				<div>{{data.statisticsName}}</div>
+				<div>{{data.taskName}}</div>
+			</td>
+			<td>
+				<div>申:{{ data.starttime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+				<div>接:{{ data.accepttime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+				<div>到:{{ data.arrivetime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+				<div>达:{{ data.completetime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+			</td>
+			<td>
+				<div>总时长:{{ data.totalTime }}</div>
+				<div>接单:{{ data.responseTime }}</div>
+				<div>到达:{{ data.arriveTimeNum }}</div>
+				<div>执行:{{ data.executionTime }}</div>
+			</td>
+			<td>
+				<div>接单:{{ data.estimateResponseTime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+				<div>到达:{{ data.estimateArriveTime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+				<div>执行:{{ data.estimateCompleteTime|date:'yyyy-MM-dd HH:mm:ss' }}</div>
+			</td>
+      <td>
+				<div>{{ data.stateName }}</div>
+				<div>{{ data.evaluationName }}</div>
+			</td>
+      <td>
+      	<div>{{ data.totalGrade }}{{data.totalGrade?'元':''}}</div>
+      	<div>{{ data.scorePrice }}{{data.scorePrice?'分':''}}</div>
+      </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 class="pagination">
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
@@ -83,4 +94,7 @@
 </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>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

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

@@ -52,6 +52,19 @@
 
   .table{
     margin: 0 8px;
+		.hide-describe{
+			// display: -webkit-box;
+			// -webkit-box-orient: vertical;
+			// -webkit-line-clamp: 2;
+			// overflow: hidden;
+			// text-overflow: ellipsis;
+			// word-wrap: break-word;
+		}
+		.text-style{
+			text-decoration: underline;
+			color: #0675ce;
+			cursor: pointer;
+		}
   }
 
   .moreFilter{

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

@@ -4,7 +4,8 @@ import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import cloneDeep from 'lodash-es/cloneDeep'
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-incident-list",
@@ -16,14 +17,15 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   constructor(
     private mainService: MainService,
     private message: NzMessageService,
-    private route: ActivatedRoute,
+    public route: ActivatedRoute,
+    private router: Router,
     private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
   listOfDataEnd: any[] = []; //表格合计
   pageIndex: number = 1; //表格当前页码
-  pageSize: number = 30; //表格每页展示条数
+  pageSize: number = 10; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
   repairDeptId;//报修科室id
@@ -43,14 +45,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     setTimeout(() => {
       this.search();
     }, 0)
-    this.onResize();
+    this.onResize(0);
   }
 
   tableHeight:number = 0;
   @HostListener('window:resize')
-  onResize(): void {
+  onResize(height): 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;
+      this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - height - this.getMoreFilter + 14;
 
     }, 0)
   }
@@ -65,7 +67,11 @@ export class IncidentListComponent 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;
+    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  || 
+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
+		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 37 : 0;
   }
 
@@ -110,6 +116,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 
   // 表格数据
   loading1 = false;
+	statisticsTypeId:any;//统计分类id
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -117,29 +124,29 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     let postData:any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      dateType: this.customChangeDateComponent.dateType,
+      statisticsTypeId: this.statisticsTypeId || undefined,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || 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,
+      hosId: this.getHosId,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+			sourceId: this.fieldConfig.fields.sourceId || undefined,
+			minutesClose: this.fieldConfig.fields.minuteClose || undefined,
+			specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
+			timeout: this.fieldConfig.fields.overtimeId || undefined,
+			abnormityType: this.fieldConfig.fields.abnormalId || undefined,
+			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
+			userId: this.fieldConfig.fields.executeUserId || undefined,
+			hour: this.fieldConfig.fields.timeFrameId || undefined,
+			gdCode: this.fieldConfig.fields.codeNum || undefined
     };
-    if (field && sort) {
-      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
-    }
+
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "workOrderList", 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.listOfData = result.dataList;
         this.listLength = result.totalCount;
       });
   }
@@ -170,24 +177,26 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
-      dateType: this.customChangeDateComponent.dateType,
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      statisticsTypeId: this.statisticsTypeId || undefined,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || 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,
+      hosId: this.getHosId,
+      deptId: this.fieldConfig.fields.deptId || undefined,
+      taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+    	sourceId: this.fieldConfig.fields.sourceId || undefined,
+    	minutesClose: this.fieldConfig.fields.minuteClose || undefined,
+    	specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
+    	timeout: this.fieldConfig.fields.overtimeId || undefined,
+    	abnormityType: this.fieldConfig.fields.abnormalId || undefined,
+    	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
+    	userId: this.fieldConfig.fields.executeUserId || undefined,
+    	hour: this.fieldConfig.fields.timeFrameId || undefined,
+    	gdCode: this.fieldConfig.fields.codeNum || undefined
     };
-    if (this.sortCurrentKey && this.sortCurrentValue) {
-      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
-    }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "workOrderList", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -215,15 +224,11 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 		this.sortCurrentValue = "";
 		this.sortCurrent = {};
     this.dateRange = []
-    this.repairDeptId = undefined;
+    this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();
-  }
-
-  // 科室搜索
-  changeRepairDeptInp(e) {
-    this.searchTimer(this.getRepairDeptList, e);
+		this.onResize(0);
   }
 
   // 防抖
@@ -232,36 +237,43 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
+	
+	// 查看工单详情
+	coopData:any;
+	detailModalShow = false; //弹窗开关
+	viewDetail(data) {
+	  this.router.navigateByUrl("/newStatistics/distributionInspectionStatistics/incidentList/orderDetail/" + data.id);
+	}
+	// 关闭弹窗
+	closeDetailModelOrder(e) {
+	  this.detailModalShow = JSON.parse(e).show;
+	}
+	// 弹窗确定
+	confirmDetailModelOrder(e){
+	  this.detailModalShow = false;
+	  this.getList();
+	}
 
-  openChangeRepairDept(flag){
-    flag && this.getRepairDeptList();
+  openChangeStatisticsType(flag){
+    flag && this.getStatisticsTypeList();
   }
 
-  // 获取报修科室列表
-  repairDeptList:any[] = [];
-  getRepairDeptList(keyword?) {
-    let data = {
-      department: {
-        statisticalHosId: this.getHosId,
-        dept: keyword,
-        searchType: 1,
-      },
-      idx: 0,
-      sum: 20,
-    };
+  // 获取统计分类列表
+  statisticsTypeList:any[] = [];
+  getStatisticsTypeList(keyword?) {
     this.isLoading = true;
     this.mainService
-      .getFetchDataList("data", "department", data)
+      .getDictionary("list", "statistics_date_type")
       .subscribe((data) => {
         this.isLoading = false;
-        this.repairDeptList = data.list;
+        this.statisticsTypeList = data;
       });
   }
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined},
-    config: {groupAndUser: true, category123: true, source: true},
+		fields: { deptId: undefined, taskTypeId: undefined, sourceId: undefined, minuteId: undefined, specialId: undefined, overtimeId: undefined, abnormalId: undefined, evaluateId: undefined, executeUserId: undefined, codeNum: undefined, timeFrameId: undefined},
+		config: { dept: true, taskType: true, source: true, minute: true, special: true, overtime: true, abnormal: true, evaluate: true, executeUser:true, code: true, timeFrame: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -277,6 +289,6 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = fields;
     console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
     this.search();
-    this.onResize();
+    this.onResize(37);
   }
 }

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

@@ -5,10 +5,9 @@ import { CommonModule } from '@angular/common';
 import { IncidentListRoutingModule } from './incident-list-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';
 import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
 
-
 @NgModule({
   declarations: [
     IncidentListComponent,
@@ -18,8 +17,8 @@ import { CustomChangeDateModule } from '../../components/custom-change-date/cust
     IncidentListRoutingModule,
     ShareModule,
     VirtualScrollerModule,
-    SearchMoreModule,
-    CustomChangeDateModule,
+    DistributionSearchMoreModule,
+    CustomChangeDateModule
   ]
 })
 export class IncidentListModule { }

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

@@ -60,6 +60,11 @@
 			// text-overflow: ellipsis;
 			// word-wrap: break-word;
 		}
+		.text-style{
+			text-decoration: underline;
+			color: #0675ce;
+			cursor: pointer;
+		}
   }
 
   .moreFilter{

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

@@ -1,10 +1,11 @@
 import { TabService } from './../../services/tab.service';
-import { debounceTime } from 'rxjs/operators';
+import { debounceTime, filter } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { Component, OnInit, HostListener, AfterViewInit, ViewChild } from "@angular/core";
 import { MainService } from 'src/app/services/main.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router, NavigationEnd  } from '@angular/router';
+import cloneDeep from 'lodash-es/cloneDeep'
 import { CustomChangeDateComponent } from '../../components/custom-change-date/custom-change-date.component';
 @Component({
   selector: "app-incident-list",
@@ -17,13 +18,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     private mainService: MainService,
     private message: NzMessageService,
     private route: ActivatedRoute,
+		private router: Router,
     private tabService: TabService,
   ) {}
 
   listOfData: any[] = []; //表格数据
   listOfDataEnd: any[] = []; //表格合计
   pageIndex: number = 1; //表格当前页码
-  pageSize: number = 30; //表格每页展示条数
+  pageSize: number = 10; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
   repairDeptId;//报修科室id
@@ -31,6 +33,15 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
   searchTimerSubject = new Subject();
 
   ngOnInit() {
+		this.getRouteQuery()
+		this.router.events
+		  .pipe(filter(event => event instanceof NavigationEnd))
+		  .subscribe((event: NavigationEnd) => {
+		    if(event.urlAfterRedirects=='/newStatistics/maintenanceStatistics/incidentList'){
+					this.getRouteQuery()
+		    }
+		  });
+
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
       fun.call(this, v[1]);
@@ -43,18 +54,38 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     setTimeout(() => {
       this.search();
     }, 0)
-    this.onResize();
+    this.onResize(0);
   }
 
   tableHeight:number = 0;
   @HostListener('window:resize')
-  onResize(): void {
+  onResize(height): 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;
-
+			this.tableHeight = window.innerHeight - (document.querySelector('.searchDataWrap') as HTMLElement).offsetHeight - 64 - 36 - 48 - 8 - (document.querySelector('.ant-table-header') as HTMLElement).offsetHeight - height - this.getMoreFilter + 14;
     }, 0)
   }
-
+	
+	getRouteQuery(){
+		let data = sessionStorage.getItem('maintenanceData')
+		let query = null
+		if(data){
+			query = JSON.parse(data)
+			console.log('query==========',query)
+			if(query.startData){
+				this.customChangeDateComponent.startDate = query.startData
+			}
+			if(query.endDate){
+				this.customChangeDateComponent.startDate = query.endDate
+			}
+			if(query.searchQuery){
+				this.fieldConfig.fields = query.searchQuery
+			}
+			
+			this.search();
+			this.onResize(37);
+		}
+	}
+	
   getQueryParams(){
     let queryParams = this.tabService.getQueryParams();
     this.tabService.clearQueryParams();
@@ -65,7 +96,11 @@ export class IncidentListComponent 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;
+    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  || 
+		this.fieldConfig.fields.buildingDTO || this.fieldConfig.fields.floorDTO || 
+		this.fieldConfig.fields.companyDTO || this.fieldConfig.fields.repairDeptDTO;
     return flag ? 37 : 0;
   }
 
@@ -129,17 +164,31 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       sourceId: this.fieldConfig.fields.sourceId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+			workHourId: undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
+			placeId: this.fieldConfig.fields.floorId || undefined,
+			companyId: this.fieldConfig.fields.companyId || undefined,
+			repairUserId: this.fieldConfig.fields.repairUserId || undefined,
+			consumableId: this.fieldConfig.fields.consumableId || undefined,
+			timeout: this.fieldConfig.fields.overtimeId==0 ? undefined : this.fieldConfig.fields.overtimeId,
+			hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
+			incidentSign: this.fieldConfig.fields.codeNum,
+			wxDegreeId: this.fieldConfig.fields.evaluateId,
     };
-    if (field && sort) {
-      postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
-    }
+		
+		if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
+			postData.workHourId = this.fieldConfig.fields.workHourSmallId
+		}
+		if(this.fieldConfig.fields.workHourParentId && !this.fieldConfig.fields.workHourSmallId){
+			postData.workHourId = this.fieldConfig.fields.workHourParentId
+		}
+		
     this.loading1 = true;
     this.mainService
-      .postCustom("itsm/report", "incidentWorkOrder", postData)
+      .postCustom("itsm/report", "incidentWorkOrderList", 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.listOfData = result.dataList;
         this.listLength = result.totalCount;
       });
   }
@@ -170,6 +219,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       nzDuration: 0,
     }).messageId;
     let postData:any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
       dateType: this.customChangeDateComponent.dateType,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
@@ -182,12 +233,26 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
       categoryId: this.fieldConfig.fields.categoryId || undefined,
       sourceId: this.fieldConfig.fields.sourceId || undefined,
       hierarchy: this.fieldConfig.fields.hierarchy || undefined,
+    	workHourId: undefined,
+    	buildingId: this.fieldConfig.fields.buildingId || undefined,
+    	placeId: this.fieldConfig.fields.floorId || undefined,
+    	companyId: this.fieldConfig.fields.companyId || undefined,
+    	repairUserId: this.fieldConfig.fields.repairUserId || undefined,
+    	consumableId: this.fieldConfig.fields.consumableId || undefined,
+    	timeout: this.fieldConfig.fields.overtimeId==0 ? undefined : this.fieldConfig.fields.overtimeId,
+    	hangUp: this.fieldConfig.fields.isHangId==0 ? undefined : this.fieldConfig.fields.isHangId,
+    	incidentSign: this.fieldConfig.fields.codeNum,
+			wxDegreeId: this.fieldConfig.fields.evaluateId,
     };
-    if (this.sortCurrentKey && this.sortCurrentValue) {
-      postData.sort = `${this.sortCurrentKey} ${this.sortCurrentValue === "ascend" ? `asc` : `desc`}`
+    
+    if(this.fieldConfig.fields.workHourParentId && this.fieldConfig.fields.workHourSmallId){
+    	postData.workHourId = this.fieldConfig.fields.workHourSmallId
+    }
+    if(this.fieldConfig.fields.workHourParentId && !this.fieldConfig.fields.workHourSmallId){
+    	postData.workHourId = this.fieldConfig.fields.workHourParentId
     }
     this.mainService
-      .postExportCustom("itsm/export", "incidentWorkOrder", postData)
+      .postExportCustom("itsm/export", "incidentWorkOrderList", postData)
       .subscribe((data) => {
         this.message.remove(this.excelExportLoading);
         this.excelExportLoading = false;
@@ -219,6 +284,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();
+		this.onResize(0);
   }
 
   // 科室搜索
@@ -232,7 +298,24 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.isLoading = true;
     this.searchTimerSubject.next([fun, e]);
   }
-
+	
+	// 查看工单详情
+	coopData:any;
+	detailModalShow = false; //弹窗开关
+	viewDetail(data) {
+	  this.coopData = data;
+	  this.detailModalShow = true;
+	}
+	// 关闭弹窗
+	closeDetailModelOrder(e) {
+	  this.detailModalShow = JSON.parse(e).show;
+	}
+	// 弹窗确定
+	confirmDetailModelOrder(e){
+	  this.detailModalShow = false;
+	  this.getList();
+	}
+	
   openChangeRepairDept(flag){
     flag && this.getRepairDeptList();
   }
@@ -260,8 +343,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
 
   // 详细搜索
   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, categoryId: undefined, sourceId: undefined, hierarchy: 
+		undefined,buildingId: undefined, floorId: undefined, companyId: undefined, 
+		workHourParentId: undefined, workHourSmallId: undefined, evaluateId: undefined, repairUserId: undefined, consumableId: undefined, isHangId: undefined, codeNum: undefined, overtimeId: undefined},
+    config: {groupAndUser: true, category123: true, source: true, buildingAndFloor: true, company: true, workHourParent: true, workHourSmall: true, evaluate: true, repairUser: true, consumable: true, isHang: true, code: true, overtime: true},
   }
   showSearchMore:boolean = false;
   showMore(){
@@ -277,6 +362,6 @@ export class IncidentListComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = fields;
     console.log('this.fieldConfig.fields:', this.fieldConfig.fields)
     this.search();
-    this.onResize();
+    this.onResize(37);
   }
 }

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

@@ -7,7 +7,7 @@ import { ShareModule } from 'src/app/share/share.module';
 import { VirtualScrollerModule } from 'ngx-virtual-scroller';
 import { SearchMoreModule } from '../../components/search-more/search-more.module';
 import { CustomChangeDateModule } from '../../components/custom-change-date/custom-change-date.module';
-
+import { IncidentDetailModule } from 'src/app/components/incidentManagement/incident-detail/incident-detail.module';
 
 @NgModule({
   declarations: [
@@ -20,6 +20,7 @@ import { CustomChangeDateModule } from '../../components/custom-change-date/cust
     VirtualScrollerModule,
     SearchMoreModule,
     CustomChangeDateModule,
+		IncidentDetailModule
   ]
 })
 export class IncidentListModule { }

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

@@ -30,7 +30,7 @@
 		overflow-x: hidden;
     height: 100%;
     .secondMenu{
-      width: 175px;
+      width: 160px;
       height: 100%;
       background-color: #fff;
       margin-right: 8px;

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

@@ -11,7 +11,7 @@
   <ng-container *ngIf="!isLoading">
     <div class="top1-statistics">
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box" (click)="viewDetail1()">
           <div class="num">{{workData.gd_total || 0}}</div>
           <div class="describe">工单总数</div>
         </div>
@@ -34,21 +34,21 @@
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box" (click)="viewDetail2()">
           <div class="num">{{workData.gd_postpone || 0}}</div>
           <div class="describe">挂起单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box" (click)="viewDetail3()">
           <div class="num">{{workData.gd_overtime || 0}}</div>
           <div class="describe">超时单数</div>
         </div>
         <div class="border"></div>
       </div>
       <div class="top-list">
-        <div class="special-box">
+        <div class="special-box" (click)="viewDetail4()">
           <div class="num">{{workData.gd_degree}}</div>
           <div class="describe">差评单数</div>
         </div>
@@ -83,10 +83,10 @@
               <span *ngIf="index !=0 && index !=1 && index !=2">{{index+1}}</span>
             </div>
             <div class="table-list">{{item.name}}</div>
-            <div class="table-list">{{item.count || 0}}</div>
+            <div class="table-list" (click)="viewMaintain1(item)">{{item.count || 0}}</div>
             <div class="table-list">{{item.avg_response}}分</div>
             <div class="table-list">{{item.avg_handle }}分</div>
-            <div class="table-list">{{item.overtime || 0}}</div>
+            <div class="table-list" (click)="viewMaintain2(item)">{{item.overtime || 0}}</div>
           </div>
         </div>
       </div>
@@ -140,7 +140,7 @@
           <div class="th" *ngFor="let item of deptCostData; let index = index;">
             <div class="table-list-4">{{index+1}}</div>
             <div class="table-list-4 ellipsis-oneline" title="{{item.dept}}">{{item.dept}}</div>
-            <div class="table-list-4">{{item.sum || 0}}</div>
+            <div class="table-list-4" (click)="viewDept(item)">{{item.sum || 0}}</div>
             <div class="table-list-4">{{item.sum_price || 0}}</div>
           </div>
         </div>

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

@@ -48,6 +48,7 @@
 					right: 0;
 				}
 				.special-box{
+					cursor: pointer;
 					text-align: center;
 					position: relative;
 					top: -5px;

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

@@ -69,7 +69,107 @@ export class SynthesizeStatisticsComponent implements OnInit, AfterViewInit {
       this.search();
     }, 0)
   }
-
+	
+	/*========= 数据下钻 ========*/
+	
+	// 汇总
+	viewDetail1(){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate
+		}
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 挂起
+	viewDetail2(){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				isHangId: 1
+			}
+		}
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 超时
+	viewDetail3(){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				overtimeId: 1
+			}
+		}
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 差评
+	viewDetail4(){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				wxDegreeId: 20424
+			}
+		}
+		sessionStorage.setItem('maintenanceData', JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 维修处理top5
+	viewMaintain1(data){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				statusValue: 'close',
+				groupId:null,
+				userId:null
+			}
+		}
+		if(this.activeIndex==0){
+			query.searchQuery.userId = data.userId
+			delete query.searchQuery.groupId
+		}else{
+			query.searchQuery.groupId = data.groupId
+			delete query.searchQuery.userId
+		}
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	viewMaintain2(data){
+		let query = {
+			startDate: this.customChangeDateComponent.startDate,
+			endDate: this.customChangeDateComponent.endDate,
+			searchQuery:{
+				statusValue: 'close',
+				groupId:null,
+				userId:null,
+				overtimeId: 1
+			}
+		}
+		if(this.activeIndex==0){
+			query.searchQuery.userId = data.userId
+			delete query.searchQuery.groupId
+		}else{
+			query.searchQuery.groupId = data.groupId
+			delete query.searchQuery.userId
+		}
+		sessionStorage.setItem('maintenanceData',JSON.stringify(query))
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
+	// 课科室费用top5
+	viewDept(data){
+		this.router.navigateByUrl('/newStatistics/maintenanceStatistics/incidentList')
+	}
+	
 	// 维修处理类型切换
 	selectCheck(type){
 		this.activeIndex = type

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

@@ -24,6 +24,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(){
+		sessionStorage.removeItem('maintenanceData')
     this.tabService.deleteAllRouteSnapshot();
   }
 
@@ -121,5 +122,6 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   // 返回
   goBack(){
     this.router.navigate(['/main/home']);
+		sessionStorage.removeItem('maintenanceData')
   }
 }