From ca56e2f284db90ce6b8466e0e93b5bd30912320c Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 14 Jul 2020 19:02:24 +0800
Subject: [PATCH] 1.运营后台统一增加token过期自动跳转登录页 2.H端和运营平台同账户可根据权限自由登录.
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html | 78 ++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 41 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 b0cbb56..b44c3d3 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
@@ -9,8 +9,8 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按名称" /> 
- <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
- <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
+ <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysdictionaries-list"><i class="layui-icon"></i>搜索</button>
+ <button id="user-btn-add" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i class="layui-icon"></i>添加</button>
</div>
<!-- 数据表格 -->
@@ -20,8 +20,8 @@
<!-- 表格操作列 -->
<script type="text/html" id="dictionaries-table-bar">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
- <a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="sysdictionaries-edit" lay-event="edit">修改</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="sysdictionaries-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="dictionaries-tpl-state">
@@ -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="a" id="a1" type="radio" value="1" lay-filter="resourceType" onchange="ccc" title="分类" class="layui-input" maxlength="20"/>
- <input name="a" id="a2" 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>
@@ -121,20 +114,23 @@
cols: [[
{ type: 'numbers' },
{
- field: 'dictionariesClassId', width: 180, sort: true, title: '字典类型', templet: function (d) {
+ field: 'dictionariesClassId', width: 180, title: '字典类型', templet: function (d) {
return d.dictionariesClassId == undefined ? "分类" : "字典"
}
},
- { field: 'dictionariesClassName', width: 200, sort: true, title: '字典分类' },
- { 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: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', sort: true, title: '操作' },// 0就诊数据 1筛查
- ]]
+ { field: 'dictionariesClassName', width: 200, title: '字典分类' },
+ { field: 'dictionariesKey', width: 180, title: '字典Key' },
+ { field: 'dictionariesName', width: 264, title: '字典值' },
+ { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', title: '状态' },// 0就诊数据 1筛查
+ { field: 'createTime', width: 250, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', title: '操作' },// 0就诊数据 1筛查
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
- // 修改菜单类型
+ // 修改类型
let changeType = function (type) {
if (type == 1) {
@@ -190,7 +186,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 {
@@ -244,10 +240,10 @@
$("#enabled2").attr('checked', true);
}
if (data.dictionariesClassId == undefined || data.dictionariesClassId == "") {
- $("#a1").attr('checked', true);
+ $("#fenlei").attr('checked', true);
$("#role_clients").attr('disabled', true);
} else {
- $("#a2").attr('checked', true);
+ $("#zidian").attr('checked', true);
}
form.val('app-form', data);
}
--
Gitblit v1.8.0