Explorar el Código

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

maotao hace 2 semanas
padre
commit
8d8c2afadc

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

@@ -22,7 +22,7 @@ export class OrderScopeComponent implements OnInit {
22 22
     orderScopeRadio: undefined,
23 23
   }
24 24
 	@Input() coopBtns:any;
25
-	
25
+
26 26
   @Output() confirmModal = new EventEmitter();
27 27
   @Output() cancelModal = new EventEmitter();
28 28
   constructor(
@@ -47,7 +47,7 @@ export class OrderScopeComponent implements OnInit {
47 47
 	allDuty:number = 1;
48 48
 	showReassign:any = 0;
49 49
 	menuList:any;
50
-	
50
+
51 51
   ngOnInit() {
52 52
 		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
53 53
 		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
@@ -77,7 +77,7 @@ export class OrderScopeComponent implements OnInit {
77 77
 				}
78 78
 			}
79 79
 		}
80
-		
80
+
81 81
 		if(this.scopeTabs.length>0){
82 82
 			this.activeScopeTab = this.scopeTabs[0]
83 83
 		}

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

@@ -626,7 +626,7 @@ export class UsersManagementComponent implements OnInit {
626 626
         }
627 627
       });
628 628
   }
629
-	
629
+
630 630
 	// 确认恢复
631 631
 	confirmRecover() {
632 632
 		this.hideRecoverModal();
@@ -656,12 +656,12 @@ export class UsersManagementComponent implements OnInit {
656 656
 	      }
657 657
 	    });
658 658
 	}
659
-	
659
+
660 660
 	// 关闭恢复模态框
661 661
 	hideRecoverModal() {
662 662
 	  this.recoverModal = false;
663 663
 	}
664
-	
664
+
665 665
   // 关闭删除模态框
666 666
   hideDelModal() {
667 667
     this.delModal = false;