标本信息增加筛选条件

src/app/views/specimen-search/specimen-search.component.html

@@ -1,7 +1,7 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl="16" class="list-template__searchBox">
+      <div nz-col nzXl="18" class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">收取科室：</span>
           <nz-select
@@ -28,6 +28,31 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
+          <span class="label">终点科室：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择终点科室"
+            [(ngModel)]="searchCriteria.checkDept"
+            (nzOnSearch)="changeInp($event, 'search')"
+            (nzOpenChange)="changeSearch($event)"
+          >
+            <ng-container *ngFor="let data of departmentSearch">
+              <nz-option
+                *ngIf="!isLoading"
+                nzLabel="{{ data.dept }}"
+                nzValue="{{ data.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>
           <input
             nz-input
@@ -69,8 +94,38 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">收取人：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择收取人："
+            [(ngModel)]="searchCriteria.receiverName"
+            (nzOnSearch)="changeInp2($event, 'search')"
+            (nzOpenChange)="changeSearch2($event)"
+          >
+            <ng-container *ngFor="let data of userSearch">
+              <nz-option
+                *ngIf="!isLoading"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.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-range-picker [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
+        </div>
+        
       </div>
-      <div nz-col nzXl="8" class="list-template__btns">
+      <div nz-col nzXl="6" class="list-template__btns">
         <button
           nz-button
           class="btn default"
@@ -87,7 +142,8 @@
       </div>
     </div>
     <div class="list-template__checkBoxes">
-      <nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="log(checkOptionsOne)"></nz-checkbox-group>
+      <div><nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="log(checkOptionsOne)"></nz-checkbox-group></div>
+      <div>合计：{{listLength}}</div>
     </div>
     <div class="list-template__bottom">
       <nz-table

src/app/views/specimen-search/specimen-search.component.less

@@ -1,5 +1,8 @@
 @import "../../../../src/theme.less";
-
+.list-template__checkBoxes{
+  display: flex;
+  justify-content: space-between;
+}
 .save {
   position: fixed;
   left: 0;

src/app/views/specimen-search/specimen-search.component.ts

@@ -3,6 +3,7 @@ import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
+import { format } from "date-fns";
 @Component({
   selector: "app-specimen-search",
   templateUrl: "./specimen-search.component.html",
@@ -18,22 +19,30 @@ export class SpecimenSearchComponent implements OnInit {
     hospital: null,
     department: null,
     speState: null,
+    receiverName: null,
+    dateRange: [],
+    checkDept: null,
   };
   types = []; // 类型列表(搜索框)
   departmentSearch = []; // 院区下的科室列表(搜索框)
+  userSearch = []; // 院区下的人员列表(搜索框)
   allHospital: any = []; //院区下拉框
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   checkOptionsOne: Array<any> = [
-    { label: "服务中心收取", value: "0", checked: false },
+    { label: "服务中心收取", value: "0", checked: true },
   ];
   changeInpSubject = new Subject();
+  changeInp2Subject = new Subject();
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDepartment(v[0], v[1]);
     });
+    this.changeInp2Subject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchUser(v[0], v[1]);
+    });
     this.getAllHospital();
   }
   // 表格筛选
@@ -103,6 +112,31 @@ export class SpecimenSearchComponent implements OnInit {
   closeModelHistory(e) {
     this.historyPromptModalShow = JSON.parse(e).show;
   }
+  // 日期选择
+  startDate: string; //发起时间开始
+  endDate: string; //发起时间结束
+  changeDate(result?): void {
+    if (!result) {
+      this.startDate = this.endDate = "";
+      return;
+    }
+    this.startDate =
+      result[0].getFullYear() +
+      "-" +
+      (result[0].getMonth() + 1) +
+      "-" +
+      result[0].getDate() +
+      " " +
+      "00:00:00";
+    this.endDate =
+      result[1].getFullYear() +
+      "-" +
+      (result[1].getMonth() + 1) +
+      "-" +
+      result[1].getDate() +
+      " " +
+      "23:59:59";
+  }
   // 重置
   reset() {
     this.searchCriteria = {
@@ -112,6 +146,9 @@ export class SpecimenSearchComponent implements OnInit {
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
       department: null,
       speState: null,
+      receiverName: null,
+      dateRange: [],
+      checkDept: null,
     };
     this.getList(1);
   }
@@ -133,8 +170,15 @@ export class SpecimenSearchComponent implements OnInit {
       this.changeInp("no", "search");
     }
   }
+  // 打开搜索框
+  changeSearch2(flag) {
+    if (flag) {
+      this.changeInp2("no", "search");
+    }
+  }
   // 边输边搜节流阀
   isLoading = false;
+  deptKey = "";
   changeInp(dept, type) {
     if (!dept) {
       return;
@@ -142,11 +186,11 @@ export class SpecimenSearchComponent implements OnInit {
     if (dept === "no") {
       dept = "";
     }
+    this.deptKey = dept;
     this.isLoading = true;
     this.changeInpSubject.next([dept, type]);
   }
   // 搜索科室
-  snum = 0;
   searchDepartment(dept, type) {
     let data = {
       department: {
@@ -156,19 +200,56 @@ export class SpecimenSearchComponent implements OnInit {
         },
       },
       idx: 0,
-      sum: 20,
+      sum: 10,
     };
-    this.snum++;
     this.mainService
       .getFetchDataList("data", "department", data)
       .subscribe((data) => {
-        this.snum--;
         if (data.status == 200) {
           if (type === "search") {
-            if (this.snum === 0) {
+            if (this.deptKey === dept) {
               this.isLoading = false;
+              this.departmentSearch = data.list;
+            }
+          }
+        }
+      });
+  }
+  // 边输边搜节流阀
+  userKey = "";
+  changeInp2(keyword, type) {
+    if (!keyword) {
+      return;
+    }
+    if (keyword === "no") {
+      keyword = "";
+    }
+    this.userKey = keyword;
+    this.isLoading = true;
+    this.changeInp2Subject.next([keyword, type]);
+  }
+  // 搜索科室
+  searchUser(keyword, type) {
+    let data = {
+      user: {
+        usertype: { id: 106 },
+        name: keyword,
+        hospital: {
+          id: this.searchCriteria.hospital,
+        },
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", data)
+      .subscribe((data) => {
+        if (data.status == 200) {
+          if (type === "search") {
+            if (this.userKey === keyword) {
+              this.isLoading = false;
+              this.userSearch = data.list;
             }
-            this.departmentSearch = data.list;
           }
         }
       });
@@ -190,10 +271,11 @@ export class SpecimenSearchComponent implements OnInit {
   // 表格数据
   loading1 = false;
   getList(type) {
+    console.log(this.searchCriteria.dateRange);
     if (type == 1) {
       this.pageIndex = 1;
     }
-    let postData = {
+    let postData: any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       specimen: {
@@ -204,6 +286,14 @@ export class SpecimenSearchComponent implements OnInit {
               id: this.searchCriteria.department,
             }
           : undefined,
+        checkDept: this.searchCriteria.checkDept
+          ? {
+              id: this.searchCriteria.checkDept,
+            }
+          : undefined,
+        receiverName: this.searchCriteria.receiverName
+          ? this.searchCriteria.receiverName
+          : undefined,
         scode: !this.searchCriteria.scode
           ? undefined
           : this.searchCriteria.scode,
@@ -215,6 +305,12 @@ export class SpecimenSearchComponent implements OnInit {
           : undefined,
       },
     };
+    if (this.searchCriteria.dateRange.length) {
+      postData.specimen.startArriveTime =
+        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd ") + "00:00:00";
+      postData.specimen.endArriveTime =
+        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd ") + "23:59:59";
+    }
     this.loading1 = true;
     this.mainService
       .getFetchDataList("simple/data", "specimen", postData)

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.8');
+    console.info('v2.4.9');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)