From 325fcff34959e7b184675fdbafa14d439cf6b066 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 09 Jan 2018 16:31:45 +0800
Subject: [PATCH] 报警用户管理
---
src/app/routes/systems/account/account-edit/account-edit.component.ts | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 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 692a055..4964b13 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
@@ -1,12 +1,8 @@
-import {NzModalSubject, NzMessageService} from 'ng-zorro-antd';
+import {NzModalSubject} from 'ng-zorro-antd';
import {Component, OnInit} from '@angular/core';
-import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import {environment} from '../../../../../environments/environment';
-import {DateService} from '../../../../core/services/date.service';
-import {FormGroup, FormBuilder, Validators, FormControl} from '@angular/forms';
-import {Jsonp} from '@angular/http';
-import {Observable} from 'rxjs';
+import {FormGroup, FormBuilder, FormControl, Validators} from '@angular/forms';
@Component({
selector: 'app-account-edit',
@@ -19,10 +15,8 @@
validateForm: FormGroup;
searchOptions = [];
- constructor(private modalHelper: ModalHelper,
+ constructor(
private subject: NzModalSubject,
- public dateSrv: DateService,
- public msgSrv: NzMessageService,
public http: HttpClient,
private formBuilder: FormBuilder
) {
@@ -39,6 +33,7 @@
expireTime: [this.account.expireTime],
id: [this.account.id]
});
+ this.searchOptions = this.account.organization ? [this.account.organization] : [];
}
save() {
@@ -62,17 +57,25 @@
}
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.setErrors({required: true});
+ }
}
searchChange(searchText) {
- const query = encodeURI(searchText);
- this.http.get(environment.SERVER_BASH_URL + '/organization/list/' + query).subscribe((res: any) => {
- this.searchOptions = res.data;
- });
+ if (searchText) {
+ const query = encodeURI(searchText);
+ if (query) {
+ this.http.get(environment.SERVER_BASH_URL + '/organization/list/' + query).subscribe((res: any) => {
+ this.searchOptions = res.data;
+ });
+ }
+ }
}
}
--
Gitblit v1.8.0