diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js index 81687b9612c1f77f2a0571511689993b23d712dd..77bfcbc8cdffd6d0a80f626cad44810e188e6af5 100644 --- a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js +++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js @@ -27,20 +27,31 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'interviewName', title: '面试者', width: 100}, - { field: 'departmentName', title: '面试部门', width: 140}, - { field: 'jobName', title: '面试岗位', width: 150 }, + { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) { + return '' + d.oddNumber + ''; + }}, + { field: 'interviewMation', title: '面试者', width: 100, templet: function (d) { + return d.interviewMation.name; + }}, + { field: 'recruitDepartmentMation', title: '面试部门', width: 140, templet: function (d) { + return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitDepartmentMation.name; + }}, + { field: 'recruitJobMation', title: '面试岗位', width: 150, templet: function (d) { + return isNull(d.personRequireMation) ? '' : d.personRequireMation.recruitJobMation.name; + }}, { field: 'interviewTime', title: '面试时间', width: 140, align: 'center' }, - { field: 'interviewer', title: '面试官', width: 120 }, + { field: 'interviewer', title: '面试官', width: 120, templet: function (d) { + return isNull(d.interviewerMation) ? '' : d.interviewerMation.name; + }}, { field: 'state', title: '面试状态', width: 160, templet: function (d) { - return bossUtil.showStateName(d.state); + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name'); }}, { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], align: 'center', width: 150 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 257, toolbar: '#messageTableBar'} + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#messageTableBar'} ]], done: function(json) { matchingLanguage(); - initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入面试者", function () { + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () { table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); }); } @@ -53,8 +64,6 @@ layui.config({ details(data); } else if (layEvent === 'edit') { // 编辑 edit(data); - } else if (layEvent === 'sub') { // 提交 - sub(data); } else if (layEvent === 'cancellation') { // 作废 cancellation(data); } else if (layEvent === 'inductionResult') { // 入职 @@ -77,9 +86,8 @@ layui.config({ // 编辑 function edit(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/bossInterviewArrangement/bossInterviewArrangementEdit.html", + url: systemCommonUtil.getUrl('FP2023060400003&id=' + data.id, null), title: systemLanguage["com.skyeye.editPageTitle"][languageType], pageId: "bossInterviewArrangementEdit", area: ['90vw', '90vh'], @@ -105,20 +113,6 @@ layui.config({ }); } - // 提交 - function sub(data) { - layer.confirm('确认提交该数据吗？', {icon: 3, title: '提交操作'}, function (index) { - layer.close(index); - var params = { - id: data.id, - }; - AjaxPostUtil.request({url: flowableBasePath + "submitBossInterviewArrangement", params: params, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("提交成功", {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - // 作废 function cancellation(data) { layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) { @@ -132,9 +126,8 @@ layui.config({ // 详情 function details(data) { - rowId = data.id; _openNewWindows({ - url: "../../tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html", + url: systemCommonUtil.getUrl('FP2023060400004&id=' + data.id, null), title: systemLanguage["com.skyeye.detailsPageTitle"][languageType], pageId: "bossInterviewArrangementDetails", area: ['90vw', '90vh'], diff --git a/boss/src/main/resources/template/js/bossInterviewee/myChargeBossIntervieweeListChoose.js b/boss/src/main/resources/template/js/bossInterviewee/myChargeBossIntervieweeListChoose.js deleted file mode 100644 index d2f43941d2d4562e471cb257657df7ac0c13764c..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/js/bossInterviewee/myChargeBossIntervieweeListChoose.js +++ /dev/null @@ -1,111 +0,0 @@ - -var rowId = ""; -layui.config({ - base: basePath, - version: skyeyeVersion -}).extend({ - window: 'js/winui.window' -}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) { - winui.renderColor(); - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$, - form = layui.form, - table = layui.table; - - table.render({ - id: 'messageTable', - elem: '#messageTable', - method: 'post', - url: flowableBasePath + 'bossInterviewee001', - where: getTableParams(), - even: true, - page: true, - limits: getLimits(), - limit: getLimit(), - cols: [[ - { type: 'radio'}, - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'name', title: '姓名', align: 'left', width: 100, templet: function (d) { - return '' + d.name + ''; - }}, - { field: 'phone', title: '联系方式', align: 'left', width: 120 }, - { field: 'fromName', title: '来源', align: 'left', width: 120 }, - { field: 'workYears', title: '工作年限', align: 'left', width: 100 }, - { field: 'favoriteJob', title: '心仪岗位', align: 'left', width: 130 }, - { field: 'stateName', title: '状态', align: 'left', width: 80 }, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 }, - { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 }, - { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150} - ]], - done: function(res){ - matchingLanguage(); - $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){ - var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); - dubClick.find("input[type='radio']").prop("checked", true); - form.render(); - var chooseIndex = JSON.stringify(dubClick.data('index')); - var obj = res.rows[chooseIndex]; - parent.bossUtil.bossIntervieweeChooseMation = obj; - - parent.refreshCode = '0'; - parent.layer.close(index); - }); - - $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){ - var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); - click.find("input[type='radio']").prop("checked", true); - form.render(); - }) - } - }); - - table.on('tool(messageTable)', function (obj) { - var data = obj.data; - var layEvent = obj.event; - if (layEvent === 'edit') { //编辑 - edit(data); - } - }); - - // 详情 - function details(data) { - rowId = data.id; - _openNewWindows({ - url: "../../tpl/bossInterviewee/bossIntervieweeDetails.html", - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "bossIntervieweeDetails", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - } - }); - } - - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - return false; - }); - - // 刷新数据 - $("body").on("click", "#reloadTable", function() { - loadTable(); - }); - - function loadTable() { - table.reloadData("messageTable", {where: getTableParams()}); - } - - function getTableParams() { - return { - name: $("#name").val(), - phone: $("#phone").val(), - type: 2, - state: '0,1' - }; - } - - exports('myChargeBossIntervieweeListChoose', {}); -}); diff --git a/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementList.html b/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementList.html index 95b5db853c1e656a5f7130e87320bc30f54b5e19..7853d55b524d28e9a7ca8e50e84fe9ca19f99525 100644 --- a/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementList.html +++ b/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementList.html @@ -16,19 +16,17 @@
diff --git a/boss/src/main/resources/template/tpl/bossInterviewee/myChargeBossIntervieweeListChoose.html b/boss/src/main/resources/template/tpl/bossInterviewee/myChargeBossIntervieweeListChoose.html deleted file mode 100644 index 70be81ec21227460738ce3bdffdbc636412fde19..0000000000000000000000000000000000000000 --- a/boss/src/main/resources/template/tpl/bossInterviewee/myChargeBossIntervieweeListChoose.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - -
-
- 面试者选择规则：1.该列表仅加载当前登录用户负责的未面试/面试中的人员 2.双击指定行即可选中 -
-
-
-
- -
- -
- -
- -
- - -
-
-
-
-
-
- -
-
-
-
-
- - - - - \ 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 c897ff37da7b3ab52e9f3743e0e504ced3b5afba..f0f71fe9e18a0e7e9d1e07bbb08740f11869608e 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 @@ -66,16 +66,15 @@ var bossUtil = { * * @param callback 回调函数 */ - bossIntervieweeChooseMation: {}, // 已经选择的面试者信息 openBossIntervieweeChoosePage: function (callback) { _openNewWindows({ - url: "../../tpl/bossInterviewee/myChargeBossIntervieweeListChoose.html", + url: systemCommonUtil.getUrl('FP2023061200001', null), title: "面试者", pageId: "myChargeBossIntervieweeListChoose", area: ['90vw', '90vh'], callBack: function (refreshCode) { if(typeof(callback) == "function") { - callback(bossUtil.bossIntervieweeChooseMation); + callback(chooseItemMation); } }}); }, 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 406c248ee2c98bf06625511b8ccad19366536af8..3566caaefb2a184d4a1736b957ac3ab88d7eaba4 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 @@ -287,7 +287,8 @@ var dsFormUtil = { saveData: function (formSubType, approvalId) { var params = {}; $.each(dsFormUtil.pageMation.dsFormPageContents, function (i, content) { - if (!isNull(content.attrDefinition) && !$.isEmptyObject(content.attrDefinition) && content.isEdit == 1) { + if (!isNull(content.attrDefinition) && !$.isEmptyObject(content.attrDefinition) + && (content.isEdit == 1 || (isNull(content.isEdit) && content.isEdit + '' != '0'))) { // 获取组件中获取值的脚本 var dsFormComponent = content.dsFormComponent; var getValueScript = getDataUseHandlebars('{{#this}}' + dsFormComponent.jsValue + '{{/this}}', content); @@ -790,6 +791,7 @@ var dsFormTableUtil = { initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, pageMation.searchTips, function () { table.reloadData(id, {page: {curr: 1}, where: dsFormTableUtil.getTableParams()}); }); + dsFormTableUtil.initChooseHtml(id, pageMation.whetherChoose, json, tableCheckBoxUtil, form); } }); table.on(`tool(${id})`, function (obj) { @@ -804,20 +806,21 @@ var dsFormTableUtil = { }); }, - initChooseHtml: function (id, whetherChoose, json, tableCheckBoxUtil) { + initChooseHtml: function (id, whetherChoose, json, tableCheckBoxUtil, form) { if (whetherChoose == 'radio') { - $(`#${id}`).next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){ + $(`#${id}`).next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function() { var dubClick = $(`#${id}`).next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); dubClick.find("input[type='radio']").prop("checked", true); form.render(); var chooseIndex = JSON.stringify(dubClick.data('index')); - var obj = res.rows[chooseIndex]; + var obj = json.rows[chooseIndex]; parent.chooseItemMation = obj; parent.refreshCode = '0'; + var index = parent.layer.getFrameIndex(window.name); parent.layer.close(index); }); - $(`#${id}`).next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){ + $(`#${id}`).next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function() { var click = $(`#${id}`).next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover"); click.find("input[type='radio']").prop("checked", true); form.render(); @@ -841,6 +844,7 @@ var dsFormTableUtil = { return false; } parent.chooseListMation = [].concat(selectedData); + var index = parent.layer.getFrameIndex(window.name); parent.layer.close(index); parent.refreshCode = '0'; }); @@ -889,7 +893,8 @@ var dsFormTableUtil = { var header = []; if (column.whetherChoose == 'radio' || column.whetherChoose == 'checkbox') { header.push({ - type: column.whetherChoose + type: column.whetherChoose, + fixed: 'left' }); } if (!isNull(column.serialNumColumn) && column.serialNumColumn) {