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-05-13 12:05:44 +08:00
parent e6e1c1d35e
commit 33e903002b
4 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,5 +51,29 @@
margin-right: 10px; margin-right: 10px;
} }
.title-bar-left {} .title-bar-left {
.title-bar-right {} }
.title-bar-right {
}
#submitFormBtns {
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.3);
z-index: 1000;
}
#submitFormBtnsContainer {
position: relative;
top: 0;
left: -180px;
width: 180px;
height: 100%;
background-color: white;
overflow: auto;
}

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

@ -255,24 +255,30 @@ function OaFormUtil(layui) {
} else { } else {
$('#submitBtnGroup').append('<button type="button" id="showSubmitFormBtns" class="layui-btn layui-btn-primary layui-btn-xs"><i class="fa fa-list-ul" aria-hidden="true"></i> 提交</button>'); $('#submitBtnGroup').append('<button type="button" id="showSubmitFormBtns" class="layui-btn layui-btn-primary layui-btn-xs"><i class="fa fa-list-ul" aria-hidden="true"></i> 提交</button>');
var html = '<div class="layui-btn-container" style="padding: 10px;">'; var html = '<div id="submitFormBtns">';
html += '<div id="submitFormBtnsContainer">';
html += '<div class="layui-btn-container" style="padding: 10px;">'
for (var i = 0, item; item = confirmAssignees[i++];) { for (var i = 0, item; item = confirmAssignees[i++];) {
html += '<button type="button" id="submitFormBtn' + i + '" class="layui-col-xs12 layui-btn layui-btn-sm ' + btnColor[(i - 1) % 3] + ' confirm-btn" lay-submit lay-filter="submit' + i + '" data-select-type="' + item.nodeType + '" data-index="' + (i - 1) + '" data-next-end-event="' + item.nextEndEvent + '" data-btn-exc="' + item.btnExc + '">' + item.btnText + '</button>' html += '<button type="button" id="submitFormBtn' + i + '" class="layui-col-xs12 layui-btn layui-btn-sm ' + btnColor[(i - 1) % 3] + ' confirm-btn" lay-submit lay-filter="submit' + i + '" data-select-type="' + item.nodeType + '" data-index="' + (i - 1) + '" data-next-end-event="' + item.nextEndEvent + '" data-btn-exc="' + item.btnExc + '">' + item.btnText + '</button>'
} }
html += '</div>'; html += '</div>';
html += '</div>';
html += '</div>';
$('#submitBtnGroup').append(html)
$(document).on('click', '#submitFormBtns', function() {
$(this).hide();
$('#submitFormBtnsContainer').css('left', '-180px');
})
$(document).on('click', '#submitFormBtnsContainer', function(e) {
e.stopPropagation()
})
$(document).on('click', '#showSubmitFormBtns', function() { $(document).on('click', '#showSubmitFormBtns', function() {
layer.open({ $('#submitFormBtns').show();
type: 1, $('#submitFormBtnsContainer').animate({left: '0'}, 300);
title: false,
area: ['200px', '100%'],
offset: 'l',
anim: 2,
isOutAnim: false,
closeBtn: 0,
shadeClose: true,
content: html
});
}) })
} }
} }
@ -675,7 +681,7 @@ function OaFormUtil(layui) {
} }
return selectedUserIdArray; return selectedUserIdArray;
} }
var osUserSelect = new OaUserSelect(layui, { var oaUserSelect = new OaUserSelect(layui, {
isApp: isApp, isApp: isApp,
headers: headers, headers: headers,
departmentRootId: 0, departmentRootId: 0,
@ -694,7 +700,7 @@ function OaFormUtil(layui) {
$('#ccs').val(ccs); $('#ccs').val(ccs);
} }
}); });
osUserSelect.open(); oaUserSelect.open();
}) })
// 转交 // 转交

11
module-form/src/main/resources/templates/ftl/page/web/oa/form-save.ftl
View File

@ -13,6 +13,7 @@
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<link rel="stylesheet" type="text/css" href="static/form/css/form.css?v=1"> <link rel="stylesheet" type="text/css" href="static/form/css/form.css?v=1">
<link rel="stylesheet" type="text/css" href="static/form/css/oa-user-select.css?v=1">
<link rel="stylesheet" type="text/css" href="static/form/css/oa-form.css?v=1"> <link rel="stylesheet" type="text/css" href="static/form/css/oa-form.css?v=1">
</head> </head>
<body> <body>
@ -41,6 +42,7 @@
<input type="hidden" id="formVersion" value="${r'${formVersion}'}"> <input type="hidden" id="formVersion" value="${r'${formVersion}'}">
</div> </div>
<script src="static/form/js/form-util.js?v=1"></script> <script src="static/form/js/form-util.js?v=1"></script>
<script src="static/form/js/oa-user-select.js?v=1"></script>
<script src="static/form/js/oa-form-util.js?v=1"></script> <script src="static/form/js/oa-form-util.js?v=1"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script src="assets/layuiadmin/layui/layui.js"></script> <script src="assets/layuiadmin/layui/layui.js"></script>
@ -61,6 +63,7 @@
var confirmAssignees = ${r"${confirmAssignees}"}; var confirmAssignees = ${r"${confirmAssignees}"};
var fields = ${r"${fields}"}; var fields = ${r"${fields}"};
var formButton = ${r"${formButton}"}; var formButton = ${r"${formButton}"};
var currentUser = ${r"${currentUser}"};
// 初始化 // 初始化
function initData() { function initData() {
@ -74,7 +77,7 @@
formUtil.initUploadFile('${field.data.id}', ${field.data.count}); formUtil.initUploadFile('${field.data.id}', ${field.data.count});
<#elseif field.data.tag == 'uploadVideo'> <#elseif field.data.tag == 'uploadVideo'>
formUtil.initUploadVideo('${field.data.id}', ${field.data.count}); formUtil.initUploadVideo('${field.data.id}', ${field.data.count});
<#elseif field.data.tag == 'uploadAudio'> <#elseif field.data.tag == 'uploadAudio'>
formUtil.initUploadAudio('${field.data.id}', ${field.data.count}); formUtil.initUploadAudio('${field.data.id}', ${field.data.count});
<#elseif field.data.tag == 'date'> <#elseif field.data.tag == 'date'>
formUtil.initDate({ formUtil.initDate({
@ -87,6 +90,7 @@
}); });
</#if> </#if>
</#list> </#list>
oaFormUtil.backFillFields(fields, currentUser);
oaFormUtil.hideFields(fields); oaFormUtil.hideFields(fields);
oaFormUtil.disableFields(fields); oaFormUtil.disableFields(fields);
} }
@ -106,7 +110,9 @@
// 提交前处理 // 提交前处理
formUtil.clearUploadField(formData); formUtil.clearUploadField(formData);
// 会签字段
oaFormUtil.setEditHistoryFields(formData, fields); oaFormUtil.setEditHistoryFields(formData, fields);
// 抄送列表
oaFormUtil.setCcs(formData); oaFormUtil.setCcs(formData);
var loadLayerIndex; var loadLayerIndex;
@ -160,6 +166,9 @@
users: confirmAssignees[index].assignees, users: confirmAssignees[index].assignees,
selectedUserIds: [], selectedUserIds: [],
onConfirm: function(selectedUsers) { onConfirm: function(selectedUsers) {
if(!selectedUsers) {
return;
}
var assignees = []; var assignees = [];
for(var j = 0, jItem; jItem = selectedUsers[j++];) { for(var j = 0, jItem; jItem = selectedUsers[j++];) {
assignees.push(jItem.userId); assignees.push(jItem.userId);

14
module-form/src/main/resources/templates/ftl/page/web/oa/form-update.ftl
View File

@ -13,6 +13,7 @@
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"> <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css"> <link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<link rel="stylesheet" type="text/css" href="static/form/css/form.css?v=1"> <link rel="stylesheet" type="text/css" href="static/form/css/form.css?v=1">
<link rel="stylesheet" type="text/css" href="static/form/css/oa-user-select.css?v=1">
<link rel="stylesheet" type="text/css" href="static/form/css/oa-form.css?v=1"> <link rel="stylesheet" type="text/css" href="static/form/css/oa-form.css?v=1">
</head> </head>
<body> <body>
@ -55,6 +56,7 @@
<input type="hidden" id="isNeedClaim" value="${r'${isNeedClaim}'}"> <input type="hidden" id="isNeedClaim" value="${r'${isNeedClaim}'}">
</div> </div>
<script src="static/form/js/form-util.js?v=1"></script> <script src="static/form/js/form-util.js?v=1"></script>
<script src="static/form/js/oa-user-select.js?v=1"></script>
<script src="static/form/js/oa-form-util.js?v=1"></script> <script src="static/form/js/oa-form-util.js?v=1"></script>
<script src="assets/js/vendor/viewer/viewer.min.js"></script> <script src="assets/js/vendor/viewer/viewer.min.js"></script>
<script src="assets/layuiadmin/layui/layui.js"></script> <script src="assets/layuiadmin/layui/layui.js"></script>
@ -77,6 +79,7 @@
var confirmAssignees = ${r"${confirmAssignees}"}; var confirmAssignees = ${r"${confirmAssignees}"};
var fields = ${r"${fields}"}; var fields = ${r"${fields}"};
var formButton = ${r"${formButton}"}; var formButton = ${r"${formButton}"};
var currentUser = ${r"${currentUser}"};
// 初始化 // 初始化
function initData() { function initData() {
@ -94,7 +97,6 @@
} }
}); });
oaFormUtil.initTabItem($('#processInstanceId').val()); oaFormUtil.initTabItem($('#processInstanceId').val());
formUtil.disableFields(fields);
var self = this; var self = this;
var loadLayerIndex; var loadLayerIndex;
@ -135,7 +137,10 @@
</#list> </#list>
form.render(null, 'dataForm'); form.render(null, 'dataForm');
formUtil.hideFields(fields);
oaFormUtil.backFillFields(fields, currentUser);
oaFormUtil.hideFields(fields);
oaFormUtil.disableFields(fields);
}, function(code, data) { }, function(code, data) {
layer.msg(data.msg); layer.msg(data.msg);
}, function() { }, function() {
@ -160,7 +165,9 @@
// 提交前处理 // 提交前处理
formUtil.clearUploadField(formData); formUtil.clearUploadField(formData);
// 会签字段
oaFormUtil.setEditHistoryFields(formData, fields); oaFormUtil.setEditHistoryFields(formData, fields);
// 抄送列表
oaFormUtil.setCcs(formData); oaFormUtil.setCcs(formData);
var loadLayerIndex; var loadLayerIndex;
@ -216,6 +223,9 @@
users: confirmAssignees[index].assignees, users: confirmAssignees[index].assignees,
selectedUserIds: [], selectedUserIds: [],
onConfirm: function(selectedUsers) { onConfirm: function(selectedUsers) {
if(!selectedUsers) {
return;
}
var assignees = []; var assignees = [];
for(var j = 0, jItem; jItem = selectedUsers[j++];) { for(var j = 0, jItem; jItem = selectedUsers[j++];) {
assignees.push(jItem.userId); assignees.push(jItem.userId);