服务台未派单增加楼栋筛选

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.3.96",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/fuwutai/fuwutai.component.html

@@ -72,9 +72,19 @@
     <div class="lists">
       <div class="head">
         <span class="auto_tit">未分派({{unassignedList.length}}条)</span>
-        <nz-select [(ngModel)]="unassignedBuilding" nzMode="multiple" nzPlaceHolder="请选择楼栋">
-          <nz-option *ngFor="let option of listOfOption" [nzLabel]="option.label" [nzValue]="option.value"></nz-option>
-        </nz-select>
+        <div class="ml8 auto_building">
+          <nz-select class="auto_building_select" [(ngModel)]="unassignedBuilding" nzMode="multiple"
+            nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeUnassignedBuilding($event)"
+            (ngModelChange)="changeUnassignedBuilding($event)">
+            <ng-container *ngFor="let option of unassignedBuildings">
+              <nz-option *ngIf="!bLoading" [nzLabel]="option[0]+'('+option[2]+')'" [nzValue]="option[3]">
+              </nz-option>
+            </ng-container>
+            <nz-option *ngIf="bLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
         <span class="toLastTime">刷新倒计时<span class="time">{{orderRefreshTime}}s</span></span>
       </div>
       <div class="searchBox">
@@ -97,7 +107,8 @@
                 <div class="gongdan" (click)="batchDispatchSelect(!data.checked,data.id)">
                   <span class="left mr8"><label nz-checkbox [ngModel]="data.checked"
                       (ngModelChange)="batchDispatchSelect($event,data.id)"></label></span>
-                  <span class="left">{{data.taskType.taskName}}({{data.gdcode}})</span>
+                  <span class="left gongdan_name" nz-tooltip
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
@@ -261,7 +272,8 @@
                 <div class="gongdan" (click)="batchWithdrawalSelect(!data.checked,data.id)">
                   <span class="left mr8"><label nz-checkbox [ngModel]="data.checked"
                       (ngModelChange)="batchWithdrawalSelect($event,data.id)"></label></span>
-                  <span class="left">{{data.taskType.taskName}}({{data.gdcode}})</span>
+                  <span class="left gongdan_name" nz-tooltip
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
@@ -423,7 +435,8 @@
               <div class="left_cots" (click)='openDetails(data.id,data.taskType.associationType.id)'>
                 <!-- 工单 -->
                 <div class="gongdan">
-                  <span class="left">{{data.taskType.taskName}}({{data.gdcode}})</span>
+                  <span class="left gongdan_name" nz-tooltip
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>

src/app/views/fuwutai/fuwutai.component.less

@@ -305,6 +305,8 @@
 
   /* 头部 */
   .lists .head {
+    display: flex;
+    align-items: center;
     width: 100%;
     height: 40px;
     line-height: 40px;
@@ -336,6 +338,20 @@
     font-weight: bold;
     font-size: 16px;
   }
+  .lists .head .auto_building {
+    display: inline-block;
+    width: 160px;
+    height: 32px;
+    overflow: hidden;
+    .auto_building_select {
+      width: 100%;
+      height: 100%;
+      /deep/ .ant-select-selection {
+        height: 100%;
+        overflow: hidden;
+      }
+    }
+  }
 
   .lists .head .shuaxin {
     float: right;
@@ -561,6 +577,12 @@
     color: #333;
     font-size: 14px;
   }
+  .gongdan_name {
+    max-width: 60% !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+  }
 
   .weifenpai .left_cots .gongdan .right {
     float: right;
@@ -1226,7 +1248,7 @@
   }
 
   .toLastTime {
-    float: right;
+    margin-left: auto;
     color: #999999;
     font-size: 12px;
 

src/app/views/fuwutai/fuwutai.component.ts

@@ -154,6 +154,31 @@ export class FuwutaiComponent implements OnInit {
   searchHosDepartmentSubject = new Subject();
   searchHosDepartmentQtSubject = new Subject();
   searchPatientListSubject = new Subject();
+  // 打开选择楼栋多选框
+  openChangeUnassignedBuilding(e) {
+    if (e) {
+      this.getUnassignedBuilding();
+    }
+  }
+  // 获取楼栋-未派单
+  unassignedBuildings = [];
+  unassignedBuilding = [];
+  bLoading = false;
+  getUnassignedBuilding() {
+    let postData = {
+      hosId: this.checkedHos,
+      unassignedOder: 1, //未派单
+    };
+    this.bLoading = true;
+    this.mainService
+      .getBuildingOrFloor("building", postData)
+      .subscribe((result) => {
+        this.bLoading = false;
+        if (result.status == 200) {
+          this.unassignedBuildings = result.data;
+        }
+      });
+  }
   // 选中未派单列表-全选
   changeAllUnassignedList(e) {
     this.unassignedList.forEach((v) => (v.checked = e));
@@ -835,6 +860,9 @@ export class FuwutaiComponent implements OnInit {
     };
     postData.workOrder["keyWord"] = keyWords;
     if (stateId == 1) {
+      if (this.unassignedBuilding.length) {
+        postData.workOrder["buildingIds"] = this.unassignedBuilding.toString();
+      }
       that.loading1 = true;
       that.loading2 = that.loading3 = false;
     } else if (stateId == 2) {
@@ -997,7 +1025,10 @@ export class FuwutaiComponent implements OnInit {
       this.router.navigateByUrl("dispatchingDesk/detailOthers/" + id);
     }
   }
-
+  // 选择楼栋
+  changeUnassignedBuilding(e) {
+    this.getOrderList(1);
+  }
   // 未分派搜索
   searchUnassigned() {
     // let that = this;