From 051a77599ca8b7972df8728ff46822d308627cbc Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 28 Mar 2018 14:32:32 +0800
Subject: [PATCH] 报表 优化
---
src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html b/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
index 6dc69f2..7ff3c0d 100644
--- a/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
+++ b/src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html
@@ -1,53 +1,56 @@
<div class="modal-header">
- <div class="modal-title">{{alarmUser.id > 0 ? '������' : '������'}} - ������</div>
+ <div class="modal-title">{{alarmUser.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>���������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="alarmUser.name" name="name" maxlength="30" required [nzDisabled]="alarmUser.id > 0 ? true : false" />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input formControlName="name"/>
</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 [(ngModel)]="alarmUser.mobile" name="mobile" maxlength="11" required />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input formControlName="mobile" maxlength="11" required/>
</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)]="alarmUser.email" name="email" required />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input formControlName="email" required/>
</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 [(ngModel)]="alarmUser.weixin" name="weixin" />
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <input nz-input formControlName="weixin" required/>
</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)]="alarmUser.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)]="alarmUser.expireTime" name="expireTime"></nz-datepicker>
+ <div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
+ <div nz-form-control>
+ <nz-datepicker style="width: 290px;" formControlName="expireTime"></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'">������</button>
</div>
</form>
--
Gitblit v1.8.0