From 56035da009f70bfc106f2acb724cbece5a319760 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Tue, 13 Jun 2023 16:01:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=85=A5=E8=81=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=87=8D=E6=9E=84=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inductionResult.js | 9 ++++----- .../inductionResult.html | 18 +++++++++--------- .../js/sysEveUserStaff/sysEveUserStaffAdd.js | 2 +- .../sysEveUserStaff/sysEveUserStaffDetails.js | 3 ++- .../layui/customer/common/systemCommonUtil.js | 16 ---------------- .../template/json/skyeyeClassEnum.json | 1 + 6 files changed, 17 insertions(+), 32 deletions(-) diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js b/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js index c7fb8e01e..cd53d9a96 100644 --- a/boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js +++ b/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'; }}); diff --git a/boss/src/main/resources/template/tpl/bossInterviewArrangement/inductionResult.html b/boss/src/main/resources/template/tpl/bossInterviewArrangement/inductionResult.html index 02c5f193a..4af3075b7 100644 --- a/boss/src/main/resources/template/tpl/bossInterviewArrangement/inductionResult.html +++ b/boss/src/main/resources/template/tpl/bossInterviewArrangement/inductionResult.html @@ -21,7 +21,7 @@
- {{interviewName}} + {{interviewMation.name}}
@@ -33,25 +33,25 @@
- {{phone}} + {{interviewMation.phone}}
- {{workYears}} + {{interviewMation.workYears}}
- {{favoriteJob}} + {{interviewMation.favoriteJob}}
- {{{basicResume}}} + {{{interviewMation.basicResume}}}
@@ -65,13 +65,13 @@
- {{departmentName}} + {{personRequireMation.recruitDepartmentMation.name}}
- {{jobName}} + {{personRequireMation.recruitJobMation.name}}
@@ -87,13 +87,13 @@
- +
- +
diff --git a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffAdd.js b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffAdd.js index 519502d54..1a0c871c1 100644 --- a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffAdd.js +++ b/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') { // 试用期 diff --git a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffDetails.js b/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffDetails.js index 848ac8413..055229662 100644 --- a/userauth/src/main/resources/template/js/sysEveUserStaff/sysEveUserStaffDetails.js +++ b/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(); } diff --git a/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js index 3409c15f7..1ad2e56ed 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js +++ b/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; - }, - /** * 根据类型获取部分功能的使用说明 * diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json index 1e99aadfd..943c6b6ae 100644 --- a/web/src/main/resources/template/json/skyeyeClassEnum.json +++ b/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": { -- GitLab