From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account-edit/account-edit.component.html | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 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 0b0e58f..3dd8d80 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
@@ -6,15 +6,17 @@
<div nz-form-label nz-col [nzSpan]="4">
<label nz-form-item-required>������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback [nzValidateStatus]="accountName">
- <input nz-input formControlName="accountName" maxlength="30" required [nzDisabled]="account.id > 0 ? true : false" />
- <div nz-form-explain *ngIf="validateForm.controls.accountName.dirty&&validateForm.controls.accountName.hasError('required')">Please input your username!</div>
+ <!-- [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>
+ <label nz-form-item-required>������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8" >
- <input nz-input maxlength="11" formControlName="mobile"/>
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input maxlength="11" formControlName="mobile" required/>
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
@@ -36,33 +38,21 @@
<label>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="8" >
- <input nz-input formControlName="organizationId" maxlength="20" placeholder="20���������" />
+ <!-- <input nz-input formControlName="organizationId" maxlength="20" placeholder="20���������" /> -->
+ <nz-select style="width: 290px;" nzAllowClear [nzPlaceHolder]="'input search text'" [nzFilter]="true" nzShowSearch
+ formControlName="organizationId" (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'������������'" >
+ <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" >
- <nz-datepicker formControlName="expireTime" nzShowTime></nz-datepicker>
+ <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 [nzLoading]="http.loading" [nzType]="'primary'" [disabled]="!validateForm.valid">������</button>
</div>
</form>
--
Gitblit v1.8.0