转正申请托管到表单布局

boss/src/main/resources/template/js/bossInterviewQuit/bossInterviewQuitList.js

@@ -37,7 +37,7 @@ layui.config({
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
                 return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
             }},
-            { field: 'stateName', title: '状态', width: 90, templet: function (d) {
+            { field: 'state', title: '状态', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
             }},
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.js

-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'fileUpload', 'form', 'textool', 'laydate'], function(exports) {
-    winui.renderColor();
-    var index = parent.layer.getFrameIndex(window.name);
-    var $ = layui.$,
-        laydate = layui.laydate,
-        textool = layui.textool,
-        form = layui.form;
-    var serviceClassName = sysServiceMation["bossInterviewRegularWorker"]["key"];
-
-    // 转正日期
-    laydate.render({elem: '#regularTime', type: 'date'});
-
-    textool.init({eleId: 'remark', maxlength: 200});
-
-    if(!systemCommonUtil.judgeCurrentUserRegularWorker()) {
-        winui.window.msg('您已提交转正申请，无法重复提交', {icon: 5, time: 2000}, function() {
-            parent.layer.close(index);
-            parent.refreshCode = '-9999';
-        });
-    }
-
-    // 获取当前登录员工信息
-    systemCommonUtil.getSysCurrentLoginUserMation(function (data) {
-        $("#regularWorkerId").html(data.bean.jobNumber + '_' + data.bean.userName);
-        $("#departmentId").attr("departmentId", data.bean.departmentId);
-        $("#departmentId").html(data.bean.departmentName);
-        $("#jobId").attr("jobId", data.bean.jobId);
-        $("#jobId").html(data.bean.jobName);
-    });
-
-    skyeyeEnclosure.init('enclosureUpload');
-    matchingLanguage();
-    // 保存为草稿
-    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) {
-        var params = {
-            departmentId: $("#departmentId").attr("departmentId"),
-			jobId: $("#jobId").attr("jobId"),
-			regularTime: $("#regularTime").val(),
-			remark: $("#remark").val(),
-            enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
-            subType: subType, // 表单类型 1.保存草稿  2.提交审批
-            approvalId: approvalId
-        };
-        AjaxPostUtil.request({url: flowableBasePath + "insertBossInterviewRegularWorker", params: params, type: 'json', method: "POST", callback: function(json) {
-            parent.layer.close(index);
-            parent.refreshCode = '0';
-        }});
-    }
-
-    $("body").on("click", "#cancle", function() {
-        parent.layer.close(index);
-    });
-});
\ No newline at end of file

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerDetails.js

-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 + "queryBossInterviewRegularWorkerDetailsById",
-            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.stateName = activitiUtil.showStateName2(json.bean.state, 1);
-            },
-            ajaxSendAfter: function (json) {
-                // 附件回显
-                skyeyeEnclosure.showDetails({'enclosureUpload': json.bean.enclosureInfo});
-                matchingLanguage();
-            }
-        });
-
-    });
-});
\ No newline at end of file

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerEdit.js

-layui.config({
-    base: basePath,
-    version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'fileUpload', 'form', 'textool', 'laydate'], function (exports) {
-    winui.renderColor();
-    var index = parent.layer.getFrameIndex(window.name);
-    var $ = layui.$,
-        laydate = layui.laydate,
-        textool = layui.textool,
-        form = layui.form;
-    var serviceClassName = sysServiceMation["bossInterviewRegularWorker"]["key"];
-
-    showGrid({
-        id: "showForm",
-        url: flowableBasePath + "queryBossInterviewRegularWorkerToEditById",
-        params: {id: parent.rowId},
-        pagination: false,
-        method: "GET",
-        template: $("#beanTemplate").html(),
-        ajaxSendAfter: function (json) {
-            // 附件回显
-            skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
-
-            // 转正日期
-            laydate.render({elem: '#regularTime', type: 'date'});
-
-            textool.init({eleId: 'remark', maxlength: 200});
-
-            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) {
-        var params = {
-            departmentId: $("#departmentId").attr("departmentId"),
-            jobId: $("#jobId").attr("jobId"),
-			regularTime: $("#regularTime").val(),
-			remark: $("#remark").val(),
-            enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload'),
-            subType: subType, // 表单类型 1.保存草稿  2.提交审批
-            approvalId: approvalId,
-            id: parent.rowId
-        };
-        AjaxPostUtil.request({url: flowableBasePath + "updateBossInterviewRegularWorker", params: params, type: 'json', method: "PUT", callback: function(json) {
-            parent.layer.close(index);
-            parent.refreshCode = '0';
-        }});
-    }
-
-    $("body").on("click", "#cancle", function() {
-        parent.layer.close(index);
-    });
-});
\ No newline at end of file

boss/src/main/resources/template/js/bossInterviewRegularWorker/bossInterviewRegularWorkerList.js

-var rowId = "";
 
 // 转正申请
 layui.config({
@@ -6,24 +5,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["bossInterviewRegularWorker"]["key"];
 
     // 新增
     authBtn('1650787545029');
 
-    laydate.render({elem: '#createTime', range: '~'});
-
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: flowableBasePath + 'queryBossInterviewRegularWorkerList',
+        url: sysMainMation.bossBasePath + 'queryBossInterviewRegularWorkerList',
         where: getTableParams(),
         even: true,
         page: true,
@@ -31,15 +27,21 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'createName', title: '申请人', width: 120},
-            { field: 'departmentName', title: '转正部门', width: 140},
-            { field: 'jobName', title: '转正岗位', width: 150 },
+            { field: 'oddNumber', title: '单号', width: 200, align: 'center', templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { field: 'departmentMation', title: '转正部门', width: 140, templet: function (d) {
+                return isNull(d.departmentMation) ? "" : d.departmentMation.name;
+            }},
+            { field: 'jobMation', title: '转正岗位', width: 150, templet: function (d) {
+                return isNull(d.jobMation) ? "" : d.jobMation.name;
+            }},
             { field: 'regularTime', title: '转正日期', align: 'center', width: 100 },
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
                 return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
             }},
-            { field: 'stateName', title: '状态', width: 90, templet: function(d) {
-                return activitiUtil.showStateName2(d.state, 1);
+            { field: 'state', title: '状态', width: 90, templet: function(d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
             }},
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
@@ -49,6 +51,9 @@ layui.config({
         ]],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
@@ -73,7 +78,7 @@ layui.config({
     // 添加
     $("body").on("click", "#addBean", function() {
         _openNewWindows({
-            url: "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.html",
+            url: systemCommonUtil.getUrl('FP2023061500006', null),
             title: systemLanguage["com.skyeye.addPageTitle"][languageType],
             pageId: "bossInterviewRegularWorkerAdd",
             area: ['90vw', '90vh'],
@@ -87,7 +92,7 @@ layui.config({
     function revoke(data) {
         layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
             layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "revokeBossInterviewRegularWorker", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
+            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "revokeRegularWorker", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
                 winui.window.msg("提交成功", {icon: 1, time: 2000});
                 loadTable();
             }});
@@ -96,9 +101,8 @@ layui.config({
 
     // 编辑申请
     function edit(data) {
-        rowId = data.id;
         _openNewWindows({
-            url: "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerEdit.html",
+            url: systemCommonUtil.getUrl('FP2023061500007&id=' + data.id, null),
             title: systemLanguage["com.skyeye.editPageTitle"][languageType],
             pageId: "bossInterviewRegularWorkerEdit",
             area: ['90vw', '90vh'],
@@ -118,7 +122,7 @@ layui.config({
                     id: data.id,
                     approvalId: approvalId
                 };
-                AjaxPostUtil.request({url: flowableBasePath + "editBossInterviewRegularWorkerToSubApproval", params: params, type: 'json', method: "POST", callback: function (json) {
+                AjaxPostUtil.request({url: sysMainMation.bossBasePath + "submitRegularWorker", params: params, type: 'json', method: "POST", callback: function (json) {
                     winui.window.msg("提交成功", {icon: 1, time: 2000});
                     loadTable();
                 }});
@@ -130,7 +134,7 @@ layui.config({
     function cancellation(data) {
         layer.confirm('确认作废该申请吗？', { icon: 3, title: '作废操作' }, function (index) {
             layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "updateBossInterviewRegularWorkerToCancellation", params: {id: data.id}, type: 'json', method: "PUT", callback: function (json) {
+            AjaxPostUtil.request({url: sysMainMation.bossBasePath + "invalidRegularWorker", params: {id: data.id}, type: 'json', method: "PUT", callback: function (json) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
             }});
@@ -139,9 +143,8 @@ layui.config({
 
     // 详情
     function details(data) {
-        rowId = data.id;
         _openNewWindows({
-            url: "../../tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerDetails.html",
+            url: systemCommonUtil.getUrl('FP2023061500008&id=' + data.id, null),
             title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
             pageId: "bossInterviewRegularWorkerDetails",
             area: ['90vw', '90vh'],
@@ -151,33 +154,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('bossInterviewRegularWorkerList', {});

boss/src/main/resources/template/tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerAdd.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin:0 auto;padding:20px;">
-        <form class="layui-form" action="" id="showForm">
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">基本信息</span><hr>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">申请人<i class="red">*</i></label>
-                <div class="layui-input-block ver-center" id="regularWorkerId">
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正日期<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="regularTime" name="regularTime" win-verify="required" placeholder="请输入转正日期" class="layui-input"/>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正部门<i class="red">*</i></label>
-                <div class="layui-input-block ver-center" id="departmentId">
-
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正岗位<i class="red">*</i></label>
-                <div class="layui-input-block ver-center" id="jobId">
-
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">申请说明<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <textarea id="remark" name="remark" win-verify="required" placeholder="请输入申请说明" class="layui-textarea" style="height: 100px;"></textarea>
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">附件</label>
-                <div class="layui-input-block" id="enclosureUpload">
-
-                </div>
-            </div>
-			
-            <div class="layui-form-item layui-col-xs12">
-                <div class="layui-input-block">
-                    <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                    <button class="winui-btn" lay-submit lay-filter="formAddBean">保存为草稿</button>
-                    <button class="winui-btn" lay-submit lay-filter="formSubBean">提交审批</button>
-                </div>
-            </div>
-        </form>
-    </div>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/bossInterviewRegularWorker/'}).use('bossInterviewRegularWorkerAdd');
-    </script>
-</body>
-</html>
\ No newline at end of file

boss/src/main/resources/template/tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerDetails.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin:0 auto;padding:20px;">
-        <form class="layui-form" action="" id="showForm">
-			
-        </form>
-    </div>
-
-    <!-- beanTemplate -->
-    <script type="text/x-handlebars-template" id="beanTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">基本信息</span><hr>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">申请人：</label>
-                <div class="layui-input-block ver-center">
-                    {{userName}}
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正日期：</label>
-                <div class="layui-input-block ver-center">
-                    {{regularTime}}
-                </div>
-            </div>
-        	<div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正部门：</label>
-                <div class="layui-input-block ver-center">
-                    {{departmentName}}
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正岗位：</label>
-                <div class="layui-input-block ver-center">
-                    {{jobName}}
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">状态：</label>
-                <div class="layui-input-block ver-center">
-                    {{{stateName}}}
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">申请说明：</label>
-                <div class="layui-input-block ver-center">
-                    {{{remark}}}
-                </div>
-            </div>
-			<div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">附件：</label>
-                <div class="layui-input-block ver-center" id="enclosureUpload">
-
-                </div>
-            </div>
-        {{/bean}}
-    </script>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/bossInterviewRegularWorker/'}).use('bossInterviewRegularWorkerDetails');
-    </script>
-</body>
-</html>
\ No newline at end of file

boss/src/main/resources/template/tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerEdit.html

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-    <div style="margin:0 auto;padding:20px;">
-        <form class="layui-form" action="" id="showForm">
-			
-        </form>
-    </div>
-
-    <!-- beanTemplate -->
-    <script type="text/x-handlebars-template" id="beanTemplate">
-        {{#bean}}
-            <div class="layui-form-item layui-col-xs12">
-                <span class="hr-title">基本信息</span><hr>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">申请人<i class="red">*</i></label>
-                <div class="layui-input-block ver-center">
-                    {{userName}}
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正日期<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <input type="text" id="regularTime" name="regularTime" win-verify="required" placeholder="请输入转正日期" class="layui-input" value="{{regularTime}}"/>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正部门<i class="red">*</i></label>
-                <div class="layui-input-block ver-center" id="departmentId" departmentId="{{departmentId}}">
-                    {{departmentName}}
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs6">
-                <label class="layui-form-label">转正岗位<i class="red">*</i></label>
-                <div class="layui-input-block ver-center" id="jobId" jobId="{{jobId}}">
-                    {{jobName}}
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">申请说明<i class="red">*</i></label>
-                <div class="layui-input-block">
-                    <textarea id="remark" name="remark" win-verify="required" placeholder="请输入申请说明" class="layui-textarea" style="height: 100px;">{{remark}}</textarea>
-                </div>
-            </div>
-            <div class="layui-form-item layui-col-xs12">
-                <label class="layui-form-label">附件</label>
-                <div class="layui-input-block" id="enclosureUpload">
-
-                </div>
-            </div>
-			
-            <div class="layui-form-item layui-col-xs12">
-                <div class="layui-input-block">
-                    <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-                    <button class="winui-btn typeOne layui-hide" lay-submit lay-filter="formEditBean">保存为草稿</button>
-                    <button class="winui-btn typeOne layui-hide" lay-submit lay-filter="formSubBean">提交审批</button>
-                    <button class="winui-btn typeTwo layui-hide" lay-submit lay-filter="subBean"><language showName="com.skyeye.save"></language></button>
-                </div>
-            </div>
-        {{/bean}}
-    </script>
-
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/bossInterviewRegularWorker/'}).use('bossInterviewRegularWorkerEdit');
-    </script>
-</body>
-</html>
\ No newline at end of file

boss/src/main/resources/template/tpl/bossInterviewRegularWorker/bossInterviewRegularWorkerList.html

@@ -7,65 +7,34 @@
     <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;">
-            <div class="winui-tip alert-info" id="showInfo">正式员工无法提交转正申请，存在非作废的转正申请无法再次提交。</div>
-            <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">
+            <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="1650787545029"><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="1650787545029"><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('1650787556727')){ }}
-                        <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
-                    {{# } }}
-                    {{# if(auth('1650787570672')){ }}
-                        <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('1650787556727')) { }}
+                    <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
                 {{# } }}
-                {{# if(d.editRow == '1' || d.editRow == '2'){ }}
-                    {{# if(auth('1650787580492')){ }}
-                        <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-                    {{# } }}
+                {{# if(auth('1650787570672')) { }}
+                    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="cancellation">作废</a>
                 {{# } }}
-                {{# if(d.editRow == '2'){ }}
-                    {{# if(auth('1650787589592')){ }}
-                        <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
-                    {{# } }}
+                {{# if(auth('1650787545029')) { }}
+                    <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('1650787589592')) { }}
+                    <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>
     <script type="text/javascript">