员工入职功能重构完成

boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js

@@ -10,11 +10,10 @@ layui.config({
     var $ = layui.$,
         laydate = layui.laydate,
         form = layui.form;
-    var selTemplate = getFileContent('tpl/template/select-option.tpl');
 
     showGrid({
         id: "showForm",
-        url: flowableBasePath + "queryBossInterviewArrangementById",
+        url: sysMainMation.bossBasePath + "queryArrangementById",
         params: {id: parent.rowId},
         pagination: false,
         method: "GET",
@@ -24,10 +23,10 @@ layui.config({
             json.bean.stateName = bossUtil.showStateName(json.bean.state);
         },
         ajaxSendAfter: function (json) {
-            skyeyeEnclosure.showDetails({'enclosureUpload': json.bean.enclosureInfo});
+            skyeyeEnclosure.showDetails({'enclosureUpload': json.bean.interviewMation.enclosureResume});
 
             // 员工在职状态加载
-            $("#inductionState").html(getDataUseHandlebars(selTemplate, {rows: systemCommonUtil.getSysUserStaffStateList()}));
+            skyeyeClassEnumUtil.showEnumDataListByClassName("userStaffState", 'select', "inductionState", '', form);
             form.on('select(inductionState)', function (data) {
                 if (data.value == '4') {
                     // 试用期
@@ -98,7 +97,7 @@ layui.config({
                         inductionState: inductionState,
                         trialTime: $("#trialTime").val()
                     };
-                    AjaxPostUtil.request({url: flowableBasePath + "setInductionResult", params: params, type: 'json', method: "PUT", callback: function(json) {
+                    AjaxPostUtil.request({url: sysMainMation.bossBasePath + "setInductionResult", params: params, type: 'json', method: "PUT", callback: function(json) {
                         parent.layer.close(index);
                         parent.refreshCode = '0';
                     }});

boss/src/main/resources/template/tpl/bossInterviewArrangement/inductionResult.html

@@ -21,7 +21,7 @@
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">面试者：</label>
             <div class="layui-input-block ver-center">
-                {{interviewName}}
+                {{interviewMation.name}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
@@ -33,25 +33,25 @@
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">联系方式：</label>
             <div class="layui-input-block ver-center">
-                {{phone}}
+                {{interviewMation.phone}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">工作年限：</label>
             <div class="layui-input-block ver-center">
-                {{workYears}}
+                {{interviewMation.workYears}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">心仪岗位：</label>
             <div class="layui-input-block ver-center">
-                {{favoriteJob}}
+                {{interviewMation.favoriteJob}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">
             <label class="layui-form-label">基本简历：</label>
             <div class="layui-input-block ver-center">
-                {{{basicResume}}}
+                {{{interviewMation.basicResume}}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">
@@ -65,13 +65,13 @@
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">需求部门：</label>
             <div class="layui-input-block ver-center">
-                {{departmentName}}
+                {{personRequireMation.recruitDepartmentMation.name}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
             <label class="layui-form-label">需求岗位：</label>
             <div class="layui-input-block ver-center">
-                {{jobName}}
+                {{personRequireMation.recruitJobMation.name}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs12">
@@ -87,13 +87,13 @@
         <div class="layui-form-item layui-col-xs6 agreePass">
             <label class="layui-form-label">入职时间<i class="red">*</i></label>
             <div class="layui-input-block">
-                <input type="text" id="entryTime" name="entryTime" placeholder="XXXX-XX-XX" class="layui-input"/>
+                <input type="text" id="entryTime" name="entryTime" placeholder="请选择入职时间" class="layui-input"/>
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6 agreePass">
             <label class="layui-form-label">参加工作时间<i class="red">*</i></label>
             <div class="layui-input-block">
-                <input type="text" id="workTime" name="workTime" placeholder="XXXX-XX-XX" class="layui-input"/>
+                <input type="text" id="workTime" name="workTime" placeholder="请选择参加工作时间" class="layui-input"/>
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6 agreePass">

userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffAdd.js

@@ -22,7 +22,7 @@ layui.config({
 		type = GetUrlParam("type");
 
 		// 员工在职状态加载
-		$("#state").html(getDataUseHandlebars(selTemplate, {rows: systemCommonUtil.getSysUserStaffStateList()}));
+		skyeyeClassEnumUtil.showEnumDataListByClassName("userStaffState", 'select', "state", '', form);
 		form.on('select(state)', function (data) {
 			if (data.value == '4') {
 				// 试用期

userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffDetails.js

@@ -25,7 +25,8 @@ layui.config({
 			method: "GET",
 		 	template: $("#beanTemplate").html(),
 		 	ajaxSendAfter:function (json) {
-		 		if(json.bean.state == systemCommonUtil.sysUserStaffState["quit"]["id"]){
+		 		if (json.bean.state == 2) {
+					// 离职
 		 			$("#leaveTime").show();
 		 			$("#leaveReason").show();
 		 		}

web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js

@@ -373,22 +373,6 @@ var systemCommonUtil = {
         }
     },
 
-    // 员工在职状态
-    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;
-    },
-
     /**
      * 根据类型获取部分功能的使用说明
      *

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -8,6 +8,7 @@
     "whetherEnum": {"name": "是否", "className": "skyeye-pro#com.skyeye.common.enumeration.WhetherEnum"},
     "dateTimeType": {"name": "日期类型", "className": "skyeye-pro#com.skyeye.dsform.classenum.DateTimeType"},
     "payTypeEnum": {"name": "付款类型", "className": "skyeye-pro#com.skyeye.common.enumeration.PayTypeEnum"},
+    "userStaffState": {"name": "员工状态", "className": "skyeye-pro#com.skyeye.common.enumeration.UserStaffState"},
 
     "bossInterviewArrangementState": {"name": "面试安排状态", "className": "skyeye-boss#com.skyeye.arrangement.classenum.ArrangementState"},
     "bossInterviewArrangementState1": {