From f0f7e0cc22420d18a3b24c00901babd776b4ca0f Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 30 May 2022 09:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ftl/page/app/oa/app-form-save.ftl         | 17 ++++++++++++--
 .../ftl/page/app/oa/app-form-show.ftl         |  6 ++++-
 .../ftl/page/app/oa/app-form-update.ftl       | 22 +++++++++++++++++--
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl
index da3cf1f2..5c9e2e8a 100644
--- a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl
+++ b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl
@@ -21,7 +21,7 @@
     <div class="layui-card">
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <div class="layui-row oa-form-footer-tool-bar">
+                <div class="layui-row oa-form-footer-tool-bar" style="display: none;">
                     <div class="layui-col-xs5 tool-bar-left layui-layout-admin">
                         <div id="submitBtnGroup" class="layui-btn-group"></div>
                     </div>
@@ -44,6 +44,7 @@
 <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/app-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>
 <script>
@@ -68,6 +69,16 @@
         var formButton = ${r"${formButton}"};
         var currentUser = ${r"${currentUser}"};
 
+        // 设置APP交互的form对象
+        appOaFormUtil.setForm(form);
+        // 初始化APP表单数据
+        appOaFormUtil.initAppFormData({
+            confirmAssignees: confirmAssignees,
+            fields: fields,
+            formButton: formButton,
+            currentUser: currentUser
+        });
+
         // 初始化
         function initData() {
             oaFormUtil.initSubmitBtns(confirmAssignees, {isApp: true});
@@ -100,7 +111,7 @@
         initData();
 
         function close() {
-            window.android.invokeNative('back');
+            appOaFormUtil.goBackApp();
         }
 
         // 关闭页面
@@ -128,11 +139,13 @@
                     ]), formData.field, {
                         headers: {token: token}
                     }, function (code, data) {
+                        appOaFormUtil.callbackAppSubmitStatus(true);
                         // 这里手动添加操作成功后的操作',
                         layer.msg('提交成功', {time: 1000}, function() {
                             close();
                         });
                     }, function (code, data) {
+                        appOaFormUtil.callbackAppSubmitStatus(false);
                         $('.confirm-btn').show();
                         layer.msg(data.msg);
                     }, function () {
diff --git a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl
index 0dd5ed21..dc5feebe 100644
--- a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl
+++ b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl
@@ -21,7 +21,7 @@
     <div class="layui-card">
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <div class="layui-row oa-form-footer-tool-bar">
+                <div class="layui-row oa-form-footer-tool-bar" style="display: none;">
                     <div class="layui-col-xs5 tool-bar-left"></div>
                     <div class="layui-col-xs7 tool-bar-right">
                         <div id="formButtonGroup"></div>
@@ -52,6 +52,7 @@
 <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/app-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>
 <script>
@@ -101,6 +102,9 @@
                 for(var i in data) {
                     dataFormData[i] = data[i] +'';
                 }
+                // 初始化APP附件
+                appOaFormUtil.initAppAttachments(data.attachments);
+
                 form.val('dataForm', dataFormData);
 
                 <#list fields as field>
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 36972e5d..d8b69cf8 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
@@ -22,7 +22,7 @@
     <div class="layui-card">
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <div class="layui-row oa-form-footer-tool-bar">
+                <div class="layui-row oa-form-footer-tool-bar" style="display: none;">
                     <div class="layui-col-xs5 tool-bar-left layui-layout-admin">
                         <div id="submitBtnGroup" class="layui-btn-group"></div>
                     </div>
@@ -59,6 +59,7 @@
 <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/app-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>
 <script>
@@ -84,6 +85,16 @@
         var formButton = ${r"${formButton}"};
         var currentUser = ${r"${currentUser}"};
 
+        // 设置APP交互的form对象
+        appOaFormUtil.setForm(form);
+        // 初始化APP表单数据
+        appOaFormUtil.initAppFormData({
+            confirmAssignees: confirmAssignees,
+            fields: fields,
+            formButton: formButton,
+            currentUser: currentUser
+        });
+
         // 初始化
         function initData() {
             oaFormUtil.initSubmitBtns(confirmAssignees, {isApp: true});
@@ -117,6 +128,9 @@
                 }
                 form.val('dataForm', dataFormData);
 
+                // 初始化APP附件
+                appOaFormUtil.initAppAttachments(data.attachments);
+
                 <#list fields as field>
                 <#if field.data.tag == 'checkbox'>
                 formUtil.initCheckboxData('dataForm', dataFormData['${field.data.id}'], '${field.data.id}');
@@ -157,7 +171,7 @@
         initData();
 
         function close() {
-            window.android.invokeNative('back');
+            appOaFormUtil.goBackApp();
         }
 
         // 关闭页面
@@ -189,11 +203,15 @@
                     ]), formData.field, {
                         headers: {token: token}
                     }, function (code, data) {
+                        // 回调APP提交状态
+                        appOaFormUtil.callbackAppSubmitStatus(true);
                         // 这里手动添加操作成功后的操作',
                         layer.msg('提交成功', {time: 1000}, function() {
                             close();
                         });
                     }, function (code, data) {
+                        // 回调APP提交状态
+                        appOaFormUtil.callbackAppSubmitStatus(false);
                         $('.confirm-btn').show();
                         layer.msg(data.msg);
                     }, function () {