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

调整oa签字格式

Browse Source
This commit is contained in:
wanggeng 2022-05-19 11:53:23 +08:00
parent 733706b345
commit 6f55b1b06b
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java
View File

@ -501,7 +501,7 @@ public class OaFormReportServiceImpl extends DefaultBaseService implements IOaFo
List<Comment> signComments = taskService.getProcessInstanceComments(processInstanceId, TaskCommentTypeEnum.SIGN.getValue());
for (Comment comment : signComments) {
TaskCommentBO taskCommentBO = JSONObject.parseObject(comment.getFullMessage(), TaskCommentBO.class);
detail.put(taskCommentBO.getFieldName(), String.format("姓名：%s。 内容：%s。 时间：%s。", taskCommentBO.getUserName(), taskCommentBO.getContent(), taskCommentBO.getTime()));
detail.put(taskCommentBO.getFieldName(), String.format("%s。 %s。 %s。", taskCommentBO.getContent(), taskCommentBO.getUserName(), taskCommentBO.getTime()));
}
LOG.debug("会签的内容");

28
module-form/src/main/resources/static/form/js/oa-form-util.js
View File

@ -74,8 +74,8 @@ function OaFormUtil(layui) {
for (var i = 0, item; item = jointlySigns[i++];) {
signListDom += [
'<div>',
' <span>姓名：' + item.userName + '。 </span>',
' <span>内容：' + item.content + '。</span>',
' <span>' + item.content + '。</span>',
' <span>' + item.userName + '。 </span>',
' <span>' + item.time + '</span>',
'</div>'
].join('');
@ -102,7 +102,7 @@ function OaFormUtil(layui) {
}
var jointlySignListText = '';
for (var i = 0, item; item = jointlySigns[i++];) {
jointlySignListText += '姓名：' + item.userName + '。 内容：' + item.content + '。 时间：' + item.time + '。\n';
jointlySignListText += item.content + '。 ' + item.userName + '。 ' + item.time + '。\n';
}
formData[key] = jointlySignListText;
}
@ -411,6 +411,28 @@ function OaFormUtil(layui) {
doms.attr('lay-verify', '');
}
/**
* 禁用字段转div
*/
this.disabledField2Div = function() {
var doms = $('#reportForm').find('input,textarea,select');
$.each(doms, function(index, item) {
if(!item.disabled) {
return;
}
var value = item.value;
var parent = $(item).parent();
parent.empty();
if(item.nodeName === 'INPUT' || item.nodeName === 'SELECT') {
parent.append('<div style="line-height: 36px;">'+ value +'</div>')
} else if(item.nodeName === 'TEXTAREA') {
parent.append('<div style="line-height: 36px; text-align: left;">'+ value +'</div>')
}
});
}
/**
* @description 隐藏字段操作
* @param fields {Array} [{fieldName:'', isVisible: 0|1}]

2
module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl
View File

@ -127,6 +127,8 @@
</#list>
form.render(null, 'dataForm');
oaFormUtil.disabledField2Div();
}, function(code, data) {
layer.msg(data.msg);
}, function() {

2
module-form/src/main/resources/templates/ftl/page/app/oa/app-form-update.ftl
View File

@ -144,6 +144,8 @@
oaFormUtil.backFillFields(fields, currentUser);
oaFormUtil.hideFields(fields);
oaFormUtil.disableFields(fields);
oaFormUtil.disabledField2Div();
}, function(code, data) {
layer.msg(data.msg);
}, function() {