Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
wanggeng 2022-07-08 11:23:26 +08:00
parent c813f905ce
commit dcb8459a9b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java
View File

@ -126,8 +126,10 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
setSign(reportForm, historicProcessInstance); setSign(reportForm, historicProcessInstance);
// 设置会签 // 设置会签
setJointlySign(reportForm); setJointlySign(reportForm);
formReportRouteService.setModal(formPO, reportForm); Map<String, Object> modal = getHashMap(10);
formReportRouteService.showPage(reportForm, formCode, formPO.getPrintPageCode(), httpSession, httpServletRequest, httpServletResponse); modal.put("formData", reportForm);
formReportRouteService.setModal(formPO, modal);
formReportRouteService.showPage(modal, formCode, formPO.getPrintPageCode(), httpSession, httpServletRequest, httpServletResponse);
} }
@Override @Override
@ -201,9 +203,9 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements
jointlySignedValue = ""; jointlySignedValue = "";
} }
if (!jointlySignedValue.isEmpty()) { 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); jointlySignMap.put(taskCommentBO.getFieldName(), jointlySignedValue);
} }
// 替换会签的内容 // 替换会签的内容

5
module-activiti/src/main/resources/templates/activiti/save.html
View File

@ -44,10 +44,11 @@
<label class="layui-form-label">模型分类 *</label> <label class="layui-form-label">模型分类 *</label>
<div class="layui-input-block input-select-change-box"> <div class="layui-input-block input-select-change-box">
<div id="modelCategoryInputBox"> <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>
<div id="modelCategorySelectBox"> <div id="modelCategorySelectBox">
<select id="modelCategorySelect" name="modelCategory" lay-verify="required"> <select id="modelCategorySelect" name="modelCategory" lay-verify="required">
<option value="">请选择</option>
<option th:each="modelCategory:${modelCategories}" th:value="${modelCategory}" th:text="${modelCategory}"></option> <option th:each="modelCategory:${modelCategories}" th:value="${modelCategory}" th:text="${modelCategory}"></option>
</select> </select>
</div> </div>
@ -114,6 +115,7 @@
$('#modelCategorySelect').removeAttr('name'); $('#modelCategorySelect').removeAttr('name');
$('#modelCategoryInputBox').show(); $('#modelCategoryInputBox').show();
$('#modelCategoryInput').attr('name', 'modelCategory'); $('#modelCategoryInput').attr('name', 'modelCategory');
$('#modelCategoryInput').attr('lay-verify', 'required');
}); });
$('#selectChangeBtn').click(function() { $('#selectChangeBtn').click(function() {
@ -123,6 +125,7 @@
$('#modelCategoryInput').removeAttr('name'); $('#modelCategoryInput').removeAttr('name');
$('#modelCategorySelectBox').show(); $('#modelCategorySelectBox').show();
$('#modelCategorySelect').attr('name', 'modelCategory'); $('#modelCategorySelect').attr('name', 'modelCategory');
$('#modelCategoryInput').attr('lay-verify', 'required');
}); });
// 校验 // 校验