Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
smart
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangqinghua
smart
Commits
29d30761
Commit
29d30761
authored
Dec 24, 2018
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
38452f18
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
15 deletions
+6
-15
examine.component.html
src/main/webapp/app/system/examine/examine.component.html
+1
-1
user.component.html
src/main/webapp/app/system/modal/user/user.component.html
+3
-11
user.component.ts
src/main/webapp/app/system/modal/user/user.component.ts
+2
-3
No files found.
src/main/webapp/app/system/examine/examine.component.html
View file @
29d30761
...
...
@@ -28,7 +28,7 @@
<button
(
click
)="
search
()"
nz-button
nzType=
"default"
><i
class=
"anticon anticon-search"
></i>
搜索
</button>
</div>
</div>
<nz-tabset
nzSelectedIndex
]="
tabNum
"
[
nzTabPosition
]="'
top
'"
[
nzType
]="'
card
'"
>
<nz-tabset
[
nzSelectedIndex
]="
tabNum
"
[
nzTabPosition
]="'
top
'"
[
nzType
]="'
card
'"
>
<nz-tab
nzTitle=
"待审批"
>
<nz-table
#
basicTable
[
nzData
]="
noList
"
[
nzFrontPagination
]="
false
"
[
nzTotal
]="
totalNumNo
"
[
nzPageIndex
]="
pageNoNo
"
[
nzPageSize
]="
pageSize
"
(
nzPageIndexChange
)="
changeNoPage
($
event
)"
>
<thead>
...
...
src/main/webapp/app/system/modal/user/user.component.html
View file @
29d30761
...
...
@@ -8,13 +8,6 @@
</nz-form-control>
</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-control
[
nzSm
]="
14
"
[
nzXs
]="
24
"
>
<input
nz-input
formControlName=
"phoneNumber"
id=
"phoneNumber"
>
...
...
@@ -35,11 +28,10 @@
<nz-form-label
[
nzSm
]="
6
"
[
nzXs
]="
24
"
nzFor=
"email"
>
邮箱地址
</nz-form-label>
<nz-form-control
[
nzSm
]="
14
"
[
nzXs
]="
24
"
>
<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-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-select
id=
"organizationId"
formControlName=
"organizationId"
nzPlaceHolder=
"选择部门"
>
<ng-container
*
ngFor=
"let item of groupList"
>
...
...
@@ -50,7 +42,7 @@
</nz-form-control>
</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-select
id=
"position"
formControlName=
"position"
nzPlaceHolder=
"选择职位"
>
<nz-option
nzValue=
"1"
nzLabel=
"组长"
></nz-option>
...
...
@@ -60,7 +52,7 @@
</nz-form-control>
</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
"
nz
Required
nz
For=
"status"
>
是否有效
</nz-form-label>
<nz-form-control
[
nzSm
]="
14
"
[
nzXs
]="
24
"
>
<nz-select
id=
"status"
formControlName=
"status"
>
<nz-option
nzValue=
"0"
nzLabel=
"有效"
></nz-option>
...
...
src/main/webapp/app/system/modal/user/user.component.ts
View file @
29d30761
...
...
@@ -34,10 +34,9 @@ export class UserComponent implements OnInit {
initForm
(){
this
.
validateForm
=
this
.
fb
.
group
({
name
:[
null
,[
Validators
.
required
,
Validators
.
maxLength
(
10
)]],
loginName
:[
null
,[
Validators
.
required
,
Validators
.
maxLength
(
10
)]],
phoneNumber
:[
null
,[
Validators
.
required
,
Validators
.
min
(
11
),
Validators
.
maxLength
(
11
)]],
phoneNumber
:[
null
,[
Validators
.
required
,
Validators
.
minLength
(
11
),
Validators
.
maxLength
(
11
)]],
gender
:[
null
,[
Validators
.
required
]],
email
:[
null
,
[
Validators
.
email
]
],
email
:[
null
,],
organizationId
:[
null
,[
Validators
.
required
]],
position
:[
null
,[
Validators
.
required
]],
status
:[
null
,[
Validators
.
required
]],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment