From 20db9678d9b5149876335d1b7412b4beaf9569dc Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Fri, 31 Dec 2021 22:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E7=AD=BE=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=BF=A1=E6=81=AF=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/approvalActiviti/approvalProcess.js    |  5 +++
 .../tpl/approvalActiviti/approvalProcess.html | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
index 78da6f6ab..96026a639 100644
--- a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
+++ b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
@@ -209,6 +209,11 @@ layui.config({
 				parent.refreshCode = '0';
 			});
 
+			// 加载会签信息
+			if(j.bean.isMultiInstance){
+				$("#multiInstanceBox").html(getDataUseHandlebars($("#multiInstance").html(), j));
+			}
+
 			form.render();
 		}else{
 			winui.window.msg(j.returnMessage, {icon: 2,time: 2000});
diff --git a/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html b/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html
index a103ca6f7..c0da92829 100644
--- a/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html
+++ b/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html
@@ -39,6 +39,9 @@
 			   			<span class="hr-title">审批</span><hr>
 			    	</div>
 				    <form class="layui-form" action="">
+						<div class="layui-form-item layui-col-xs12" id="multiInstanceBox">
+
+						</div>
 				        <div class="layui-form-item layui-col-xs12">
 							<label class="layui-form-label">审批结果<i class="red">*</i></label>
 							<div class="layui-input-block winui-radio">
@@ -155,6 +158,36 @@
 			</div>
 		{{/bean}}
 	</script>
+
+	<!-- 多实例会签信息 -->
+	<script type="text/x-handlebars-template" id="multiInstance">
+		{{#bean}}
+			<div class="layui-form-item layui-col-xs12">
+				<label class="layui-form-label">完成条件：</label>
+				<div class="layui-input-block ver-center">
+					{{completionCondition}}
+				</div>
+			</div>
+			<div class="layui-form-item layui-col-xs4">
+				<label class="layui-form-label">会签任务总数：</label>
+				<div class="layui-input-block ver-center">
+					{{nrOfInstances}}
+				</div>
+			</div>
+			<div class="layui-form-item layui-col-xs4">
+				<label class="layui-form-label">正在执行的会签总数：</label>
+				<div class="layui-input-block ver-center">
+					{{nrOfActiveInstances}}
+				</div>
+			</div>
+			<div class="layui-form-item layui-col-xs4">
+				<label class="layui-form-label">已完成的会签任务总数：</label>
+				<div class="layui-input-block ver-center">
+					{{nrOfCompletedInstances}}
+				</div>
+			</div>
+		{{/bean}}
+	</script>
 	
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
-- 
GitLab