Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
68249bd0
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1431
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
68249bd0
编写于
4月 21, 2022
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
员工信息新增试用期信息
上级
37f823c2
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
92 addition
and
25 deletion
+92
-25
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffAdd.js
...sources/template/js/syseveuserstaff/sysEveUserStaffAdd.js
+25
-9
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffDetails.js
...ces/template/js/syseveuserstaff/sysEveUserStaffDetails.js
+3
-3
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffEdit.js
...ources/template/js/syseveuserstaff/sysEveUserStaffEdit.js
+3
-1
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffAdd.html
...rces/template/tpl/syseveuserstaff/sysEveUserStaffAdd.html
+15
-1
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffDetails.html
.../template/tpl/syseveuserstaff/sysEveUserStaffDetails.html
+16
-10
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffEdit.html
...ces/template/tpl/syseveuserstaff/sysEveUserStaffEdit.html
+13
-1
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
...es/template/assets/lib/layui/customer/systemCommonUtil.js
+17
-0
未找到文件。
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffAdd.js
浏览文件 @
68249bd0
...
@@ -18,19 +18,28 @@ layui.config({
...
@@ -18,19 +18,28 @@ layui.config({
var
$
=
layui
.
$
,
var
$
=
layui
.
$
,
laydate
=
layui
.
laydate
,
laydate
=
layui
.
laydate
,
dtree
=
layui
.
dtree
;
dtree
=
layui
.
dtree
;
var
selTemplate
=
getFileContent
(
'
tpl/template/select-option.tpl
'
);
type
=
GetUrlParam
(
"
type
"
);
type
=
GetUrlParam
(
"
type
"
);
// 入职时间
// 员工在职状态加载
laydate
.
render
({
$
(
"
#state
"
).
html
(
getDataUseHandlebars
(
selTemplate
,
{
rows
:
systemCommonUtil
.
getSysUserStaffStateList
()}));
elem
:
'
#entryTime
'
,
form
.
on
(
'
select(state)
'
,
function
(
data
)
{
range
:
false
if
(
data
.
value
==
'
4
'
)
{
// 试用期
$
(
"
#trialTimeBox
"
).
show
();
}
else
{
$
(
"
#trialTimeBox
"
).
hide
();
}
});
});
// 入职时间
laydate
.
render
({
elem
:
'
#entryTime
'
,
range
:
false
});
// 参加工作时间
// 参加工作时间
laydate
.
render
({
laydate
.
render
({
elem
:
'
#workTime
'
,
range
:
false
});
elem
:
'
#workTime
'
,
range
:
false
// 预计试用结束日期
});
laydate
.
render
({
elem
:
'
#trialTime
'
,
range
:
false
});
// 初始化上传
// 初始化上传
$
(
"
#userPhoto
"
).
upload
({
$
(
"
#userPhoto
"
).
upload
({
...
@@ -156,6 +165,11 @@ layui.config({
...
@@ -156,6 +165,11 @@ layui.config({
winui
.
window
.
msg
(
'
请选择考勤段
'
,
{
icon
:
2
,
time
:
2000
});
winui
.
window
.
msg
(
'
请选择考勤段
'
,
{
icon
:
2
,
time
:
2000
});
return
false
;
return
false
;
}
}
var
state
=
$
(
"
#state
"
).
val
();
if
(
state
==
'
4
'
&&
isNull
(
$
(
"
#trialTime
"
).
val
())){
winui
.
window
.
msg
(
'
请选择预计试用结束日期
'
,
{
icon
:
2
,
time
:
2000
});
return
false
;
}
var
params
=
{
var
params
=
{
userName
:
$
(
"
#userName
"
).
val
(),
userName
:
$
(
"
#userName
"
).
val
(),
email
:
$
(
"
#email
"
).
val
(),
email
:
$
(
"
#email
"
).
val
(),
...
@@ -172,7 +186,9 @@ layui.config({
...
@@ -172,7 +186,9 @@ layui.config({
jobId
:
jobId
,
jobId
:
jobId
,
jobScoreId
:
jobScoreId
,
jobScoreId
:
jobScoreId
,
checkTimeStr
:
timeIds
,
checkTimeStr
:
timeIds
,
type
:
type
type
:
type
,
state
:
state
,
trialTime
:
$
(
"
#trialTime
"
).
val
()
};
};
params
.
userPhoto
=
$
(
"
#userPhoto
"
).
find
(
"
input[type='hidden'][name='upload']
"
).
attr
(
"
oldurl
"
);
params
.
userPhoto
=
$
(
"
#userPhoto
"
).
find
(
"
input[type='hidden'][name='upload']
"
).
attr
(
"
oldurl
"
);
if
(
isNull
(
params
.
userPhoto
)){
if
(
isNull
(
params
.
userPhoto
)){
...
...
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffDetails.js
浏览文件 @
68249bd0
...
@@ -25,9 +25,9 @@ layui.config({
...
@@ -25,9 +25,9 @@ layui.config({
method
:
"
GET
"
,
method
:
"
GET
"
,
template
:
$
(
"
#beanTemplate
"
).
html
(),
template
:
$
(
"
#beanTemplate
"
).
html
(),
ajaxSendAfter
:
function
(
json
){
ajaxSendAfter
:
function
(
json
){
if
(
json
.
bean
.
state
==
"
在职
"
){
if
(
json
.
bean
.
state
==
systemCommonUtil
.
sysUserStaffState
[
"
quit
"
][
"
id
"
]
){
$
(
"
#leaveTime
"
).
hide
();
$
(
"
#leaveTime
"
).
show
();
$
(
"
#leaveReason
"
).
hide
();
$
(
"
#leaveReason
"
).
show
();
}
}
$
(
"
#userPhoto
"
).
attr
(
"
src
"
,
systemCommonUtil
.
getFilePath
(
json
.
bean
.
userPhoto
));
$
(
"
#userPhoto
"
).
attr
(
"
src
"
,
systemCommonUtil
.
getFilePath
(
json
.
bean
.
userPhoto
));
matchingLanguage
();
matchingLanguage
();
...
...
userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffEdit.js
浏览文件 @
68249bd0
...
@@ -210,7 +210,9 @@ layui.config({
...
@@ -210,7 +210,9 @@ layui.config({
departmentId
:
departmentId
,
departmentId
:
departmentId
,
jobId
:
jobId
,
jobId
:
jobId
,
jobScoreId
:
jobScoreId
,
jobScoreId
:
jobScoreId
,
checkTimeStr
:
timeIds
checkTimeStr
:
timeIds
,
state
:
$
(
"
#state
"
).
attr
(
"
state
"
),
trialTime
:
$
(
"
#trialTime
"
).
html
()
};
};
params
.
userPhoto
=
$
(
"
#userPhoto
"
).
find
(
"
input[type='hidden'][name='upload']
"
).
attr
(
"
oldurl
"
);
params
.
userPhoto
=
$
(
"
#userPhoto
"
).
find
(
"
input[type='hidden'][name='upload']
"
).
attr
(
"
oldurl
"
);
if
(
isNull
(
params
.
userPhoto
)){
if
(
isNull
(
params
.
userPhoto
)){
...
...
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffAdd.html
浏览文件 @
68249bd0
...
@@ -44,12 +44,26 @@
...
@@ -44,12 +44,26 @@
<div
class=
"upload"
id=
"userPhoto"
></div>
<div
class=
"upload"
id=
"userPhoto"
></div>
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs6"
>
<div
class=
"layui-form-item layui-col-xs6"
style=
"height: 108px"
>
<label
class=
"layui-form-label"
>
参加工作时间
<i
class=
"red"
>
*
</i></label>
<label
class=
"layui-form-label"
>
参加工作时间
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"workTime"
name=
"workTime"
win-verify=
"required"
placeholder=
"XXXX-XX-XX"
class=
"layui-input"
/>
<input
type=
"text"
id=
"workTime"
name=
"workTime"
win-verify=
"required"
placeholder=
"XXXX-XX-XX"
class=
"layui-input"
/>
</div>
</div>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs6"
>
<label
class=
"layui-form-label"
>
在职状态
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<select
lay-filter=
"state"
lay-search=
""
id=
"state"
name=
"state"
>
</select>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs6"
id=
"trialTimeBox"
style=
"display: none"
>
<label
class=
"layui-form-label"
>
预计试用结束日期
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"trialTime"
name=
"trialTime"
placeholder=
"请选择预计试用结束日期"
class=
"layui-input"
/>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs12"
>
<div
class=
"layui-form-item layui-col-xs12"
>
<span
class=
"hr-title"
>
联系方式
</span><hr>
<span
class=
"hr-title"
>
联系方式
</span><hr>
</div>
</div>
...
...
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffDetails.html
浏览文件 @
68249bd0
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
{{
jobNumber
}}
{{
jobNumber
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs
12
"
>
<
div
class
=
"
layui-form-item layui-col-xs
6
"
>
<
label
class
=
"
layui-form-label
"
>
身份证件
:
<
/label
>
<
label
class
=
"
layui-form-label
"
>
身份证件
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
userIdCard
}}
{{
userIdCard
}}
...
@@ -50,17 +50,11 @@
...
@@ -50,17 +50,11 @@
{{
userSex
}}
{{
userSex
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs
6
"
>
<
div
class
=
"
layui-form-item layui-col-xs
12
"
>
<
label
class
=
"
layui-form-label
"
>
个人头像
:
<
/label
>
<
label
class
=
"
layui-form-label
"
>
个人头像
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
<
div
class
=
"
layui-input-block ver-center
"
>
<
img
src
=
""
class
=
"
photo-img
"
id
=
"
userPhoto
"
>
<
img
src
=
""
class
=
"
photo-img
"
id
=
"
userPhoto
"
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
label
class
=
"
layui-form-label
"
>
在职状态
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center {{colorClass}}
"
>
{{
state
}}
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
label
class
=
"
layui-form-label
"
>
参加工作时间
:
<
/label
>
<
label
class
=
"
layui-form-label
"
>
参加工作时间
:
<
/label
>
...
@@ -74,13 +68,25 @@
...
@@ -74,13 +68,25 @@
{{
entryTime
}}
{{
entryTime
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
leaveTime
"
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
label
class
=
"
layui-form-label
"
>
在职状态
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center {{colorClass}}
"
>
{{
stateName
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
trialTimeBox
"
>
<
label
class
=
"
layui-form-label
"
>
预计试用结束日期
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
trialTime
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
leaveTime
"
style
=
"
display: none
"
>
<
label
class
=
"
layui-form-label
"
>
离职时间
:
<
/label
>
<
label
class
=
"
layui-form-label
"
>
离职时间
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
quitTime
}}
{{
quitTime
}}
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
leaveReason
"
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
leaveReason
"
style
=
"
display: none
"
>
<
label
class
=
"
layui-form-label
"
>
离职原因
:
<
/label
>
<
label
class
=
"
layui-form-label
"
>
离职原因
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
quitReason
}}
{{
quitReason
}}
...
...
userauth/src/main/resources/template/tpl/syseveuserstaff/sysEveUserStaffEdit.html
浏览文件 @
68249bd0
...
@@ -50,12 +50,24 @@
...
@@ -50,12 +50,24 @@
<
div
class
=
"
upload
"
id
=
"
userPhoto
"
><
/div
>
<
div
class
=
"
upload
"
id
=
"
userPhoto
"
><
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
style
=
"
height: 108px
"
>
<
label
class
=
"
layui-form-label
"
>
参加工作时间
<
i
class
=
"
red
"
>*<
/i></
label
>
<
label
class
=
"
layui-form-label
"
>
参加工作时间
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
workTime
"
name
=
"
workTime
"
win
-
verify
=
"
required
"
placeholder
=
"
XXXX-XX-XX
"
class
=
"
layui-input
"
value
=
"
{{workTime}}
"
/>
<
input
type
=
"
text
"
id
=
"
workTime
"
name
=
"
workTime
"
win
-
verify
=
"
required
"
placeholder
=
"
XXXX-XX-XX
"
class
=
"
layui-input
"
value
=
"
{{workTime}}
"
/>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
>
<
label
class
=
"
layui-form-label
"
>
在职状态
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block ver-center
"
id
=
"
state
"
state
=
"
{{state}}
"
>
{{
stateName
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs6
"
id
=
"
trialTimeBox
"
>
<
label
class
=
"
layui-form-label
"
>
预计试用结束日期
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block ver-center
"
id
=
"
trialTime
"
>
{{
trialTime
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
span
class
=
"
hr-title
"
>
联系方式
<
/span><hr
>
<
span
class
=
"
hr-title
"
>
联系方式
<
/span><hr
>
<
/div
>
<
/div
>
...
...
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
浏览文件 @
68249bd0
...
@@ -273,6 +273,23 @@ var systemCommonUtil = {
...
@@ -273,6 +273,23 @@ var systemCommonUtil = {
}
else
{
}
else
{
return
fileBasePath
+
url
;
return
fileBasePath
+
url
;
}
}
},
// 员工在职状态
sysUserStaffState
:
{
"
onTheJob
"
:
{
"
id
"
:
1
,
"
name
"
:
"
在职(转正的员工)
"
},
"
quit
"
:
{
"
id
"
:
2
,
"
name
"
:
"
离职
"
},
"
probation
"
:
{
"
id
"
:
3
,
"
name
"
:
"
见习(用于实习生)
"
},
"
probationPeriod
"
:
{
"
id
"
:
4
,
"
name
"
:
"
试用期(用于未转正的员工)
"
},
"
retire
"
:
{
"
id
"
:
5
,
"
name
"
:
"
退休
"
}
},
getSysUserStaffStateList
:
function
(){
var
list
=
[];
$
.
each
(
systemCommonUtil
.
sysUserStaffState
,
function
(
key
,
value
){
list
.
push
(
value
);
});
return
list
;
}
}
};
};
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录