From 6efb2a0076a544b5714bccba214d81904264540d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:49:31 +0800
Subject: [PATCH] 报表展示 增加镇村选项

---
 src/app/routes/systems/account/account.component.ts |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 209ad3a..8f4f93c 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -5,6 +5,8 @@
 import {environment} from '../../../../environments/environment';
 import { DateService } from '../../../business/services/util/date.service';
 import {AccountEditComponent} from './account-edit/account-edit.component';
+import { FormBuilder, Validators, FormControl, FormGroup } from '@angular/forms';
+import { ResultBean } from '@business/entity/grid';
 @Component({
   selector: 'app-account',
   templateUrl: './account.component.html',
@@ -13,7 +15,7 @@
 
 export class AccountComponent implements OnInit {
 
-  private isDeleteOptions = [
+  public isDeleteOptions = [
     {value: '1', label: '���'},
     {value: '0', label: '���'}
   ];
@@ -30,14 +32,15 @@
   allChecked = false;
   indeterminate = false;
   sortMap: string[] = [];
-  loading: boolean = true;
+  loading = true;
 
   constructor(
     public http: HttpClient,
     private confirmServ: NzModalService,
     public dateSrv: DateService,
     public msgSrv: NzMessageService,
-    private modalHelper: ModalHelper
+    private modalHelper: ModalHelper,
+    private fb: FormBuilder
   ) {
 
   }
@@ -47,7 +50,7 @@
       this.query.pageIndex = 1;
     }
     this.http.get(environment.SERVER_BASH_URL + '/account/list', {params: this.query}).subscribe((res: any) => {
-      if (res.code == 0) {
+      if (res.code === 0) {
         this.msgSrv.error(res.message);
       } else {
         this.data = res.data.data;
@@ -60,6 +63,12 @@
 
   ngOnInit() {
     this.load();
+    // ������������������
+    this.resetPwdForm = this.fb.group({
+    accountName      : [ null, [ Validators.email ] ],
+    password         : [ null, [ Validators.required ] ],
+    checkPassword    : [ null, [ Validators.required, this.confirmationValidator ] ]
+    });
   }
 
   edit(account?: any) {
@@ -67,7 +76,7 @@
       account = {};
     }
     this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
-      if (res.code == 0) {
+      if (res.code === 0) {
         this.msgSrv.error(res.message);
       } else {
         this.msgSrv.success('���������������������');
@@ -104,7 +113,7 @@
 
   checkAll(value: boolean) {
     this.data.forEach(i => {
-      if (i.isDelete == '1') {
+      if (i.isDelete === '1') {
         i.checked = false;
       } else {
         i.checked = value;
@@ -132,7 +141,7 @@
     if (value) {
       this.sortMap.push(`${field} ${value}`);
     }
-    this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
+    this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(',') : '';
     this.load(true);
   }
 
@@ -140,5 +149,53 @@
     if (date) {
       return this.dateSrv.date_format(date, 'YYYY-MM-DD');
     }
+   }
+  public resetPwdWindowIsVisible = false;
+  public isResetPwdLoading = false;
+  public resetPwdForm: FormGroup;
+  public showResetPwdWindow(account) {
+        this.resetPwdWindowIsVisible = true;
+        this.resetPwdForm = this.fb.group({
+          id               : [ account.id ],
+          accountName      : [ account.accountName],
+          password         : [ null, [ Validators.required ] ],
+          checkPassword    : [ null, [ Validators.required, this.confirmationValidator ] ]
+        });
+  }
+  public resetPwdCancel() {
+       this.resetPwdWindowIsVisible = false;
+  }
+  public resetPwdOk() {
+    for (const i in this.resetPwdForm.controls) {
+      this.resetPwdForm.controls[ i ].markAsDirty();
+    }
+    if (this.resetPwdForm.valid) {
+       this.isResetPwdLoading = true;
+       const data = this.resetPwdForm.value;
+       data['accountName'] = null;
+       this.http.post(environment.SERVER_BASH_URL + '/account/account', data).subscribe((res: ResultBean<any>) => {
+         if ( res.code === 1 && res.data === 1 ) {
+          this.isResetPwdLoading = false;
+          this.resetPwdWindowIsVisible = false;
+          this.msgSrv.success('���������������������');
+         }
+      });
+    }
+  }
+  confirmationValidator = (control: FormControl): { [s: string]: boolean } => {
+    if (!control.value) {
+      return { required: true };
+    } else if (control.value !== this.resetPwdForm.controls[ 'password' ].value) {
+      return { confirm: true, error: true };
+    }
+  }
+  getFormControl(name) {
+    return this.resetPwdForm.controls[ name ];
+  }
+  updateConfirmValidator() {
+    /** wait for refresh value */
+    setTimeout(_ => {
+      this.resetPwdForm.controls[ 'checkPassword' ].updateValueAndValidity();
+    });
   }
 }

--
Gitblit v1.8.0