Merge branch 'lmm' into develop

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/share/allocation-worker/allocation-worker.component.html

@@ -4,12 +4,13 @@
     <div nz-row class="select">
       <div nz-col nzSpan="6">
         <div class="label">人员姓名：</div>
-        <input nz-input placeholder="请输入人员姓名" [(ngModel)]="searchName" nzSize="default" (ngModelChange)="searchInp()" />
+        <input [disabled]="nameMask" nz-input placeholder="请输入人员姓名" [(ngModel)]="searchName" nzSize="default"
+          (ngModelChange)="searchInp('worker')" />
       </div>
       <div nz-col nzSpan="6" class="ml8">
         <div class="label">人员分组：</div>
-        <nz-select style="width: 220px;" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="checkedGroup"
-          (ngModelChange)="searchInp()" nzPlaceHolder="请选择人员分组">
+        <nz-select nzAllowClear [nzDisabled]="groupMask" style="width: 220px;" [nzDropdownMatchSelectWidth]="false"
+          [(ngModel)]="checkedGroup" (ngModelChange)="searchInp('group')" nzPlaceHolder="请选择人员分组">
           <nz-option *ngFor="let optionData of groupList" [nzLabel]="optionData.groupName" [nzValue]="optionData.id">
           </nz-option>
         </nz-select>
@@ -46,7 +47,8 @@
     </div>
   </div>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submit()" *ngIf="mapOfCheckedId[worderId]">确认</button>
+    <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submit()"
+      *ngIf="mapOfCheckedId[worderId]">确认</button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>

src/app/share/allocation-worker/allocation-worker.component.ts

@@ -17,8 +17,10 @@ export class AllocationWorkerComponent implements OnInit {
   ) {}
 
   ngOnInit() {
+    this.groupList = JSON.parse(
+      localStorage.getItem("user")
+    ).user.scope.groupIds;
     this.getWorkerList();
-    // this.getGroupList();
   }
   // 支助人员数据
   workerList = [];
@@ -42,13 +44,13 @@ export class AllocationWorkerComponent implements OnInit {
 
   // 支助人员数据
   groupList: Array<{ groupName: string; id: string }> = []; //分组下拉框
-  groupIds;
   snum = 0;
   loading1 = false;
+  nameMask = false; //是否禁用
+  groupMask = false; //是否禁用
   getWorkerList(pageIndex?) {
-    let that = this;
-    that.id = that.route.snapshot.paramMap.get("id");
-    that.stateId = that.route.snapshot.paramMap.get("stateId");
+    this.id = this.route.snapshot.paramMap.get("id");
+    this.stateId = this.route.snapshot.paramMap.get("stateId");
     this.pageIndex = pageIndex ? pageIndex : this.pageIndex;
 
     let groupsId = [];
@@ -58,18 +60,25 @@ export class AllocationWorkerComponent implements OnInit {
       }
     );
 
-    let postData = {
+    let postData: any = {
       idx: this.pageIndex - 1,
-      sum: that.pageSize,
-      // workOrderId: that.id,
-      groupId: that.checkedGroup ? that.checkedGroup : "",
-      groupIds: that.groupIds ? that.groupIds : "",
-      name: that.searchName,
+      sum: this.pageSize,
+      groupIds: "",
       hosId: this.route.snapshot.paramMap.get("hosId"),
     };
+    if (this.searchName) {
+      postData.name = this.searchName;
+    } else {
+      delete postData.name;
+    }
+    if (this.checkedGroup) {
+      postData.groupId = this.checkedGroup;
+    } else {
+      delete postData.groupId;
+    }
     this.snum++;
     this.loading1 = true;
-    that.mainService
+    this.mainService
       .getSerInfo("getOnlineWorker", postData)
       .subscribe((data) => {
         this.snum--;
@@ -77,36 +86,29 @@ export class AllocationWorkerComponent implements OnInit {
           this.loading1 = false;
         }
         console.log(data);
-        that.workerList = data.data;
-        that.listLength = data.totalNum;
-        if (data.groupIds) {
-          // 获取分组
-          that.groupIds = data.groupIds;
-          that.mainService
-            .coopData("group", "findGroup", { groupIds: data.groupIds })
-            .subscribe((res) => {
-              that.groupList = res.data;
-            });
-        } else {
-          that.groupList = [];
-        }
+        this.workerList = data.data;
+        this.listLength = data.totalNum;
       });
   }
 
   // 输入用户信息搜索节流阀
   time: any;
-  searchInp() {
-    let that = this;
-    // clearTimeout(that.time);
-    // that.time = setTimeout(() => {
-    that.getWorkerList(1);
-    // }, 2000);
+  searchInp(type) {
+    this.getWorkerList(1);
+    console.log(type);
+    if (type == "worker") {
+      this.groupMask = Boolean(this.searchName);
+    } else if (type == "group") {
+      this.nameMask = Boolean(this.checkedGroup);
+    }
   }
 
   // 选择分配支助人员
   worderId = 0; //支助人员id
   checkAllotWorker(id, flag?): void {
-    this.mapOfCheckedId = { [id]: flag?!this.mapOfCheckedId[id]:this.mapOfCheckedId[id] };
+    this.mapOfCheckedId = {
+      [id]: flag ? !this.mapOfCheckedId[id] : this.mapOfCheckedId[id],
+    };
     this.worderId = id;
   }
 

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

@@ -72,18 +72,31 @@
     <div class="lists">
       <div class="head">
         <span class="auto_tit">未分派({{unassignedList.length}}条)</span>
+        <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">
-        <div class="search">
-          <input type="text" placeholder="请输入关键字" [(ngModel)]="unassignedSearchCon">
-          <div class="magnifier" (click)="searchUnassigned()">
+        <label nz-checkbox [(ngModel)]="allUnassignedList" (ngModelChange)="changeAllUnassignedList($event)">全选</label>
+        <div class="search wp60">
+          <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="unassignedSearchCon">
+          <div class="magnifier wp20" (click)="searchUnassigned()">
             <i class="icon_transport transport-sousuo"></i>
             <span>搜索</span>
           </div>
         </div>
-        <button nz-button nzType="primary" (click)="batchDispatch()" nzSize="small"
-          [disabled]="!batchType">批量派单</button>
+        <button nz-button nzType="primary" (click)="batchDispatch()" [disabled]="!batchType">批量派单</button>
       </div>
       <div class="cots_body weifenpai" *ngIf="txtLabelCol==1">
         <overlay-scrollbars #osComponentRef2 [ngStyle]="{ height:'100%' }">
@@ -94,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>
@@ -239,15 +253,15 @@
         <span class="toLastTime">刷新倒计时<span class="time">{{orderRefreshTime}}s</span></span>
       </div>
       <div class="searchBox">
-        <div class="search">
-          <input type="text" placeholder="请输入关键字" [(ngModel)]="arriveSearchCon">
-          <div class="magnifier" (click)="searchArrive()">
+        <label nz-checkbox [(ngModel)]="allArriveList" (ngModelChange)="changeAllArriveList($event)">全选</label>
+        <div class="search wp60">
+          <input class="wp75" type="text" placeholder="请输入关键字" [(ngModel)]="arriveSearchCon">
+          <div class="magnifier wp20" (click)="searchArrive()">
             <i class="icon_transport transport-sousuo"></i>
             <span>搜索</span>
           </div>
         </div>
-        <button nz-button nzType="primary" (click)="batchWithdrawal()" nzSize="small"
-          [disabled]="!batchType1">批量撤回</button>
+        <button nz-button nzType="primary" (click)="batchWithdrawal()" [disabled]="!batchType1">批量撤回</button>
       </div>
       <div class="cots_body daidaoda" *ngIf="txtLabelCol==1">
         <overlay-scrollbars #osComponentRef3 [ngStyle]="{ height:'100%' }">
@@ -258,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>
@@ -266,7 +281,8 @@
                 </div>
                 <!-- 地点 -->
                 <div class="didian" (click)='openDetails(data.id,data.taskType.associationType.id)'>
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
+                  <span class="left"
+                    *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
                     {{data.startDept?data.startDept.dept:''}}
                     <span *ngFor="let item of data.middleDept">
                       ->{{item.dept}}
@@ -419,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>
@@ -427,7 +444,8 @@
                 </div>
                 <!-- 地点 -->
                 <div class="didian">
-                  <span class="left" *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
+                  <span class="left"
+                    *ngIf="data.taskType.associationType&&data.taskType.associationType.value=='inspect'">
                     {{data.startDept?data.startDept.dept:''}}
                     <span *ngFor="let item of data.middleDept">
                       ->{{item.dept}}

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;
@@ -364,7 +380,7 @@
 
     .search {
       height: 34px;
-      width: 80%;
+      width: 90%;
       background-color: white;
       border: 1px rgb(225, 229, 232) solid;
       border-radius: 20px;
@@ -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,55 @@ 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));
+    this.unassignedList.forEach((item1) => {
+      this.unassignedListClone.forEach((item2) => {
+        if (item1.id == item2.id) {
+          item2.checked = item1.checked;
+        }
+      });
+    });
+    this.batchType = this.unassignedListClone.some((item) => item.checked);
+  }
+  // 选中待到达列表-全选
+  changeAllArriveList(e) {
+    this.arriveList.forEach((v) => (v.checked = e));
+    this.arriveList.forEach((item1) => {
+      this.arriveListClone.forEach((item2) => {
+        if (item1.id == item2.id) {
+          item2.checked = item1.checked;
+        }
+      });
+    });
+    this.batchType1 = this.arriveListClone.some((item) => item.checked);
+  }
   // 添加备注
   addRemarks(item) {
     this.remarksEle.nativeElement.focus();
@@ -198,6 +247,7 @@ export class FuwutaiComponent implements OnInit {
     this.openRecallModal(ids.join("-"));
   }
   // 批量分派选中
+  allUnassignedList = false;
   batchDispatchSelect(e, id) {
     this.unassignedList.forEach((item) => {
       if (item.id == id) {
@@ -212,8 +262,16 @@ export class FuwutaiComponent implements OnInit {
       });
     });
     this.batchType = this.unassignedListClone.some((item) => item.checked);
+    if (this.unassignedListClone.length) {
+      this.allUnassignedList = this.unassignedListClone.every(
+        (item) => item.checked
+      );
+    } else {
+      this.allUnassignedList = false;
+    }
   }
   // 批量撤回选中
+  allArriveList = false;
   batchWithdrawalSelect(e, id) {
     this.arriveList.forEach((item) => {
       if (item.id == id) {
@@ -228,6 +286,11 @@ export class FuwutaiComponent implements OnInit {
       });
     });
     this.batchType1 = this.arriveListClone.some((item) => item.checked);
+    if (this.arriveListClone.length) {
+      this.allArriveList = this.arriveListClone.every((item) => item.checked);
+    } else {
+      this.allArriveList = false;
+    }
   }
 
   // 获取科室
@@ -797,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) {
@@ -818,6 +884,7 @@ export class FuwutaiComponent implements OnInit {
               item.checked = false;
             });
             that.batchType = false;
+            that.allUnassignedList = false;
             that.unassignedListClone = JSON.parse(
               JSON.stringify(that.unassignedList)
             );
@@ -855,6 +922,7 @@ export class FuwutaiComponent implements OnInit {
               item.checked = false;
             });
             that.batchType1 = false;
+            that.allArriveList = false;
             that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
           } else {
             that.arriveList.forEach((item1) => {
@@ -957,7 +1025,10 @@ export class FuwutaiComponent implements OnInit {
       this.router.navigateByUrl("dispatchingDesk/detailOthers/" + id);
     }
   }
-
+  // 选择楼栋
+  changeUnassignedBuilding(e) {
+    this.getOrderList(1);
+  }
   // 未分派搜索
   searchUnassigned() {
     // let that = this;

src/common.less

@@ -16,6 +16,15 @@
 .w100 {
   width: 100% !important;
 }
+.wp75 {
+  width: 75% !important;
+}
+.wp60 {
+  width: 60% !important;
+}
+.wp20 {
+  width: 20% !important;
+}
 .dib {
   display: inline-block !important;
 }