增加护士端工单列表筛选功能

src/app/views/hushijiandan/hushijiandan.component.html

@@ -572,8 +572,14 @@
               <div class="orderTit display_flex justify-content_space-between align-items_center">
                 <span>工单列表</span>
                 <div>
-                  <nz-select style="width: 120px;" [(ngModel)]="orderSelected"
-                    (ngModelChange)="changeOrderSel(orderSelected)" nzPlaceHolder="请选择">
+                  <nz-select style="width: 100px;" [(ngModel)]="orderStateSelected"
+                    (ngModelChange)="changeOrderState($event)" nzPlaceHolder="请选择工单状态">
+                    <nz-option nzValue="-1" nzLabel="全部"></nz-option>
+                    <nz-option nzValue="1" nzLabel="执行中"></nz-option>
+                    <nz-option nzValue="2" nzLabel="待评价"></nz-option>
+                  </nz-select>
+                  <nz-select class="ml8" style="width: 100px;" [(ngModel)]="orderSelected"
+                    (ngModelChange)="changeOrderSel(orderSelected)" nzPlaceHolder="请选择任务类型">
                     <nz-option nzValue="-1" nzLabel="全部"></nz-option>
                     <nz-option *ngFor="let item of orderSelectList" [nzValue]="item.id" [nzLabel]="item.name">
                     </nz-option>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -161,6 +161,7 @@ export class HushijiandanComponent implements OnInit {
 
   orderSelectList: any = []; //工单列表筛选选项
   orderSelected = "-1"; //工单列表下拉框选中
+  orderStateSelected = "1"; //工单列表工单状态下拉框选中
 
   tabSearchCont: string = ""; //左侧tab搜索框内容
   pLoading: boolean = true; //患者信息loading
@@ -1754,6 +1755,10 @@ export class HushijiandanComponent implements OnInit {
     this.selectedType = e;
     this.getOrderList();
   }
+  // 工单列表工单状态下拉筛选
+  changeOrderState(e) {
+    this.getOrderList();
+  }
   // 工单列表
   orderList: any = [];
   orderIdx: number = 1;
@@ -1763,7 +1768,7 @@ export class HushijiandanComponent implements OnInit {
     let that = this;
     that.orderList = [];
     that.OLoading = true;
-    let postData = {
+    let postData: any = {
       workOrder: {
         createDept: JSON.parse(localStorage.getItem("user")).user.dept.id,
         platform: 2,
@@ -1778,6 +1783,20 @@ export class HushijiandanComponent implements OnInit {
         id: that.selectedType,
       };
     }
+    // 执行中包含状态：待抢单、待接单、待到达、待送达、执行中、定时预约
+    if (that.orderStateSelected == "1") {
+      //执行中
+      delete postData.workOrder.gdState;
+      postData.workOrder.nurseState = 1;
+    } else if (that.orderStateSelected == "2") {
+      //待评价
+      delete postData.workOrder.nurseState;
+      postData.workOrder.gdState = { id: "73" };
+    } else {
+      //全部
+      delete postData.workOrder.nurseState;
+      delete postData.workOrder.gdState;
+    }
     that.mainService
       .getFetchDataList("nurse", "workOrder", postData)
       .subscribe((data) => {