From 0e184df30a1d07a30d412e2d5fd91bc37711455d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 10 Jan 2018 10:04:33 +0800
Subject: [PATCH] 安装用户 管理
---
src/app/routes/users/installer/edit/edit.component.ts | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index fa8d5ff..6509fe4 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -1,9 +1,10 @@
-import { NzModalSubject, NzMessageService } 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 {NzModalSubject, NzMessageService} 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, FormControl, Validators} from '@angular/forms';
@Component({
selector: 'app-edit',
@@ -13,42 +14,47 @@
export class UserInstallerEditComponent implements OnInit {
user: any;
+ private validateForm: FormGroup;
constructor(
private modalHelper: ModalHelper,
private subject: NzModalSubject,
public dateSrv: DateService,
public msgSrv: NzMessageService,
- public http: HttpClient) { }
+ public http: HttpClient,
+ private formBuilder: FormBuilder
+ ) {}
ngOnInit() {
-// if (this.user.id > 0) {
-// this.http.get(environment.SERVER_BASH_URL + '/user/operate_user/' + this.user.id).subscribe((res: any) => {
-// this.user = res;
-// this.user.createTime = this.dateSrv.date_format(this.user.createTime, 'YYYY-MM-DD');
-// this.user.expireTime = this.dateSrv.date_format(this.user.expireTime, 'YYYY-MM-DD');
-// });
-// } else {
-// this.user.createTime = this.dateSrv.today('YYYY-MM-DD');
-// this.user.expireTime = this.dateSrv.today('YYYY-MM-DD');
-// }
+ const user = this.user;
+ this.validateForm = this.formBuilder.group({
+ name: [user.name],
+ mobile: [user.mobile, [Validators.pattern("^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0,5-9]))\\d{8}$")]],
+ email: [user.email],
+ weixin: [user.weixin],
+ organizationId: [user.organizationId],
+ expireTime: [user.expireTime],
+ id: [user.id]
+ });
}
save() {
- if (this.user.name == null || this.user.name === '') {
- this.msgSrv.error('���������������');
- } else if (this.user.mobile == null || this.user.mobile === '') {
- this.msgSrv.error('���������������');
- } else if (this.user.email == null || this.user.email === '') {
- this.msgSrv.error('���������������������');
- } else if (this.user.password == null || this.user.password === '') {
- this.msgSrv.error('���������������');
- } else {
- this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser', this.user).subscribe(() => {
+ const validateForm = this.validateForm;
+ const controls = validateForm.controls;
+ if (validateForm.valid) {
+ for (const i in controls) {
+ controls[i].disable();
+ }
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser', validateForm.value).subscribe(() => {
this.subject.next('true');
this.close();
});
+ } else {
+ for (const i in controls) {
+ controls[i].markAsDirty();
+ }
}
+
}
close() {
--
Gitblit v1.8.0