From e3a254e169adeb0b11a8b3eae9172701e9557d0c Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 18 May 2022 17:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84OA=20app=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/form/css/oa-form.css | 4 +- .../static/form/css/oa-user-select.css | 14 +-- .../resources/static/form/js/oa-form-util.js | 88 ++++++++++++------ .../static/form/js/oa-user-select.js | 5 +- .../templates/ftl/page/app/app-form-save.ftl | 3 +- .../templates/ftl/page/app/app-form-show.ftl | 7 +- .../ftl/page/app/app-form-update.ftl | 11 +-- .../ftl/page/app/oa/app-form-save.ftl | 3 +- .../ftl/page/app/oa/app-form-show.ftl | 59 +++++++++--- .../ftl/page/app/oa/app-form-update.ftl | 92 +++++++++++++------ .../templates/ftl/page/web/form-save.ftl | 3 +- .../templates/ftl/page/web/form-show.ftl | 3 +- .../templates/ftl/page/web/form-update.ftl | 3 +- .../templates/ftl/page/web/oa/form-save.ftl | 3 +- .../templates/ftl/page/web/oa/form-show.ftl | 8 +- .../templates/ftl/page/web/oa/form-update.ftl | 3 +- 16 files changed, 208 insertions(+), 101 deletions(-) diff --git a/module-form/src/main/resources/static/form/css/oa-form.css b/module-form/src/main/resources/static/form/css/oa-form.css index 6e38b46b..3d1cc685 100644 --- a/module-form/src/main/resources/static/form/css/oa-form.css +++ b/module-form/src/main/resources/static/form/css/oa-form.css @@ -6,7 +6,7 @@ padding: 15px 0; z-index: 100; background-color: #FFF; - border-bottom: 1px solid #f1f1f1; + border-bottom: 1px solid #e6e6e6; } .oa-form-footer-tool-bar { @@ -17,7 +17,7 @@ padding: 15px 0; z-index: 100; background-color: #FFF; - border-top: 1px solid #f1f1f1; + border-top: 1px solid #e6e6e6; } .layui-card { diff --git a/module-form/src/main/resources/static/form/css/oa-user-select.css b/module-form/src/main/resources/static/form/css/oa-user-select.css index 32d971de..b6e63622 100644 --- a/module-form/src/main/resources/static/form/css/oa-user-select.css +++ b/module-form/src/main/resources/static/form/css/oa-user-select.css @@ -1,21 +1,21 @@ .select-user-container {background-color:#fff; padding: 0px;height: 100%;width: 500px; position:relative;} -.select-user-container .top {border-top: 1px;border-right: 1px;border-bottom: 0;border-left: 1px;border-style: solid;border-color: silver;padding: 5px;} -.select-user-container .top .selected-user {border: 1px dotted silver;line-height: 30px;padding: 5px;overflow: hidden;} +.select-user-container .top {border-top: 1px;border-right: 1px;border-bottom: 0;border-left: 1px;border-style: solid;border-color: #e6e6e6;padding: 5px;} +.select-user-container .top .selected-user {border: 1px dotted #e6e6e6;line-height: 30px;padding: 5px;overflow: hidden;} .select-user-container .top .selected-user .list {width: 498px;height: 60px;overflow-y: scroll;overflow-x: hidden;} -.select-user-container .center {border: 1px solid silver;height: 40px;overflow: hidden;} +.select-user-container .center {border: 1px solid #e6e6e6;height: 40px;overflow: hidden;} .select-user-container .center .list {padding: 5px 8px;line-height: 30px;height: 50px;white-space: nowrap;overflow-x: scroll;overflow-y: hidden;} .select-user-container .center .list span {cursor: pointer;} .select-user-container .center .list span::after {content: ' > ';} .select-user-container .center .list span:last-child {color: #b7b5b5; cursor: default;} .select-user-container .center .list span:last-child::after {content: ''} .select-user-container .bottom {font-size: 0;} -.select-user-container .bottom .left {display: inline-block;width: 198px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 1px;border-style: solid;border-color: silver;overflow: hidden;} +.select-user-container .bottom .left {display: inline-block;width: 198px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 1px;border-style: solid;border-color: #e6e6e6;overflow: hidden;} .select-user-container .bottom .left .list {width: 216px;height: 300px;overflow-y: scroll;overflow-x: hidden;} -.select-user-container .bottom .left .list div {font-size: 14px;padding: 5px 8px;line-height: 28px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 0;border-style: dotted;border-color: silver; cursor: pointer;} +.select-user-container .bottom .left .list div {font-size: 14px;padding: 5px 8px;line-height: 28px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 0;border-style: dotted;border-color: #e6e6e6; cursor: pointer;} .select-user-container .bottom .left .list div:last-child {border-bottom: 0;} -.select-user-container .bottom .right {display: inline-block;width: 299px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 0px;border-style: solid;border-color: silver;overflow: hidden;} +.select-user-container .bottom .right {display: inline-block;width: 299px;border-top: 0;border-right: 1px;border-bottom: 1px;border-left: 0px;border-style: solid;border-color: #e6e6e6;overflow: hidden;} .select-user-container .bottom .right .list {width: 316px;height: 300px;overflow-y: scroll;overflow-x: hidden;} -.select-user-container .bottom .right .list .user-item {padding: 5px;border-bottom: 1px dotted silver; cursor: pointer;} +.select-user-container .bottom .right .list .user-item {padding: 5px;border-bottom: 1px dotted #e6e6e6; cursor: pointer;} .select-user-container .bottom .right .list .user-item .avatar {display: inline-block;width: 40px;height: 40px; line-height: 40px; font-size: 20px; border-radius: 20px; text-align: center;} .select-user-container .bottom .right .list .user-item .avatar img {width: 100%;height: 100%;} .select-user-container .bottom .right .list .user-item .info {display: inline-block;font-size: 14px;line-height: 20px;vertical-align: top;margin-left: 5px;} diff --git a/module-form/src/main/resources/static/form/js/oa-form-util.js b/module-form/src/main/resources/static/form/js/oa-form-util.js index e86a75e7..f867254d 100644 --- a/module-form/src/main/resources/static/form/js/oa-form-util.js +++ b/module-form/src/main/resources/static/form/js/oa-form-util.js @@ -7,6 +7,19 @@ function OaFormUtil(layui) { var restAjax = layui.restajax; var processImageEnlargeScale = 0; + // 消息位置 + function getMsgOffset(isApp) { + return isApp ? '15px' : 'auto'; + } + + /** + * 关闭按钮组 + */ + function closeBtns() { + $('#formBtns').click(); + $('#appFormBtns').click(); + } + /** * 设置保存历史字段列表 * @param formData @@ -57,13 +70,13 @@ function OaFormUtil(layui) { if (!jointlySigns) { continue; } - var signListDom = '
记录'; + var signListDom = '
记录'; for (var i = 0, item; item = jointlySigns[i++];) { signListDom += [ '
', ' 姓名：' + item.userName + '。 ', ' 内容：' + item.content + '。', - ' 时间：' + item.time + '。', + ' ' + item.time + '', '
' ].join(''); } @@ -180,7 +193,7 @@ function OaFormUtil(layui) { ul += ''; $('#processLog').append(ul); }, function (code, data) { - layer.msg(data.msg); + layer.msg(data.msg, {offset: getMsgOffset(isApp)}); }); } @@ -198,7 +211,7 @@ function OaFormUtil(layui) { function initRuntimeProcessImage() { var html = [ '
', - ' 流转图', + ' 流转图', '
', '
', ' ' buttons += '
'; buttons += '
'; @@ -545,6 +555,7 @@ function OaFormUtil(layui) { exts: 'pdf|doc|docx|xls|xlsx|ppt|pptx|wps|txt|rar|zip|jpg|png|gif|bmp|jpeg|mp4|wav|mp3', headers: headers, before: function (obj) { + closeBtns(); layerLoadingIndex = layer.msg('上传中...', {icon: 16, time: 0, shade: 0.3}) }, done: function (res, index, upload) { @@ -667,6 +678,7 @@ function OaFormUtil(layui) { // 打印 $(document.body).on('click', '#printBtn', function() { + closeBtns(); if(!formCode || !formVersion || !uid) { return; } @@ -675,6 +687,7 @@ function OaFormUtil(layui) { // 回退页面 $(document.body).on('click', '#goBackBtn', function () { + closeBtns(); if (!taskId) { return; } @@ -727,6 +740,7 @@ function OaFormUtil(layui) { // 回退 $(document.body).on('click', '.go-back-btn', function () { + closeBtns(); if (!taskId) { return; } @@ -744,11 +758,11 @@ function OaFormUtil(layui) { restAjax.put(restAjax.path('api/oa-form-report/update-go-back/process-instance-id/{processInstanceId}/task-id/{taskId}/node-id/{nodeId}', [processInstanceId, taskId, nodeId]), { reason: reason }, null, function (code, data) { - layer.msg('回退成功'); + layer.msg('回退成功', {offset: getMsgOffset(isApp)}); formButton.btnAttachment = 0; }, function (code, data) { $('.confirm-btn, .go-back-btn, .delete-btn').show(); - layer.msg(data.msg); + layer.msg(data.msg, {offset: getMsgOffset(isApp)}); }, function () { $('.confirm-btn, .go-back-btn, .delete-btn').hide(); loadLayerIndex = layer.msg('提交中...', {icon: 16, time: 0, shade: 0.3}); @@ -761,21 +775,33 @@ function OaFormUtil(layui) { // 强制结束 $(document.body).on('click', '#forcedEndBtn', function() { - layer.confirm('确定结束吗?', function (confirmLayerIndex) { + closeBtns(); + $('#appFormBtns').click(); + $('#formBtns').click(); + layer.confirm('确定结束吗?', {title: false}, function (confirmLayerIndex) { layer.close(confirmLayerIndex); - layer.prompt({title: '请输入结束原因', formType: 2}, function (reason, promptIndex) { + layer.prompt({title: '请输入结束原因', formType: 2, offset: getMsgOffset(isApp)}, function (reason, promptIndex) { layer.close(promptIndex); var loadLayerIndex; - restAjax.put(restAjax.path('api/oa-form-report/update-forced-end/process-instance-id/{processInstanceId}/task-id/{taskId}', [processInstanceId, taskId]), { + var url; + if(isApp) { + url = 'app/oa-form-report/update-forced-end/process-instance-id/{processInstanceId}/task-id/{taskId}'; + } else { + url = 'api/oa-form-report/update-forced-end/process-instance-id/{processInstanceId}/task-id/{taskId}'; + } + + restAjax.put(restAjax.path(url, [processInstanceId, taskId]), { reason: reason - }, null, function (code, data) { - layer.msg('结束成功'); + }, { + headers: headers + }, function (code, data) { + layer.msg('结束成功', {offset: getMsgOffset(isApp)}); formButton.btnAttachment = 0; }, function (code, data) { $('.confirm-btn, .go-back-btn').show(); - layer.msg(data.msg); + layer.msg(data.msg, {offset: getMsgOffset(isApp)}); }, function () { $('.confirm-btn, .go-back-btn').hide(); loadLayerIndex = layer.msg('提交中...', {icon: 16, time: 0, shade: 0.3}); @@ -788,6 +814,7 @@ function OaFormUtil(layui) { // 抄送 $(document.body).on('click', '#ccBtn', function() { + closeBtns(); function getCcArray() { var selectedUserIdArray = []; if(!$('#ccs').val()) { @@ -808,9 +835,6 @@ function OaFormUtil(layui) { departmentRootId: 0, selectedUserIdArray: getCcArray(), onConfirm: function(selectedUserArray) { - if(selectedUserArray.length == 0) { - return; - } var ccs = ''; for(var i = 0, item; item = selectedUserArray[i++];) { if (ccs.length > 0) { @@ -826,6 +850,7 @@ function OaFormUtil(layui) { // 转交 $(document.body).on('click', '#transferBtn', function() { + closeBtns(); var osUserSelect = new OaUserSelect(layui, { isApp: isApp, headers: headers, @@ -835,21 +860,30 @@ function OaFormUtil(layui) { if(selectedUserArray.length == 0) { return; } - layer.confirm('确定转交吗?', function (confirmLayerIndex) { + layer.confirm('确定转交吗?', {title: false}, function (confirmLayerIndex) { layer.close(confirmLayerIndex); - layer.prompt({title: '请输入转交原因', formType: 2}, function (reason, promptIndex) { + layer.prompt({title: '请输入转交原因', formType: 2, offset: getMsgOffset(isApp)}, function (reason, promptIndex) { layer.close(promptIndex); var loadLayerIndex; - restAjax.put(restAjax.path('api/oa-form-report/update-assignee/process-instance-id/{processInstanceId}/task-id/{taskId}', [processInstanceId, taskId]), { + var url; + if(isApp) { + url = 'app/oa-form-report/update-assignee/process-instance-id/{processInstanceId}/task-id/{taskId}'; + } else { + url = 'api/oa-form-report/update-assignee/process-instance-id/{processInstanceId}/task-id/{taskId}'; + } + + restAjax.put(restAjax.path(url, [processInstanceId, taskId]), { assignee: selectedUserArray[0].userId, reason: reason - }, null, function (code, data) { - layer.msg('转交成功'); + }, { + headers: headers + }, function (code, data) { + layer.msg('转交成功', {offset: getMsgOffset(isApp)}); formButton.btnAttachment = 0; }, function (code, data) { $('.confirm-btn, .go-back-btn, .delete-btn').show(); - layer.msg(data.msg); + layer.msg(data.msg, {offset: getMsgOffset(isApp)}); }, function () { $('.confirm-btn, .go-back-btn, .delete-btn').hide(); loadLayerIndex = layer.msg('转交中...', {icon: 16, time: 0, shade: 0.3}); diff --git a/module-form/src/main/resources/static/form/js/oa-user-select.js b/module-form/src/main/resources/static/form/js/oa-user-select.js index 07b7b2a6..e13b7350 100644 --- a/module-form/src/main/resources/static/form/js/oa-user-select.js +++ b/module-form/src/main/resources/static/form/js/oa-user-select.js @@ -112,7 +112,7 @@ function OaUserSelect(layui, opt) { refreshSelectedUser: function() { var doms = ''; for(var i = 0, item; item = Properties.selectedUserArray[i++];) { - doms += ''+ item.userName +' '; + doms += ''+ item.userName +' '; } $('#selectedUsers').empty(); $('#selectedUsers').append(doms); @@ -331,7 +331,6 @@ function OaUserSelect(layui, opt) { $(document).on('click', '#userSelectConfirmBtn', function(e) { if(onConfirm) { - var selectUserArray = []; onConfirm(Properties.selectedUserArray); } Methods.close(); @@ -374,7 +373,7 @@ function OaUserSelect(layui, opt) { anim: isApp ? 2 : 0, isOutAnim: false, title: false, - shadeClose: false, + shadeClose: true, scrollbar: false, content: Init.initHtml(), success: function() { diff --git a/module-form/src/main/resources/templates/ftl/page/app/app-form-save.ftl b/module-form/src/main/resources/templates/ftl/page/app/app-form-save.ftl index 7a1cb6e0..d2412de7 100644 --- a/module-form/src/main/resources/templates/ftl/page/app/app-form-save.ftl +++ b/module-form/src/main/resources/templates/ftl/page/app/app-form-save.ftl @@ -40,7 +40,8 @@ + +
- <#list fields as field> - ${field.html} - -
-
- +
+
+
+
+
+
+
+
    +
  • 详情
    • +
  • 流转日志
    • +
  • 流转图
    • +
+
+
+ <#list fields as field> + ${field.html} + +
+
+
@@ -35,11 +50,14 @@
+ + diff --git a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-update.ftl b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-update.ftl index 87274c1b..7bf965c8 100644 --- a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-update.ftl +++ b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-update.ftl @@ -13,6 +13,8 @@ + + @@ -20,29 +22,49 @@
- <#list fields as field> - ${field.html} - -
-
+
+
- +
+
+
+
+
+ +
+
    +
  • 详情
    • +
  • 流转日志
    • +
  • 流转图
    • +
+
+
+ <#list fields as field> + ${field.html} + +
+
+
+
+ +