diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java index 4bfa67be..bcc7d35a 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java @@ -126,8 +126,10 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements setSign(reportForm, historicProcessInstance); // 设置会签 setJointlySign(reportForm); - formReportRouteService.setModal(formPO, reportForm); - formReportRouteService.showPage(reportForm, formCode, formPO.getPrintPageCode(), httpSession, httpServletRequest, httpServletResponse); + Map modal = getHashMap(10); + modal.put("formData", reportForm); + formReportRouteService.setModal(formPO, modal); + formReportRouteService.showPage(modal, formCode, formPO.getPrintPageCode(), httpSession, httpServletRequest, httpServletResponse); } @Override @@ -201,9 +203,9 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements jointlySignedValue = ""; } if (!jointlySignedValue.isEmpty()) { - jointlySignedValue += "\n"; + jointlySignedValue += "
"; } - jointlySignedValue += "签批人:" + taskCommentBO.getUserName() + "。签批内容:" + taskCommentBO.getContent() + "。签批时间:" + taskCommentBO.getTime(); + jointlySignedValue += taskCommentBO.getContent() + " " + taskCommentBO.getUserName() + "→" + taskCommentBO.getTime(); jointlySignMap.put(taskCommentBO.getFieldName(), jointlySignedValue); } // 替换会签的内容 diff --git a/module-activiti/src/main/resources/templates/activiti/save.html b/module-activiti/src/main/resources/templates/activiti/save.html index 107d2a1f..6a045ae6 100644 --- a/module-activiti/src/main/resources/templates/activiti/save.html +++ b/module-activiti/src/main/resources/templates/activiti/save.html @@ -44,10 +44,11 @@
- +
@@ -114,6 +115,7 @@ $('#modelCategorySelect').removeAttr('name'); $('#modelCategoryInputBox').show(); $('#modelCategoryInput').attr('name', 'modelCategory'); + $('#modelCategoryInput').attr('lay-verify', 'required'); }); $('#selectChangeBtn').click(function() { @@ -123,6 +125,7 @@ $('#modelCategoryInput').removeAttr('name'); $('#modelCategorySelectBox').show(); $('#modelCategorySelect').attr('name', 'modelCategory'); + $('#modelCategoryInput').attr('lay-verify', 'required'); }); // 校验