From dcb8459a9b9861efd045e6540cf4fc2790e72156 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 8 Jul 2022 11:23:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/oa/impl/OaFormReportRouteServiceImpl.java  | 10 ++++++----
 .../src/main/resources/templates/activiti/save.html    |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

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<String, Object> 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 += "<br/>";
             }
-            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 @@
                     <label class="layui-form-label">模型分类 *</label>
                     <div class="layui-input-block input-select-change-box">
                         <div id="modelCategoryInputBox">
-                            <input type="text" id="modelCategoryInput" name="modelCategory" class="layui-input" value="" placeholder="请输入模型分类" lay-verify="required">
+                            <input type="text" id="modelCategoryInput" name="modelCategory" class="layui-input" value="" placeholder="请输入模型分类">
                         </div>
                         <div id="modelCategorySelectBox">
                             <select id="modelCategorySelect" name="modelCategory" lay-verify="required">
+                                <option value="">请选择</option>
                                 <option th:each="modelCategory:${modelCategories}" th:value="${modelCategory}" th:text="${modelCategory}"></option>
                             </select>
                         </div>
@@ -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');
         });
 
         // 校验