人员需求申请其他查询整改完成

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireList.js

@@ -32,6 +32,12 @@ layui.config({
             { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
                 return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
             }},
+            { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
+                return d.recruitDepartmentMation.name;
+            }},
+            { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
+                return d.recruitJobMation.name;
+            }},
             { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
             }},

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeList.js

-var rowId = "";
 
 // 我负责的人员需求申请
 layui.config({
@@ -16,7 +15,7 @@ layui.config({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: flowableBasePath + 'queryMyChargeBossPersonRequireList',
+        url: sysMainMation.bossBasePath + 'queryMyChargePersonRequireList',
         where: getTableParams(),
         even: true,
         page: true,
@@ -24,23 +23,33 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'createName', title: '申请人', width: 140},
-            { field: 'applyDepartmentName', title: '申请人部门', width: 140},
-            { field: 'recruitJobName', title: '需求岗位', width: 150 },
-            { field: 'recruitDepartmentName', title: '需求部门', width: 140 },
-            { field: 'wages', title: '薪资', width: 120 },
-            { field: 'recruitNum', title: '需求人数', width: 100 },
-            { field: 'stateName', title: '状态', width: 90, templet: function (d) {
-                if(d.state == 6){
-                    return '<span class="state-new">招聘中</span>';
-                } else if(d.state == 7){
-                    return '<span class="state-new">招聘结束</span>';
-                }
+            { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
+                return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
+            }},
+            { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
+                return d.recruitDepartmentMation.name;
+            }},
+            { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
+                return d.recruitJobMation.name;
+            }},
+            { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
             }},
-            { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], width: 150}
+            { field: 'wages', title: '薪资范围', width: 120 },
+            { field: 'recruitNum', title: '需求人数', 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: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }
         ]],
         done: function(json) {
             matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单据编号", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
         }
     });
 
@@ -49,14 +58,15 @@ layui.config({
         var layEvent = obj.event;
         if (layEvent === 'details') { // 详情
             details(data);
+        } else if (layEvent === 'processDetails') { // 流程详情
+            activitiUtil.activitiDetails(data);
         }
     });
 
     // 详情
     function details(data) {
-        rowId = data.id;
         _openNewWindows({
-            url: "../../tpl/bossPersonRequire/bossPersonRequireDetails.html",
+            url: systemCommonUtil.getUrl('FP2023052100003&id=' + data.id, null),
             title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
             pageId: "bossPersonRequireDetails",
             area: ['90vw', '90vh'],
@@ -66,14 +76,6 @@ 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();
     });
@@ -83,9 +85,7 @@ layui.config({
     }
 
     function getTableParams() {
-        return {
-            state: $("#state").val(),
-        };
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
     }
 
     exports('bossPersonRequireMyChargeList', {});

boss/src/main/resources/template/js/bossPersonRequire/bossPersonRequireMyChargeListChoose.js

-var rowId = "";
 
 // 我负责的人员需求申请
 layui.config({
@@ -17,7 +16,7 @@ layui.config({
         id: 'messageTable',
         elem: '#messageTable',
         method: 'post',
-        url: flowableBasePath + 'queryMyChargeBossPersonRequireList',
+        url: sysMainMation.bossBasePath + 'queryMyChargePersonRequireList',
         where: getTableParams(),
         even: true,
         page: true,
@@ -25,27 +24,30 @@ layui.config({
         limit: getLimit(),
         cols: [[
             { type: 'radio'},
-            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'createName', title: '申请人', width: 140},
-            { field: 'applyDepartmentName', title: '申请人部门', width: 140},
-            { field: 'recruitJobName', title: '需求岗位', width: 150 },
-            { field: 'recruitDepartmentName', title: '需求部门', width: 140 },
-            { field: 'wages', title: '薪资', width: 120 },
-            { field: 'recruitNum', title: '需求人数', width: 100 },
-            { field: 'stateName', title: '状态', width: 90, templet: function (d) {
-                if(d.state == 6){
-                    return '<span class="state-new">招聘中</span>';
-                } else if(d.state == 7){
-                    return '<span class="state-new">招聘结束</span>';
-                }
+            { field: 'oddNumber', title: '单据编号', align: 'left', width: 200, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+            }},
+            { field: 'recruitDepartmentId', title: '需求部门', align: 'left', width: 140, templet: function (d) {
+                return d.recruitDepartmentMation.name;
             }},
-            { field: 'createTime', title: systemLanguage["com.skyeye.entryTime"][languageType], width: 150}
+            { field: 'recruitJobId', title: '需求岗位', align: 'left', width: 150, templet: function (d) {
+                return d.recruitJobMation.name;
+            }},
+            { field: 'state', title: '状态', align: 'left', width: 80, templet: function (d) {
+                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("bossPersonRequireState", 'id', d.state, 'name');
+            }},
+            { field: 'wages', title: '薪资范围', width: 120 },
+            { field: 'recruitNum', title: '需求人数', 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: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 }
         ]],
         done: function(res){
             matchingLanguage();
             for (var i = 0; i < res.rows.length; i++) {
-                // 不允许删除的设置为不可选中
-                if(res.rows[i].state != 6){
+                // 招聘结束的设置为不可选中
+                if(res.rows[i].state != 'endRecruitment'){
                     systemCommonUtil.disabledRow(res.rows[i].LAY_TABLE_INDEX, 'radio');
                 }
             }

boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireMyChargeList.html

@@ -7,34 +7,14 @@
     <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="6">招聘中</option>
-                                <option value="7">招聘结束</option>
-                            </select>
-                        </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>
-        <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>
-            </div>
-        </div>
-        <div style="margin:auto 10px;">
-            <table id="messageTable" lay-filter="messageTable"></table>
+    <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>
         </div>
     </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">

boss/src/main/resources/template/tpl/bossPersonRequire/bossPersonRequireMyChargeListChoose.html

@@ -7,34 +7,14 @@
     <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="6">招聘中</option>
-                                <option value="7">招聘结束</option>
-                            </select>
-                        </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>
-        <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>
-            </div>
-        </div>
-        <div style="margin:auto 10px;">
-            <table id="messageTable" lay-filter="messageTable"></table>
+    <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>
         </div>
     </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">