From d80f70d9c52f28dc9b98c128bd058d0fb61d5c57 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 1 May 2022 14:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E8=B0=83=E5=8A=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bossInterviewJobTransferAdd.js | 118 ++++++++++ .../bossInterviewJobTransferDetails.js | 34 +++ .../bossInterviewJobTransferEdit.js | 153 ++++++++++++ .../bossInterviewJobTransferList.js | 219 ++++++++++++++++++ .../bossInterviewJobTransferAdd.html | 96 ++++++++ .../bossInterviewJobTransferDetails.html | 93 ++++++++ .../bossInterviewJobTransferEdit.html | 105 +++++++++ .../bossInterviewJobTransferList.html | 74 ++++++ .../sysStaffRewardPunishAdd.js | 19 +- .../sysStaffRewardPunishEdit.js | 21 +- .../js/storeStaff/storeStaffDistribute.js | 45 ++-- .../syseveuserstaff/sysEveUserStaffChoose.js | 10 +- .../template/js/wagesModel/wagesModelAdd.js | 33 +-- .../template/js/wagesModel/wagesModelEdit.js | 32 +-- .../wagesSocialSecurityFundAdd.js | 33 +-- .../wagesSocialSecurityFundEdit.js | 33 +-- .../template/assets/lib/layui/custom.js | 1 + .../assets/lib/layui/customer/bossUtil.js | 18 ++ .../lib/layui/customer/organizationUtil.js | 188 +++++++++++++++ .../lib/layui/customer/systemCommonUtil.js | 24 ++ .../template/json/activitiNameKey.json | 3 +- 21 files changed, 1206 insertions(+), 146 deletions(-) create mode 100644 boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js create mode 100644 boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferDetails.js create mode 100644 boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js create mode 100644 boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js create mode 100644 boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html create mode 100644 boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html create mode 100644 boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html create mode 100644 boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferList.html create mode 100644 web/src/main/resources/template/assets/lib/layui/customer/organizationUtil.js diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js new file mode 100644 index 000000000..f10e5148a --- /dev/null +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js @@ -0,0 +1,118 @@ +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form', 'textool', 'laydate', 'dtree'], function(exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + laydate = layui.laydate, + textool = layui.textool, + form = layui.form, + dtree = layui.dtree; + var selOption = getFileContent('tpl/template/select-option.tpl'); + + // 调岗类型 + $("#transferType").html(getDataUseHandlebars(selOption, {rows: bossUtil.getTransferTypeList()})); + + textool.init({ + eleId: 'remark', + maxlength: 200, + tools: ['count', 'copy', 'reset'] + }); + + // 加载组织结构 + organizationUtil.initAddOrganization(dtree); + + skyeyeEnclosure.init('enclosureUpload'); + matchingLanguage(); + form.render(); + // 保存为草稿 + form.on('submit(formAddBean)', function(data) { + if(winui.verifyForm(data.elem)) { + saveData("1", ""); + } + return false; + }); + + // 提交审批 + form.on('submit(formSubBean)', function(data) { + if(winui.verifyForm(data.elem)) { + activitiUtil.startProcess(sysActivitiModel["bossInterviewJobTransfer"]["key"], function (approvalId) { + saveData("2", approvalId); + }); + } + return false; + }); + + function saveData(subType, approvalId) { + if(isNull(organizationUtil.getCompanyMation(dtree)['nodeId'])){ + winui.window.msg('请选择企业', {icon: 2,time: 2000}); + return false; + } + if(isNull(organizationUtil.getDepartmentMation(dtree)['nodeId'])){ + winui.window.msg('请选择部门', {icon: 2,time: 2000}); + return false; + } + if(isNull(organizationUtil.getJobMation(dtree)['nodeId'])){ + winui.window.msg('请选择岗位', {icon: 2,time: 2000}); + return false; + } + var params = { + transferType: $("#transferType").val(), + transferStaffId: $("#transferStaffId").attr("staffId"), + primaryCompanyId: $("#primaryCompanyId").attr("companyId"), + primaryCompanyName: $("#primaryCompanyId").html(), + primaryDepartmentId: $("#primaryDepartmentId").attr("departmentId"), + primaryDepartmentName: $("#primaryDepartmentId").html(), + primaryJobId: $("#primaryJobId").attr("jobId"), + primaryJobName: $("#primaryJobId").html(), + primaryJobScoreId: $("#primaryJobScoreId").attr("jobScoreId"), + primaryJobScoreName: $("#primaryJobScoreId").html(), + + currentCompanyId: organizationUtil.getCompanyMation(dtree)['nodeId'], + currentCompanyName: organizationUtil.getCompanyMation(dtree)['context'], + currentDepartmentId: organizationUtil.getDepartmentMation(dtree)['nodeId'], + currentDepartmentName: organizationUtil.getDepartmentMation(dtree)['context'], + currentJobId: organizationUtil.getJobMation(dtree)['nodeId'], + currentJobName: organizationUtil.getJobMation(dtree)['context'], + currentJobScoreId: organizationUtil.getJobScoreMation(dtree)['nodeId'], + currentJobScoreName: organizationUtil.getJobScoreMation(dtree)['context'], + + remark: $("#remark").val(), + enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), + subType: subType, // 表单类型 1.保存草稿 2.提交审批 + approvalId: approvalId + }; + AjaxPostUtil.request({url: flowableBasePath + "insertBossInterviewJobTransfer", params: params, type: 'json', method: "POST", callback: function(json) { + if(json.returnCode == 0) { + parent.layer.close(index); + parent.refreshCode = '0'; + } else { + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + } + + // 人员选择 + $("body").on("click", ".transferStaffIdBtn", function(){ + systemCommonUtil.userStaffCheckType = false; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + $("#transferStaffId").attr("staffId", checkStaffMation.id); + $("#transferStaffId").val(checkStaffMation.jobNumber + '_' + checkStaffMation.userName); + $("#primaryCompanyId").attr("companyId", checkStaffMation.companyId); + $("#primaryCompanyId").html(checkStaffMation.companyName); + $("#primaryDepartmentId").attr("departmentId", checkStaffMation.departmentId); + $("#primaryDepartmentId").html(checkStaffMation.departmentName); + $("#primaryJobId").attr("jobId", checkStaffMation.jobId); + $("#primaryJobId").html(checkStaffMation.jobName); + $("#primaryJobScoreId").attr("jobScoreId", checkStaffMation.jobScoreId); + $("#primaryJobScoreId").html(checkStaffMation.jobScoreName); + }); + }); + + $("body").on("click", "#cancle", function() { + parent.layer.close(index); + }); +}); \ No newline at end of file diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferDetails.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferDetails.js new file mode 100644 index 000000000..0a7ee1bbe --- /dev/null +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferDetails.js @@ -0,0 +1,34 @@ +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui'], function (exports) { + winui.renderColor(); + layui.use(['form'], function (form) { + var $ = layui.$; + + showGrid({ + id: "showForm", + url: flowableBasePath + "queryBossInterviewJobTransferDetailsById", + params: {id: parent.rowId}, + pagination: false, + method: "GET", + template: $("#beanTemplate").html(), + ajaxSendLoadBefore: function(hdb, json){ + json.bean.remark = stringManipulation.textAreaShow(json.bean.remark); + json.bean.transferTypeName = bossUtil.getTransferTypeNameById(json.bean.transferType); + }, + ajaxSendAfter: function(json){ + // 附件回显 + skyeyeEnclosure.showDetails({'enclosureUpload': json.bean.enclosureInfo}); + + matchingLanguage(); + } + }); + + $("body").on("click", ".enclosureItem", function(){ + download(fileBasePath + $(this).attr("rowpath"), $(this).html()); + }); + }); +}); \ No newline at end of file diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js new file mode 100644 index 000000000..d434ff694 --- /dev/null +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js @@ -0,0 +1,153 @@ +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'jquery', 'winui', 'form', 'textool', 'laydate', 'dtree'], function (exports) { + winui.renderColor(); + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + laydate = layui.laydate, + textool = layui.textool, + form = layui.form, + dtree = layui.dtree; + var selOption = getFileContent('tpl/template/select-option.tpl'); + + showGrid({ + id: "showForm", + url: flowableBasePath + "queryBossInterviewJobTransferToEditById", + params: {id: parent.rowId}, + pagination: false, + method: "GET", + template: $("#beanTemplate").html(), + ajaxSendAfter: function(json){ + // 调岗类型 + $("#transferType").html(getDataUseHandlebars(selOption, {rows: bossUtil.getTransferTypeList()})); + $("#transferType").val(json.bean.transferType); + + textool.init({ + eleId: 'remark', + maxlength: 200, + tools: ['count', 'copy', 'reset'] + }); + + var organization = { + companyId: json.bean.currentCompanyId, + departmentId: json.bean.currentDepartmentId, + jobId: json.bean.currentJobId, + jobScoreId: json.bean.currentJobScoreId + }; + // 加载组织结构 + organizationUtil.initEditOrganization(dtree, organization); + + // 附件回显 + skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo}); + + if(json.bean.state == '1'){ + $(".typeTwo").removeClass("layui-hide"); + }else{ + $(".typeOne").removeClass("layui-hide"); + } + + matchingLanguage(); + form.render(); + } + }); + + // 保存为草稿 + form.on('submit(formEditBean)', function(data) { + if(winui.verifyForm(data.elem)) { + saveData('1', ""); + } + return false; + }); + + // 提交审批 + form.on('submit(formSubBean)', function(data) { + if(winui.verifyForm(data.elem)) { + activitiUtil.startProcess(sysActivitiModel["bossInterviewJobTransfer"]["key"], function (approvalId) { + saveData("2", approvalId); + }); + } + return false; + }); + + // 工作流中保存 + form.on('submit(subBean)', function(data) { + if(winui.verifyForm(data.elem)) { + saveData('3', ""); + } + return false; + }); + + function saveData(subType, approvalId){ + if(isNull(organizationUtil.getCompanyMation(dtree)['nodeId'])){ + winui.window.msg('请选择企业', {icon: 2,time: 2000}); + return false; + } + if(isNull(organizationUtil.getDepartmentMation(dtree)['nodeId'])){ + winui.window.msg('请选择部门', {icon: 2,time: 2000}); + return false; + } + if(isNull(organizationUtil.getJobMation(dtree)['nodeId'])){ + winui.window.msg('请选择岗位', {icon: 2,time: 2000}); + return false; + } + var params = { + transferType: $("#transferType").val(), + transferStaffId: $("#transferStaffId").attr("staffId"), + primaryCompanyId: $("#primaryCompanyId").attr("companyId"), + primaryCompanyName: $("#primaryCompanyId").html(), + primaryDepartmentId: $("#primaryDepartmentId").attr("departmentId"), + primaryDepartmentName: $("#primaryDepartmentId").html(), + primaryJobId: $("#primaryJobId").attr("jobId"), + primaryJobName: $("#primaryJobId").html(), + primaryJobScoreId: $("#primaryJobScoreId").attr("jobScoreId"), + primaryJobScoreName: $("#primaryJobScoreId").html(), + + currentCompanyId: organizationUtil.getCompanyMation(dtree)['nodeId'], + currentCompanyName: organizationUtil.getCompanyMation(dtree)['context'], + currentDepartmentId: organizationUtil.getDepartmentMation(dtree)['nodeId'], + currentDepartmentName: organizationUtil.getDepartmentMation(dtree)['context'], + currentJobId: organizationUtil.getJobMation(dtree)['nodeId'], + currentJobName: organizationUtil.getJobMation(dtree)['context'], + currentJobScoreId: organizationUtil.getJobScoreMation(dtree)['nodeId'], + currentJobScoreName: organizationUtil.getJobScoreMation(dtree)['context'], + + remark: $("#remark").val(), + enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'), + subType: subType, // 表单类型 1.保存草稿 2.提交审批 + approvalId: approvalId, + id: parent.rowId + }; + AjaxPostUtil.request({url: flowableBasePath + "updateBossInterviewJobTransfer", params: params, type: 'json', method: "PUT", callback: function(json) { + if(json.returnCode == 0) { + parent.layer.close(index); + parent.refreshCode = '0'; + } else { + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + } + + // 人员选择 + $("body").on("click", ".transferStaffIdBtn", function(){ + systemCommonUtil.userStaffCheckType = false; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + $("#transferStaffId").attr("staffId", checkStaffMation.id); + $("#transferStaffId").val(checkStaffMation.jobNumber + '_' + checkStaffMation.userName); + $("#primaryCompanyId").attr("companyId", checkStaffMation.companyId); + $("#primaryCompanyId").html(checkStaffMation.companyName); + $("#primaryDepartmentId").attr("departmentId", checkStaffMation.departmentId); + $("#primaryDepartmentId").html(checkStaffMation.departmentName); + $("#primaryJobId").attr("jobId", checkStaffMation.jobId); + $("#primaryJobId").html(checkStaffMation.jobName); + $("#primaryJobScoreId").attr("jobScoreId", checkStaffMation.jobScoreId); + $("#primaryJobScoreId").html(checkStaffMation.jobScoreName); + }); + }); + + $("body").on("click", "#cancle", function(){ + parent.layer.close(index); + }); +}); \ No newline at end of file diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js new file mode 100644 index 000000000..63967b196 --- /dev/null +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js @@ -0,0 +1,219 @@ +var rowId = ""; + +// 岗位调动申请申请 +layui.config({ + base: basePath, + version: skyeyeVersion +}).extend({ + window: 'js/winui.window' +}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) { + winui.renderColor(); + var $ = layui.$, + form = layui.form, + laydate = layui.laydate, + table = layui.table; + + // 新增 + authBtn('1651308552871'); + + laydate.render({ + elem: '#createTime', + range: '~' + }); + + table.render({ + id: 'messageTable', + elem: '#messageTable', + method: 'post', + url: flowableBasePath + 'queryBossInterviewJobTransferList', + where: getTableParams(), + even: true, + page: true, + limits: getLimits(), + limit: getLimit(), + cols: [[ + { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers'}, + { field: 'transferStaffName', title: '申请人', rowspan: '2', width: 140}, + { title: '原岗位信息', align: 'center', colspan: '4'}, + { title: '申请岗位信息', align: 'center', colspan: '4'}, + { field: 'transferType', title: '调岗类型', rowspan: '2', width: 90, templet: function(d) { + return bossUtil.getTransferTypeNameById(d.transferType); + }}, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function(d){ + return '' + d.processInstanceId + ''; + }}, + { field: 'stateName', title: '状态', rowspan: '2', width: 90, templet: function(d) { + return activitiUtil.showStateName2(d.state, 1); + }}, + { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 140 }, + { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 }, + { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 140 }, + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150}, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 257, toolbar: '#messageTableBar'} + ], + [ + { field: 'primaryCompanyName', title: '企业', align: 'left', width: 150}, + { field: 'primaryDepartmentName', title: '部门', align: 'left', width: 150}, + { field: 'primaryJobName', title: '岗位', align: 'left', width: 150}, + { field: 'primaryJobScoreName', title: '岗位定级', align: 'left', width: 150}, + { field: 'currentCompanyName', title: '企业', align: 'left', width: 150}, + { field: 'currentDepartmentName', title: '部门', align: 'left', width: 150}, + { field: 'currentJobName', title: '岗位', align: 'left', width: 150}, + { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150} + ] + ], + done: function(){ + matchingLanguage(); + } + }); + + table.on('tool(messageTable)', function (obj) { + var data = obj.data; + var layEvent = obj.event; + if (layEvent === 'details') { // 详情 + details(data); + }else if (layEvent === 'edit') { // 编辑 + edit(data); + }else if (layEvent === 'subApproval') { // 提交审批 + subApproval(data); + }else if(layEvent === 'cancellation') { // 作废 + cancellation(data); + }else if(layEvent === 'processDetails') { // 流程详情 + activitiUtil.activitiDetails(data); + }else if(layEvent === 'revoke') { // 撤销申请 + revoke(data); + } + }); + + // 添加 + $("body").on("click", "#addBean", function(){ + _openNewWindows({ + url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html", + title: systemLanguage["com.skyeye.addPageTitle"][languageType], + pageId: "bossInterviewJobTransferAdd", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1,time: 2000}); + loadTable(); + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + }}); + }); + + // 撤销 + function revoke(data){ + layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: flowableBasePath + "revokeBossInterviewJobTransfer", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function(json){ + if(json.returnCode == 0){ + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + }); + } + + // 编辑申请 + function edit(data){ + rowId = data.id; + _openNewWindows({ + url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html", + title: systemLanguage["com.skyeye.editPageTitle"][languageType], + pageId: "bossInterviewJobTransferEdit", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1,time: 2000}); + loadTable(); + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + } + }); + } + + // 提交审批 + function subApproval(data){ + layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) { + layer.close(index); + activitiUtil.startProcess(sysActivitiModel["bossInterviewJobTransfer"]["key"], function (approvalId) { + var params = { + id: data.id, + approvalId: approvalId + }; + AjaxPostUtil.request({url: flowableBasePath + "editBossInterviewJobTransferToSubApproval", params: params, type: 'json', method: "POST", callback: function(json){ + if(json.returnCode == 0){ + winui.window.msg("提交成功", {icon: 1, time: 2000}); + loadTable(); + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + }); + }); + } + + // 作废 + function cancellation(data){ + layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) { + layer.close(index); + AjaxPostUtil.request({url: flowableBasePath + "updateBossInterviewJobTransferToCancellation", params: {id: data.id}, type: 'json', method: "PUT", callback: function(json){ + if(json.returnCode == 0){ + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + loadTable(); + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); + } + }}); + }); + } + + // 详情 + function details(data){ + rowId = data.id; + _openNewWindows({ + url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html", + title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], + pageId: "bossInterviewJobTransferDetails", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + } + }); + } + + form.render(); + form.on('submit(formSearch)', function (data) { + if (winui.verifyForm(data.elem)) { + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); + } + return false; + }); + + // 刷新 + $("body").on("click", "#reloadTable", function(){ + loadTable(); + }); + + function loadTable(){ + table.reload("messageTable", {where: getTableParams()}); + } + + function getTableParams(){ + var startTime = "", endTime = ""; + if(!isNull($("#createTime").val())){ + startTime = $("#createTime").val().split('~')[0].trim() + ' 00:00:00'; + endTime = $("#createTime").val().split('~')[1].trim() + ' 23:59:59'; + } + return { + state: $("#state").val(), + startTime: startTime, + endTime: endTime + }; + } + + exports('bossInterviewJobTransferList', {}); +}); diff --git a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html new file mode 100644 index 000000000..407c7e008 --- /dev/null +++ b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html @@ -0,0 +1,96 @@ + + + + + + + + + +
+
+
+ 基本信息
+
+
+ +
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ +
+
+
    +
    +
    +
      +
      +
      +
        +
        +
        +
          +
          +
          +
          + +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          + +
          +
          + + + +
          +
          +
          +
          + + + + + + \ No newline at end of file diff --git a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html new file mode 100644 index 000000000..4dc347c82 --- /dev/null +++ b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html @@ -0,0 +1,93 @@ + + + + + + + + + +
          +
          + +
          +
          + + + + + + + + + \ No newline at end of file diff --git a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html new file mode 100644 index 000000000..5895d3633 --- /dev/null +++ b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html @@ -0,0 +1,105 @@ + + + + + + + + + +
          +
          + +
          +
          + + + + + + + + + \ No newline at end of file diff --git a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferList.html b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferList.html new file mode 100644 index 000000000..688451a92 --- /dev/null +++ b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferList.html @@ -0,0 +1,74 @@ + + + + + + + + + +
          +
          +
          +
          +
          + +
          + +
          + +
          + +
          + + +
          +
          +
          +
          +
          +
          + + +
          +
          +
          +
          + +
          +
          + + + + + \ No newline at end of file diff --git a/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishAdd.js b/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishAdd.js index d494aba65..5306fbf20 100644 --- a/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishAdd.js +++ b/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishAdd.js @@ -1,7 +1,4 @@ -// 员工信息 -var staffMation = {}; - // 员工奖惩信息 layui.config({ base: basePath, @@ -61,7 +58,7 @@ layui.config({ awardUnit: $("#awardUnit").val(), content: $("#content").val(), desc: $("#desc").val(), - staffId: staffMation.id, + staffId: systemCommonUtil.checkStaffMation.id, enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload') }; AjaxPostUtil.request({url:reqBasePath + "sysstaffrewardpunish002", params: params, type: 'json', callback: function(json){ @@ -78,16 +75,10 @@ layui.config({ // 选择员工 $("body").on("click", "#staffNameSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - $("#staffName").val(staffMation.jobNumber + "_" + staffMation.userName); - } - }}); + systemCommonUtil.userStaffCheckType = false; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + $("#staffName").val(checkStaffMation.jobNumber + "_" + checkStaffMation.userName); + }); }); $("body").on("click", "#cancle", function(){ diff --git a/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishEdit.js b/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishEdit.js index 5b5483f6b..3bb9c5080 100644 --- a/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishEdit.js +++ b/ehr/src/main/resources/template/js/sysStaffRewardPunish/sysStaffRewardPunishEdit.js @@ -1,7 +1,4 @@ -// 员工信息 -var staffMation = {}; - // 员工奖惩信息 layui.config({ base: basePath, @@ -27,7 +24,7 @@ layui.config({ template: $("#beanTemplate").html(), ajaxSendLoadBefore: function(hdb){}, ajaxSendAfter:function(json){ - staffMation = { + systemCommonUtil.checkStaffMation = { id: json.bean.staffId, userName: json.bean.userName }; @@ -77,7 +74,7 @@ layui.config({ awardUnit: $("#awardUnit").val(), content: $("#content").val(), desc: $("#desc").val(), - staffId: staffMation.id, + staffId: systemCommonUtil.checkStaffMation.id, rowId: parent.rowId, enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload') }; @@ -98,16 +95,10 @@ layui.config({ // 选择员工 $("body").on("click", "#staffNameSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - $("#staffName").val(staffMation.jobNumber + "_" + staffMation.userName); - } - }}); + systemCommonUtil.userStaffCheckType = false; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + $("#staffName").val(checkStaffMation.jobNumber + "_" + checkStaffMation.userName); + }); }); $("body").on("click", "#cancle", function(){ diff --git a/shop/src/main/resources/template/js/storeStaff/storeStaffDistribute.js b/shop/src/main/resources/template/js/storeStaff/storeStaffDistribute.js index 20074b844..4e4f7683b 100644 --- a/shop/src/main/resources/template/js/storeStaff/storeStaffDistribute.js +++ b/shop/src/main/resources/template/js/storeStaff/storeStaffDistribute.js @@ -1,10 +1,5 @@ var rowId = ""; -// 已选择的员工信息 -var checkStaffList = []; -// 多选 -var userStaffCheckType = true; - layui.config({ base: basePath, version: skyeyeVersion @@ -121,31 +116,25 @@ layui.config({ winui.window.msg('请先选择门店信息.', {icon: 2, time: 2000}); return false; } - checkStaffList = []; - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - var list = new Array(); - $.each(checkStaffList, function (i, item){ - list.push(item.id); - }); - var params = { - storeId: chooseStoreId, - staffId: JSON.stringify(list) - }; - AjaxPostUtil.request({url: shopBasePath + "storeStaff003", params: params, type: 'json', method: "POST", callback: function(json){ - if(json.returnCode == 0){ - loadStaff(chooseStoreId); - }else{ - winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); - } - }}); + systemCommonUtil.userStaffCheckType = true; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.checkStaffMation = []; // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + var list = new Array(); + $.each(checkStaffMation, function (i, item){ + list.push(item.id); + }); + var params = { + storeId: chooseStoreId, + staffId: JSON.stringify(list) + }; + AjaxPostUtil.request({url: shopBasePath + "storeStaff003", params: params, type: 'json', method: "POST", callback: function(json){ + if(json.returnCode == 0){ + loadStaff(chooseStoreId); + }else{ + winui.window.msg(json.returnMessage, {icon: 2, time: 2000}); } }}); + }); }); exports('storeStaffDistribute', {}); diff --git a/userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffChoose.js b/userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffChoose.js index d715236e3..ec60424c4 100644 --- a/userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffChoose.js +++ b/userauth/src/main/resources/template/js/syseveuserstaff/sysEveUserStaffChoose.js @@ -16,17 +16,17 @@ layui.config({ var selTemplate = getFileContent('tpl/template/select-option.tpl') // 选择类型，默认单选，true:多选，false:单选 - var userStaffCheckType = isNull(parent.userStaffCheckType) ? false : parent.userStaffCheckType; + var userStaffCheckType = isNull(parent.systemCommonUtil.userStaffCheckType) ? false : parent.systemCommonUtil.userStaffCheckType; // 设置提示信息 var s = '员工选择规则：'; if(userStaffCheckType){ s += '1.多选；如没有查到要选择的员工，请检查员工信息是否满足当前规则。'; // 多选保存的员工对象信息 - var checkStaffList = [].concat(parent.checkStaffList); + var checkStaffMation = [].concat(parent.systemCommonUtil.checkStaffMation); // 初始化值 var ids = []; - $.each(checkStaffList, function(i, item){ + $.each(checkStaffMation, function(i, item){ ids.push(item.id); }); tableCheckBoxUtil.setIds({ @@ -121,7 +121,7 @@ layui.config({ form.render(); var chooseIndex = JSON.stringify(dubClick.data('index')); var obj = res.rows[chooseIndex]; - parent.staffMation = obj; + parent.systemCommonUtil.checkStaffMation = obj; parent.refreshCode = '0'; parent.layer.close(index); @@ -197,7 +197,7 @@ layui.config({ } AjaxPostUtil.request({url: reqBasePath + "staff009", params: {ids: selectedData.toString()}, type: 'json', method: "POST", callback: function(json){ if(json.returnCode == 0){ - parent.checkStaffList = [].concat(json.rows); + parent.systemCommonUtil.checkStaffMation = [].concat(json.rows); parent.layer.close(index); parent.refreshCode = '0'; }else{ diff --git a/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js b/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js index e7eb51423..b3bf1a934 100644 --- a/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js +++ b/wages/src/main/resources/template/js/wagesModel/wagesModelAdd.js @@ -6,7 +6,6 @@ var companyList = []; var departmentList = []; // 选择员工，多选 -var userStaffCheckType = true; var checkStaffList = []; // 当前选中的薪资字段 @@ -211,26 +210,18 @@ layui.config({ } }); $("body").on("click", "#userStaffSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - var templateArray = [].concat(checkStaffList); - var tags = $('#userStaff').tagEditor('getTags')[0].tags; - for (i = 0; i < tags.length; i++) { - $('#userStaff').tagEditor('removeTag', tags[i]); - } - checkStaffList = [].concat(templateArray); - $.each(checkStaffList, function(i, item){ - $('#userStaff').tagEditor('addTag', item.name); - }); - } else if (refreshCode == '-9999') { - winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); - } - }}); + systemCommonUtil.userStaffCheckType = true; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.checkStaffMation = [].concat(checkStaffList); // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + var tags = $('#userStaff').tagEditor('getTags')[0].tags; + for (i = 0; i < tags.length; i++) { + $('#userStaff').tagEditor('removeTag', tags[i]); + } + checkStaffList = [].concat(checkStaffMation); + $.each(checkStaffList, function(i, item){ + $('#userStaff').tagEditor('addTag', item.name); + }); + }); }); // 新增行 diff --git a/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js b/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js index b0096b480..ee90110c4 100644 --- a/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js +++ b/wages/src/main/resources/template/js/wagesModel/wagesModelEdit.js @@ -258,26 +258,18 @@ layui.config({ // 选择员工 $("body").on("click", "#userStaffSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - var templateArray = [].concat(checkStaffList); - var tags = $('#userStaff').tagEditor('getTags')[0].tags; - for (i = 0; i < tags.length; i++) { - $('#userStaff').tagEditor('removeTag', tags[i]); - } - checkStaffList = [].concat(templateArray); - $.each(checkStaffList, function(i, item){ - $('#userStaff').tagEditor('addTag', item.name); - }); - } else if (refreshCode == '-9999') { - winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); - } - }}); + systemCommonUtil.userStaffCheckType = true; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.checkStaffMation = [].concat(checkStaffList); // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + var tags = $('#userStaff').tagEditor('getTags')[0].tags; + for (i = 0; i < tags.length; i++) { + $('#userStaff').tagEditor('removeTag', tags[i]); + } + checkStaffList = [].concat(checkStaffMation); + $.each(checkStaffList, function(i, item){ + $('#userStaff').tagEditor('addTag', item.name); + }); + }); }); // 新增行 diff --git a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js index 8c3334931..3a59ffe69 100644 --- a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js +++ b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundAdd.js @@ -6,7 +6,6 @@ var companyList = []; var departmentList = []; // 选择员工，多选 -var userStaffCheckType = true; var checkStaffList = []; // 五险一金设置 @@ -196,26 +195,18 @@ layui.config({ } }); $("body").on("click", "#userStaffSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - var templateArray = [].concat(checkStaffList); - var tags = $('#userStaff').tagEditor('getTags')[0].tags; - for (i = 0; i < tags.length; i++) { - $('#userStaff').tagEditor('removeTag', tags[i]); - } - checkStaffList = [].concat(templateArray); - $.each(checkStaffList, function(i, item){ - $('#userStaff').tagEditor('addTag', item.name); - }); - } else if (refreshCode == '-9999') { - winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); - } - }}); + systemCommonUtil.userStaffCheckType = true; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.checkStaffMation = [].concat(checkStaffList); // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + var tags = $('#userStaff').tagEditor('getTags')[0].tags; + for (i = 0; i < tags.length; i++) { + $('#userStaff').tagEditor('removeTag', tags[i]); + } + checkStaffList = [].concat(checkStaffMation); + $.each(checkStaffList, function(i, item){ + $('#userStaff').tagEditor('addTag', item.name); + }); + }); }); // 五险金额变化 diff --git a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js index fda182fa0..608abe79c 100644 --- a/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js +++ b/wages/src/main/resources/template/js/wagesSocialSecurityFund/wagesSocialSecurityFundEdit.js @@ -6,7 +6,6 @@ var companyList = []; var departmentList = []; // 选择员工，多选 -var userStaffCheckType = true; var checkStaffList = []; // 五险一金设置 @@ -233,26 +232,18 @@ layui.config({ // 选择员工 $("body").on("click", "#userStaffSel", function(){ - _openNewWindows({ - url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", - title: "选择员工", - pageId: "sysEveUserStaffChoose", - area: ['90vw', '90vh'], - callBack: function(refreshCode){ - if (refreshCode == '0') { - var templateArray = [].concat(checkStaffList); - var tags = $('#userStaff').tagEditor('getTags')[0].tags; - for (i = 0; i < tags.length; i++) { - $('#userStaff').tagEditor('removeTag', tags[i]); - } - checkStaffList = [].concat(templateArray); - $.each(checkStaffList, function(i, item){ - $('#userStaff').tagEditor('addTag', item.name); - }); - } else if (refreshCode == '-9999') { - winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); - } - }}); + systemCommonUtil.userStaffCheckType = true; // 选择类型，默认单选，true:多选，false:单选 + systemCommonUtil.checkStaffMation = [].concat(checkStaffList); // 选择时返回的对象 + systemCommonUtil.openSysAllUserStaffChoosePage(function (checkStaffMation){ + var tags = $('#userStaff').tagEditor('getTags')[0].tags; + for (i = 0; i < tags.length; i++) { + $('#userStaff').tagEditor('removeTag', tags[i]); + } + checkStaffList = [].concat(checkStaffMation); + $.each(checkStaffList, function(i, item){ + $('#userStaff').tagEditor('addTag', item.name); + }); + }); }); // 五险金额变化 diff --git a/web/src/main/resources/template/assets/lib/layui/custom.js b/web/src/main/resources/template/assets/lib/layui/custom.js index fc03cf956..ce72223b2 100644 --- a/web/src/main/resources/template/assets/lib/layui/custom.js +++ b/web/src/main/resources/template/assets/lib/layui/custom.js @@ -29,6 +29,7 @@ var customerJS = { "proUtil": "../../assets/lib/layui/customer/proUtil.js", // 项目管理模块相关工具 "adminAssistantUtil": "../../assets/lib/layui/customer/adminAssistantUtil.js", // 行政管理模块相关工具 "codeDocUtil": "../../assets/lib/layui/customer/codeDocUtil.js", // 代码生成器相关工具类 + "organizationUtil": "../../assets/lib/layui/customer/organizationUtil.js", // 组织机构相关工具类 }; //系统基础信息 diff --git a/web/src/main/resources/template/assets/lib/layui/customer/bossUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/bossUtil.js index 09e581383..e32b50715 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/bossUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/bossUtil.js @@ -148,6 +148,24 @@ var bossUtil = { getLeaveTypeNameById: function (id){ var list = bossUtil.getLeaveTypeList(); return getInPoingArr(list, "id", id, "name"); + }, + + // 调岗类型 + transferTypeList: { + "flatTone": {"id": 1, "name": "平调"}, + "promotion": {"id": 2, "name": "晋升"}, + "demotion": {"id": 3, "name": "降职"}, + }, + getTransferTypeList: function () { + var list = []; + $.each(bossUtil.transferTypeList, function (key, value) { + list.push(value); + }); + return list; + }, + getTransferTypeNameById: function (id){ + var list = bossUtil.getTransferTypeList(); + return getInPoingArr(list, "id", id, "name"); } }; \ No newline at end of file diff --git a/web/src/main/resources/template/assets/lib/layui/customer/organizationUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/organizationUtil.js new file mode 100644 index 000000000..ad17180d2 --- /dev/null +++ b/web/src/main/resources/template/assets/lib/layui/customer/organizationUtil.js @@ -0,0 +1,188 @@ + +// 组织机构工具类 +var organizationUtil = { + + // 企业树 + companyTree: null, + // 部门树 + departmentTree: null, + // 岗位树 + jobTree: null, + // 岗位定级树 + jobScoreTree: null, + + // 初始化新增页面的组织机构 + initAddOrganization: function (dtree) { + // 初始化公司 + organizationUtil.companyTree = dtree.render({ + elem: "#demoTree1", + url: reqBasePath + 'queryCompanyMationListTree', + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree1 li").length > 0){ + $("#demoTree1 li").eq(0).children('div').click(); + } + } + }); + + dtree.on("node('demoTree1')" ,function(param) { + var choose = dtree.getNowParam(organizationUtil.companyTree); + // 初始化部门 + organizationUtil.departmentTree = dtree.render({ + elem: "#demoTree2", + url: reqBasePath + 'companydepartment006?companyId=' + choose.nodeId, + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree2 li").length > 0){ + $("#demoTree2 li").eq(0).children('div').click(); + } + } + }); + }); + + dtree.on("node('demoTree2')" ,function(param){ + var choose = dtree.getNowParam(organizationUtil.departmentTree); + // 初始化职位 + organizationUtil.jobTree = dtree.render({ + elem: "#demoTree3", + url: reqBasePath + 'companyjob006?departmentId=' + choose.nodeId, + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree3 li").length > 0){ + $("#demoTree3 li").eq(0).children('div').click(); + } + } + }); + }); + + dtree.on("node('demoTree3')" ,function(param){ + var choose = dtree.getNowParam(organizationUtil.jobTree); + // 初始化职位定级 + organizationUtil.jobScoreTree = dtree.render({ + elem: "#demoTree4", + url: reqBasePath + 'companyjobscore008?jobId=' + choose.nodeId, + dataStyle: 'layuiStyle', + method: 'GET', + done: function(){ + if($("#demoTree4 li").length > 0){ + $("#demoTree4 li").eq(0).children('div').click(); + } + } + }); + }); + }, + + // 初始化编辑页面的组织机构 + initEditOrganization: function (dtree, mation) { + // 初始化公司 + organizationUtil.companyTree = dtree.render({ + elem: "#demoTree1", + url: reqBasePath + 'queryCompanyMationListTree', + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree1 li").length > 0){ + for(var i = 0; i < $("#demoTree1 li").length; i++){ + if($("#demoTree1 li").eq(i).attr("data-id") == mation.companyId){ + $("#demoTree1 li").eq(i).children('div').click(); + return; + } + } + } + } + }); + + dtree.on("node('demoTree1')" ,function(param) { + var choose = dtree.getNowParam(organizationUtil.companyTree); + // 初始化部门 + organizationUtil.departmentTree = dtree.render({ + elem: "#demoTree2", + url: reqBasePath + 'companydepartment006?companyId=' + choose.nodeId, + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree2 li").length > 0){ + for(var i = 0; i < $("#demoTree2 li").length; i++){ + if($("#demoTree2 li").eq(i).attr("data-id") == mation.departmentId){ + $("#demoTree2 li").eq(i).children('div').click(); + return; + } + } + } + } + }); + }); + + dtree.on("node('demoTree2')" ,function(param){ + var choose = dtree.getNowParam(organizationUtil.departmentTree); + // 初始化职位 + organizationUtil.jobTree = dtree.render({ + elem: "#demoTree3", + url: reqBasePath + 'companyjob006?departmentId=' + choose.nodeId, + dataStyle: 'layuiStyle', + done: function(){ + if($("#demoTree3 li").length > 0){ + for(var i = 0; i < $("#demoTree3 li").length; i++){ + if($("#demoTree3 li").eq(i).attr("data-id") == mation.jobId){ + $("#demoTree3 li").eq(i).children('div').click(); + return; + } + } + } + } + }); + }); + + dtree.on("node('demoTree3')" ,function(param){ + var choose = dtree.getNowParam(organizationUtil.jobTree); + // 初始化职位定级 + organizationUtil.jobScoreTree = dtree.render({ + elem: "#demoTree4", + url: reqBasePath + 'companyjobscore008?jobId=' + choose.nodeId, + dataStyle: 'layuiStyle', + method: 'GET', + done: function(){ + if($("#demoTree4 li").length > 0){ + for(var i = 0; i < $("#demoTree4 li").length; i++){ + if($("#demoTree4 li").eq(i).attr("data-id") == mation.jobScoreId){ + $("#demoTree4 li").eq(i).children('div').click(); + return; + } + } + } + } + }); + }); + }, + + /** + * 获取企业信息 + */ + getCompanyMation: function (dtree) { + return organizationUtil.judgeNullRetuenObject(dtree.getNowParam(organizationUtil.companyTree)); + }, + + /** + * 获取部门信息 + */ + getDepartmentMation: function (dtree) { + return organizationUtil.judgeNullRetuenObject(dtree.getNowParam(organizationUtil.departmentTree)); + }, + + /** + * 获取岗位信息 + */ + getJobMation: function (dtree) { + return organizationUtil.judgeNullRetuenObject(dtree.getNowParam(organizationUtil.jobTree)); + }, + + /** + * 获取岗位定级信息 + */ + getJobScoreMation: function (dtree) { + return organizationUtil.judgeNullRetuenObject(dtree.getNowParam(organizationUtil.jobScoreTree)); + }, + + judgeNullRetuenObject: function (object) { + return isNull(object) ? {} : object; + } + +} diff --git a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js index 0fc99386b..25d1cf448 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js @@ -232,6 +232,30 @@ var systemCommonUtil = { }}); }, + /** + * 员工选择页面(所有员工) + * + * @param callback 回调函数 + */ + userStaffCheckType: false, // 选择类型，默认单选，true:多选，false:单选 + checkStaffMation: [], // 选择时返回的对象 + openSysAllUserStaffChoosePage: function (callback){ + _openNewWindows({ + url: "../../tpl/syseveuserstaff/sysEveUserStaffChoose.html", + title: "员工选择", + pageId: "sysuserselpage", + area: ['90vw', '90vh'], + callBack: function(refreshCode){ + if (refreshCode == '0') { + if(typeof(callback) == "function") { + callback(systemCommonUtil.checkStaffMation); + } + } else if (refreshCode == '-9999') { + winui.window.msg(systemLanguage["com.skyeye.operationFailed"][languageType], {icon: 2,time: 2000}); + } + }}); + }, + /** * 系统资源图标选择页面 * diff --git a/web/src/main/resources/template/json/activitiNameKey.json b/web/src/main/resources/template/json/activitiNameKey.json index cb26f0ab5..63291feae 100644 --- a/web/src/main/resources/template/json/activitiNameKey.json +++ b/web/src/main/resources/template/json/activitiNameKey.json @@ -36,5 +36,6 @@ "bossPersonRequire": {"name": "人员需求申请", "key": "../../tpl/bossPersonRequire/bossPersonRequireAdd.html", "complate": true}, "bossInterviewRegularWorker": {"name": "转正申请", "key": "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.html", "complate": true}, - "bossInterviewQuit": {"name": "离职申请", "key": "../../tpl/bossInterviewQuit/bossInterviewQuitAdd.html", "complate": true} + "bossInterviewQuit": {"name": "离职申请", "key": "../../tpl/bossInterviewQuit/bossInterviewQuitAdd.html", "complate": true}, + "bossInterviewJobTransfer": {"name": "岗位调动申请", "key": "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html", "complate": true} } \ No newline at end of file -- GitLab