From 904bca110bbd3cd7775c7dcbfabf0447f03e4c91 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 08 Jan 2018 11:55:21 +0800
Subject: [PATCH] 账户 管理

---
 src/app/routes/systems/account/account.component.ts |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 0f532d3..abc610c 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -6,7 +6,6 @@
 import {environment} from '../../../../environments/environment';
 import {DateService} from '../../../core/services/date.service';
 import {AccountEditComponent} from './account-edit/account-edit.component';
-
 @Component({
   selector: 'app-account',
   templateUrl: './account.component.html',
@@ -32,6 +31,7 @@
   allChecked = false;
   indeterminate = false;
   sortMap: string[] = [];
+  loading: boolean = true;
 
   constructor(
     public http: HttpClient,
@@ -52,6 +52,7 @@
       this.total = res.data.total;
 
       this.refreshStatus();
+      this.loading = false;
     });
   }
 
@@ -59,8 +60,8 @@
     this.load();
   }
 
-  edit(account) {
-    if (account == null) {
+  edit(account?: any) {
+    if (!account) {
       account = {};
     }
     this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
@@ -73,15 +74,22 @@
     });
   }
 
-  remove(accountId) {
-    const ids = [];
-    if (accountId == null) {
+  remove() {
+    const ids: number[] = [];
+    this.confirmServ.confirm({
+      title: '������������',
+      content: '���������������������������?',
+      okText: '������',
+      cancelText: '������'
+    }).on('onOk', () => {
       this.selectedRows.forEach(i => {
         ids.push(i.id);
       });
-    } else {
-      ids.push(accountId);
-    }
+      this.delete(...ids);
+    });
+  }
+
+  delete(...ids: number[]) {
     this.http.post(environment.SERVER_BASH_URL + '/account/ids', ids).subscribe((res: any) => {
       if (res.data > 0) {
         this.msgSrv.success('���������������������');
@@ -91,7 +99,7 @@
       }
     });
   }
-
+  
   checkAll(value: boolean) {
     this.data.forEach(i => {
       if (i.isDelete == '1') {
@@ -119,7 +127,7 @@
         this.sortMap.push(i);
       }
     });
-    if (value != null) {
+    if (value) {
       this.sortMap.push(`${field} ${value}`);
     }
     this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
@@ -127,7 +135,9 @@
   }
 
   format_date(date) {
-    return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+    if (date) {
+      return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+    }
   }
 
 }

--
Gitblit v1.8.0