diff --git a/activiti/src/main/resources/template/js/addSignTask/jointlySign.js b/activiti/src/main/resources/template/js/addSignTask/jointlySign.js
index bae38e9791f5ab9290628bcd081f6927a4d8ffb1..da7c74e9580b08f7ca1eece85a64c844275f63d7 100644
--- a/activiti/src/main/resources/template/js/addSignTask/jointlySign.js
+++ b/activiti/src/main/resources/template/js/addSignTask/jointlySign.js
@@ -44,7 +44,7 @@ layui.config({
cols: [[
{ type: 'checkbox', align: 'center' },
{ field: 'name', title: '会签人', align: 'left', width: 180, templet: function(d){
- if(d.type == 1){
+ if(d.type == 1 || d.noDelete){
return '';
}else{
@@ -53,13 +53,20 @@ layui.config({
'';
}
}},
- { field: 'type', title: '角色', align: 'left', width: 180, templet: function(d){
+ { field: 'type', title: '角色', align: 'center', width: 100, templet: function(d){
if(d.type == 1){
return "主持人";
}else{
return "参与人";
}
}},
+ { field: 'isActive', title: '状态', align: 'center', width: 100, templet: function(d){
+ if(!d.isActive){
+ return "已评审";
+ }else{
+ return "未评审";
+ }
+ }},
{ field: 'email', title: '邮箱', align: 'left', width: 200}
]],
done: function(res){
diff --git a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
index 5ad9937367261e6f2c3e059adf36b56b35014925..4e22e25949d4bef0a169bc8f86540ab034c26bba 100644
--- a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
+++ b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
@@ -199,21 +199,36 @@ layui.config({
activitiUtil.initApprovalPerson("approvalOpinionDom", processInstanceId, taskId, $("input[name='flag']:checked").val());
}
- // 加载审批历史
- inboxTimeTreeApprovalHistory();
- matchingLanguage();
-
- // 工作流的其他操作
- activitiUtil.activitiMenuOperator("otherMenuOperator", j.bean, function (){
- parent.layer.close(index);
- parent.refreshCode = '0';
- });
+ // 并行会签的子实例，不支持工作流的其他操作
+ if(!j.bean.parallelMultilnStanceExecttionChild){
+ activitiUtil.activitiMenuOperator("otherMenuOperator", j.bean, function (){
+ parent.layer.close(index);
+ parent.refreshCode = '0';
+ });
+ }else{
+ $("#otherMenuOperator").parent().hide();
+ }
// 加载会签信息
if(j.bean.isMultiInstance){
$("#multiInstanceBox").html(getDataUseHandlebars($("#multiInstance").html(), j));
+ $("#multiInstanceState").html('已开启');
+ if(j.bean.nrOfInstances != 0){
+ // 会签任务总数为0说明没有设置会签人，可以自行审批通过，如果不为0，说明设置了会签人，需要通过会签投票获取结果
+ $("#resultTitle").html('会签结果');
+ $("#multiInstanceState").html('已完成');
+ if(j.bean.nrOfActiveInstances != 0){
+ // 正在执行的会签总数不为0，说明会签还未结束，不能提交到下一个审批节点
+ $("#approvalOpinionDom").hide();
+ $("#subBtnBox").hide();
+ $("#multiInstanceState").html('进行中');
+ }
+ }
}
+ // 加载审批历史
+ inboxTimeTreeApprovalHistory();
+ matchingLanguage();
form.render();
}else{
winui.window.msg(j.returnMessage, {icon: 2,time: 2000});
diff --git a/activiti/src/main/resources/template/tpl/addSignTask/jointlySign.html b/activiti/src/main/resources/template/tpl/addSignTask/jointlySign.html
index 4030b480c9aed33885a26a4bf8ef01273f814093..ff548d655acc0ebd49d9105b3d687c3ec168f4df 100644
--- a/activiti/src/main/resources/template/tpl/addSignTask/jointlySign.html
+++ b/activiti/src/main/resources/template/tpl/addSignTask/jointlySign.html
@@ -22,6 +22,12 @@
+