优化

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

@@ -1,6 +1,5 @@
-import { Component, OnInit, Output, EventEmitter } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import { Location } from "@angular/common";
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../services/main.service";
 
 @Component({
@@ -11,8 +10,6 @@ import { MainService } from "../../services/main.service";
 export class AllocationWorkerComponent implements OnInit {
   constructor(
     private route: ActivatedRoute,
-    private router: Router,
-    private location: Location,
     private mainService: MainService
   ) {}
 
@@ -144,8 +141,6 @@ export class AllocationWorkerComponent implements OnInit {
       };
     }
     that.mainService.assignWorker(postData, flags).subscribe((data) => {
-      console.log(data);
-      // that.close();
       that.btnLoading = false;
       if (data.status == 200) {
         that.showPromptModal("分配", true, "");
@@ -157,7 +152,6 @@ export class AllocationWorkerComponent implements OnInit {
 
   // 关闭弹框
   close() {
-    // this.router.navigateByUrl('dispatchingDesk');
     history.go(-1);
   }
 

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

@@ -1427,4 +1427,4 @@
 <app-select-dept [createLoading]="createLoading" [deptFlag]="deptFlag" (submitFormHand)="submitFormHand($event)"
   (deptFlagHand)="deptFlagHand($event)" [hosId]="checkedHos" *ngIf="deptFlag"></app-select-dept>
 
-<router-outlet (deactivate)="refreshList()"></router-outlet>
+<router-outlet (deactivate)="refreshList($event)"></router-outlet>

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

@@ -825,7 +825,10 @@ export class FuwutaiComponent implements OnInit {
     this.batchType1 = false;
   }
   // 刷新工单列表
-  refreshList() {
+  refreshList(e) {
+    if (!e.promptContent) {
+      return;
+    }
     this.getUnassignedBuilding2();
     this.resetList();
     this.getOrderList(1);
@@ -905,13 +908,10 @@ export class FuwutaiComponent implements OnInit {
         postData.workOrder["deptIds"] = this.unassignedBuilding.toString();
       }
       that.loading1 = true;
-      that.loading2 = that.loading3 = false;
     } else if (stateId == 2) {
       that.loading2 = true;
-      that.loading1 = that.loading3 = false;
     } else if (stateId == 3) {
       that.loading3 = true;
-      that.loading1 = that.loading2 = false;
     }
     console.log(postData);
     that.mainService