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/users/installer/installer.component.ts | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 3a07063..56af9e0 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -3,8 +3,10 @@
import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import {UserInstallerEditComponent} from './edit/edit.component';
-import {environment} from 'environments/environment';
+import {environment} from 'environments/environment';
import {DateService} from '@business/services/util/date.service';
+import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { ResultBean } from '@business/entity/grid';
@Component({
selector: 'app-installer',
@@ -12,10 +14,14 @@
styles: []
})
export class InstallerComponent implements OnInit {
-
+ isDeleteOptions = [
+ {value: '1', label: '���'},
+ {value: '0', label: '���'}
+ ];
q: any = {
pi: 1,
ps: 10,
+ isDelete: this.isDeleteOptions[1].value,
sorter: '',
u_name: '',
u_mobile: ''
@@ -28,16 +34,24 @@
allChecked = false;
indeterminate = false;
sortMap: any = {};
- loading: boolean = true;
+ loading = true;
constructor(
public http: HttpClient,
public dateSrv: DateService,
public msgSrv: NzMessageService,
- private modalHelper: ModalHelper) {}
+ private modalHelper: ModalHelper,
+ private fb: FormBuilder
+ ) {}
ngOnInit() {
this.load();
+ // ���������������������������
+ this.resetPwdForm = this.fb.group({
+ name : [ null, [ Validators.email ] ],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
+ });
}
load(reload: boolean = false) {
@@ -87,7 +101,7 @@
checkAll(value: boolean) {
this.curRows.forEach(i => {
- if (i.isDelete == '1') {
+ if (i.isDelete === '1') {
i.checked = false;
} else {
i.checked = value;
@@ -126,4 +140,60 @@
return this.dateSrv.date_format(date, 'YYYY-MM-DD');
}
}
+ public resetPwdWindowIsVisible = false;
+ public isResetPwdLoading = false;
+ public resetPwdForm: FormGroup;
+ 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['name'] = null;
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser', data).subscribe((res: ResultBean<any>) => {
+ if ( res.code === 1 && res.data === 1 ) {
+ this.isResetPwdLoading = false;
+ this.resetPwdWindowIsVisible = false;
+ this.msgSrv.success('���������������������');
+ }
+ });
+ }
+}
+ /**
+ * ������������������������
+ * @param account
+ */
+ public showResetPwdWindow(install) {
+ this.resetPwdWindowIsVisible = true;
+ this.resetPwdForm = this.fb.group({
+ id : [ install.id ],
+ name : [ install.name],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
+ });
+ }
+ 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 };
+ }
+ }
+ /**
+ * ������ formControl������ ������ ���������������������
+ * @param name y
+ */
+ public getFormControl(name) {
+ return this.resetPwdForm.controls[ name ];
+ }
+ updateConfirmValidator() {
+ /** wait for refresh value */
+ setTimeout(_ => {
+ this.resetPwdForm.controls[ 'checkPassword' ].updateValueAndValidity();
+ });
+ }
}
--
Gitblit v1.8.0