提交 68249bd0 编写于 作者: Skyeye云's avatar Skyeye云

员工信息新增试用期信息

上级 37f823c2
...@@ -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)){
......
...@@ -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();
......
...@@ -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)){
......
...@@ -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>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
{{jobNumber}} {{jobNumber}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs6">
<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-xs6"> <div class="layui-form-item layui-col-xs12">
<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}}
......
...@@ -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>
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册