From f93df266255a5d740d2403392daed1beefe290f4 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 28 May 2024 15:29:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/filedestory/edit.html    |  2 +-
 .../templates/system/fileprovide/add.html     |  2 +-
 .../system/fileprovide/fileprovide.html       |  3 -
 .../templates/system/network/network/add.html | 12 +--
 .../system/network/network/edit.html          | 12 +--
 .../system/property/property/add.html         | 24 ++---
 .../system/property/property/edit.html        | 24 ++---
 .../resources/templates/system/train/add.html | 96 +++++++++++++------
 .../templates/system/train/edit.html          | 87 ++++++++++-------
 .../templates/system/train/examine.html       | 74 +++++++++-----
 .../templates/system/train/train.html         |  4 +-
 11 files changed, 207 insertions(+), 133 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
index 8632107..feade6e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
@@ -21,7 +21,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">销毁数量：</label>
             <div class="col-sm-8">
-                <input name="destoryCount" required th:field="*{destoryCount}" class="form-control" type="text">
+                <input name="destoryCount"  digits="true" required th:field="*{destoryCount}" class="form-control" type="text">
             </div>
         </div>
         <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
index b65cd32..af46cfa 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
@@ -45,7 +45,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">发文份数：</label>
                 <div class="col-sm-8">
-                    <input name="provideCount" class="form-control" type="text">
+                    <input name="provideCount" digits="true" class="form-control"  type="text">
                 </div>
             </div>
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
index 82b572d..a8184a7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
@@ -42,9 +42,6 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:fileprovide:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:fileprovide:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:fileprovide:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
index 06156a6..35956f7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
@@ -31,13 +31,13 @@
                     <input name="part" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记人员：</label>
                 <div class="col-sm-8">
                     <input name="netUser" class="form-control" readonly th:value="${sysuser.userName}" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -46,7 +46,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">设备密级：</label>
                 <div class="col-sm-8">
                     <select name="netMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
@@ -54,10 +54,10 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">设备数量：</label>
                 <div class="col-sm-8">
-                    <input name="terminalNum" class="form-control" type="text">
+                    <input name="terminalNum" digits="true" class="form-control" type="text">
                 </div>
             </div>
         </form>
@@ -83,4 +83,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
index bccf9bc..f634122 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/edit.html
@@ -32,13 +32,13 @@
                     <input name="part" th:field="*{part}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记人员：</label>
                 <div class="col-sm-8">
                     <input name="netUser" disabled th:field="*{netUser}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -47,7 +47,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">设备密级：</label>
                 <div class="col-sm-8">
                     <select name="netMiji" class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
@@ -55,10 +55,10 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">设备数量：</label>
                 <div class="col-sm-8">
-                    <input name="terminalNum" th:field="*{terminalNum}" class="form-control" type="text">
+                    <input name="terminalNum" digits="true" th:field="*{terminalNum}" class="form-control" type="text">
                 </div>
             </div>
 
@@ -85,4 +85,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
index ece3da0..7c6bb55 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
@@ -7,19 +7,19 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-property-add">
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用部门：</label>
                 <div class="col-sm-8">
                     <input name="useDepart" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用人员：</label>
                 <div class="col-sm-8">
                     <input name="userName" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -28,25 +28,25 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">单位名称：</label>
                 <div class="col-sm-8">
                     <input name="frameworkId" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记部门：</label>
                 <div class="col-sm-8">
                     <input name="recoverDepart" class="form-control" readonly th:value="${sysuser.dept.deptName}" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记人员：</label>
                 <div class="col-sm-8">
                     <input name="recoverName" class="form-control" readonly th:value="${sysuser.userName}" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -55,22 +55,22 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">所属市州：</label>
                 <div class="col-sm-8">
                     <input name="part" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">所属区县：</label>
                 <div class="col-sm-8">
                     <input name="areaId" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">资产数量：</label>
                 <div class="col-sm-8">
-                    <input name="propertyNum" class="form-control" type="text">
+                    <input name="propertyNum" digits="true" class="form-control" type="text">
                 </div>
             </div>
         </form>
@@ -102,4 +102,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
index acb1f14..2192187 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
@@ -14,19 +14,19 @@
                     <input disabled name="useId" th:field="*{useId}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用部门：</label>
                 <div class="col-sm-8">
                     <input name="useDepart" th:field="*{useDepart}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用人员：</label>
                 <div class="col-sm-8">
                     <input name="userName" th:field="*{userName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">使用日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -35,25 +35,25 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">单位名称：</label>
                 <div class="col-sm-8">
                     <input name="frameworkId" th:field="*{frameworkId}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记部门：</label>
                 <div class="col-sm-8">
                     <input name="recoverDepart" th:field="*{recoverDepart}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记人员：</label>
                 <div class="col-sm-8">
                     <input name="recoverName" th:field="*{recoverName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">登记日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -62,22 +62,22 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">所属市州：</label>
                 <div class="col-sm-8">
                     <input name="part" th:field="*{part}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">所属区县：</label>
                 <div class="col-sm-8">
                     <input name="areaId" th:field="*{areaId}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">资产数量：</label>
                 <div class="col-sm-8">
-                    <input name="propertyNum" th:field="*{propertyNum}" class="form-control" type="text">
+                    <input name="propertyNum" digits="true" th:field="*{propertyNum}" class="form-control" type="text">
                 </div>
             </div>
         </form>
@@ -109,4 +109,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html
index e76d9c7..d11e8bc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -19,19 +19,19 @@
                     <input name="FRAMEWORK" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">人员名称：</label>
                 <div class="col-sm-8">
                     <input name="USERNAME" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">单位名称：</label>
                 <div class="col-sm-8">
                     <input name="deptName" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训类型：</label>
                 <div class="col-sm-8">
                     <select name="trainType" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
@@ -39,7 +39,7 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训对象：</label>
                 <div class="col-sm-8">
                     <select name="trainSubject" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
@@ -53,25 +53,17 @@
                     <textarea name="trainAddress" class="form-control"></textarea>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">培训开始日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="trainDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">培训结束时间：</label>
+                <label class="col-sm-3 control-label">培训日期：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="trainTimeend" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <div class="input-daterange input-group">
+                        <input type="text" class="input-sm form-control" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                        <span class="input-group-addon">到</span>
+                        <input type="text" class="input-sm form-control" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">填报人：</label>
                 <div class="col-sm-8">
                     <input name="createStaffid" class="form-control" type="text" >
@@ -87,14 +79,14 @@
                 </div>
             </div>
 
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训人员：</label>
                 <div class="col-sm-8">
                     <input name="trainName" class="form-control" type="text">
                 </div>
             </div>
 
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">部门：</label>
                 <div class="col-sm-8">
                     <input name="PART" class="form-control" type="text">
@@ -109,18 +101,60 @@
         $("#form-train-add").validate({
             focusCleanup: true
         });
+        layui.use('laydate', function(){
+            var laydate = layui.laydate;
+
+            var startDate = laydate.render({
+                elem: '#laydate-startTime',
+                theme: 'molv',
+                trigger: 'click',
+                done: function(value, date) {
+                    // 结束时间大于开始时间
+                    if (value !== '') {
+                        endDate.config.min.year = date.year;
+                        endDate.config.min.month = date.month - 1;
+                        endDate.config.min.date = date.date;
+                    } else {
+                        endDate.config.min.year = '';
+                        endDate.config.min.month = '';
+                        endDate.config.min.date = '';
+                    }
+                }
+            });
 
+            var endDate = laydate.render({
+                elem: '#laydate-endTime',
+                theme: 'molv',
+                trigger: 'click',
+                done: function(value, date) {
+                    // Start date cannot be after end date
+                    if (value !== '') {
+                        startDate.config.max = {
+                            year: date.year,
+                            month: date.month - 1,
+                            date: date.date
+                        };
+                    } else {
+                        startDate.config.max = {
+                            year: '',
+                            month: '',
+                            date: ''
+                        };
+                    }
+                }
+            });
+        });
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-train-add').serialize());
             }
         }
 
-        $("input[name='trainDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
+        // $("input[name='trainDate']").datetimepicker({
+        //     format: "yyyy-mm-dd",
+        //     minView: "month",
+        //     autoclose: true
+        // });
 
         $("input[name='createDate']").datetimepicker({
             format: "yyyy-mm-dd",
@@ -134,11 +168,11 @@
             autoclose: true
         });
 
-        $("input[name='trainTimeend']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
+        // $("input[name='trainTimeend']").datetimepicker({
+        //     format: "yyyy-mm-dd",
+        //     minView: "month",
+        //     autoclose: true
+        // });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
index 8860258..71d8478 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -20,19 +20,19 @@
                     <input name="FRAMEWORK" th:field="*{FRAMEWORK}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">人员名称：</label>
                 <div class="col-sm-8">
                     <input name="USERNAME" th:field="*{USERNAME}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">单位名称：</label>
                 <div class="col-sm-8">
                     <input name="deptName" th:field="*{deptName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训类型：</label>
                 <div class="col-sm-8">
                     <select name="trainType" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
@@ -40,7 +40,7 @@
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训对象：</label>
                 <div class="col-sm-8">
                     <select name="trainSubject" class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
@@ -54,30 +54,22 @@
                     <textarea name="trainAddress" class="form-control">[[*{trainAddress}]]</textarea>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">培训开始日期：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">培训日期：</label>
                 <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="trainDate" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <div class="input-daterange input-group">
+                        <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                        <span class="input-group-addon">到</span>
+                        <input type="text" class="input-sm form-control" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">培训人员：</label>
                 <div class="col-sm-8">
                     <input name="trainName" th:field="*{trainName}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">培训结束时间：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="trainTimeend" th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -87,19 +79,54 @@
         $("#form-train-edit").validate({
             focusCleanup: true
         });
+        layui.use('laydate', function(){
+            var laydate = layui.laydate;
+
+            var startDate = laydate.render({
+                elem: '#laydate-startTime',
+                theme: 'molv',
+                trigger: 'click',
+                done: function(value, date) {
+                    // 结束时间大于开始时间
+                    if (value !== '') {
+                        endDate.config.min.year = date.year;
+                        endDate.config.min.month = date.month - 1;
+                        endDate.config.min.date = date.date;
+                    } else {
+                        endDate.config.min.year = '';
+                        endDate.config.min.month = '';
+                        endDate.config.min.date = '';
+                    }
+                }
+            });
 
+            var endDate = laydate.render({
+                elem: '#laydate-endTime',
+                theme: 'molv',
+                trigger: 'click',
+                done: function(value, date) {
+                    // Start date cannot be after end date
+                    if (value !== '') {
+                        startDate.config.max = {
+                            year: date.year,
+                            month: date.month - 1,
+                            date: date.date
+                        };
+                    } else {
+                        startDate.config.max = {
+                            year: '',
+                            month: '',
+                            date: ''
+                        };
+                    }
+                }
+            });
+        });
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-train-edit').serialize());
             }
         }
-
-        $("input[name='trainDate']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
-
         $("input[name='createDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
@@ -111,12 +138,6 @@
             minView: "month",
             autoclose: true
         });
-
-        $("input[name='trainTimeend']").datetimepicker({
-            format: "yyyy-mm-dd",
-            minView: "month",
-            autoclose: true
-        });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
index 8cfe53f..0c9d110 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
@@ -56,11 +56,12 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">培训开始日期：</label>
+            <label class="col-sm-3 control-label">培训日期：</label>
             <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="trainDate" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                <div class="input-daterange input-group">
+                    <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainDate, 'yyyy-MM-dd')}" name="trainDate" id="laydate-startTime" placeholder="开始日期"/>
+                    <span class="input-group-addon">到</span>
+                    <input type="text" class="input-sm form-control" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" name="trainTimeend" id="laydate-endTime" placeholder="结束日期"/>
                 </div>
             </div>
         </div>
@@ -70,15 +71,6 @@
                 <input name="trainName" disabled th:field="*{trainName}" class="form-control" type="text">
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">培训结束时间：</label>
-            <div class="col-sm-8">
-                <div class="input-group date">
-                    <input name="trainTimeend" disabled th:value="${#dates.format(tdTrain.trainTimeend, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                </div>
-            </div>
-        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">培训状态：</label>
             <div class="col-sm-8">
@@ -117,19 +109,55 @@
     $("#form-train-examine").validate({
         focusCleanup: true
     });
+    layui.use('laydate', function(){
+        var laydate = layui.laydate;
 
+        var startDate = laydate.render({
+            elem: '#laydate-startTime',
+            theme: 'molv',
+            trigger: 'click',
+            done: function(value, date) {
+                // 结束时间大于开始时间
+                if (value !== '') {
+                    endDate.config.min.year = date.year;
+                    endDate.config.min.month = date.month - 1;
+                    endDate.config.min.date = date.date;
+                } else {
+                    endDate.config.min.year = '';
+                    endDate.config.min.month = '';
+                    endDate.config.min.date = '';
+                }
+            }
+        });
+
+        var endDate = laydate.render({
+            elem: '#laydate-endTime',
+            theme: 'molv',
+            trigger: 'click',
+            done: function(value, date) {
+                // Start date cannot be after end date
+                if (value !== '') {
+                    startDate.config.max = {
+                        year: date.year,
+                        month: date.month - 1,
+                        date: date.date
+                    };
+                } else {
+                    startDate.config.max = {
+                        year: '',
+                        month: '',
+                        date: ''
+                    };
+                }
+            }
+        });
+    });
     function submitHandler() {
         if ($.validate.form()) {
             $.operate.save(prefix + "/examine", $('#form-train-examine').serialize());
         }
     }
     $("input[name='updateStaffid']").val([[${user.userName}]])
-    $("input[name='trainDate']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
-
     $("input[name='createDate']").datetimepicker({
         format: "yyyy-mm-dd",
         minView: "month",
@@ -141,12 +169,6 @@
         minView: "month",
         autoclose: true
     });
-
-    $("input[name='trainTimeend']").datetimepicker({
-        format: "yyyy-mm-dd",
-        minView: "month",
-        autoclose: true
-    });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html
index e563138..f4b3f2e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/train.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html
@@ -135,7 +135,7 @@
                 },
                 {
                     field: 'trainTimeend',
-                    title: '培训结束时间'
+                    title: '培训结束日期'
                 },
                 {
                     field: 'createStaffid',
@@ -204,4 +204,4 @@
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>