diff --git a/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js b/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js index 8c8abcb5af59736e8750a49ecf3ff2f40b2e5095..41175424c94fb31c05d68ebddd68890adedde3ae 100644 --- a/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js +++ b/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js @@ -76,49 +76,13 @@ layui.config({ table.on('tool(messageMyStartTable)', function (obj) { var data = obj.data; var layEvent = obj.event; - if (layEvent === 'edit') { //编辑 - edit(data); - } else if (layEvent === 'details') { //详情 + if (layEvent === 'details') { //详情 activitiUtil.activitiDetails(data); - } else if (layEvent === 'revoke') { //撤销 - revoke(data); } else if (layEvent === 'refreshPic') { //刷新流程图 refreshPic(data); } }); - //编辑 - function edit(data) { - sequenceId = data.sequenceId; - taskId = data.id; - processInstanceId = data.processInstanceId; - rowId = data.dataId; - _openNewWindows({ - url: data.editPageUrl, - title: systemLanguage["com.skyeye.editPageTitle"][languageType], - pageId: "myactivitiedit", - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - } - }); - } - - //撤销 - function revoke(data) { - if(isNull(data.revokeMapping)){//撤销接口为空 - winui.window.msg('撤销接口调用失败', {icon: 2, time: 2000}); - return false; - } - layer.confirm('确定撤销该流程吗?', { icon: 3, title: '撤销操作' }, function (index) { - layer.close(index); - AjaxPostUtil.request({url: flowableBasePath + data.revokeMapping, params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) { - winui.window.msg("撤销成功", {icon: 1, time: 2000}); - reloadMyStartTable(); - }}); - }); - } - //刷新流程图 function refreshPic(data) { layer.confirm('确认重新生成流程图吗?', { icon: 3, title: '刷新流程图操作' }, function (i) { diff --git a/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html b/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html index 2778d3819fa54a6b9d6993573040c3fc34ac3a1b..cdeeddf177d9eaab023c818275a3e60797949ec7 100644 --- a/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html +++ b/activiti/src/main/resources/template/tpl/myActiviti/initiatedProcess.html @@ -33,10 +33,6 @@
diff --git a/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js index a3b8a05055b9da930d4d674d53a25d37b08e81ea..4b7c4fbe9d53a7ebd4cbb42e5b8e58f9f87034ea 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/activitiUtil.js @@ -109,7 +109,7 @@ var activitiUtil = { }; // 优先请求一次获取下个用户节点的信息,如果没有审批节点信息,则不加载审批人选项 AjaxPostUtil.request({url: flowableBasePath + "activitiProcess001", params: params, type: 'json', callback: function(json) { - if (!isNull(json.bean)) { + if (!isNull(json.bean) && !$.isEmptyObject(json.bean)) { var approvalPersonChooseDom = '
' + '' + '
' +