From 83e8bc39056a0ea0534ccbfcaca37054700a15b0 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Mon, 6 May 2024 09:55:59 +0800
Subject: [PATCH] =?UTF-8?q?delete:=20=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/myActiviti/initiatedProcess.js         | 38 +------------------
 .../tpl/myActiviti/initiatedProcess.html      |  4 --
 .../assets/lib/layui/customer/activitiUtil.js |  2 +-
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js b/activiti/src/main/resources/template/js/myActiviti/initiatedProcess.js
index 8c8abcb5a..41175424c 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 2778d3819..cdeeddf17 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 @@
     <div style="margin:auto 10px;">
         <table id="messageMyStartTable" lay-filter="messageMyStartTable"></table>
         <script type="text/html" id="myStartTableBar">
-			{{# if(d.editRow == 1){ }}
-				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-				<a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="revoke">撤销</a>
-			{{# } }}
 			<a class="layui-btn layui-btn-xs" lay-event="details">详情</a>
 			<a class="layui-btn layui-btn-xs" lay-event="refreshPic">刷新流程图</a>
         </script>
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 a3b8a0505..4b7c4fbe9 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 = '<div class="layui-form-item layui-col-xs12">' +
                     '<label class="layui-form-label">下一个审批人<i class="red">*</i></label>' +
                     '<div class="layui-input-block">' +
-- 
GitLab