From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 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 6975e2e..7f4322a 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,7 +31,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="app-model">
- <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+ <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
<input name="id" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">字典类型</label>
@@ -112,21 +112,21 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
cols: [[
- { type: 'numbers' },
+ { type: 'numbers', width: "10%",align: 'center',},
{
- field: 'dictionariesClassId', width: 180, title: '字典类型', templet: function (d) {
+ field: 'dictionariesClassId', width: "10%",align: 'center', title: '字典类型', templet: function (d) {
return d.dictionariesClassId == undefined ? "分类" : "字典"
}
},
- { 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筛查
+ { field: 'dictionariesClassName', width: "10%",align: 'center', title: '字典分类' },
+ { field: 'dictionariesKey', width: "20%",align: 'center', title: '字典Key' },
+ { field: 'dictionariesName', width: "10%",align: 'center', title: '字典值' },
+ { field: 'id', width: "10%",align: 'center', toolbar: '#dictionaries-tpl-state', title: '状态' },// 0就诊数据 1筛查
+ { field: 'createTime', width: "10%",align: 'center', title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+ { field: 'id', width: "10%",align: 'center', toolbar: '#dictionaries-table-bar', title: '操作' },// 0就诊数据 1筛查
]],
- done:function(){
- permissionsInput();
+ done:function(res){
+ permissionsInput(res,config);
}
});
@@ -153,7 +153,6 @@
}
});
function ccc() {
- console.log(11111111)
}
// 删除
var doDelete = function (obj) {
@@ -163,10 +162,10 @@
admin.req('api-user/sysdictionaries/' + obj.id, {}, function (data) {
layer.closeAll('loading');
if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
+ layer.msg(data.msg, { icon: 1, time: 2000 });
table.reload('app-table', {});
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
}
}, 'delete');
});
@@ -175,22 +174,18 @@
// 获取应用列表
var getdata = function () {
var co = $('#role_clients');
- console.log(11111111111111);
- console.log(co);
admin.req('api-user/sysdictionaries/findAll', JSON.stringify({ dictionariesClassIdIsNull: "str" }), function (data) {
layer.closeAll('loading');
if (0 === data.code) {
- console.log(123132132132132132)
let selected = false;
clientsAll = data;
$.each(data.data, function (index, item) {
//往下拉菜单里添加元素
- // console.log(JSON.stringify(item))
$('#role_clients').append(new Option(item.dictionariesName, item.dictionariesKey, false, selected));
})
form.render();
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
}
}, 'Post');
}
@@ -199,7 +194,11 @@
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
var key = $('#app-edit-search').val();
- table.reload('app-table', { where: { dictionariesName: key } });
+ table.reload('app-table', {
+ where: { dictionariesName: key },
+ page: {
+ curr: 1
+ } });
});
// 修改role状态
form.on('switch(dictionaries-tpl-state)', function (obj) {
@@ -210,10 +209,10 @@
}, function (data) {
layer.closeAll('loading');
if (data.code == 0) {
- // layer.msg(data.msg, { icon: 1, time: 500 });
+ // layer.msg(data.msg, { icon: 1, time: 2000 });
table.reload('app-table', {});
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
$(obj.elem).prop('checked', !obj.elem.checked);
form.render('checkbox');
}
@@ -264,11 +263,11 @@
admin.req('api-user/sysdictionaries', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
if (data.code == 0) {
- // layer.msg(data.msg, { icon: 1, time: 500 });
+ // layer.msg(data.msg, { icon: 1, time: 2000 });
layer.closeAll();
table.reload('app-table', {});
} else {
- layer.msg(data.msg, { icon: 2, time: 500 });
+ layer.msg(data.msg, { icon: 2, time: 2000 });
}
}, "POST");
return false;
--
Gitblit v1.8.0