feat: 流程代码修改

activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js

@@ -22,7 +22,13 @@ layui.config({
 		// 加载业务数据
 		activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'details');
 		// 当前审批人
-		$("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name));
+		if (!isNull(data.bean.task?.taskCurrentAssigneeMation)) {
+			var str = "";
+			$.each(data.bean.task?.taskCurrentAssigneeMation, function(i, item) {
+				str += '<span class="layui-badge layui-bg-blue">' + item.name + '</span><br>';
+			});
+			$("#taskCurrentAssignee").html(str);
+		}
 		// 加载流程图片
 		$("#processInstanceIdImg").attr("src", fileBasePath + 'images/upload/activiti/' + processInstanceId + ".png?cdnversion=" + Math.ceil(new Date()/3600000));
 		matchingLanguage();

activiti/src/main/resources/template/js/approvalActiviti/approvalProcessTask.js

@@ -26,7 +26,13 @@ layui.config({
 		activitiUtil.loadBusiness(data.bean.objectId, data.bean.objectKey, data.bean.actFlowId, 'edit');
 
 		// 当前审批人
-		$("#taskCurrentAssignee").html(getNotUndefinedVal(data.bean.task?.taskCurrentAssigneeMation?.name));
+		if (!isNull(data.bean.task?.taskCurrentAssigneeMation)) {
+			var str = "";
+			$.each(data.bean.task?.taskCurrentAssigneeMation, function(i, item) {
+				str += '<span class="layui-badge layui-bg-blue">' + item.name + '</span><br>';
+			});
+			$("#taskCurrentAssignee").html(str);
+		}
 	}, async: false});
     
     AjaxPostUtil.request({url: flowableBasePath + "activitimode016", params: {taskId: taskId, processInstanceId: processInstanceId}, type: 'json', method: 'GET', callback: function(j){

activiti/src/main/resources/template/js/myActiviti/processedProcess.js

@@ -85,6 +85,7 @@ layui.config({
         var data = obj.data;
         var layEvent = obj.event;
         if (layEvent === 'details') { //详情
+			data.processInstanceId = data.hisTask?.processInstanceId;
 			activitiUtil.activitiDetails(data);
         } else if (layEvent === 'withdraw') { //撤回
         	withdraw(data);
@@ -95,8 +96,8 @@ layui.config({
 
 	// 撤回
 	function withdraw(data) {
-		processInstanceId = data.processInstanceId;
-		hisTaskId = data.hisTaskId;
+		processInstanceId = data.hisTask?.processInstanceId;
+		hisTaskId = data.hisTask?.id;
 		_openNewWindows({
 			url: "../../tpl/activitiCommon/revokeActiviti.html",
 			title: "撤回",
@@ -113,7 +114,7 @@ layui.config({
 	function refreshPic(data) {
 		layer.confirm('确认重新生成流程图吗？', { icon: 3, title: '刷新流程图操作' }, function (i) {
 			layer.close(i);
-            AjaxPostUtil.request({url: flowableBasePath + "activitimode027", params: {processInstanceId: data.processInstanceId}, type: 'json', callback: function (json) {
+            AjaxPostUtil.request({url: flowableBasePath + "activitimode027", params: {processInstanceId: data.hisTask?.processInstanceId}, type: 'json', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
  	   		}});
 		});