Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-01-05 2d4cbcc4f92edbc4f926d9710bdda64520039c2b

 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>