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 | 20 +++++++++++++-------
src/app/routes/systems/account/account-edit/account-edit.component.ts | 16 +++++++++++-----
src/app/routes/systems/account/account.component.html | 2 +-
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/app/routes/systems/account/account-edit/account-edit.component.ts b/src/app/routes/systems/account/account-edit/account-edit.component.ts
index d91dcc6..4101709 100644
--- a/src/app/routes/systems/account/account-edit/account-edit.component.ts
+++ b/src/app/routes/systems/account/account-edit/account-edit.component.ts
@@ -63,11 +63,17 @@
}
check(accountName) {
- this.http.get(environment.SERVER_BASH_URL + '/account/' + accountName).subscribe((res: any) => {
- if (res.data > 0) {
- this.validateForm.controls.accountName.setErrors({unique: true});
- }
- });
+ if (accountName) {
+ this.http.get(environment.SERVER_BASH_URL + '/account/' + accountName).subscribe((res: any) => {
+ if (res.data > 0) {
+ this.validateForm.controls.accountName.setErrors({unique: true});
+ } else {
+ this.validateForm.controls.accountName.reset;
+ }
+ });
+ } else {
+ this.validateForm.controls.accountName.setErrors({required: true});
+ }
}
searchChange(searchText) {
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index b78dc77..62d58c8 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -105,7 +105,7 @@
<a (click)="edit(account)">������</a>
<ng-container *ngIf="account.isDelete == '0'">
<span nz-table-divider></span>
- <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="remove(account.id)" >
+ <nz-popconfirm [nzTitle]="'���������������������������?'" [nzOkText]="'Yes'" [nzCancelText]="'No'" (nzOnConfirm)="delete(account.id)" >
<a nz-popconfirm>������</a>
</nz-popconfirm>
</ng-container>
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 1168412..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',
@@ -75,15 +74,22 @@
});
}
- remove(accountId?: number) {
+ remove() {
const ids: number[] = [];
- if (accountId) {
- ids.push(accountId);
- } else {
+ this.confirmServ.confirm({
+ title: '������������',
+ content: '���������������������������?',
+ okText: '������',
+ cancelText: '������'
+ }).on('onOk', () => {
this.selectedRows.forEach(i => {
ids.push(i.id);
});
- }
+ 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('���������������������');
@@ -93,7 +99,7 @@
}
});
}
-
+
checkAll(value: boolean) {
this.data.forEach(i => {
if (i.isDelete == '1') {
--
Gitblit v1.8.0