From ba7047825ba0fbc589450d26c1c18b9ff62f5005 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 26 Nov 2022 13:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=81=8C=E4=BD=8D=E7=BA=A7?= =?UTF-8?q?=E5=88=AB=E6=95=B4=E6=94=B9=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/companyJob/companyJobList.js | 2 +- .../js/companyJobScore/companyJobScoreAdd.js | 91 +++----- .../companyJobScore/companyJobScoreDetail.js | 66 ++---- .../js/companyJobScore/companyJobScoreEdit.js | 199 ++++++++---------- .../js/companyJobScore/companyJobScoreList.js | 74 ++----- .../tpl/companyJob/companyJobList.html | 2 +- .../companyJobScore/companyJobScoreAdd.html | 49 +---- .../companyJobScoreDetail.html | 28 ++- .../companyJobScore/companyJobScoreEdit.html | 51 +---- .../companyJobScore/companyJobScoreList.html | 34 +-- .../js/wagesFieldType/wagesFieldTypeAdd.js | 57 ++--- .../js/wagesFieldType/wagesFieldTypeChoose.js | 176 +++++++--------- .../js/wagesFieldType/wagesFieldTypeEdit.js | 82 ++++---- .../js/wagesFieldType/wagesFieldTypeList.js | 78 ++----- .../wagesFieldType/wagesSysFieldTypeList.js | 5 +- .../tpl/wagesFieldType/wagesFieldTypeAdd.html | 13 +- .../wagesFieldType/wagesFieldTypeChoose.html | 38 +--- .../wagesFieldType/wagesFieldTypeEdit.html | 15 +- .../wagesFieldType/wagesFieldTypeList.html | 45 +--- .../wagesStaffMationDesign.html | 4 +- 20 files changed, 383 insertions(+), 726 deletions(-) diff --git a/organization/src/main/resources/template/js/companyJob/companyJobList.js b/organization/src/main/resources/template/js/companyJob/companyJobList.js index 2570ed84b..4fbf3fc53 100644 --- a/organization/src/main/resources/template/js/companyJob/companyJobList.js +++ b/organization/src/main/resources/template/js/companyJob/companyJobList.js @@ -32,7 +32,7 @@ layui.config({ { 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 }, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, toolbar: '#tableBar' } + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' } ]], isPage: false, done: function(json) { diff --git a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreAdd.js b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreAdd.js index fea8fff3b..7753f8973 100644 --- a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreAdd.js +++ b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreAdd.js @@ -9,35 +9,29 @@ layui.config({ layui.use(['form'], function (form) { var index = parent.layer.getFrameIndex(window.name); var $ = layui.$; - var rowNum = 1; //表格的序号 - var usetableTemplate = $("#usetableTemplate").html(); - + + skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", '', form); + initTable(); matchingLanguage(); form.render(); form.on('submit(formAddBean)', function (data) { if (winui.verifyForm(data.elem)) { - // 获取已选字段数据 - var rowTr = $("#useTable tr"); - var tableData = new Array(); - $.each(rowTr, function(i, item) { - // 获取行编号 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - var row = { - fieldKey: $("#fieldId" + rowNum).attr("rowKey"), - minMoney: $("#minMoney" + rowNum).val(), - maxMoney: $("#maxMoney" + rowNum).val(), - sortNo: (i + 1), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); + var result = initTableChooseUtil.getDataList('fieldList'); + if (!result.checkResult) { + return false; + } + var tableData = [].concat(result.dataList); + $.each(tableData, function(i, item) { + var thisRowKey = item["trcusid"].replace("tr", ""); + item['fieldKey'] = $("#fieldId" + thisRowKey).attr('rowKey'); }); var params = { - nameCn: $("#nameCn").val(), - nameEn: $("#nameEn").val(), + name: $("#name").val(), jobId: parent.jobId, - fieldStr: JSON.stringify(tableData) + enabled: $("#enabled input:radio:checked").val(), + scoreFields: JSON.stringify(tableData) }; - AjaxPostUtil.request({url: reqBasePath + "companyjobscore002", params: params, type: 'json', callback: function (json) { + AjaxPostUtil.request({url: reqBasePath + "writeCompanyJobScoreMation", params: params, type: 'json', method: 'POST', callback: function (json) { parent.layer.close(index); parent.refreshCode = '0'; }}); @@ -45,42 +39,21 @@ layui.config({ return false; }); - // 新增行 - $("body").on("click", "#addRow", function() { - addRow(); - }); - - // 删除行 - $("body").on("click", "#deleteRow", function() { - deleteRow(); - }); - - // 新增行 - function addRow() { - var par = { - id: "row" + rowNum.toString(), //checkbox的id - trId: "tr" + rowNum.toString(), //行的id - fieldId: "fieldId" + rowNum.toString(), //字段id - minMoney: "minMoney" + rowNum.toString(), //最小薪资范围id - maxMoney: "maxMoney" + rowNum.toString(), //最大薪资范围id - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - form.render('select'); - form.render('checkbox'); - rowNum++; - } - - // 删除行 - function deleteRow() { - var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked"); - if(checkRow.length > 0) { - $.each(checkRow, function(i, item) { - $(item).parent().parent().remove(); - }); - } else { - winui.window.msg('请选择要删除的行', {icon: 2, time: 2000}); - } + function initTable() { + initTableChooseUtil.initTable({ + id: "fieldList", + cols: [ + {id: 'fieldId', title: '字段', formType: 'chooseInput', width: '120', iconClassName: 'chooseFieldBtn', verify: 'required'}, + {id: 'minMoney', title: '最小薪资范围', formType: 'input', width: '100', verify: 'required|money', value: '0'}, + {id: 'maxMoney', title: '最大薪资范围', formType: 'input', width: '100', verify: 'required|money', value: '0'}, + {id: 'remark', title: '备注', formType: 'input', width: '100'} + ], + deleteRowCallback: function (trcusid) { + }, + addRowCallback: function (trcusid) { + }, + form: form + }); } // 字段选择 @@ -89,13 +62,13 @@ layui.config({ _openNewWindows({ url: "../../tpl/wagesFieldType/wagesFieldTypeChoose.html", title: "选择薪资字段", - pageId: "productlist", + pageId: "wagesFieldTypeChoose", area: ['90vw', '90vh'], callBack: function (refreshCode) { // 获取表格行号 var thisRowNum = trId.replace("tr", ""); // 表格名称赋值 - $("#fieldId" + thisRowNum.toString()).val(fieldMation.nameCn + '(' + fieldMation.key + ')'); + $("#fieldId" + thisRowNum.toString()).val(fieldMation.name + '(' + fieldMation.key + ')'); $("#fieldId" + thisRowNum.toString()).attr("rowKey", fieldMation.key); }}); }); diff --git a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreDetail.js b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreDetail.js index 895af767c..fb2c7281b 100644 --- a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreDetail.js +++ b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreDetail.js @@ -4,57 +4,29 @@ layui.config({ version: skyeyeVersion }).extend({ window: 'js/winui.window' -}).define(['window', 'jquery', 'winui'], function (exports) { +}).define(['window', 'jquery', 'winui', 'form'], function (exports) { winui.renderColor(); - layui.use(['form'], function (form) { var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - var rowNum = 1; //表格的序号 - var usetableTemplate = $("#usetableTemplate").html(); - - showGrid({ - id: "showForm", - url: reqBasePath + "companyjobscore009", - params: {rowId: parent.rowId}, - pagination: false, - method: "GET", - template: $("#showBaseTemplate").html(), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { + var $ = layui.$, + form = layui.form; - // 加载列表项 - $.each(json.bean.modelField, function(i, item) { - addRow(); - $("#fieldId" + (rowNum - 1)).html(item.nameCn + '(' + item.key + ')'); - $("#minMoney" + (rowNum - 1)).html(item.minMoney); - $("#maxMoney" + (rowNum - 1)).html(item.maxMoney); - $("#remark" + (rowNum - 1)).html(item.remark); - }); - - matchingLanguage(); - form.render(); - } - }); - - // 新增行 - function addRow() { - var par = { - id: "row" + rowNum.toString(), //checkbox的id - trId: "tr" + rowNum.toString(), //行的id - fieldId: "fieldId" + rowNum.toString(), //字段id - minMoney: "minMoney" + rowNum.toString(), //最小薪资范围id - maxMoney: "maxMoney" + rowNum.toString(), //最大薪资范围id - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - form.render('select'); - form.render('checkbox'); - rowNum++; + showGrid({ + id: "showForm", + url: reqBasePath + "companyjobscore003", + params: {id: parent.rowId}, + pagination: false, + method: "GET", + template: $("#showBaseTemplate").html(), + ajaxSendLoadBefore: function(hdb, json) { + json.bean.enabled = skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', json.bean.enabled, 'name'); + }, + ajaxSendAfter:function (json) { + matchingLanguage(); + form.render(); } + }); - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); + $("body").on("click", "#cancle", function() { + parent.layer.close(index); }); }); \ No newline at end of file diff --git a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreEdit.js b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreEdit.js index 20ce1c327..655faa240 100644 --- a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreEdit.js +++ b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreEdit.js @@ -6,126 +6,97 @@ layui.config({ window: 'js/winui.window' }).define(['window', 'jquery', 'winui'], function (exports) { winui.renderColor(); - layui.use(['form'], function (form) { - var index = parent.layer.getFrameIndex(window.name); - var $ = layui.$; - var rowNum = 1; //表格的序号 - var usetableTemplate = $("#usetableTemplate").html(); - - showGrid({ - id: "showForm", - url: reqBasePath + "companyjobscore003", - params: {rowId: parent.rowId}, - pagination: false, - method: "GET", - template: $("#showBaseTemplate").html(), - ajaxSendLoadBefore: function(hdb) { - }, - ajaxSendAfter:function (json) { + var index = parent.layer.getFrameIndex(window.name); + var $ = layui.$, + form = layui.form; - // 加载列表项 - $.each(json.bean.modelField, function(i, item) { - addRow(); - $("#fieldId" + (rowNum - 1)).val(item.nameCn + '(' + item.key + ')'); - $("#fieldId" + (rowNum - 1)).attr("rowKey", item.fieldKey); - $("#minMoney" + (rowNum - 1)).val(item.minMoney); - $("#maxMoney" + (rowNum - 1)).val(item.maxMoney); - $("#remark" + (rowNum - 1)).val(item.remark); - }); + showGrid({ + id: "showForm", + url: reqBasePath + "companyjobscore003", + params: {id: parent.rowId}, + pagination: false, + method: "GET", + template: $("#beanTemplate").html(), + ajaxSendLoadBefore: function(hdb) { + }, + ajaxSendAfter:function (json) { + skyeyeClassEnumUtil.showEnumDataListByClassName("commonEnable", 'radio', "enabled", json.bean.enabled, form); - matchingLanguage(); - form.render(); - form.on('submit(formEditBean)', function (data) { - if (winui.verifyForm(data.elem)) { - // 获取已选字段数据 - var rowTr = $("#useTable tr"); - var tableData = new Array(); - $.each(rowTr, function(i, item) { - // 获取行编号 - var rowNum = $(item).attr("trcusid").replace("tr", ""); - var row = { - fieldKey: $("#fieldId" + rowNum).attr("rowKey"), - minMoney: $("#minMoney" + rowNum).val(), - maxMoney: $("#maxMoney" + rowNum).val(), - sortNo: (i + 1), - remark: $("#remark" + rowNum).val() - }; - tableData.push(row); - }); - var params = { - nameCn: $("#nameCn").val(), - nameEn: $("#nameEn").val(), - rowId: parent.rowId, - jobId: parent.jobId, - fieldStr: JSON.stringify(tableData) - }; - AjaxPostUtil.request({url: reqBasePath + "companyjobscore004", params: params, type: 'json', method: "PUT", callback: function (json) { - parent.layer.close(index); - parent.refreshCode = '0'; - }}); - } - return false; - }); - } - }); - - // 新增行 - $("body").on("click", "#addRow", function() { - addRow(); - }); - - // 删除行 - $("body").on("click", "#deleteRow", function() { - deleteRow(); - }); + initTable(); + initTableChooseUtil.deleteAllRow('fieldList'); + $.each(json.bean.scoreFields, function(i, item) { + item['fieldId'] = item.fieldName + '(' + item.fieldKey + ')'; + var trcusid = initTableChooseUtil.resetData('fieldList', item); + // 获取表格行号 + var thisRowKey = trcusid.replace("tr", ""); + $("#fieldId" + thisRowKey.toString()).attr("rowKey", item.fieldKey); + }); - // 新增行 - function addRow() { - var par = { - id: "row" + rowNum.toString(), //checkbox的id - trId: "tr" + rowNum.toString(), //行的id - fieldId: "fieldId" + rowNum.toString(), //字段id - minMoney: "minMoney" + rowNum.toString(), //最小薪资范围id - maxMoney: "maxMoney" + rowNum.toString(), //最大薪资范围id - remark: "remark" + rowNum.toString() //备注id - }; - $("#useTable").append(getDataUseHandlebars(usetableTemplate, par)); - form.render('select'); - form.render('checkbox'); - rowNum++; - } - - // 删除行 - function deleteRow() { - var checkRow = $("#useTable input[type='checkbox'][name='tableCheckRow']:checked"); - if(checkRow.length > 0) { - $.each(checkRow, function(i, item) { - $(item).parent().parent().remove(); - }); - } else { - winui.window.msg('请选择要删除的行', {icon: 2, time: 2000}); - } + matchingLanguage(); + form.render(); + form.on('submit(formEditBean)', function (data) { + if (winui.verifyForm(data.elem)) { + var result = initTableChooseUtil.getDataList('fieldList'); + if (!result.checkResult) { + return false; + } + var tableData = [].concat(result.dataList); + $.each(tableData, function(i, item) { + var thisRowKey = item["trcusid"].replace("tr", ""); + item['fieldKey'] = $("#fieldId" + thisRowKey).attr('rowKey'); + }); + var params = { + name: $("#name").val(), + jobId: parent.jobId, + enabled: $("#enabled input:radio:checked").val(), + scoreFields: JSON.stringify(tableData), + id: parent.rowId, + }; + AjaxPostUtil.request({url: reqBasePath + "writeCompanyJobScoreMation", params: params, type: 'json', method: "POST", callback: function (json) { + parent.layer.close(index); + parent.refreshCode = '0'; + }}); + } + return false; + }); } + }); - // 字段选择 - $("body").on("click", ".chooseFieldBtn", function (e) { - var trId = $(this).parent().parent().attr("trcusid"); - _openNewWindows({ - url: "../../tpl/wagesFieldType/wagesFieldTypeChoose.html", - title: "选择薪资字段", - pageId: "productlist", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - // 获取表格行号 - var thisRowNum = trId.replace("tr", ""); - // 表格名称赋值 - $("#fieldId" + thisRowNum.toString()).val(fieldMation.nameCn + '(' + fieldMation.key + ')'); - $("#fieldId" + thisRowNum.toString()).attr("rowKey", fieldMation.key); - }}); + function initTable() { + initTableChooseUtil.initTable({ + id: "fieldList", + cols: [ + {id: 'fieldId', title: '字段', formType: 'chooseInput', width: '120', iconClassName: 'chooseFieldBtn', verify: 'required'}, + {id: 'minMoney', title: '最小薪资范围', formType: 'input', width: '100', verify: 'required|money', value: '0'}, + {id: 'maxMoney', title: '最大薪资范围', formType: 'input', width: '100', verify: 'required|money', value: '0'}, + {id: 'remark', title: '备注', formType: 'input', width: '100'} + ], + deleteRowCallback: function (trcusid) { + }, + addRowCallback: function (trcusid) { + }, + form: form }); + } + + // 字段选择 + $("body").on("click", ".chooseFieldBtn", function (e) { + var trId = $(this).parent().parent().attr("trcusid"); + _openNewWindows({ + url: "../../tpl/wagesFieldType/wagesFieldTypeChoose.html", + title: "选择薪资字段", + pageId: "wagesFieldTypeChoose", + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + // 获取表格行号 + var thisRowKey = trId.replace("tr", ""); + // 表格名称赋值 + $("#fieldId" + thisRowKey.toString()).val(fieldMation.name + '(' + fieldMation.key + ')'); + $("#fieldId" + thisRowKey.toString()).attr("rowKey", fieldMation.key); + }}); + }); - $("body").on("click", "#cancle", function() { - parent.layer.close(index); - }); + $("body").on("click", "#cancle", function() { + parent.layer.close(index); }); }); \ No newline at end of file diff --git a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreList.js b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreList.js index b5cc5e9cc..3382c9a2e 100644 --- a/organization/src/main/resources/template/js/companyJobScore/companyJobScoreList.js +++ b/organization/src/main/resources/template/js/companyJobScore/companyJobScoreList.js @@ -29,25 +29,23 @@ layui.config({ limit: getLimit(), cols: [[ { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'nameCn', title: '名称（中文）', align: 'left', width: 150, templet: function (d) { - return '' + d.nameCn + ''; + { field: 'name', title: '名称', align: 'left', width: 150, templet: function (d) { + return '' + d.name + ''; }}, - { field: 'nameEn', title: '名称（英文）', align: 'left', width: 150 }, - { field: 'state', title: '状态', align: 'center', width: 60, templet: function (d) { - if(d.state == '2'){ - return "禁用"; - } else if (d.state == '1'){ - return "启用"; - } + { field: 'enabled', title: '状态', align: 'center', width: 60, templet: function (d) { + return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("commonEnable", 'id', d.enabled, 'name'); }}, - { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 }, - { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 100 }, + { 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: '最后修改时间', align: 'center', width: 100}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} + { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }, + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar' } ]], done: function(json) { matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () { + table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -58,24 +56,12 @@ layui.config({ edit(data); } else if (layEvent === 'delet') { //删除 delet(data); - } else if (layEvent === 'up') { //启用 - up(data); - } else if (layEvent === 'down') { //禁用 - down(data); } else if (layEvent === 'details') { //详情 details(data); } }); - form.render(); - form.on('submit(formSearch)', function (data) { - if (winui.verifyForm(data.elem)) { - refreshloadTable(); - } - return false; - }); - - //添加 + // 添加 $("body").on("click", "#addBean", function() { _openNewWindows({ url: "../../tpl/companyJobScore/companyJobScoreAdd.html", @@ -92,35 +78,13 @@ layui.config({ function delet(data) { layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) { layer.close(index); - AjaxPostUtil.request({url: reqBasePath + "companyjobscore005", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) { + AjaxPostUtil.request({url: reqBasePath + "deleteCompanyJobScoreMationById", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) { winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); loadTable(); }}); }); } - // 禁用 - function down(data) { - layer.confirm(systemLanguage["com.skyeye.disableOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.disableOperation"][languageType]}, function(index) { - layer.close(index); - AjaxPostUtil.request({url: reqBasePath + "companyjobscore007", params: {rowId: data.id}, type: 'json', method: "GET", callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.disableOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - - // 启用 - function up(data) { - layer.confirm(systemLanguage["com.skyeye.enableOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.enableOperation"][languageType]}, function(index) { - layer.close(index); - AjaxPostUtil.request({url: reqBasePath + "companyjobscore006", params: {rowId: data.id}, type: 'json', method: "GET", callback: function (json) { - winui.window.msg(systemLanguage["com.skyeye.enableOperationSuccessMsg"][languageType], {icon: 1, time: 2000}); - loadTable(); - }}); - }); - } - // 编辑 function edit(data) { rowId = data.id; @@ -149,7 +113,7 @@ layui.config({ }); } - // 刷新数据 + form.render(); $("body").on("click", "#reloadTable", function() { loadTable(); }); @@ -158,16 +122,8 @@ layui.config({ table.reloadData("messageTable", {where: getTableParams()}); } - function refreshloadTable() { - table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()}); - } - function getTableParams() { - return { - name: $("#name").val(), - state: $("#state").val(), - jobId: jobId - }; + return $.extend(true, {jobId: jobId}, initTableSearchUtil.getSearchValue("messageTable")); } exports('companyJobScoreList', {}); diff --git a/organization/src/main/resources/template/tpl/companyJob/companyJobList.html b/organization/src/main/resources/template/tpl/companyJob/companyJobList.html index 5cbd71563..4cc56a03f 100644 --- a/organization/src/main/resources/template/tpl/companyJob/companyJobList.html +++ b/organization/src/main/resources/template/tpl/companyJob/companyJobList.html @@ -22,7 +22,7 @@ {{# if(auth('1552962700195') && d.userNum == 0){ }} {{# } }} - {{# if(auth('1552962719430')){ }} + {{# if(auth('1612002229646')){ }} 岗位定级 {{# } }} diff --git a/organization/src/main/resources/template/tpl/companyJobScore/companyJobScoreAdd.html b/organization/src/main/resources/template/tpl/companyJobScore/companyJobScoreAdd.html index 1e7415016..34afda2bc 100644 --- a/organization/src/main/resources/template/tpl/companyJobScore/companyJobScoreAdd.html +++ b/organization/src/main/resources/template/tpl/companyJobScore/companyJobScoreAdd.html @@ -12,40 +12,21 @@
基础信息
-
- +
+
- +
-
- -
- +
+ +
-
-
-
- - -
-
- - - - - - - - - - - - -
字段*最小薪资范围*最大薪资范围*备注
+
+
@@ -57,20 +38,6 @@
- - - - - - - - -