代码调整

boss/src/main/resources/template/js/bossInterviewArrangement/bossInterviewerList.js

@@ -42,9 +42,6 @@ layui.config({
             { field: 'state', title: '面试状态', width: 160, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossInterviewArrangementState", 'id', d.state, 'name');
             }},
-            { 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: 120, toolbar: '#messageTableBar'}
         ]],

boss/src/main/resources/template/js/bossInterviewArrangement/inductionResult.js

@@ -20,7 +20,6 @@ layui.config({
         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.interviewMation.enclosureResume});

boss/src/main/resources/template/js/bossInterviewJobTransfer/bossInterviewJobTransferList.js

@@ -6,24 +6,21 @@ layui.config({
     version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
-        laydate = layui.laydate,
         table = layui.table;
     var serviceClassName = sysServiceMation["bossInterviewJobTransfer"]["key"];
 
     // 新增
     authBtn('1651308552871');
 
-    laydate.render({elem: '#createTime', range: '~'});
-
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: flowableBasePath + 'queryBossInterviewJobTransferList',
+        url: sysMainMation.bossBasePath + 'queryBossInterviewJobTransferList',
         where: getTableParams(),
         even: true,
         page: true,
@@ -31,17 +28,22 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' },
-            { field: 'transferStaffName', title: '申请人', rowspan: '2', width: 140},
+            { field: 'oddNumber', title: '单号', width: 200, align: 'center', rowspan: '2', templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { field: 'transferStaffMation', title: '申请人', rowspan: '2', width: 140, templet: function(d) {
+                return isNull(d.transferStaffMation) ? '' : d.transferStaffMation.name;
+            }},
             { 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);
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossUserTransferType", 'id', d.transferType, 'name');
             }},
             { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
                 return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
             }},
-            { field: 'stateName', title: '状态', rowspan: '2', width: 90, templet: function(d) {
-                return activitiUtil.showStateName2(d.state, 1);
+            { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function(d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
             }},
             { 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 },
@@ -50,18 +52,37 @@ layui.config({
             { 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}
+                { field: 'primaryCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) {
+                    return d.primaryCompanyMation.name;
+                }},
+                { field: 'primaryDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.primaryDepartmentMation) ? '' : d.primaryDepartmentMation.name;
+                }},
+                { field: 'primaryJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.primaryJobMation) ? '' : d.primaryJobMation.name;
+                }},
+                { field: 'primaryJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.primaryJobScoreMation) ? '' : d.primaryJobScoreMation.name;
+                }},
+                { field: 'currentCompanyName', title: '企业', align: 'left', width: 150, templet: function(d) {
+                    return d.currentCompanyMation.name;
+                }},
+                { field: 'currentDepartmentName', title: '部门', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.currentDepartmentMation) ? '' : d.currentDepartmentMation.name;
+                }},
+                { field: 'currentJobName', title: '岗位', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.currentJobMation) ? '' : d.currentJobMation.name;
+                }},
+                { field: 'currentJobScoreName', title: '岗位定级', align: 'left', width: 150, templet: function(d) {
+                    return isNull(d.currentJobScoreMation) ? '' : d.currentJobScoreMation.name;
+                }}
             ]
         ],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
@@ -100,7 +121,7 @@ layui.config({
     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) {
+            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "revokeJobTransfer", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
                 winui.window.msg("提交成功", {icon: 1, time: 2000});
                 loadTable();
             }});
@@ -131,7 +152,7 @@ layui.config({
                     id: data.id,
                     approvalId: approvalId
                 };
-                AjaxPostUtil.request({url: flowableBasePath + "editBossInterviewJobTransferToSubApproval", params: params, type: 'json', method: "POST", callback: function (json) {
+                AjaxPostUtil.request({url: sysMainMation.bossBasePath + "submitJobTransfer", params: params, type: 'json', method: "POST", callback: function (json) {
                     winui.window.msg("提交成功", {icon: 1, time: 2000});
                     loadTable();
                 }});
@@ -143,7 +164,7 @@ layui.config({
     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) {
+            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidJobTransfer", params: {id: data.id}, type: 'json', method: "PUT", callback: function (json) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
             }});
@@ -164,33 +185,15 @@ layui.config({
     }
 
     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() {
-        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
-        };
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('bossInterviewJobTransferList', {});

boss/src/main/resources/template/js/bossInterviewer/interviewerResult.js

@@ -19,7 +19,6 @@ layui.config({
         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.interviewMation.enclosureResume});

boss/src/main/resources/template/tpl/bossInterviewJobTransfer/bossInterviewJobTransferList.html

@@ -7,63 +7,32 @@
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
 </head>
 <body>
-    <div style="margin:0 auto; height: 100%;">
-        <div class="txtcenter" style="margin:0 auto; padding-top: 10px;">
-            <form class="layui-form layui-form-pane" action="" autocomplete="off">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">状态</label>
-                        <div class="layui-input-inline">
-                            <select id="state">
-                                <option value="">全部</option>
-                                <option value="0">草稿</option>
-                                <option value="1">审核中</option>
-                                <option value="2">审核通过</option>
-                                <option value="3">审核不通过</option>
-                                <option value="4">作废</option>
-                                <option value="5">撤销</option>
-                            </select>
-                        </div>
-                        <label class="layui-form-label">申请时间</label>
-                        <div class="layui-input-inline">
-                            <input type="text" id="createTime" name="createTime" placeholder="请选择申请时间" class="layui-input" />
-                        </div>
-                        <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-                        <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-                    </div>
-                </div>
-            </form>
+    <div class="winui-toolbar">
+        <div class="winui-tool" style="text-align: left;">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1651308552871"><i class="fa fa-plus" aria-hidden="true"></i>录入申请</button>
         </div>
-        <div class="winui-toolbar">
-            <div class="winui-tool" style="text-align: left;">
-                <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-                <button id="addBean" class="winui-toolbtn" auth="1651308552871"><i class="fa fa-plus" aria-hidden="true"></i>录入申请</button>
-            </div>
-        </div>
-        <div style="margin:auto 10px;">
-            <table id="messageTable" lay-filter="messageTable"></table>
-            <script type="text/html" id="messageTableBar">
-                {{# if(d.editRow == '1'){ }}
-                    {{# if(auth('1651308562351')){ }}
-                        <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
-                    {{# } }}
-                    {{# if(auth('1651308571857')){ }}
-                        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
-                    {{# } }}
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+        <script type="text/html" id="messageTableBar">
+            {{# if(d.editRow == '1'){ }}
+                {{# if(auth('1651308562351')){ }}
+                    <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
                 {{# } }}
-                {{# if(d.editRow == '1' || d.editRow == '2'){ }}
-                    {{# if(auth('1651308582626')){ }}
-                        <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-                    {{# } }}
+                {{# if(auth('1651308571857')){ }}
+                    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
                 {{# } }}
-                {{# if(d.editRow == '2'){ }}
-                    {{# if(auth('1651308591882')){ }}
-                        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
-                    {{# } }}
+                {{# if(auth('1651308552871')){ }}
+                    <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
                 {{# } }}
-                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">详情</a>
-            </script>
-        </div>
+            {{# } }}
+            {{# if(d.editRow == '2'){ }}
+                {{# if(auth('1651308591882')){ }}
+                    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+                {{# } }}
+            {{# } }}
+        </script>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>

common/src/main/resources/template/js/dsFormPage/editPageContent.js

@@ -162,6 +162,16 @@ layui.config({
                                 </select>
                             </div>
                         </div>`,
+        'userSelTypeBox': `<div class="layui-form-item layui-col-xs12">
+                            <label class="layui-form-label">单选/多选配置<i class="red">*</i></label>
+                            <div class="layui-input-block">
+                                <select lay-filter="checkType" lay-search="" id="checkType" name="checkType" win-verify="required">
+                                    <option value="">请选择</option>
+                                    <option value="1">多选</option>
+                                    <option value="2">单选</option>
+                                </select>
+                            </div>
+                        </div>`,
         'tableAttrBox': `<div class="layui-form-item layui-col-xs12">
                         <label class="layui-form-label">表格属性<i class="red">*</i></label>
                         <div class="layui-input-block" data="[]">

web/src/main/resources/template/assets/lib/layui/customer/bossUtil.js

@@ -2,50 +2,6 @@
 // 招聘模块工具函数
 var bossUtil = {
 
-    /**
-     * 面试安排的状态
-     *
-     * @param state
-     * @returns {string}
-     */
-    showStateName: function (state){
-        if (state == '1') {
-            return "<span>草稿</span>";
-        } else if (state == '2') {
-            return "<span class='state-new'>已提交(待安排面试人员)</span>";
-        } else if (state == '3') {
-            return "<span class='state-new'>已提交(待面试)</span>";
-        } else if (state == '4') {
-            return "<span class='state-up'>面试通过</span>";
-        } else if (state == '5') {
-            return "<span class='state-down'>面试不通过</span>";
-        } else if (state == '6') {
-            return "<span class='state-success'>已完成入职</span>";
-        } else if (state == '7') {
-            return "<span class='state-error'>已完成拒绝入职</span>";
-        } else if (state == '8') {
-            return "<span class='state-error'>作废</span>";
-        } else {
-            return "参数错误";
-        }
-    },
-
-    /**
-     * 面试官列表展示的面试状态
-     *
-     * @param state
-     * @returns {string}
-     */
-    showArrangeInterviewerStateName: function (state){
-        if (state == '3') {
-            return "<span class='state-new'>待面试</span>";
-        } else if (state == '4' || state == '6' || state == '7') {
-            return "<span class='state-up'>面试通过</span>";
-        } else if (state == '5') {
-            return "<span class='state-down'>面试不通过</span>";
-        }
-    },
-
     /**
      * 打开我负责的未入职的面试者选择页面--表单组件中使用
      *

web/src/main/resources/template/assets/lib/layui/customer/common/systemCommonUtil.js

@@ -207,7 +207,7 @@ var systemCommonUtil = {
     },
 
     /**
-     * 员工选择页面(所有员工)
+     * 员工选择页面(所有员工)--组件管理中使用
      *
      * @param callback 回调函数
      */

web/src/main/resources/template/assets/lib/layui/customer/organizationUtil.js

 
-// 组织机构工具类
+// 组织机构工具类--组件管理中使用
 var organizationUtil = {
 
     // 企业树