From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop

---
 src/app/routes/systems/account/account.component.ts |  102 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 7d925d8..92c5346 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -1,12 +1,10 @@
 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';
 import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
+import { DateService } from '../../../business/services/util/date.service';
 import {AccountEditComponent} from './account-edit/account-edit.component';
-
 @Component({
   selector: 'app-account',
   templateUrl: './account.component.html',
@@ -15,7 +13,7 @@
 
 export class AccountComponent implements OnInit {
 
-  options = [
+  public isDeleteOptions = [
     {value: '1', label: '���'},
     {value: '0', label: '���'}
   ];
@@ -23,7 +21,7 @@
   query: any = {
     pageIndex: 1,
     pageSize: 10,
-    isDelete: this.options[1].value
+    isDelete: this.isDeleteOptions[1].value
   };
   data: any[] = [];
   total: 0;
@@ -31,25 +29,32 @@
   selectedRows: any[] = [];
   allChecked = false;
   indeterminate = false;
-  sortMap: any = {};
+  sortMap: string[] = [];
+  loading = 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;
-
+      if (res.code === 0) {
+        this.msgSrv.error(res.message);
+      } else {
+        this.data = res.data.data;
+        this.total = res.data.total;
+      }
       this.refreshStatus();
+      this.loading = false;
     });
   }
 
@@ -57,24 +62,38 @@
     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('���������������������');
+  remove() {
+    const ids: number[] = [];
+    this.confirmServ.confirm({
+      title: '������������',
+      content: '���������������������������?',
+      okText: '������',
+      cancelText: '������'
+    }).on('onOk', () => {
+      this.selectedRows.forEach(i => {
+        ids.push(i.id);
+      });
+      this.delete(...ids);
     });
   }
 
-  delete(account) {
-    this.http.post(environment.SERVER_BASH_URL + '/account/account/id' , account).subscribe((res: any) => {
-      if(res.data > 0){
+  delete(...ids: number[]) {
+    this.http.post(environment.SERVER_BASH_URL + '/account/ids', ids).subscribe((res: any) => {
+      if (res.data > 0) {
         this.msgSrv.success('���������������������');
         this.load(true);
       } else {
@@ -83,19 +102,13 @@
     });
   }
 
-  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.data.forEach(i => {
-      i.checked = value;
+      if (i.isDelete === '1') {
+        i.checked = false;
+      } else {
+        i.checked = value;
+      }
     });
     this.refreshStatus();
   }
@@ -109,14 +122,23 @@
   }
 
   sort(field: string, value: any) {
-    this.sortMap = {};
-    this.sortMap[field] = value;
-    this.query.sorter = value ? `${field} ${value}` : '';
+    const temp = this.sortMap;
+    this.sortMap = [];
+    temp.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