From 1738edbe080a76d6954f90a6306ebe372627c6d4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Thu, 14 May 2020 14:13:10 +0800
Subject: [PATCH] 修改时间显示的功能

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html |   47 ++++++++++++++++++++---------------------------
 1 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
index cc81dd6..fa67243 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -31,18 +31,23 @@
 
 <!-- 表单弹窗 -->
 <script type="text/html" id="app-model">
-    <style>
-        .layui-layer-setwin {
-    position: absolute;
-    right: 15px;
-    *right: 0;
-    top: -29px;
-    font-size: 0;
-    line-height: initial;
-}
-    </style>
     <form id="app-form" lay-filter="app-form" class="layui-form model-form">
         <input name="id" type="hidden"/>
+        <div class="layui-form-item">
+            <label class="layui-form-label">字典类型</label>
+            <div class="layui-input-block">
+                <input name="zidian_or_fenlei" id="fenlei" type="radio" value="1"   lay-filter="resourceType" onchange="ccc" title="分类" class="layui-input" maxlength="20"/>
+                <input name="zidian_or_fenlei" id="zidian " type="radio" value="0" checked lay-filter="resourceType"  title="字典" class="layui-input" maxlength="20"/>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">所属类型</label>
+            <div class="layui-input-block">
+                <select id="role_clients"   name="dictionariesClassId" placeholder="选择一个应用" lay-filter="role_clients">
+                    <option value="">-请选择-</option>
+                </select>
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label">字典值</label>
             <div class="layui-input-block">
@@ -60,16 +65,10 @@
             <label class="layui-form-label">字段排序</label>
             <div class="layui-input-block">
                 <input name="dictionariesOrder" placeholder="请输入数字"  type="text" class="layui-input" maxlength="20"
-                       lay-verify="required" required />
+                       lay-verify="required|number" required />
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">字典类型</label>
-            <div class="layui-input-block">
-                <input name="zidian_or_fenlei" id="fenlei" type="radio" value="1"   lay-filter="resourceType" onchange="ccc" title="分类" class="layui-input" maxlength="20"/>
-                <input name="zidian_or_fenlei" id="zidian " type="radio" value="0" checked lay-filter="resourceType"  title="字典" class="layui-input" maxlength="20"/>
-            </div>
-        </div>
+        
         <div class="layui-form-item">
             <label class="layui-form-label">状态</label>
             <div class="layui-input-block">
@@ -77,13 +76,7 @@
                 <input name="enabled" id="enabled2" type="radio"  value="0" title="停用" class="layui-input" maxlength="20"/>
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">所属类型</label>
-            <div class="layui-input-block">
-                <select id="role_clients"   name="dictionariesClassId" placeholder="选择一个应用" lay-filter="role_clients">
-                    <option value="">-请选择-</option>
-                </select>
-        </div>
+        
         <div class="layui-form-item model-form-footer zd-btn-class" style="margin-top:30px;">
             <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
             <button class="layui-btn" lay-filter="user-form-submit" lay-submit>保存</button>
@@ -129,7 +122,7 @@
                 { field: 'dictionariesKey', width: 180, sort: true, title: '字典Key' },
                 { field: 'dictionariesName', width: 264, sort: true, title: '字典值' },
                 { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', sort: true, title: '状态' },// 0就诊数据 1筛查
-                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
+                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                 { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', sort: true, title: '操作' },// 0就诊数据 1筛查
             ]]
         });
@@ -190,7 +183,7 @@
                     $.each(data.data, function (index, item) {
                         //往下拉菜单里添加元素
                         // console.log(JSON.stringify(item))
-                        $('#role_clients').append(new Option(item.dictionariesName, item.id, false, selected));
+                        $('#role_clients').append(new Option(item.dictionariesName, item.dictionariesKey, false, selected));
                     })
                     form.render();
                 } else {

--
Gitblit v1.8.0