From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/systems/account/account.component.ts |  104 +++++++++++++++++++++++++++-------------------------
 1 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 9078ab4..1168412 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {ModalHelper} from '@delon/theme';
 import {HttpClient} from '@angular/common/http';
 import * as moment from 'moment';
@@ -22,35 +22,38 @@
 
   query: any = {
     pageIndex: 1,
-    pageSize: 3,
+    pageSize: 10,
     isDelete: this.options[1].value
   };
   data: any[] = [];
   total: 0;
 
   selectedRows: any[] = [];
-  curRows: any[] = [];
   allChecked = false;
   indeterminate = false;
-  sortMap: any = {};
+  sortMap: string[] = [];
+  loading: boolean = true;
 
   constructor(
     public http: HttpClient,
+    private confirmServ: NzModalService,
     public dateSrv: DateService,
     public msgSrv: NzMessageService,
-    private modalHelper: ModalHelper) {
+    private modalHelper: ModalHelper
+  ) {
 
   }
 
   load(reload: boolean = false) {
-   if (reload) {
+    if (reload) {
       this.query.pageIndex = 1;
     }
     this.http.get(environment.SERVER_BASH_URL + '/account/list', {params: this.query}).subscribe((res: any) => {
       this.data = res.data.data;
       this.total = res.data.total;
 
-      this.dataChange(this.data);
+      this.refreshStatus();
+      this.loading = false;
     });
   }
 
@@ -58,24 +61,31 @@
     this.load();
   }
 
-  edit(account) {
-    this.modalHelper.static(AccountEditComponent, {account}).subscribe(() => {
-      this.load(true);
-      this.msgSrv.success('���������������������');
+  edit(account?: any) {
+    if (!account) {
+      account = {};
+    }
+    this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
+      if (res.code == 0) {
+        this.msgSrv.error(res.message);
+      } else {
+        this.msgSrv.success('���������������������');
+        this.load(true);
+      }
     });
   }
 
-  add() {
-    const account = {};
-    this.modalHelper.static(AccountEditComponent, {account}).subscribe(() => {
-      this.load(true);
-      this.msgSrv.success('���������������������');
-    });
-  }
-
-  delete(account) {
-    this.http.post(environment.SERVER_BASH_URL + '/account/account/id' , account).subscribe((res: any) => {
-      if(res.data > 0){
+  remove(accountId?: number) {
+    const ids: number[] = [];
+    if (accountId) {
+      ids.push(accountId);
+    } else {
+      this.selectedRows.forEach(i => {
+        ids.push(i.id);
+      });
+    }
+    this.http.post(environment.SERVER_BASH_URL + '/account/ids', ids).subscribe((res: any) => {
+      if (res.data > 0) {
         this.msgSrv.success('���������������������');
         this.load(true);
       } else {
@@ -84,50 +94,44 @@
     });
   }
 
-  remove() {
-    const ids = [];
-    this.selectedRows.forEach(i => {
-      ids.push(i.id);
-    });
-    this.http.post(environment.SERVER_BASH_URL + '/account/accounts/ids', ids).subscribe((res: any) => {
-      this.load(true);
-    });
-  }
-
   checkAll(value: boolean) {
-    this.curRows.forEach(i => {
-      i.checked = value;
+    this.data.forEach(i => {
+      if (i.isDelete == '1') {
+        i.checked = false;
+      } else {
+        i.checked = value;
+      }
     });
-    this.refreshStatus();
-  }
-
-  dataChange(res: any) {
-    this.curRows = res;
     this.refreshStatus();
   }
 
   refreshStatus() {
-    const allChecked = this.curRows.every(value => value.checked);
-    const allUnChecked = this.curRows.every(value => !value.checked);
+    const allChecked = this.data.every(value => value.checked);
+    const allUnChecked = this.data.every(value => !value.checked);
     this.allChecked = allChecked;
     this.indeterminate = (!allChecked) && (!allUnChecked);
     this.selectedRows = this.data.filter(value => value.checked);
   }
 
   sort(field: string, value: any) {
-    this.sortMap = {};
-    this.sortMap[field] = value;
-    this.query.sorter = value ? `${field} ${value}` : '';
-    this.load(true);
-  }
-
-  reset(ls: any[]) {
-    for (const item of ls) item.value = false;
+    const ids = this.sortMap;
+    this.sortMap = [];
+    ids.forEach(i => {
+      if (!i.startsWith(field)) {
+        this.sortMap.push(i);
+      }
+    });
+    if (value) {
+      this.sortMap.push(`${field} ${value}`);
+    }
+    this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
     this.load(true);
   }
 
   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