From 1d41114ea875e058fde4c7e0bec2dc6c3ede2818 Mon Sep 17 00:00:00 2001
From: ly19960718 <1622779752@qq.com>
Date: Sat, 1 May 2021 16:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/institution/institution-mapper.xml |  2 +-
 .../resources/templates/institution/save.html | 27 +++++++++----------
 .../templates/institution/update.html         | 26 +++++++++---------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml
index 48790d3..ac236f0 100644
--- a/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml
+++ b/module-institution-management/src/main/resources/mybatis/mapper/institution/institution-mapper.xml
@@ -111,7 +111,7 @@
             #{institutionRegionArea},
             #{institutionRegionVillage},
             #{institutionRegionStreet},
-            #{institutionType}
+            #{institutionType},
             #{creator},
             #{gmtCreate},
             #{modifier},
diff --git a/module-institution-management/src/main/resources/templates/institution/save.html b/module-institution-management/src/main/resources/templates/institution/save.html
index 9262cc3..76ee6cb 100644
--- a/module-institution-management/src/main/resources/templates/institution/save.html
+++ b/module-institution-management/src/main/resources/templates/institution/save.html
@@ -36,18 +36,6 @@
         </div>
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">机构名称</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item layui-form-text">
-                    <label class="layui-form-label">机构描述</label>
-                    <div class="layui-input-block">
-                        <textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
-                    </div>
-                </div>
                 <div class="layui-form-item layui-form-text">
                     <label class="layui-form-label">机构图片</label>
                     <div class="layui-input-block">
@@ -78,12 +66,24 @@
                         </script>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">机构名称</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构成立时间</label>
                     <div class="layui-input-block">
                         <input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;"  lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">机构描述</label>
+                    <div class="layui-input-block">
+                        <textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构负责人</label>
                     <div class="layui-input-block">
@@ -195,7 +195,6 @@
                 }
                 return;
             }
-
             top.restAjax.get(top.restAjax.path('api/file/list', []), {
                 ids: ids
             }, null, function(code, data) {
@@ -279,7 +278,7 @@
         function initInstitutionFoundingTimeDateTime() {
             laydate.render({
                 elem: '#institutionFoundingTime',
-                type: 'datetime',
+                type: 'date',
                 trigger: 'click'
             });
         }
diff --git a/module-institution-management/src/main/resources/templates/institution/update.html b/module-institution-management/src/main/resources/templates/institution/update.html
index 2cdc2e6..ae290e4 100644
--- a/module-institution-management/src/main/resources/templates/institution/update.html
+++ b/module-institution-management/src/main/resources/templates/institution/update.html
@@ -36,18 +36,6 @@
         </div>
         <div class="layui-card-body" style="padding: 15px;">
             <form class="layui-form layui-form-pane" lay-filter="dataForm">
-                <div class="layui-form-item">
-                    <label class="layui-form-label">机构名称</label>
-                    <div class="layui-input-block">
-                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
-                    </div>
-                </div>
-                <div class="layui-form-item layui-form-text">
-                    <label class="layui-form-label">机构描述</label>
-                    <div class="layui-input-block">
-                        <textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
-                    </div>
-                </div>
                 <div class="layui-form-item layui-form-text">
                     <label class="layui-form-label">机构图片</label>
                     <div class="layui-input-block">
@@ -78,12 +66,24 @@
                         </script>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">机构名称</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="institutionName" name="institutionName" class="layui-input" value="" placeholder="请输入机构名称"  maxlength="255" lay-verify="required">
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构成立时间</label>
                     <div class="layui-input-block">
                         <input type="text" id="institutionFoundingTime" name="institutionFoundingTime" class="layui-input" value="" placeholder="请选择机构成立时间" readonly style="cursor: pointer;" lay-verify="required">
                     </div>
                 </div>
+                <div class="layui-form-item layui-form-text">
+                    <label class="layui-form-label">机构描述</label>
+                    <div class="layui-input-block">
+                        <textarea id="institutionDesc" name="institutionDesc" class="layui-textarea" placeholder="请输入机构描述"></textarea>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">机构负责人</label>
                     <div class="layui-input-block">
@@ -281,7 +281,7 @@
         function initInstitutionFoundingTimeDateTime(v) {
             laydate.render({
                 elem: '#institutionFoundingTime',
-                type: 'datetime',
+                type: 'date',
                 value: v,
                 trigger: 'click'
             });