diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/arrangeInterviewer.js b/boss/src/main/resources/template/js/bossInterviewArrangement/arrangeInterviewer.js
new file mode 100644
index 0000000000000000000000000000000000000000..6eaf1d29078eb265df63df8b5edfe74657aab0f9
--- /dev/null
+++ b/boss/src/main/resources/template/js/bossInterviewArrangement/arrangeInterviewer.js
@@ -0,0 +1,95 @@
+
+layui.config({
+ base: basePath,
+ version: skyeyeVersion
+}).extend({
+ window: 'js/winui.window'
+}).define(['window', 'jquery', 'winui', 'form', 'tagEditor'], function(exports) {
+ winui.renderColor();
+ var index = parent.layer.getFrameIndex(window.name);
+ var $ = layui.$,
+ form = layui.form;
+ var interviewer = [];
+
+ showGrid({
+ id: "showForm",
+ url: flowableBasePath + "queryBossInterviewArrangementById",
+ params: {id: parent.rowId},
+ pagination: false,
+ method: "GET",
+ template: $("#beanTemplate").html(),
+ ajaxSendLoadBefore: function(hdb, json){
+ json.bean.basicResume = stringManipulation.textAreaShow(json.bean.basicResume);
+ json.bean.stateName = bossUtil.showStateName(json.bean.state);
+ },
+ ajaxSendAfter: function (json) {
+ skyeyeEnclosure.showDetails({'enclosureUpload': json.bean.enclosureInfo});
+
+ var userNames = [];
+ interviewer = [].concat(json.bean.interviewer);
+ $.each(interviewer, function(i, item){
+ userNames.push(item.name);
+ });
+ $('#interviewer').tagEditor({
+ initialTags: userNames,
+ placeholder: '请选择面试官',
+ editorTag: false,
+ beforeTagDelete: function(field, editor, tags, val) {
+ var inArray = -1;
+ $.each(interviewer, function(i, item) {
+ if(val === item.name) {
+ inArray = i;
+ return false;
+ }
+ });
+ if(inArray != -1) {
+ interviewer.splice(inArray, 1);
+ }
+ }
+ });
+
+ matchingLanguage();
+ form.render();
+ // 提交
+ form.on('submit(formSubBean)', function(data) {
+ if(winui.verifyForm(data.elem)) {
+ var params = {
+ id: parent.rowId,
+ interviewer: interviewer[0].id
+ };
+ AjaxPostUtil.request({url: flowableBasePath + "setBossInterviewer", 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});
+ }
+ }});
+ }
+ return false;
+ });
+
+ }
+ });
+
+ // 面试官选择
+ $("body").on("click", ".interviewerBtn", function(){
+ systemCommonUtil.userReturnList = [].concat(interviewer);
+ systemCommonUtil.chooseOrNotMy = "1"; // 人员列表中是否包含自己--1.包含；其他参数不包含
+ systemCommonUtil.chooseOrNotEmail = "2"; // 人员列表中是否必须绑定邮箱--1.必须；其他参数没必要
+ systemCommonUtil.checkType = "2"; // 人员选择类型，1.多选；其他。单选
+ systemCommonUtil.openSysUserStaffChoosePage(function (staffChooseList){
+ // 移除所有tag
+ var tags = $('#interviewer').tagEditor('getTags')[0].tags;
+ for (i = 0; i < tags.length; i++) {
+ $('#interviewer').tagEditor('removeTag', tags[i]);
+ }
+ interviewer = [].concat(staffChooseList);
+ // 添加新的tag
+ $.each(interviewer, function(i, item){
+ $('#interviewer').tagEditor('addTag', item.name);
+ });
+ });
+ });
+
+});
\ No newline at end of file
diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementDetails.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementDetails.js
index 4d852c3d146dba276ddc7c967cd3ea7e6b5d8116..b09c39746c959d72afabe2232631130bcd53d42c 100644
--- a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementDetails.js
+++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementDetails.js
@@ -6,7 +6,7 @@ layui.config({
window: 'js/winui.window'
}).define(['window', 'jquery', 'winui', 'form'], function(exports) {
winui.renderColor();
- var $ = layui.$
+ var $ = layui.$,
form = layui.form;
showGrid({
diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js
index 251b2f028f97c5e9601058f7efcc44db1b8ee78b..ea1c83ff9c7fbad330a98a4372a320f20bf1fac7 100644
--- a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js
+++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewArrangementList.js
@@ -37,7 +37,7 @@ layui.config({
{ field: 'departmentName', title: '面试部门', width: 140},
{ field: 'jobName', title: '面试岗位', width: 150 },
{ field: 'interviewTime', title: '面试时间', width: 140, align: 'center' },
- { field: 'interviewer', title: '面试官', width: 100 },
+ { field: 'interviewer', title: '面试官', width: 140 },
{ field: 'state', title: '面试状态', width: 160, templet: function(d){
return bossUtil.showStateName(d.state);
}},
diff --git a/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js
new file mode 100644
index 0000000000000000000000000000000000000000..5c9699fee902c9de6a831fcc61d9a202c80baa77
--- /dev/null
+++ b/boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js
@@ -0,0 +1,122 @@
+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;
+
+ laydate.render({
+ elem: '#createTime',
+ range: '~'
+ });
+
+ table.render({
+ id: 'messageTable',
+ elem: '#messageTable',
+ method: 'post',
+ url: flowableBasePath + 'queryMyEntryBossPersonRequireAboutArrangementList',
+ where: getTableParams(),
+ even: true,
+ page: true,
+ limits: getLimits(),
+ 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: 'interviewTime', title: '面试时间', width: 140, align: 'center' },
+ { field: 'interviewer', title: '面试官', width: 140 },
+ { field: 'state', title: '面试状态', width: 160, templet: function(d){
+ return bossUtil.showStateName(d.state);
+ }},
+ { 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'}
+ ]],
+ 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 === 'arrangeInterviewer') { // 安排面试官
+ arrangeInterviewer(data);
+ }
+ });
+
+ // 安排面试官
+ function arrangeInterviewer(data){
+ rowId = data.id;
+ _openNewWindows({
+ url: "../../tpl/bossInterviewArrangement/arrangeInterviewer.html",
+ title: '安排面试官',
+ pageId: "arrangeInterviewer",
+ 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 details(data){
+ rowId = data.id;
+ _openNewWindows({
+ url: "../../tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html",
+ title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+ pageId: "bossInterviewArrangementDetails",
+ 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('bossInterviewerList', {});
+});
diff --git a/boss/src/main/resources/template/tpl/bossInterviewArrangement/arrangeInterviewer.html b/boss/src/main/resources/template/tpl/bossInterviewArrangement/arrangeInterviewer.html
new file mode 100644
index 0000000000000000000000000000000000000000..c9ac3929880abb2c82ce5db332d58e5e98527422
--- /dev/null
+++ b/boss/src/main/resources/template/tpl/bossInterviewArrangement/arrangeInterviewer.html
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html b/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html
index d09a986f417679a1d4146d06d2b6c29d6a6bdef7..bb87bda443e7047d9fde003ced3bda299c54f28e 100644
--- a/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html
+++ b/boss/src/main/resources/template/tpl/bossInterviewArrangement/bossInterviewArrangementDetails.html
@@ -80,7 +80,7 @@
-
+
-
+
diff --git a/boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireList.html b/boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireList.html
index aaf7ae0dbda6da720a8872432df31c76b56ea2cc..67722829b7b4e84888b677f2b9a7246e6a254ffb 100644
--- a/boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireList.html
+++ b/boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireList.html
@@ -26,9 +26,9 @@
-
+
-
+