ToolTech/bpmc
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
hanjian
2024-09-02 20:59:57 +08:00
parent 6def8a39d3
commit fd7fc372a1
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ebpm-process-manage/webapp/pages/trace/traceByText.jsp
View File

@@ -154,7 +154,7 @@
<td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
historicTaskInstance.getStartTime())%></td>
<%
String fullCommentMsg = (comment!=null&&comment.getFullMessage()!=null? comment.getFullMessage() : "");
String fullCommentMsg = (comment!=null&&comment.getMessage()!=null? comment.getMessage() : "");
if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
String cancelCommentMsg="当前流程已作废";
fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);

2
ebpm-process-manage/webapp/pages/trace/traceImage.jsp
View File

@@ -312,7 +312,7 @@
}
html.push('<tr>');
html.push('<td class="clum">审批意见: </td>');
var fullCommentMsg = item.comment!=null&&item.comment.fullMessage!=null? item.comment.fullMessage : "";
var fullCommentMsg = item.comment!=null&&item.comment.message!=null? item.comment.message : "";
var shortCommentMsg="";
if(item.historicTaskInstance.deleteReason!=null&&"cancel_process"==item.historicTaskInstance.actionType){
var cancelCommentMsg="当前流程已作废,作废意见为:"+item.historicTaskInstance.deleteReason;

4
ebpm-process-manage/webapp/pages/trace/traceImageAndText.jsp
View File

@@ -148,7 +148,7 @@ function showSubActivityDetal(topId){
<th width="15%">处理环节</th>
<th width="15%">处理人</th>
<th width="12%">处理时间</th>
<th >处理意见</th>
<th >处理意见2222</th>
<th width="15%">接收环节</th>
<th width="15%">接收人</th>
@@ -182,7 +182,7 @@ function showSubActivityDetal(topId){
<td><%=DateUtil.convertDateToString("yyyy-MM-dd HH:mm:ss",
historicTaskInstance.getStartTime())%></td>
<%
String fullCommentMsg = (comment!=null&&comment.getFullMessage()!=null? comment.getFullMessage() : "");
String fullCommentMsg = (comment!=null&&comment.getMessage()!=null? comment.getMessage() : "");
if(!StringUtils.isEmpty(historicTaskInstance.getDeleteReason())&&"cancel_process".equals(historicTaskInstance.getActionType())){
String cancelCommentMsg="当前流程已作废";
fullCommentMsg=StringUtils.isEmpty(fullCommentMsg)?cancelCommentMsg:(cancelCommentMsg+",意见为:"+fullCommentMsg);