From 33e903002b91eae609a475de4bdde5154a88e640 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 13 May 2022 12:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E6=9D=BF=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/form/css/oa-form.css     | 28 +++++++++++++--
 .../resources/static/form/js/oa-form-util.js  | 34 +++++++++++--------
 .../templates/ftl/page/web/oa/form-save.ftl   | 11 +++++-
 .../templates/ftl/page/web/oa/form-update.ftl | 14 ++++++--
 4 files changed, 68 insertions(+), 19 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 5d5ce5e1..4526e0d9 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
@@ -51,5 +51,29 @@
     margin-right: 10px;
 }
 
-.title-bar-left {}
-.title-bar-right {}
\ No newline at end of file
+.title-bar-left {
+}
+
+.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;
+}
\ No newline at end of file
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 f5aa54d6..31e07e4d 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
@@ -255,24 +255,30 @@ function OaFormUtil(layui) {
         } 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>');
 
-            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++];) {
                 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>';
+
+            $('#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() {
-                layer.open({
-                    type: 1,
-                    title: false,
-                    area: ['200px', '100%'],
-                    offset: 'l',
-                    anim: 2,
-                    isOutAnim: false,
-                    closeBtn: 0,
-                    shadeClose: true,
-                    content: html
-                });
+                $('#submitFormBtns').show();
+                $('#submitFormBtnsContainer').animate({left: '0'}, 300);
             })
         }
     }
@@ -675,7 +681,7 @@ function OaFormUtil(layui) {
                     }
                     return selectedUserIdArray;
                 }
-                var osUserSelect = new OaUserSelect(layui, {
+                var oaUserSelect = new OaUserSelect(layui, {
                     isApp: isApp,
                     headers: headers,
                     departmentRootId: 0,
@@ -694,7 +700,7 @@ function OaFormUtil(layui) {
                         $('#ccs').val(ccs);
                     }
                 });
-                osUserSelect.open();
+                oaUserSelect.open();
             })
 
             // 转交
diff --git a/module-form/src/main/resources/templates/ftl/page/web/oa/form-save.ftl b/module-form/src/main/resources/templates/ftl/page/web/oa/form-save.ftl
index 0b9823a0..4c52739f 100644
--- a/module-form/src/main/resources/templates/ftl/page/web/oa/form-save.ftl
+++ b/module-form/src/main/resources/templates/ftl/page/web/oa/form-save.ftl
@@ -13,6 +13,7 @@
     <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="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">
 </head>
 <body>
@@ -41,6 +42,7 @@
     <input type="hidden" id="formVersion" value="${r'${formVersion}'}">
 </div>
 <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="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
@@ -61,6 +63,7 @@
         var confirmAssignees = ${r"${confirmAssignees}"};
         var fields = ${r"${fields}"};
         var formButton = ${r"${formButton}"};
+        var currentUser = ${r"${currentUser}"};
 
         // 初始化
         function initData() {
@@ -74,7 +77,7 @@
             formUtil.initUploadFile('${field.data.id}', ${field.data.count});
             <#elseif field.data.tag == 'uploadVideo'>
             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});
             <#elseif field.data.tag == 'date'>
             formUtil.initDate({
@@ -87,6 +90,7 @@
             });
             </#if>
             </#list>
+            oaFormUtil.backFillFields(fields, currentUser);
             oaFormUtil.hideFields(fields);
             oaFormUtil.disableFields(fields);
         }
@@ -106,7 +110,9 @@
 
                     // 提交前处理
                     formUtil.clearUploadField(formData);
+                    // 会签字段
                     oaFormUtil.setEditHistoryFields(formData, fields);
+                    // 抄送列表
                     oaFormUtil.setCcs(formData);
 
                     var loadLayerIndex;
@@ -160,6 +166,9 @@
                         users: confirmAssignees[index].assignees,
                         selectedUserIds: [],
                         onConfirm: function(selectedUsers) {
+                            if(!selectedUsers) {
+                                return;
+                            }
                             var assignees = [];
                             for(var j = 0, jItem; jItem = selectedUsers[j++];) {
                                 assignees.push(jItem.userId);
diff --git a/module-form/src/main/resources/templates/ftl/page/web/oa/form-update.ftl b/module-form/src/main/resources/templates/ftl/page/web/oa/form-update.ftl
index f829f831..a1507293 100644
--- a/module-form/src/main/resources/templates/ftl/page/web/oa/form-update.ftl
+++ b/module-form/src/main/resources/templates/ftl/page/web/oa/form-update.ftl
@@ -13,6 +13,7 @@
     <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="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">
 </head>
 <body>
@@ -55,6 +56,7 @@
     <input type="hidden" id="isNeedClaim" value="${r'${isNeedClaim}'}">
 </div>
 <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="assets/js/vendor/viewer/viewer.min.js"></script>
 <script src="assets/layuiadmin/layui/layui.js"></script>
@@ -77,6 +79,7 @@
         var confirmAssignees = ${r"${confirmAssignees}"};
         var fields = ${r"${fields}"};
         var formButton = ${r"${formButton}"};
+        var currentUser = ${r"${currentUser}"};
 
         // 初始化
         function initData() {
@@ -94,7 +97,6 @@
                 }
             });
             oaFormUtil.initTabItem($('#processInstanceId').val());
-            formUtil.disableFields(fields);
 
             var self = this;
             var loadLayerIndex;
@@ -135,7 +137,10 @@
                 </#list>
 
                 form.render(null, 'dataForm');
-                formUtil.hideFields(fields);
+
+                oaFormUtil.backFillFields(fields, currentUser);
+                oaFormUtil.hideFields(fields);
+                oaFormUtil.disableFields(fields);
             }, function(code, data) {
                 layer.msg(data.msg);
             }, function() {
@@ -160,7 +165,9 @@
 
                     // 提交前处理
                     formUtil.clearUploadField(formData);
+                    // 会签字段
                     oaFormUtil.setEditHistoryFields(formData, fields);
+                    // 抄送列表
                     oaFormUtil.setCcs(formData);
 
                     var loadLayerIndex;
@@ -216,6 +223,9 @@
                         users: confirmAssignees[index].assignees,
                         selectedUserIds: [],
                         onConfirm: function(selectedUsers) {
+                            if(!selectedUsers) {
+                                return;
+                            }
                             var assignees = [];
                             for(var j = 0, jItem; jItem = selectedUsers[j++];) {
                                 assignees.push(jItem.userId);