Merge branch 'lmm' into develop

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

@@ -165,10 +165,13 @@ export class FuwutaiComponent implements OnInit {
   unassignedBuilding = [];
   bLoading = false;
   getUnassignedBuilding() {
-    let postData = {
+    let postData: any = {
       hosId: this.checkedHos,
       unassignedOder: 1, //未派单
     };
+    if (this.allUnassignedOrders) {
+      postData.wokerIds = this.allUnassignedOrders;
+    }
     this.bLoading = true;
     this.mainService
       .getBuildingOrFloor("building", postData)
@@ -179,6 +182,41 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
+  allUnassignedOrders = "";
+  getUnassignedBuilding2() {
+    if (this.user.user.scope) {
+      this.user.user.scope.typeIds = this.user.user.scope.typeIds || [];
+    } else {
+      return;
+    }
+    let types = "";
+    this.user.user.scope.typeIds.forEach((e) => {
+      types += e.id + ",";
+    });
+    types = types.slice(0, types.length - 1);
+    let postData = {
+      workOrder: {
+        serTaskTypes: types || "null",
+        serGdState: 1,
+        range: this.orderScopeRadio,
+        platform: 3,
+        searchDays: 1,
+        keyWord: "",
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    this.mainService
+      .getFetchDataList("ser", "workOrder", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.allUnassignedOrders = result.list
+            .map((item) => item.id)
+            .toString();
+        }
+      });
+    // -----------------------
+  }
   // 选中未派单列表-全选
   changeAllUnassignedList(e) {
     this.unassignedList.forEach((v) => (v.checked = e));
@@ -495,6 +533,7 @@ export class FuwutaiComponent implements OnInit {
     this.checkTab(this.typeId);
     this.moveMenu();
     this.getPhoneNum();
+    this.getUnassignedBuilding2();
   }
   ngOnDestroy() {
     console.log("关闭ser", this.webs.ws);
@@ -762,6 +801,7 @@ export class FuwutaiComponent implements OnInit {
       }
       this.workerRefreshTime--;
       if (this.orderRefreshTime == 0) {
+        this.getUnassignedBuilding2();
         this.getOrderList(1, true);
         this.getOrderList(2);
         this.getOrderList(3);
@@ -786,6 +826,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 刷新工单列表
   refreshList() {
+    this.getUnassignedBuilding2();
     this.resetList();
     this.getOrderList(1);
     this.getOrderList(2);