人员统计，科室统计，全院统计

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.html

@@ -33,11 +33,36 @@
             <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">科室名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event, 'getDeptList')" nzAllowClear nzPlaceHolder="请选择科室名称" [(ngModel)]="searchDto.dept">
+            <ng-container *ngFor="let option of deptList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">楼栋名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event, 'getBuildingList')" nzAllowClear nzPlaceHolder="请选择楼栋名称" [(ngModel)]="searchDto.building">
+            <ng-container *ngFor="let option of buildingList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search(1)'>搜索</button>
         <button nz-button class="btn default ml8" (click)='export()' [nzLoading]="loading2">导出</button>
         <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button class="btn default ml8" (click)='exportDetail()' [nzLoading]="loading3" [disabled]="!checkedDepIds.length">批量导出详细科室报表</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -45,29 +70,24 @@
         [nzLoading]="loading1">
         <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
+            <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+              (nzCheckedChange)="checkAll($event)"></th>
             <th nzWidth="5%">序号</th>
-            <th nzWidth="5%">人员姓名</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getTrip" [(nzSort)]="sortCurrent.getTrip">回收趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getClothesNum" [(nzSort)]="sortCurrent.getClothesNum">回收被服数量</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendTrip" [(nzSort)]="sortCurrent.sendTrip">送回趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">送回被服数量</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
+            <th nzWidth="5%">科室名称</th>
+            <th nzShowSort nzWidth="17%" nzSortKey="clothesTypeNum" [(nzSort)]="sortCurrent.clothesTypeNum">回收种类数</th>
+            <th nzShowSort nzWidth="17%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收单数</th>
+            <th nzShowSort nzWidth="17%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回单数</th>
+            <th nzShowSort nzWidth="17%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">洗涤被服数量</th>
+            <th nzShowSort nzWidth="17%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let index=index;">
+          <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
+            <td nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.userName }}</td>
-            <td>{{ data.totalTrip }}</td>
-            <td>{{ data.totalOrder }}</td>
-            <td>{{ data.getTrip }}</td>
+            <td>{{ data.dept || '' }}</td>
+            <td>{{ data.clothesTypeNum }}</td>
             <td>{{ data.getOrder }}</td>
-            <td>{{ data.getClothesNum }}</td>
-            <td>{{ data.sendTrip }}</td>
             <td>{{ data.sendOrder }}</td>
             <td>{{ data.sendClothesNum }}</td>
             <td>{{ data.price }}</td>
@@ -75,7 +95,7 @@
         </tbody>
       </nz-table>
       <div class="list-template__pagination">
-        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
+        <nz-pagination [(nzPageIndex)]="pageIndex" [nzPageSizeOptions]="[10,100]" [(nzTotal)]="listLength" nzShowSizeChanger [(nzPageSize)]="pageSize"
           (nzPageIndexChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)"
           (nzPageSizeChange)="getList(pageIndex, sortCurrentKey, sortCurrentValue)">
         </nz-pagination>

src/app/views/quilt-washing-department-statistics/quilt-washing-department-statistics.component.ts

@@ -6,6 +6,8 @@ import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
 import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-quilt-washing-department-statistics",
@@ -22,11 +24,22 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
     private tool: ToolService
   ) {}
 
+  searchTimerSubject = new Subject();
+
+  searchDto: any = {
+    dept: null,
+    building: null,
+  }
+
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHos();
     this.changeDateRange(this.defRange);
-    this.search();
+    // this.search();
   }
 
   dateType: string = "day"; //选中时间维度
@@ -116,12 +129,17 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
   // 导出
   loading2 = false;
   export() {
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
     let that = this;
     let postData: any = {
       startTime: this.startDate + " " + "00:00:00",
       endTime: this.endDate + " " + "23:59:59",
       hosId: that.hospital,
       type: this.dateType,
+      deptId: this.searchDto.dept || undefined,
+      buildingId: this.searchDto.building || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort =
@@ -152,6 +170,51 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
       }
     );
   }
+  // 批量导出详细科室报表
+  loading3 = false;
+  exportDetail() {
+    let ids = this.checkedDepIds.join(",");
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
+    let that = this;
+    let postData: any = {
+      startTime: this.startDate + " " + "00:00:00",
+      endTime: this.endDate + " " + "23:59:59",
+      hosId: that.hospital,
+      type: this.dateType,
+      deptId: ids || undefined,
+      buildingId: this.searchDto.building || undefined,
+    };
+    if (this.sortCurrentKey && this.sortCurrentValue) {
+      postData.sort =
+        this.sortCurrentValue === "ascend"
+          ? this.sortCurrentKey
+          : `${this.sortCurrentKey} desc`;
+    }
+    this.loading3 = true;
+    that.mainService.exportReport("clothesDeptDetails", postData).subscribe(
+      (data) => {
+        this.loading3 = false;
+        this.showPromptModal("导出", true, "");
+        var file = new Blob([data], {
+          type: "application/vnd.ms-excel",
+        });
+        //trick to download store a file having its URL
+        var fileURL = URL.createObjectURL(file);
+        var a = document.createElement("a");
+        a.href = fileURL;
+        a.target = "_blank";
+        a.download = "详细科室报表.xls";
+        document.body.appendChild(a);
+        a.click();
+      },
+      (err) => {
+        this.loading3 = false;
+        this.showPromptModal("导出", false, "");
+      }
+    );
+  }
   // 重置
   reset() {
     this.changeDateType("day");
@@ -159,16 +222,52 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
-      source1: null,
-      source2: null,
-      source3: null,
-      source4: null,
+      clothesTypeNum: null,
+      getOrder: null,
+      sendOrder: null,
+      sendClothesNum: null,
+      price: null,
     };
+    this.searchDto = {
+      dept: null,
+      building: null,
+    }
     this.search();
   }
+  // 选中表格单列
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDepIds = []; //已选中单列id
+  refreshStatus(): void {
+    this.isAllDisplayDataChecked = this.listOfData.every(
+      (item) => this.mapOfCheckedId[item.id]
+    );
+    let arr = [];
+    for (var k in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[k]) {
+        arr.push(Number(k));
+      }
+    }
+    this.checkedDepIds = arr;
+  }
+  // 整行操作
+  selectedListData(data) {
+    this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
+    this.refreshStatus();
+  }
+  // 全选
+  isAllDisplayDataChecked = false; //当前页是否全选
+  checkAll(value: boolean): void {
+    this.listOfData.forEach((item) => {
+      this.mapOfCheckedId[item.id] = value;
+    });
+    this.refreshStatus();
+  }
   // 表格数据
   loading1 = false;
   getList(num?: number, field?: string, sort?: string) {
+    this.mapOfCheckedId = {};
+    this.checkedDepIds = [];
+    this.isAllDisplayDataChecked = false;
     this.pageIndex = num;
     let postData: any = {
       idx: this.pageIndex - 1,
@@ -177,6 +276,8 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
       type: this.dateType,
+      deptId: this.searchDto.dept || undefined,
+      buildingId: this.searchDto.building || undefined,
     };
     if (field && sort) {
       postData.sort = sort === "ascend" ? field : `${field} desc`;
@@ -194,6 +295,53 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
   hospital: string; //选中院区
   getAllHos() {
     this.hospital = this.tool.getCurrentHospital().id + "";
+    this.getDeptList();
+    this.getBuildingList();
+  }
+
+  // 边输边搜节流阀
+  changeInp(e, fn) {
+    this.searchTimer(this[fn], e);
+  }
+  // 获取科室
+  deptList: any = [];
+  getDeptList(keyword = '') {
+    let postData = {
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hospital,
+        dept: keyword,
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.deptList = result.list;
+      });
+  }
+
+  // 获取楼栋
+  buildingList: any = [];
+  getBuildingList(keyword = '') {
+    let postData = {
+      building: {
+        cascadeHosId: this.hospital,
+        buildingName: keyword
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "building", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.buildingList = result.list;
+      });
   }
 
   // 修改时间展示维度
@@ -432,17 +580,17 @@ export class QuiltWashingDepartmentStatisticsComponent implements OnInit {
 
   // 边输入边搜索节流阀
   isLoading: boolean = false;
-  searchTimer(fun, e, those) {
-    let that = this;
-    that.isLoading = true;
-    fun(e, those);
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
   }
   // 列表排序
   sortCurrent = {
-    source1: null,
-    source2: null,
-    source3: null,
-    source4: null,
+    clothesTypeNum: null,
+    getOrder: null,
+    sendOrder: null,
+    sendClothesNum: null,
+    price: null,
   };
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.html

@@ -46,28 +46,22 @@
         <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
-            <th nzWidth="5%">人员姓名</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="totalTrip" [(nzSort)]="sortCurrent.totalTrip">总趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="totalOrder" [(nzSort)]="sortCurrent.totalOrder">总单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getTrip" [(nzSort)]="sortCurrent.getTrip">回收趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="getClothesNum" [(nzSort)]="sortCurrent.getClothesNum">回收被服数量</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendTrip" [(nzSort)]="sortCurrent.sendTrip">送回趟数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">送回被服数量</th>
-            <th nzShowSort nzWidth="10%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
+            <th nzWidth="11%">日期</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="deptNum" [(nzSort)]="sortCurrent.deptNum">科室数</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="clothesTypeNum" [(nzSort)]="sortCurrent.clothesTypeNum">被服种类数</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="getOrder" [(nzSort)]="sortCurrent.getOrder">回收工单数</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="sendOrder" [(nzSort)]="sortCurrent.sendOrder">送回工单数</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="sendClothesNum" [(nzSort)]="sortCurrent.sendClothesNum">洗涤数量</th>
+            <th nzShowSort nzWidth="14%" nzSortKey="price" [(nzSort)]="sortCurrent.price">费用(元)</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.userName }}</td>
-            <td>{{ data.totalTrip }}</td>
-            <td>{{ data.totalOrder }}</td>
-            <td>{{ data.getTrip }}</td>
+            <td>{{ data.date }}</td>
+            <td>{{ data.deptNum }}</td>
+            <td>{{ data.clothesTypeNum }}</td>
             <td>{{ data.getOrder }}</td>
-            <td>{{ data.getClothesNum }}</td>
-            <td>{{ data.sendTrip }}</td>
             <td>{{ data.sendOrder }}</td>
             <td>{{ data.sendClothesNum }}</td>
             <td>{{ data.price }}</td>

src/app/views/quilt-washing-hospital-statistics/quilt-washing-hospital-statistics.component.ts

@@ -26,7 +26,7 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHos();
     this.changeDateRange(this.defRange);
-    this.search();
+    // this.search();
   }
 
   dateType: string = "day"; //选中时间维度
@@ -159,10 +159,12 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
-      source1: null,
-      source2: null,
-      source3: null,
-      source4: null,
+      deptNum: null,
+      clothesTypeNum: null,
+      getOrder: null,
+      sendOrder: null,
+      sendClothesNum: null,
+      price: null,
     };
     this.search();
   }
@@ -439,10 +441,12 @@ export class QuiltWashingHospitalStatisticsComponent implements OnInit {
   }
   // 列表排序
   sortCurrent = {
-    source1: null,
-    source2: null,
-    source3: null,
-    source4: null,
+    deptNum: null,
+    clothesTypeNum: null,
+    getOrder: null,
+    sendOrder: null,
+    sendClothesNum: null,
+    price: null,
   };
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.html

@@ -33,6 +33,24 @@
             <nz-option nzLabel="{{data.label}}" nzValue="{{data.id}}" *ngFor="let data of defRanges"></nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">人员名称</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp($event)" nzAllowClear nzPlaceHolder="请选择人员名称" [(ngModel)]="searchDto.user">
+            <ng-container *ngFor="let option of userList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">人员分组</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzPlaceHolder="请选择人员分组" [(ngModel)]="searchDto.group">
+            <nz-option [nzLabel]="data.groupName" [nzValue]="data.id" *ngFor="let data of groupList"></nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default" (click)='search(1)'>搜索</button>

src/app/views/quilt-washing-personnel-statistics/quilt-washing-personnel-statistics.component.ts

@@ -6,6 +6,8 @@ import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
 import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-quilt-washing-personnel-statistics",
@@ -22,11 +24,17 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     private tool: ToolService
   ) {}
 
+  searchTimerSubject = new Subject();
+
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHos();
     this.changeDateRange(this.defRange);
-    this.search();
+    // this.search();
   }
 
   dateType: string = "day"; //选中时间维度
@@ -77,6 +85,11 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //操作提示框是否展示
 
+  searchDto: any = {
+    group: null,
+    user: null,
+  }
+
   // 初始化增删改按钮
   coopBtns: any = {};
   searchData: any = {}; // 综合统计页面带过来的参数
@@ -96,6 +109,46 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     that.changeDateRange(that.defRange);
     that.search();
   }
+  // 获取分组
+  groupList: any = []; //分组
+  getGroupList(id) {
+    let groupData = {
+      group2: {
+        hospitals: id,
+        type:1
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("data", "group2", groupData)
+      .subscribe((result) => {
+        this.groupList = result.list;
+      });
+  }
+  // 边输边搜节流阀
+  changeInp(e) {
+    this.searchTimer(this.getUserList, e);
+  }
+  // 获取人员
+  userList: any = []; //人员
+  getUserList(keyword = '') {
+    let postData = {
+      user: {
+        hospital: { id: this.hospital },
+        name: keyword
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        this.userList = result.list;
+      });
+  }
   // 搜索
   search(num?: number) {
     if (this.hospital) {
@@ -122,6 +175,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
       endTime: this.endDate + " " + "23:59:59",
       hosId: that.hospital,
       type: this.dateType,
+      userId: this.searchDto.user || undefined,
+      groupId: this.searchDto.group || undefined,
     };
     if (this.sortCurrentKey && this.sortCurrentValue) {
       postData.sort =
@@ -159,11 +214,20 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
-      source1: null,
-      source2: null,
-      source3: null,
-      source4: null,
+      totalTrip: null,
+      totalOrder: null,
+      getTrip: null,
+      getOrder: null,
+      getClothesNum: null,
+      sendTrip: null,
+      sendOrder: null,
+      sendClothesNum: null,
+      price: null,
     };
+    this.searchDto = {
+      group: null,
+      user: null,
+    }
     this.search();
   }
   // 表格数据
@@ -177,6 +241,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
       endTime: this.searchData.dateRange.end,
       hosId: this.searchData.hosId,
       type: this.dateType,
+      userId: this.searchDto.user || undefined,
+      groupId: this.searchDto.group || undefined,
     };
     if (field && sort) {
       postData.sort = sort === "ascend" ? field : `${field} desc`;
@@ -194,6 +260,8 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
   hospital: string; //选中院区
   getAllHos() {
     this.hospital = this.tool.getCurrentHospital().id + "";
+    this.getGroupList(this.hospital);
+    this.getUserList();
   }
 
   // 修改时间展示维度
@@ -432,17 +500,21 @@ export class QuiltWashingPersonnelStatisticsComponent implements OnInit {
 
   // 边输入边搜索节流阀
   isLoading: boolean = false;
-  searchTimer(fun, e, those) {
-    let that = this;
-    that.isLoading = true;
-    fun(e, those);
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
   }
   // 列表排序
   sortCurrent = {
-    source1: null,
-    source2: null,
-    source3: null,
-    source4: null,
+    totalTrip: null,
+    totalOrder: null,
+    getTrip: null,
+    getOrder: null,
+    getClothesNum: null,
+    sendTrip: null,
+    sendOrder: null,
+    sendClothesNum: null,
+    price: null,
   };
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";

src/common.less

@@ -253,6 +253,8 @@
         display: flex;
         justify-content: flex-end;
         align-items: center;
+        flex-wrap: wrap;
+        row-gap: 8px;
       }
     }
     .list-template__checkBoxes {