Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
b829f599
Commit
b829f599
authored
Sep 28, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改员工属性
parent
043bd71c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
enterprise-manager-ui/admin/src/views/position/drawershow.vue
...rprise-manager-ui/admin/src/views/position/drawershow.vue
+3
-3
enterprise-manager-ui/admin/src/views/position/list.vue
enterprise-manager-ui/admin/src/views/position/list.vue
+6
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
...ava/com/mortals/xhx/module/staff/web/StaffController.java
+6
-0
No files found.
enterprise-manager-ui/admin/src/views/position/drawershow.vue
View file @
b829f599
...
@@ -8,9 +8,9 @@
...
@@ -8,9 +8,9 @@
size=
"50%"
>
size=
"50%"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<el-row>
<Field
label=
"职位名称"
prop=
"positionName"
v-model=
"form.positionName"
placeholder=
"请输入职位名称"
/>
<Field
:span=
"20"
label=
"职位名称"
prop=
"positionName"
v-model=
"form.positionName"
placeholder=
"请输入职位名称"
/>
<Field
label=
"职位编码"
prop=
"positionCode"
v-model=
"form.positionCode"
placeholder=
"请输入职位编码"
/>
<Field
:span=
"20"
label=
"职位编码"
prop=
"positionCode"
v-model=
"form.positionCode"
placeholder=
"请输入职位编码"
/>
<Field
label=
"备注"
prop=
"remark"
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入备注"
/>
<Field
:span=
"20"
label=
"备注"
prop=
"remark"
v-model=
"form.remark"
type=
"textarea"
placeholder=
"请输入备注"
/>
</el-row>
</el-row>
...
...
enterprise-manager-ui/admin/src/views/position/list.vue
View file @
b829f599
...
@@ -39,6 +39,12 @@
...
@@ -39,6 +39,12 @@
return
{
return
{
config
:
{
config
:
{
search
:
[
search
:
[
{
name
:
"
positionName
"
,
type
:
"
text
"
,
label
:
"
职位名称
"
},
],
],
columns
:
[
columns
:
[
{
type
:
"
selection
"
,
width
:
60
},
{
type
:
"
selection
"
,
width
:
60
},
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @
b829f599
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.web;
...
@@ -2,6 +2,8 @@ package com.mortals.xhx.module.staff.web;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.user.model.UserQuery
;
import
com.mortals.xhx.base.system.user.service.UserService
;
import
com.mortals.xhx.module.company.model.CompanyQuery
;
import
com.mortals.xhx.module.company.model.CompanyQuery
;
import
com.mortals.xhx.module.company.service.CompanyService
;
import
com.mortals.xhx.module.company.service.CompanyService
;
import
com.mortals.xhx.module.position.model.PositionQuery
;
import
com.mortals.xhx.module.position.model.PositionQuery
;
...
@@ -51,6 +53,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
...
@@ -51,6 +53,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
private
CompanyService
companyService
;
private
CompanyService
companyService
;
@Autowired
@Autowired
private
PositionService
positionService
;
private
PositionService
positionService
;
@Autowired
private
UserService
userService
;
public
StaffController
()
{
public
StaffController
()
{
...
@@ -67,6 +71,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
...
@@ -67,6 +71,8 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
this
.
addDict
(
model
,
"companyId"
,
companyService
.
find
(
new
CompanyQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getCompanyName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"companyId"
,
companyService
.
find
(
new
CompanyQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getCompanyName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"positionId"
,
positionService
.
find
(
new
PositionQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getPositionName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"positionId"
,
positionService
.
find
(
new
PositionQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getPositionName
(),
(
o
,
n
)
->
n
)));
this
.
addDict
(
model
,
"updateUserId"
,
userService
.
find
(
new
UserQuery
()).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getId
().
toString
(),
y
->
y
.
getRealName
(),
(
o
,
n
)
->
n
)));
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
...
...
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