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-edit/account-edit.component.ts |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 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..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
@@ -39,6 +39,7 @@
       expireTime: [this.account.expireTime],
       id: [this.account.id]
     });
+    this.searchOptions = this.account.organization ? [this.account.organization] : [];
   }
 
   save() {
@@ -62,17 +63,27 @@
   }
 
   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) {
-    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