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 | 108 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 69 insertions(+), 39 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 4266c13..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 @@ -1,16 +1,16 @@ <div class="layui-card"> <div class="layui-card-header"> - <h2 class="header-title">业务日志</h2> + <h2 class="header-title">字典管理</h2> <span class="layui-breadcrumb pull-right"> <a href="#!home_console">首页</a> - <a><cite>业务日志</cite></a> + <a><cite>字典管理</cite></a> </span> </div> <div class="layui-card-body"> <div class="layui-form toolbar"> - <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> <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="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"> @@ -33,6 +33,21 @@ <script type="text/html" id="app-model"> <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"> @@ -50,31 +65,19 @@ <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" title="分类" class="layui-input" maxlength="20"/> - <input name="a" id="a2" 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"> <input name="enabled" id="enabled1" type="radio" checked value="1" title="启用" class="layui-input" maxlength="20"/> - <input name="enabled" id="enabled2" type="radio" value="0" title="停用" class="layui-input" maxlength="20"/> + <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"> + + <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> </div> @@ -111,18 +114,33 @@ 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: 300, 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) { + $('#role_clients').attr('disabled', true); + $('#role_clients').val(""); + } else { + $('#role_clients').attr('disabled', false); + } + form.render('select', 'app-form'); + }; // 工具条点击事件 table.on('tool(app-table)', function (obj) { @@ -134,6 +152,9 @@ doDelete(data); } }); + function ccc() { + console.log(11111111) + } // 删除 var doDelete = function (obj) { layer.confirm('确定删除此用户吗?', function (i) { @@ -165,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 { @@ -173,6 +194,8 @@ } }, 'Post'); } + + // 搜索按钮点击事件 $('#app-btn-search').click(function () { var key = $('#app-edit-search').val(); @@ -202,8 +225,8 @@ layer.open({ type: 1, title: data ? '修改用户' : '添加用户', - area: '450px', - offset: '120px', + area: '400px', + offset: '200px', content: $('#app-model').html(), success: function () { $('#app-form')[0].reset(); @@ -216,25 +239,28 @@ } else { $("#enabled2").attr('checked', true); } - if (data.dictionariesClassId == undefined || data.dictionariesClassId=="") { - $("#a1").attr('checked', true); + if (data.dictionariesClassId == undefined || data.dictionariesClassId == "") { + $("#fenlei").attr('checked', true); $("#role_clients").attr('disabled', true); } else { - $("#a2").attr('checked', true); + $("#zidian").attr('checked', true); } form.val('app-form', data); } } }); }; - // 添加按钮点击事件 - $('#user-btn-add').click(function () { + // 添加按钮点击事件 + $('#user-btn-add').click(function () { showEditModel(); }); // // 表单提交事件 form.on('submit(user-form-submit)', function (data) { layer.load(2); + if (data.field.dictionariesClassId == "") { + data.field.dictionariesClassId = null; + } admin.req('api-user/sysdictionaries', JSON.stringify(data.field), function (data) { layer.closeAll('loading'); if (data.code == 0) { @@ -247,5 +273,9 @@ }, "POST"); return false; }); + + form.on("radio(resourceType)", function (data) { + changeType(data.value); + }); }); </script> \ No newline at end of file -- Gitblit v1.8.0