diff --git a/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js b/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js index 847acd559ce40af6ce519c1e1bbe12a1f4bac0cc..2ceaebc59de09d659a75cf58741c60bcc91ea026 100644 --- a/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js +++ b/activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js @@ -21,6 +21,8 @@ layui.config({ AjaxPostUtil.request({url: flowableBasePath + "queryProcessInstance", params: {processInstanceId: processInstanceId}, type: 'json', method: 'POST', callback: function(data) { // 加载业务数据 activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'details'); + // 当前审批人 + $("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name)); // 加载流程图片 $("#processInstanceIdImg").attr("src", fileBasePath + 'images/upload/activiti/' + processInstanceId + ".png?cdnversion=" + Math.ceil(new Date()/3600000)); matchingLanguage(); diff --git a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js index 8dcceed230a3db3438d709707f5d98aa4feceb5b..5d3e6e47c2712b37e5367316fb5d8b49916b2c19 100644 --- a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js +++ b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js @@ -25,6 +25,8 @@ layui.config({ // 加载业务数据 activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'edit'); + // 当前审批人 + $("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name)); }, async: false}); AjaxPostUtil.request({url: flowableBasePath + "activitimode016", params: {taskId: taskId, processInstanceId: processInstanceId}, type: 'json', method: 'GET', callback: function(j){ diff --git a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js index ff1e8d4c8814ad2d0864cbd048e2abdf495dfc8c..30d8b0a1aa316ddfeaacf309ceed41329ba91a7f 100644 --- a/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/pendingProcess.js @@ -44,6 +44,9 @@ layui.config({ { field: 'createTime', title: '申请时间', align: 'center', width: 150, templet: function (d) { return d.processMation.createTime; }}, + { field: 'assignee', title: '当前审批人', width: 120, templet: function (d) { + return d.processMation.createName; + }}, { field: 'name', title: '当前节点', width: 130, templet: function (d) { return '[' + d.name + ']'; }}, diff --git a/activiti/src/main/resources/template/js/myActiviti/processedProcess.js b/activiti/src/main/resources/template/js/myActiviti/processedProcess.js index 1faedb60612af2c92ce8b897c24385fb0e8d3597..d94453ab2e3a1c671acdf5872c125027092fd55b 100644 --- a/activiti/src/main/resources/template/js/myActiviti/processedProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/processedProcess.js @@ -1,7 +1,8 @@ -var processInstanceId = "";//流程id - -var hisTaskId = "";//历史审批任务id +// 流程id +var processInstanceId = ""; +// 历史审批任务id +var hisTaskId = ""; layui.config({ base: basePath, @@ -14,53 +15,69 @@ layui.config({ table = layui.table, form = layui.form; - // 我的历史任务 + // 我的历史审批任务 table.render({ id: 'messageMyHistoryTaskTable', elem: '#messageMyHistoryTaskTable', method: 'post', url: flowableBasePath + 'activitimode014', - where:{}, + where: getTableParams(), even: true, page: true, limits: getLimits(), limit: getLimit(), cols: [[ - { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' }, - { field: 'processInstanceId', title: '流程ID', width: 100 }, - { field: 'taskType', title: '类型', width: 150, templet: function (d) { - return d.processMation.title; + { title: systemLanguage["com.skyeye.serialNumber"][languageType], rowspan: '2', type: 'numbers' }, + { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 280, templet: function (d) { + return '' + getNotUndefinedVal(d.hisTask?.processInstanceId) + ''; }}, - { field: 'createName', title: '申请人', width: 120, templet: function (d) { - return d.processMation.createName; + { field: 'taskType', title: '类型', rowspan: '2', width: 150, templet: function (d) { + return getNotUndefinedVal(d.processMation.title); }}, - { field: 'createTime', title: '申请时间', align: 'center', width: 150, templet: function (d) { - return d.processMation.createTime; + { field: 'createName', title: '申请人', rowspan: '2', width: 120, templet: function (d) { + return getNotUndefinedVal(d.processMation?.createName); }}, - { field: 'name', title: '我处理的节点', width: 130, templet: function (d) { - return '[' + d.name + ']'; - }}, - { field: 'agencyName', title: '受理人', width: 80}, - { field: 'endTime', title: '受理时间', align: 'center', width: 140, templet: function (d) { - if (!isNull(d.endTime)){ - var str = d.endTime.toString(); - str = str.substring(0, str.length - 3); - return date('Y-m-d H:i', str); - } else { - return ""; - } - }}, - { field: 'weatherEnd', title: '审批进度', align: 'left', width: 80, templet: function (d) { - if(d.weatherEnd == 0){ + { field: 'createTime', title: '申请时间', rowspan: '2', align: 'center', width: 150, templet: function (d) { + return getNotUndefinedVal(d.processMation?.createTime); + }}, + { field: 'assigneeList', title: '当前审批人', align: 'left', rowspan: '2', width: 150, templet: function (d) { + if (!isNull(d.assigneeList)) { + var str = ""; + $.each(d.assigneeList, function(i, item) { + str += '' + item.name + '
'; + }); + return str; + } + return ''; + }}, + { title: '我处理的', colspan: '2', align: 'center' }, + { field: 'weatherEnd', title: '审批进度', align: 'left', rowspan: '2', width: 80, templet: function (d) { + if (d.weatherEnd == 0) { return "进行中"; } else { return "已完成"; } }}, - { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#myHistoryTaskTableBar'} - ]], + { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', rowspan: '2', align: 'center', width: 150, toolbar: '#myHistoryTaskTableBar'} + ], [ + { field: 'hisTaskName', title: '节点', width: 130, templet: function (d) { + return '[' + getNotUndefinedVal(d.hisTask?.name) + ']'; + }}, + { field: 'lastUpdateTime', title: '处理时间', width: 130, templet: function (d) { + if (!isNull(d.hisTask.endTime)) { + var str = d.hisTask.endTime.toString(); + str = str.substring(0, str.length - 3); + return date('Y-m-d H:i', str); + } else { + return ""; + } + }} + ]], done: function(json) { matchingLanguage(); + initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入流程ID", function () { + table.reloadData("messageMyHistoryTaskTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -76,11 +93,9 @@ layui.config({ } }); - //撤回 + // 撤回 function withdraw(data) { - //流程id processInstanceId = data.processInstanceId; - //历史审批任务id hisTaskId = data.hisTaskId; _openNewWindows({ url: "../../tpl/activitiCommon/revokeActiviti.html", @@ -89,12 +104,12 @@ layui.config({ area: ['70vw', '40vh'], callBack: function (refreshCode) { winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - reloadMyHistoryTaskTable(); + loadTable(); } }); } - //刷新流程图 + // 刷新流程图 function refreshPic(data) { layer.confirm('确认重新生成流程图吗？', { icon: 3, title: '刷新流程图操作' }, function (i) { layer.close(i); @@ -104,14 +119,18 @@ layui.config({ }); } - //刷新我的历史任务 + form.render(); $("body").on("click", "#reloadMyHistoryTaskTable", function() { - reloadMyHistoryTaskTable(); + loadTable(); }); - - function reloadMyHistoryTaskTable(){ - table.reloadData("messageMyHistoryTaskTable", {where:{}}); - } + + function loadTable() { + table.reloadData("messageMyHistoryTaskTable", {where: getTableParams()}); + } + + function getTableParams() { + return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageMyHistoryTaskTable")); + } exports('processedProcess', {}); }); diff --git a/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html b/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html index 7d0737588fac4b7d98bf1ff383dbbe7fb44a3bc3..c5dea93a3fc21d22b1b3a0563b3ed3a47c2f6647 100644 --- a/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html +++ b/activiti/src/main/resources/template/tpl/activitiCommon/processInstanceDetails.html @@ -32,6 +32,15 @@
+
+ 审批信息
+
+
+ +
+ +
+
diff --git a/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcessTask.html b/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcessTask.html index 50bc174318d4e1ab8a50f65dc22d2edf80b21a06..91fd2ecc85ef76edbe2bd00e2c22de040fd0446b 100644 --- a/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcessTask.html +++ b/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcessTask.html @@ -42,6 +42,12 @@
+
+ +
+ +
+
diff --git a/activiti/src/main/resources/template/tpl/myActiviti/processedProcess.html b/activiti/src/main/resources/template/tpl/myActiviti/processedProcess.html index 9833bc1b3f74d54070ae9f13b2c1b6b3159ef5a0..3fec968f4a67094cb95251c15096331f5cc3a672 100644 --- a/activiti/src/main/resources/template/tpl/myActiviti/processedProcess.html +++ b/activiti/src/main/resources/template/tpl/myActiviti/processedProcess.html @@ -5,28 +5,25 @@ + -
-
-
-
- - -
-
-
-
- +
-
+
-