Merge remote-tracking branch 'origin/new-exam' into new-exam

8 months ago · 7f4cd784a0
parent a699c18036 81bf215217
commit 7f4cd784a0
1 changed files with 7 additions and 1 deletions
--- a/ruoyi-admin/src/main/resources/templates/system/placeRegist/placeRegist.html
+++ b/ruoyi-admin/src/main/resources/templates/system/placeRegist/placeRegist.html
@ -2,6 +2,7 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
    <th:block th:include="include :: header('场所出入登记')" />
+    <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="gray-bg">
     <div class="container-div" id="app">
@ -20,7 +21,7 @@
                            </li>
                            <li>
                                <label>登记日期：</label>
-                                <input type="text" class="time-input" placeholder="请选择登记日期" name="registTime"/>
+                                <input name="registTime" required class="form-control m-b" id="datetimepicker-demo-3" type="text">
                            </li>
                            <li>
                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -48,6 +49,7 @@
        </div>
    </div>
    <th:block th:include="include :: footer" />
+     <th:block th:include="include :: datetimepicker-js" />
    <script th:inline="javascript">
        var detailFlag = [[${@permission.hasPermi('system:placeRegist:detail')}]];
        var editFlag = [[${@permission.hasPermi('system:placeRegist:edit')}]];
@ -149,6 +151,10 @@
            };
            $.table.init(options);
        });
+        $("input[name='registTime']").datetimepicker({
+            format: "yyyy-mm-dd hh:ii",
+            autoclose: true
+        });
    </script>
 </body>
 </html>