解决冲突代码

src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -88,12 +88,14 @@ export class IncidentDetailComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
-
+				if(this.incidentData.wxdegree){
+					this.incidentData.wxdegree.value = Number(this.incidentData.wxdegree.value)
+				}
         this.clickTbab(this.tabs[0]);
 
         let logs = this.incidentData.logs || [];
         this.resolveLogs = logs.filter(v => v.logType.value == 'resolve').slice(0, 1);
-        this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
+				this.callbackLogs = logs.filter(v => v.logType.value == 'callback').slice(0, 1);
 
         this.getHospitalConfig();
       });

src/app/components/order-scope/order-scope.component.ts

@@ -22,7 +22,7 @@ export class OrderScopeComponent implements OnInit {
     orderScopeRadio: undefined,
   }
 	@Input() coopBtns:any;
-	
+
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
@@ -45,9 +45,9 @@ export class OrderScopeComponent implements OnInit {
 	activeScopeTab:any;
 	//#region 工单范围-运维start
 	allDuty:number = 1;
-	showReassign:number = 0;
+	showReassign:any = 0;
 	menuList:any;
-	
+
   ngOnInit() {
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
@@ -77,7 +77,7 @@ export class OrderScopeComponent implements OnInit {
 				}
 			}
 		}
-		
+
 		if(this.scopeTabs.length>0){
 			this.activeScopeTab = this.scopeTabs[0]
 		}
@@ -100,7 +100,7 @@ export class OrderScopeComponent implements OnInit {
     itsmGetOrderScope() {
       // 是否不限制部门
       this.allDuty = this.itsmData.allDuty === undefined ? 1 : this.itsmData.allDuty;
-      this.showReassign = this.itsmData.showReassign;
+      this.showReassign = this.itsmData.showReassign || 0;
 			// 权限内的院区和组
       let hosList = this.user.infoPermission.dutyList || [];
       let groups = this.user.infoPermission.dutyGroupList || [];

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

@@ -53,7 +53,6 @@ export class QueryRangeComponent implements OnInit {
     let queryType = this.validateForm.value.queryType;
     let hospital;
     let duty;
-		let parent = this.validateForm.value.parent;
     switch (queryType) {
       case 1:
         break;
@@ -69,7 +68,7 @@ export class QueryRangeComponent implements OnInit {
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty, parent});
+    this.submitQueryRange.emit({queryType, hospital, duty});
     this.hideModal();
   }
 

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

@@ -6,7 +6,7 @@
 		  <span class="label">科室</span>：
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
 		    <ng-container *ngFor="let option of alldepart">
-		      <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+		      <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
 		    </ng-container>
 		    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 		      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -129,7 +129,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
       let flag = dictionaryList.some((item) => item.value === 'dateOther');
       !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
       this.dictionaryList = dictionaryList;
-      this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+      this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });
       if(this.parent==1){
 				this.widthValue = this.widthConfig.length * 100 + 300 * 1 + 20
 			}else{
@@ -264,8 +264,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 	getDeparts(dept?) {
 	  let data = {
 	    department: {
-	      cascadeHosId: this.hospital,
+	      statisticalHosId: this.getHosId,
 	      dept: dept,
+	      searchType: 1,
 	    },
 	    idx: 0,
 	    sum: 20,

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

@@ -5,7 +5,7 @@
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
         <ng-container *ngFor="let option of alldepart">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -27,56 +27,58 @@
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
 	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
-  <thead (nzSortChange)="sort($event)" nzSingleSort>
-    <tr>
-			<th nzWidth="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
-			<th nzWidth="9%" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData">
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
-      <td>{{ data.name }}</td>
-      <td>{{ data.totalCount }}</td>
-      <td>{{ data.totalGrade }}</td>
-			<td>{{ data.totalPrice }}</td>
-      <td>{{ data.response_time_num }}</td>
-      <td>{{ data.execution_time_num }}</td>
-      <td>{{ data.aveper }}</td>
-      <td>{{ data.total_time }}</td>
-      <td>{{ data.five_count }}</td>
-      <td>{{ data.special_close }}</td>
-    </tr>
-  </tbody>
-  <ng-template #footerTpl>
-    <table class="footTable">
-      <tr *ngFor="let data of listOfDataEnd">
-				<td style="width: 9%" *ngIf="parent==1">{{ data.parentName }}</td>
-				<td style="width: 9%" *ngIf="parent==0">{{ data.name }}</td>
-				<td style="width: 9%" *ngIf="parent==1"></td>
-        <td style="width: 9%">{{ data.totalCount }}</td>
-        <td style="width: 9%">{{ data.totalGrade }}</td>
-				<td style="width: 9%">{{ data.totalPrice }}</td>
-        <td style="width: 9%">{{ data.response_time_num }}</td>
-        <td style="width: 9%">{{ data.execution_time_num }}</td>
-        <td style="width: 9%">{{ data.aveper }}</td>
-        <td style="width: 9%">{{ data.total_time }}</td>
-        <td style="width: 9%">{{ data.five_count }}</td>
-        <td style="width: 9%">{{ data.special_close }}</td>
-      </tr>
-    </table>
-  </ng-template>
-</nz-table>
+<div class="tableWrap">
+	<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
+			<tr>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalGrade" [(nzSort)]="sortCurrent.totalGrade">总积分</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="response_time_num" [(nzSort)]="sortCurrent.response_time_num">平均响应时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="execution_time_num" [(nzSort)]="sortCurrent.execution_time_num">平均送达时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="aveper" [(nzSort)]="sortCurrent.aveper">按时完成达标率</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="total_time" [(nzSort)]="sortCurrent.total_time">平均总时间</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="five_count" [(nzSort)]="sortCurrent.five_count">五分钟内工单</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="special_close" [(nzSort)]="sortCurrent.special_close">特殊关闭数</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr *ngFor="let data of listOfData">
+				<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
+				<td>{{ data.name }}</td>
+				<td>{{ data.totalCount }}</td>
+				<td>{{ data.totalGrade }}</td>
+				<td>{{ data.totalPrice }}</td>
+				<td>{{ data.response_time_num }}</td>
+				<td>{{ data.execution_time_num }}</td>
+				<td>{{ data.aveper }}</td>
+				<td>{{ data.total_time }}</td>
+				<td>{{ data.five_count }}</td>
+				<td>{{ data.special_close }}</td>
+			</tr>
+		</tbody>
+		<ng-template #footerTpl>
+			<table class="footTable">
+				<tr *ngFor="let data of listOfDataEnd">
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentName }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.name }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalCount }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalGrade }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.response_time_num }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.execution_time_num }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.aveper }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.total_time }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.five_count }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.special_close }}</td>
+				</tr>
+			</table>
+		</ng-template>
+	</nz-table>
+</div>
 <div class="pagination">
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>

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

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

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

@@ -119,6 +119,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 
   // 表格数据
   loading1 = false;
+	widthValue:any;
+	widthConfig:any = [];
+	widthStyle:any;
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -140,6 +143,15 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthValue = 11 * 100 + 300 * 1 + 20
+			this.widthStyle = '9%'
+		}else{
+			this.widthConfig = new Array(10).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthValue = 10 * 100 + 162 * 1 + 20
+			this.widthStyle = '10%'
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "deptTransOrderQc", postData)
@@ -252,8 +264,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 	getDeparts(dept?) {
 	  let data = {
 	    department: {
-	      cascadeHosId: this.hospital,
+	      statisticalHosId: this.getHosId,
 	      dept: dept,
+	      searchType: 1,
 	    },
 	    idx: 0,
 	    sum: 20,

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

@@ -2,10 +2,10 @@
   <div class="searchData">
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
-      <span class="label">楼栋</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="buildingId" (nzOpenChange)="openChangeBuilding($event)">
-        <ng-container *ngFor="let option of buildingList">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
+      <span class="label">科室</span>：
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
+        <ng-container *ngFor="let option of alldepart">
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -20,28 +20,31 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.statisticsTypeDTO || fieldConfig.fields.buildingDTO">
   <span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
   <span>{{fieldConfig.fields.userDTO?.name}}</span>
   <span>{{fieldConfig.fields.statisticsTypeDTO?.name}}</span>
   <span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
+	<span>{{fieldConfig.fields.buildingDTO?.buildingName}}</span>
 </div>
 <nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
     <tr>
-      <th nzWidth="12%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
-      <th nzWidth="11%" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
+			<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+      <th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室(编码)</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="totalCount" [(nzSort)]="sortCurrent.totalCount">工单数量</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="evaCount" [(nzSort)]="sortCurrent.evaCount">评价总工单数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva1" [(nzSort)]="sortCurrent.eva1">一星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva2" [(nzSort)]="sortCurrent.eva2">二星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva3" [(nzSort)]="sortCurrent.eva3">三星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva4" [(nzSort)]="sortCurrent.eva4">四星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="eva5" [(nzSort)]="sortCurrent.eva5">五星评价数</th>
+      <th [nzWidth]="widthThStyle" nzShowSort nzSortKey="avgCount" [(nzSort)]="sortCurrent.avgCount">平均总星级</th>
     </tr>
   </thead>
   <tbody>
     <tr *ngFor="let data of listOfData">
+			<td *ngIf="parent==1">{{ data.parentName || '无' }}</td>
       <td>{{ data.name }}</td>
       <td>{{ data.totalCount }}</td>
       <td>{{ data.evaCount }}</td>
@@ -56,15 +59,17 @@
   <ng-template #footerTpl>
     <table class="footTable">
       <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 12%">{{ data.name }}</td>
-        <td style="width: 11%">{{ data.totalCount }}</td>
-        <td style="width: 11%">{{ data.evaCount }}</td>
-        <td style="width: 11%">{{ data.eva1 }}</td>
-        <td style="width: 11%">{{ data.eva2 }}</td>
-        <td style="width: 11%">{{ data.eva3 }}</td>
-        <td style="width: 11%">{{ data.eva4 }}</td>
-        <td style="width: 11%">{{ data.eva5 }}</td>
-        <td style="width: 11%">{{ data.avgCount }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1">{{ data.parentName }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==0">{{ data.name }}</td>
+				<td [ngStyle]="{width: widthStyle}" *ngIf="parent==1"></td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.totalCount }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.evaCount }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva1 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva2 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva3 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva4 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.eva5 }}</td>
+        <td [ngStyle]="{width: widthThStyle}">{{ data.avgCount }}</td>
       </tr>
     </table>
   </ng-template>

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

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

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

@@ -26,9 +26,11 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   pageSize: number = 30; //表格每页展示条数
   listLength: number = 0; //表格总数据量
 
-  buildingId;//楼栋id
-
-  searchTimerSubject = new Subject();
+	buildingId;//楼栋id
+	hospital:any;
+	deptTypeId;//科室类型id
+	deptId;
+	searchTimerSubject = new Subject();
 
   ngOnInit() {
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -40,6 +42,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   ngAfterViewInit(){
     this.initSessionData();
     this.getQueryParams();
+    this.getDeparts();
     setTimeout(() => {
       this.search();
     }, 0)
@@ -65,7 +68,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   }
 
   get getMoreFilter(){
-    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO;
+    let flag = this.fieldConfig.fields.groupDTO || this.fieldConfig.fields.userDTO || this.fieldConfig.fields.taskTypeDTO || this.fieldConfig.fields.statisticsTypeDTO || this.fieldConfig.fields.buildingDTO;
     return flag ? 37 : 0;
   }
 
@@ -74,11 +77,13 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
   hosId:any;
   dutyId:any;
   parentDutyId:any;
+  parent:any;
   initSessionData(){
     let newStatistics = JSON.parse(sessionStorage.getItem('newStatistics'));
     let queryType:any = newStatistics.queryType;
     let hosId:any = newStatistics.hospitalId;
     let dutyId:any = newStatistics.dutyId;
+  	this.parent = newStatistics.parent;
 
     queryType = queryType ? +queryType : undefined;
     hosId = hosId ? +hosId : undefined;
@@ -110,6 +115,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
   // 表格数据
   loading1 = false;
+	widthStyle:any;
+	widthThStyle:any;
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -119,8 +126,10 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
       sum: this.pageSize,
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -129,6 +138,13 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthThStyle = '9%'
+			this.widthStyle = '14%'
+		}else{
+			this.widthThStyle = '10%'
+			this.widthStyle = '20%'
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "deptDegreeTransOrder", postData)
@@ -168,8 +184,10 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     let postData:any = {
       startDate: this.customChangeDateComponent.startDate || undefined,
       endDate: this.customChangeDateComponent.endDate || undefined,
+			showParentDept: this.parent==1 ? 'true' : undefined,
+			deptId: this.deptId || undefined,
+			buildingId: this.fieldConfig.fields.buildingId || undefined,
       hosId: this.getHosId,
-      buildingId: this.buildingId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
       statisticsTypeId: this.fieldConfig.fields.statisticsTypeId || undefined,
@@ -208,7 +226,7 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 		this.sortCurrent = {};
     this.dateRange = []
     this.buildingId = undefined;
-    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined};
+    this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
     this.search();
   }
@@ -218,6 +236,31 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     this.searchTimer(this.getBuildingList, e);
   }
 
+	// 科室搜索
+	changeInp(e) {
+	  this.searchTimer(this.getDeparts, e);
+	}
+
+	// 获取所有科室
+	alldepart:any;
+	getDeparts(dept?) {
+	  let data = {
+	    department: {
+	      statisticalHosId: this.getHosId,
+	      dept: dept,
+	      searchType: 1,
+	    },
+	    idx: 0,
+	    sum: 20,
+	  };
+	  this.mainService
+	    .getFetchDataList("data", "department", data)
+	    .subscribe((data) => {
+				this.isLoading = false;
+	      this.alldepart = data.list;
+	    });
+	}
+
   // 防抖
   isLoading = false;
   searchTimer(fun, e) {
@@ -252,8 +295,8 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 
   // 详细搜索
   fieldConfig:any = {
-    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined},
-    config: {groupAndUser: true, statisticsType: true, taskType: true},
+    fields: {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined},
+    config: {groupAndUser: true, statisticsType: true, taskType: true, building: true},
   }
   showSearchMore:boolean = false;
   showMore(){

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

@@ -5,7 +5,7 @@
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
         <ng-container *ngFor="let option of alldepart">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -239,8 +239,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 	getDeparts(dept?) {
 	  let data = {
 	    department: {
-	      cascadeHosId: this.hospital,
+	      statisticalHosId: this.getHosId,
 	      dept: dept,
+	      searchType: 1,
 	    },
 	    idx: 0,
 	    sum: 20,

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

@@ -162,6 +162,7 @@
 						display: flex;
 						height: 45px;
 						border-bottom: 1px solid #D9D9D9;
+						background: #FAFAFA;
 						.table-td{
 							line-height: 45px;
 							text-align: center;

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

@@ -5,7 +5,7 @@
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
         <ng-container *ngFor="let option of alldepart">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -30,56 +30,58 @@
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 	<span>{{fieldConfig.fields.deptTypeDTO?.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="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData">
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
-      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-      <td>{{ data.sum }}</td>
-      <td>{{ data.degreeCount }}</td>
-      <td>{{ data.oneStar }}</td>
-      <td>{{ data.twoStar }}</td>
-      <td>{{ data.threeStar }}</td>
-      <td>{{ data.fourStar }}</td>
-      <td>{{ data.fiveStar }}</td>
-      <td>{{ data.totalStar }}</td>
-      <td>{{ data.avgStar }}</td>
-    </tr>
-  </tbody>
-  <ng-template #footerTpl>
-    <table class="footTable">
-      <tr *ngFor="let data of listOfDataEnd">
-				<td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
-				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode }}</td>
-				<td style="width: 10%" *ngIf="parent==1"></td>
-        <td style="width: 10%">{{ data.sum }}</td>
-        <td style="width: 10%">{{ data.degreeCount }}</td>
-        <td style="width: 10%">{{ data.oneStar }}</td>
-        <td style="width: 10%">{{ data.twoStar }}</td>
-        <td style="width: 10%">{{ data.threeStar }}</td>
-        <td style="width: 10%">{{ data.fourStar }}</td>
-        <td style="width: 10%">{{ data.fiveStar }}</td>
-        <td style="width: 10%">{{ data.totalStar }}</td>
-        <td style="width: 10%">{{ data.avgStar }}</td>
-      </tr>
-    </table>
-  </ng-template>
-</nz-table>
+<div class="tableWrap">
+	<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }"  [nzFooter]="footerTpl">
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
+			<tr>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="degreeCount" [(nzSort)]="sortCurrent.degreeCount">评价工单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="oneStar" [(nzSort)]="sortCurrent.oneStar">一星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="twoStar" [(nzSort)]="sortCurrent.twoStar">二星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="threeStar" [(nzSort)]="sortCurrent.threeStar">三星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="fourStar" [(nzSort)]="sortCurrent.fourStar">四星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="fiveStar" [(nzSort)]="sortCurrent.fiveStar">五星</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalStar" [(nzSort)]="sortCurrent.totalStar">评价总星数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgStar" [(nzSort)]="sortCurrent.avgStar">平均总星数</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr *ngFor="let data of listOfData">
+				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
+				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+				<td>{{ data.sum }}</td>
+				<td>{{ data.degreeCount }}</td>
+				<td>{{ data.oneStar }}</td>
+				<td>{{ data.twoStar }}</td>
+				<td>{{ data.threeStar }}</td>
+				<td>{{ data.fourStar }}</td>
+				<td>{{ data.fiveStar }}</td>
+				<td>{{ data.totalStar }}</td>
+				<td>{{ data.avgStar }}</td>
+			</tr>
+		</tbody>
+		<ng-template #footerTpl>
+			<table class="footTable">
+				<tr *ngFor="let data of listOfDataEnd">
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.degreeCount }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.oneStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.twoStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.threeStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.fourStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.fiveStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalStar }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgStar }}</td>
+				</tr>
+			</table>
+		</ng-template>
+	</nz-table>
+</div>
 <div class="pagination">
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>

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

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  // margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

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

@@ -117,6 +117,9 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 
   // 表格数据
   loading1 = false;
+	widthStyle:any;
+	widthValue:any;
+	widthConfig:any = [];
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -142,6 +145,15 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthStyle = '9%'
+			this.widthValue = 12 * 100 + 300 * 1 + 20
+		}else{
+			this.widthConfig = new Array(10).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthStyle = '10%'
+			this.widthValue = 11 * 100 + 150 * 1 + 20
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "deptEvaluate", postData)
@@ -185,7 +197,7 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+      deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
       repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -254,8 +266,9 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
 	getDeparts(dept?) {
 	  let data = {
 	    department: {
-	      cascadeHosId: this.hospital,
+	      statisticalHosId: this.getHosId,
 	      dept: dept,
+	      searchType: 1,
 	    },
 	    idx: 0,
 	    sum: 20,

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

@@ -5,7 +5,7 @@
 		  <span class="label">科室</span>：
 		  <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
 		    <ng-container *ngFor="let option of alldepart">
-		      <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+		      <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
 		    </ng-container>
 		    <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
 		      <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -30,59 +30,61 @@
   <span>{{fieldConfig.fields.floorDTO?.floorName}}</span>
 	<span>{{fieldConfig.fields.deptTypeDTO?.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="9%" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
-      <th nzWidth="10%" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
-      <th nzWidth="9%" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr *ngFor="let data of listOfData">
-			<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
-      <td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
-      <td>{{ data.sum }}</td>
-      <td>{{ data.avgResponseTime }}</td>
-      <td>{{ data.avgResolvedTime }}</td>
-      <td>{{ data.resolvedOverNum }}</td>
-      <td>{{ data.overTimeNum }}</td>
-      <td>{{ data.consumablePrice }}</td>
-      <td>{{ data.workHourPrice }}</td>
-      <td>{{ data.totalPrice }}</td>
-      <td>{{ data.negativeNum }}</td>
-      <td>{{ data.favorableRate }}</td>
-    </tr>
-  </tbody>
-  <ng-template #footerTpl>
-    <table class="footTable">
-      <tr *ngFor="let data of listOfDataEnd">
-        <td style="width: 9%" *ngIf="parent==1">{{ data.parentCode }}</td>
-				<td style="width: 10%" *ngIf="parent==0">{{ data.deptCode}}</td>
-				<td style="width: 10%" *ngIf="parent==1"></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="tableWrap">
+	<nz-table class="table" accesskey=""[nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px' }" [nzFooter]="footerTpl">
+		<thead (nzSortChange)="sort($event)" nzSingleSort>
+			<tr>
+				<th [nzWidth]="widthStyle" *ngIf="parent==1" nzShowSort nzSortKey="parentOrders" [(nzSort)]="sortCurrent.parentOrders">父级科室(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="orders" [(nzSort)]="sortCurrent.orders">科室名称(编码)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="sum" [(nzSort)]="sortCurrent.sum">工单总数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgResponseTime" [(nzSort)]="sortCurrent.avgResponseTime">平均接单时长</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="avgResolvedTime" [(nzSort)]="sortCurrent.avgResolvedTime">平均解决时长</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="resolvedOverNum" [(nzSort)]="sortCurrent.resolvedOverNum">超时单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="overTimeNum" [(nzSort)]="sortCurrent.overTimeNum">挂起单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="consumablePrice" [(nzSort)]="sortCurrent.consumablePrice">耗材费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="workHourPrice" [(nzSort)]="sortCurrent.workHourPrice">工时费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="totalPrice" [(nzSort)]="sortCurrent.totalPrice">总费用(元)</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="negativeNum" [(nzSort)]="sortCurrent.negativeNum">差评单数</th>
+				<th [nzWidth]="widthStyle" nzShowSort nzSortKey="favorableRate" [(nzSort)]="sortCurrent.favorableRate">好评率</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr *ngFor="let data of listOfData">
+				<td *ngIf="parent==1">{{ data.parentName || '无' }}<ng-container *ngIf="parent==1 && data.parentName">({{ data.parentCode }})</ng-container></td>
+				<td>{{ data.deptName }}<ng-container *ngIf="data.deptCode">({{ data.deptCode }})</ng-container></td>
+				<td>{{ data.sum }}</td>
+				<td>{{ data.avgResponseTime }}</td>
+				<td>{{ data.avgResolvedTime }}</td>
+				<td>{{ data.resolvedOverNum }}</td>
+				<td>{{ data.overTimeNum }}</td>
+				<td>{{ data.consumablePrice }}</td>
+				<td>{{ data.workHourPrice }}</td>
+				<td>{{ data.totalPrice }}</td>
+				<td>{{ data.negativeNum }}</td>
+				<td>{{ data.favorableRate }}</td>
+			</tr>
+		</tbody>
+		<ng-template #footerTpl>
+			<table class="footTable">
+				<tr *ngFor="let data of listOfDataEnd">
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1">{{ data.parentCode }}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==0">{{ data.deptCode}}</td>
+					<td [ngStyle]="{width:widthStyle}" *ngIf="parent==1"></td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.sum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgResponseTime }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.avgResolvedTime }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.resolvedOverNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.overTimeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.consumablePrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.workHourPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.totalPrice }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.negativeNum }}</td>
+					<td [ngStyle]="{width:widthStyle}">{{ data.favorableRate }}</td>
+				</tr>
+			</table>
+		</ng-template>
+	</nz-table>
+</div>
 <div class="pagination">
   <ng-template #totalTemplate let-total> 共 {{ total }} 条 </ng-template>
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)" nzShowSizeChanger [nzPageSizeOptions]="[30,50,100,200]" [nzShowTotal]="totalTemplate"></nz-pagination>

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

@@ -53,7 +53,22 @@
   .table{
     margin: 0 8px;
   }
-
+	
+	.tableWrap{
+	  margin: 0 8px;
+	  overflow-x: auto;
+	  .footTable, tbody{
+	    td{
+	      width: 100px;
+	      max-width: 100px;
+	      &.width150{
+	        width: 150px;
+	        max-width: 150px;
+	      }
+	    }
+	  }
+	}
+	
   .moreFilter{
     margin-bottom: 16px;
     span{

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

@@ -117,6 +117,9 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 
   // 表格数据
   loading1 = false;
+	widthStyle:any;
+	widthValue:any;
+	widthConfig:any = [];
   getList(num?: number, field?: string, sort?: string) {
     if (num !== undefined) {
       this.pageIndex = num;
@@ -142,6 +145,15 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     if (field && sort) {
       postData.sort = `${field} ${sort === "ascend" ? `asc` : `desc`}`
     }
+		if(this.parent==1){
+			this.widthConfig = new Array(12).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthStyle = '8%'
+			this.widthValue = 1920
+		}else{
+			this.widthConfig = new Array(11).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });;
+			this.widthStyle = '9%'
+			this.widthValue = 1920
+		}
     this.loading1 = true;
     this.mainService
       .postCustom("itsm/report", "repairDept", postData)
@@ -185,7 +197,7 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
       hosId: this.hosId || undefined,
       dutyId: this.dutyId || undefined,
       parentDutyId: this.parentDutyId || undefined,
-      deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -253,10 +265,11 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
 	alldepart:any;
 	getDeparts(dept?) {
 	  let data = {
-	    department: {
-	      cascadeHosId: this.hospital,
-	      dept: dept,
-	    },
+			department: {
+			  statisticalHosId: this.getHosId,
+			  dept: dept,
+			  searchType: 1,
+			},
 	    idx: 0,
 	    sum: 20,
 	  };

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

@@ -5,7 +5,7 @@
       <span class="label">科室</span>：
       <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="deptId" nzServerSearch nzShowSearch (nzOnSearch)="changeInp($event)">
         <ng-container *ngFor="let option of alldepart">
-          <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+          <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
         </ng-container>
         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
           <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...

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

@@ -185,7 +185,7 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
 			hosId: this.hosId || undefined,
 			dutyId: this.dutyId || undefined,
 			parentDutyId: this.parentDutyId || undefined,
-			deptTypeId: this.fieldConfig.deptTypeId || undefined,
+			deptTypeId: this.fieldConfig.fields.deptTypeId || undefined,
 			repairDeptId: this.deptId || undefined,
       groupId: this.fieldConfig.fields.userId ? undefined : (this.fieldConfig.fields.groupId || undefined),
       userId: this.fieldConfig.fields.userId || undefined,
@@ -254,8 +254,9 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
   getDeparts(dept?) {
     let data = {
       department: {
-        cascadeHosId: this.hospital,
+        statisticalHosId: this.getHosId,
         dept: dept,
+        searchType: 1,
       },
       idx: 0,
       sum: 20,

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

@@ -136,6 +136,7 @@
 						display: flex;
 						height: 45px;
 						border-bottom: 1px solid #D9D9D9;
+						background: #FAFAFA;
 						.table-td{
 							line-height: 45px;
 							text-align: center;

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

@@ -35,7 +35,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   hospital;
   duty;
   queryType;//查询范围
-	parent;
+	parent:any = 0;
   // 初始化院区、部门显示
   initHospitalAndDuty(hospitalOrDuty){
     let sessionData = JSON.parse(sessionStorage.getItem('newStatistics'));
@@ -85,7 +85,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 
   // 缓存数据
   sessionSave(){
-    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent:this.parent}));
+    sessionStorage.setItem('newStatistics', JSON.stringify({queryType: this.queryType, hospitalId: this.hospital ? this.hospital.id : undefined, dutyId: this.duty ? this.duty.id : undefined, hospital: this.hospital, duty: this.duty, parent: this.parent}));
   }
 
   // 查询范围

src/app/views/users-management/users-management.component.ts

@@ -626,7 +626,7 @@ export class UsersManagementComponent implements OnInit {
         }
       });
   }
-	
+
 	// 确认恢复
 	confirmRecover() {
 		this.hideRecoverModal();
@@ -656,12 +656,12 @@ export class UsersManagementComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 关闭恢复模态框
 	hideRecoverModal() {
 	  this.recoverModal = false;
 	}
-	
+
   // 关闭删除模态框
   hideDelModal() {
     this.delModal = false;