From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/systems/account/account-edit/account-edit.component.html | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 3dd8d80..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
@@ -13,10 +13,10 @@
<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 nz-form-item-required>������</label>
+ <label>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
- <input nz-input maxlength="11" formControlName="mobile" required/>
+ <input nz-input maxlength="11" formControlName="mobile" />
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
@@ -35,12 +35,11 @@
</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 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]="'������������'" >
+ <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>
@@ -53,6 +52,6 @@
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">������</button>
- <button nz-button [nzLoading]="http.loading" [nzType]="'primary'" [disabled]="!validateForm.valid">������</button>
+ <button nz-button [nzType]="'primary'" [disabled]="!validateForm.valid">������</button>
</div>
</form>
--
Gitblit v1.8.0