From 53bdccb69df5349087300a7eee0ca6a80f30813b Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 6 May 2022 18:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8B=E6=8B=89=E8=83=BD=E9=80=89=E6=8B=A9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module-form/src/main/resources/static/form/js/oa-form-util.js | 4 ++--
 .../main/resources/templates/ftl/page/web/oa/form-show.ftl    | 1 +
 .../main/resources/templates/ftl/page/web/oa/form-update.ftl  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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 63bb01b3..3dae2398 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
@@ -230,7 +230,7 @@ function OaFormUtil(layui) {
                 var boxId = '#' + item.fieldName + 'Box';
                 $(boxId).css('position', 'relative');
                 $(boxId).append('<div style="width: 100%; height: 100%; background-color: #fff0; position: absolute; top: 0; left: 0; cursor: not-allowed;"></div>');
-                var doms = $(boxId).find('input,button,textarea');
+                var doms = $(boxId).find('input,button,textarea,select');
                 doms.removeAttr('name');
                 doms.attr('disabled', 'disabled');
                 doms.attr('lay-verify', '');
@@ -242,7 +242,7 @@ function OaFormUtil(layui) {
      * 禁用表单全部字段
      */
     this.disableFormAllFields = function () {
-        var doms = $('#reportForm').find('input,button,textarea');
+        var doms = $('#reportForm').find('input,button,textarea,select');
         doms.attr('disabled', 'disabled');
         doms.attr('lay-verify', '');
     }
diff --git a/module-form/src/main/resources/templates/ftl/page/web/oa/form-show.ftl b/module-form/src/main/resources/templates/ftl/page/web/oa/form-show.ftl
index a4b3100b..3dbed29d 100644
--- a/module-form/src/main/resources/templates/ftl/page/web/oa/form-show.ftl
+++ b/module-form/src/main/resources/templates/ftl/page/web/oa/form-show.ftl
@@ -82,6 +82,7 @@
                 }
             });
             oaFormUtil.initTabItem(processInstanceId);
+            oaFormUtil.disableFormAllFields();
 
             var self = this;
             var loadLayerIndex;
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 17ec17d9..b34205a8 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
@@ -91,6 +91,7 @@
                 }
             });
             oaFormUtil.initTabItem($('#processInstanceId').val());
+            formUtil.disableFields(fields);
 
             var self = this;
             var loadLayerIndex;
@@ -132,7 +133,6 @@
 
                 form.render(null, 'dataForm');
                 formUtil.hideFields(fields);
-                formUtil.disableFields(fields);
             }, function(code, data) {
                 layer.msg(data.msg);
             }, function() {