Commit 29d30761 authored by wangqinghua's avatar wangqinghua

update

parent 38452f18
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button> <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索</button>
</div> </div>
</div> </div>
<nz-tabset nzSelectedIndex]="tabNum" [nzTabPosition]="'top'" [nzType]="'card'"> <nz-tabset [nzSelectedIndex]="tabNum" [nzTabPosition]="'top'" [nzType]="'card'">
<nz-tab nzTitle="待审批"> <nz-tab nzTitle="待审批">
<nz-table #basicTable [nzData]="noList" [nzFrontPagination]="false" [nzTotal]="totalNumNo" [nzPageIndex]="pageNoNo" [nzPageSize]="pageSize" (nzPageIndexChange)="changeNoPage($event)"> <nz-table #basicTable [nzData]="noList" [nzFrontPagination]="false" [nzTotal]="totalNumNo" [nzPageIndex]="pageNoNo" [nzPageSize]="pageSize" (nzPageIndexChange)="changeNoPage($event)">
<thead> <thead>
......
...@@ -8,13 +8,6 @@ ...@@ -8,13 +8,6 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="loginName">登录名</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="loginName" id="loginName">
<nz-form-explain *ngIf="validateForm.get('loginName').dirty && validateForm.get('loginName').errors">登录名不能为空!</nz-form-explain>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phoneNumber" nzRequired>手机号码</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="phoneNumber" nzRequired>手机号码</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="phoneNumber" id="phoneNumber"> <input nz-input formControlName="phoneNumber" id="phoneNumber">
...@@ -35,11 +28,10 @@ ...@@ -35,11 +28,10 @@
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="email">邮箱地址</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="email">邮箱地址</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<input nz-input formControlName="email" id="email"> <input nz-input formControlName="email" id="email">
<nz-form-explain *ngIf="validateForm.get('email').dirty && validateForm.get('email').errors">邮箱地址格式错误!</nz-form-explain>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="organizationId">所属部门</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="organizationId">所属部门</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select id="organizationId" formControlName="organizationId" nzPlaceHolder="选择部门"> <nz-select id="organizationId" formControlName="organizationId" nzPlaceHolder="选择部门">
<ng-container *ngFor="let item of groupList"> <ng-container *ngFor="let item of groupList">
...@@ -50,7 +42,7 @@ ...@@ -50,7 +42,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="position">职位</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="position">职位</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select id="position" formControlName="position" nzPlaceHolder="选择职位"> <nz-select id="position" formControlName="position" nzPlaceHolder="选择职位">
<nz-option nzValue="1" nzLabel="组长"></nz-option> <nz-option nzValue="1" nzLabel="组长"></nz-option>
...@@ -60,7 +52,7 @@ ...@@ -60,7 +52,7 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzFor="status">是否有效</nz-form-label> <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="status">是否有效</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24"> <nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select id="status" formControlName="status"> <nz-select id="status" formControlName="status">
<nz-option nzValue="0" nzLabel="有效"></nz-option> <nz-option nzValue="0" nzLabel="有效"></nz-option>
......
...@@ -34,10 +34,9 @@ export class UserComponent implements OnInit { ...@@ -34,10 +34,9 @@ export class UserComponent implements OnInit {
initForm(){ initForm(){
this.validateForm = this.fb.group({ this.validateForm = this.fb.group({
name:[null,[Validators.required,Validators.maxLength(10)]], name:[null,[Validators.required,Validators.maxLength(10)]],
loginName:[null,[Validators.required,Validators.maxLength(10)]], phoneNumber:[null,[Validators.required,Validators.minLength(11),Validators.maxLength(11)]],
phoneNumber:[null,[Validators.required,Validators.min(11),Validators.maxLength(11)]],
gender:[null,[Validators.required]], gender:[null,[Validators.required]],
email:[null,[Validators.email]], email:[null,],
organizationId:[null,[Validators.required]], organizationId:[null,[Validators.required]],
position:[null,[Validators.required]], position:[null,[Validators.required]],
status:[null,[Validators.required]], status:[null,[Validators.required]],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment