From 1bae504cec0247b87ba85006d90835b70ce713ff Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 08 Apr 2020 14:07:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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 59262ef..cc81dd6 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
@@ -8,9 +8,9 @@
</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="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
</div>
<!-- 数据表格 -->
@@ -31,6 +31,16 @@
<!-- 表单弹窗 -->
<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">
@@ -56,25 +66,25 @@
<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"/>
+ <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">
<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">
+ <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>
@@ -124,6 +134,18 @@
]]
});
+ // 修改菜单类型
+ 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) {
var data = obj.data;
@@ -134,6 +156,9 @@
doDelete(data);
}
});
+ function ccc() {
+ console.log(11111111)
+ }
// 删除
var doDelete = function (obj) {
layer.confirm('确定删除此用户吗？', function (i) {
@@ -173,6 +198,8 @@
}
}, 'Post');
}
+
+
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
var key = $('#app-edit-search').val();
@@ -202,8 +229,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,27 +243,27 @@
} 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;
+ if (data.field.dictionariesClassId == "") {
+ data.field.dictionariesClassId = null;
}
admin.req('api-user/sysdictionaries', JSON.stringify(data.field), function (data) {
layer.closeAll('loading');
@@ -250,5 +277,9 @@
}, "POST");
return false;
});
+
+ form.on("radio(resourceType)", function (data) {
+ changeType(data.value);
+ });
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0