From 9cd223e02abde85ba740ae8117e02f254c329167 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 21 Jun 2018 11:42:26 +0800
Subject: [PATCH] 优化
---
src/app/routes/systems/account/account-edit/account-edit.component.html | 56 ++++++++++++++++++++++----------------------------------
1 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/src/app/routes/systems/account/account-edit/account-edit.component.html b/src/app/routes/systems/account/account-edit/account-edit.component.html
index eb904a2..58b2dad 100644
--- a/src/app/routes/systems/account/account-edit/account-edit.component.html
+++ b/src/app/routes/systems/account/account-edit/account-edit.component.html
@@ -1,69 +1,57 @@
<div class="modal-header">
<div class="modal-title">{{account.id > 0 ? '������' : '������'}} - ������</div>
</div>
-<form #f="ngForm" (ngSubmit)="save()" nz-form [nzType]="'horizontal'">
+<form (ngSubmit)="save()" nz-form [nzType]="'horizontal'" [formGroup]="validateForm">
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4">
- <label>������</label>
+ <label nz-form-item-required>������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.accountName" name="name" maxlength="30" required [nzDisabled]="account.id > 0 ? true : false" />
+ <!-- [nzValidateStatus]="accountName" -->
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback >
+ <input nz-input formControlName="accountName" maxlength="30" required [nzDisabled]="account.id > 0 ? true : false" (blur)="check(validateForm.controls.accountName.value)"/>
+ <div nz-form-explain *ngIf="validateForm.controls.accountName.dirty && validateForm.controls.accountName.hasError('required')">���������������������!</div>
+ <div nz-form-explain *ngIf="validateForm.controls.accountName.dirty && validateForm.controls.accountName.hasError('unique')">���������������������!</div>
</div>
<div nz-form-label nz-col [nzSpan]="4">
<label>������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.mobile" name="mobile" maxlength="11" required />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input maxlength="11" formControlName="mobile" />
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4">
<label>������������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.email" name="email" required />
+ <div nz-form-control nz-col [nzSpan]="8" >
+ <input nz-input formControlName="email" />
</div>
<div nz-form-label nz-col [nzSpan]="4">
<label>���������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.weixin" name="weixin" />
+ <div nz-form-control nz-col [nzSpan]="8" >
+ <input nz-input formControlName="weixin" />
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4">
- <label>������</label>
+ <label nz-form-item-required>������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.organizationId" name="organizationId" maxlength="20" placeholder="20���������" />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <nz-select style="width: 290px;" nzAllowClear [nzPlaceHolder]="'input search text'" [nzFilter]="false" nzShowSearch
+ formControlName="organizationId" (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'������������'" required>
+ <nz-option *ngFor="let option of searchOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
+ </nz-select>
</div>
<div nz-form-label nz-col [nzSpan]="4">
<label>������������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <div nz-form-control [nzValidateStatus]="expireTime" >
- <nz-datepicker [(ngModel)]="account.expireTime" name="expireTime"></nz-datepicker>
- </div>
+ <div nz-form-control nz-col [nzSpan]="8" >
+ <nz-datepicker style="width: 290px;" formControlName="expireTime" nzShowTime></nz-datepicker>
</div>
</div>
- <!-- <div nz-form-item nz-row class="mb-sm">
- <div nz-form-label nz-col [nzSpan]="4">
- <label>������</label>
- </div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="account.password" name="password" maxlength="30" placeholder="30���������" required />
- </div>
- <div nz-form-label nz-col [nzSpan]="4">
- <label>������������</label>
- </div>
- <div nz-form-control nz-col [nzSpan]="8">
- <div nz-form-control [nzValidateStatus]="createTime">
- <nz-datepicker [(ngModel)]="account.createTime" name="createTime"></nz-datepicker>
- </div>
- </div>
- </div> -->
<div class="modal-footer">
<button nz-button type="button" (click)="close()">������</button>
- <button nz-button [nzLoading]="http.loading" [nzType]="'primary'">������</button>
+ <button nz-button [nzType]="'primary'" [disabled]="!validateForm.valid">������</button>
</div>
</form>
--
Gitblit v1.8.0