diff --git a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js deleted file mode 100644 index f1f2fe5a247becaba6c4f7b6adca0561ab9ba106..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferAdd.js +++ /dev/null @@ -1,111 +0,0 @@ -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 serviceClassName = sysServiceMation["bossInterviewJobTransfer"]["key"]; - var selOption = getFileContent('tpl/template/select-option.tpl'); - - // 调岗类型 - $("#transferType").html(getDataUseHandlebars(selOption, {rows: bossUtil.getTransferTypeList()})); - - textool.init({eleId: 'remark', maxlength: 200}); - - // 加载组织结构 - 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(serviceClassName, 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) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - // 人员选择 - $("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 deleted file mode 100644 index 04a21c52a49fba5f7ca8bd13b8cdbb4fe6bd7f50..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferDetails.js +++ /dev/null @@ -1,31 +0,0 @@ -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(); - } - }); - - }); -}); \ 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 deleted file mode 100644 index 7781daa352fa6b29c5878518bb2c1d440edb2e9d..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferEdit.js +++ /dev/null @@ -1,146 +0,0 @@ -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 serviceClassName = sysServiceMation["bossInterviewJobTransfer"]["key"]; - 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}); - - 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(serviceClassName, 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) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - - // 人员选择 - $("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 index 48da5a13c98fe15c56b5bae90044b7f7e5061651..a1ac3b6b2dc4dacdfc4a19f7b1119c01aaa83588 100644 --- a/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js +++ b/boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js @@ -1,4 +1,3 @@ -var rowId = ""; // 岗位调动申请申请 layui.config({ @@ -49,7 +48,7 @@ layui.config({ { 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'} + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 257, toolbar: '#messageTableBar' } ], [ { field: 'primaryCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) { @@ -107,7 +106,7 @@ layui.config({ // 添加 $("body").on("click", "#addBean", function() { _openNewWindows({ - url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html", + url: systemCommonUtil.getUrl('FP2023061400001', null), title: systemLanguage["com.skyeye.addPageTitle"][languageType], pageId: "bossInterviewJobTransferAdd", area: ['90vw', '90vh'], @@ -130,9 +129,8 @@ layui.config({ // 编辑申请 function edit(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html", + url: systemCommonUtil.getUrl('FP2023061400002&id=' + data.id, null), title: systemLanguage["com.skyeye.editPageTitle"][languageType], pageId: "bossInterviewJobTransferEdit", area: ['90vw', '90vh'], @@ -147,7 +145,7 @@ layui.config({ 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(serviceClassName, function (approvalId) { + activitiUtil.startProcess(serviceClassName, null, function (approvalId) { var params = { id: data.id, approvalId: approvalId @@ -173,9 +171,8 @@ layui.config({ // 详情 function details(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html", + url: systemCommonUtil.getUrl('FP2023061400003&id=' + data.id, null), title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], pageId: "bossInterviewJobTransferDetails", area: ['90vw', '90vh'], diff --git a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html b/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html deleted file mode 100644 index 3b9fcbe5464b6bc8f967c81efebf92dd423e7c61..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferAdd.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - -
-
-
- 基本信息
-
-
- -
- - -
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
-
- -
- -
-
-
    -
    -
    -
      -
      -
      -
        -
        -
        -
          -
          -
          -
          - -
          - -
          - -
          -
          -
          - -
          - -
          -
          -
          - -
          - -
          -
          - -
          -
          - - - -
          -
          -
          -
          - - - - - - \ 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 deleted file mode 100644 index 4dc347c82a34b3a34a004ccb81c6afc54a1e8dae..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferDetails.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - -
          -
          - -
          -
          - - - - - - - - - \ 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 deleted file mode 100644 index 5895d3633d90d57a5f799ea4c7da5484043afd32..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferEdit.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - -
          -
          - -
          -
          - - - - - - - - - \ No newline at end of file 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 1e15b3a0ad097446879b412b44e6982c6ef5d22d..771af5ecfcd8981b13a7e5a535c2f0b73e38f369 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 @@ -57,24 +57,6 @@ 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/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js index 8d5af18209f6ba80d60273bf9f45f579794712fa..e177ec626a8877cf0e16fd4a10a769937449588a 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js @@ -160,7 +160,8 @@ var dsFormUtil = { value = data; } var showType = dsFormUtil.getShowType(content.attrDefinition); - if (showType == 8 && dsFormComponent.numCode == 'userStaffChoose') { + if (showType == 8 && + (dsFormComponent.numCode == 'userStaffChoose' || dsFormComponent.numCode == 'staffChoose')) { var key = attrDefinition.attrKey; // 例如：将key由relationUserId变为relationUserMation key = dsFormUtil.getKeyIdToMation(key); @@ -421,7 +422,7 @@ var dsFormUtil = { } // 加载html var str = ''; - if (component.numCode == 'userStaffChoose') { + if (component.numCode == 'userStaffChoose' || component.numCode == 'staffChoose') { str = getDataUseHandlebars(dsFormUtil.showType['8-1'], {bean: content}); } else { str = getDataUseHandlebars(dsFormUtil.showType[showType], {bean: content});