From 09e95982e57f1a26be4249d11091a935544df684 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 16 Jan 2018 16:57:25 +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 | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 0f532d3..4524daa 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -2,11 +2,9 @@
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 = [
+ private 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;
@@ -32,6 +30,7 @@
allChecked = false;
indeterminate = false;
sortMap: string[] = [];
+ loading: boolean = true;
constructor(
public http: HttpClient,
@@ -48,10 +47,14 @@
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;
});
}
@@ -59,8 +62,8 @@
this.load();
}
- edit(account) {
- if (account == null) {
+ edit(account?: any) {
+ if (!account) {
account = {};
}
this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
@@ -73,15 +76,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('���������������������');
@@ -112,14 +122,14 @@
}
sort(field: string, value: any) {
- const ids = this.sortMap;
+ const temp = this.sortMap;
this.sortMap = [];
- ids.forEach(i => {
+ temp.forEach(i => {
if (!i.startsWith(field)) {
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 +137,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