Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/order-scope/order-scope.component.ts

@@ -22,7 +22,7 @@ export class OrderScopeComponent implements OnInit {
     orderScopeRadio: undefined,
   }
 	@Input() coopBtns:any;
-	
+
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
@@ -47,7 +47,7 @@ export class OrderScopeComponent implements OnInit {
 	allDuty:number = 1;
 	showReassign:any = 0;
 	menuList:any;
-	
+
   ngOnInit() {
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
@@ -77,7 +77,7 @@ export class OrderScopeComponent implements OnInit {
 				}
 			}
 		}
-		
+
 		if(this.scopeTabs.length>0){
 			this.activeScopeTab = this.scopeTabs[0]
 		}

src/app/views/users-management/users-management.component.ts

@@ -626,7 +626,7 @@ export class UsersManagementComponent implements OnInit {
         }
       });
   }
-	
+
 	// 确认恢复
 	confirmRecover() {
 		this.hideRecoverModal();
@@ -656,12 +656,12 @@ export class UsersManagementComponent implements OnInit {
 	      }
 	    });
 	}
-	
+
 	// 关闭恢复模态框
 	hideRecoverModal() {
 	  this.recoverModal = false;
 	}
-	
+
   // 关闭删除模态框
   hideDelModal() {
     this.delModal = false;