暂存

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,6 +72,9 @@
     <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>
         <span class="toLastTime">刷新倒计时<span class="time">{{orderRefreshTime}}s</span></span>
       </div>
       <div class="searchBox">