Skip to content

G
guns-vip
Commit c8ac9eb1 by fengshuonan
Options

部门管理页面整理

parent e076d6ff
Showing with 118 additions and 114 deletions
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/system/service/DeptService.java
......@@ -59,7 +59,7 @@ public class DeptService extends ServiceImpl<DeptMapper, Dept> {
@Transactional(rollbackFor = Exception.class)
public void editDept(Dept dept) {
if (ToolUtil.isOneEmpty(dept, dept.getDeptId(), dept.getSimpleName(), dept.getFullName(), dept.getPid(), dept.getDescription())) {
if (ToolUtil.isOneEmpty(dept, dept.getDeptId(), dept.getSimpleName(), dept.getFullName(), dept.getPid())) {
throw new ServiceException(BizExceptionEnum.REQUEST_NULL);
}
......
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/dept/dept.js
......@@ -23,9 +23,9 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
{type: 'checkbox'},
{field: 'deptId', hide: true, sort: true, title: 'id'},
{field: 'simpleName', align: "center", sort: true, title: '部门简称'},
{field: 'fullName',align: "center", sort: true, title: '部门全称'},
{field: 'sort',align: "center", sort: true, title: '排序'},
{field: 'description',align: "center", sort: true, title: '备注'},
{field: 'fullName', align: "center", sort: true, title: '部门全称'},
{field: 'sort', align: "center", sort: true, title: '排序'},
{field: 'description', align: "center", sort: true, title: '备注'},
{align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 200}
]];
};
......@@ -56,6 +56,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
Dept.openAddDept = function () {
admin.putTempData('formOk', false);
top.layui.admin.open({
area: ['1000px', Feng.getClientHeightPx()],
type: 2,
title: '添加部门',
content: Feng.ctxPath + '/dept/dept_add',
......@@ -66,6 +67,24 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
};
/**
* 点击编辑部门
*
* @param data 点击按钮时候的行数据
*/
Dept.onEditDept = function (data) {
admin.putTempData('formOk', false);
top.layui.admin.open({
area: ['1000px', Feng.getClientHeightPx()],
type: 2,
title: '编辑部门',
content: Feng.ctxPath + "/dept/dept_update?deptId=" + data.deptId,
end: function () {
admin.getTempData('formOk') && table.reload(Dept.tableId);
}
});
};
/**
* 导出excel按钮
*/
Dept.exportExcel = function () {
......@@ -78,15 +97,6 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
};
/**
* 点击编辑部门
*
* @param data 点击按钮时候的行数据
*/
Dept.onEditDept = function (data) {
window.location.href = Feng.ctxPath + "/dept/dept_update?deptId="+ data.deptId;
};
/**
* 点击删除部门
*
* @param data 点击按钮时候的行数据
......@@ -127,7 +137,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
// 添加按钮点击事件
$('#btnAdd').click(function () {
window.location.href = Feng.ctxPath + "/dept/dept_add";
Dept.openAddDept();
});
// 导出excel
......
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/dept/dept_add.js
......@@ -24,7 +24,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
layer.open({
type: 2,
title: '父级部门',
area: ['300px', '200px'],
area: ['300px', '400px'],
content: Feng.ctxPath + '/system/commonTree?formName=' + formName + "&formId=" + formId + "&treeUrl=" + treeUrl,
end: function () {
$("#pid").val(DeptInfoDlg.data.pid);
......@@ -38,8 +38,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/dept/add", function (data) {
Feng.success("添加成功！");
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/dept";
//传给上个页面，刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
}, function (data) {
Feng.error("添加失败！" + data.responseJSON.message)
......@@ -51,8 +54,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/dept";
});
});
\ No newline at end of file
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/dept/dept_edit.js
......@@ -29,7 +29,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
layer.open({
type: 2,
title: '父级部门',
area: ['300px', '200px'],
area: ['300px', '400px'],
content: Feng.ctxPath + '/system/commonTree?formName=' + formName + "&formId=" + formId + "&treeUrl=" + treeUrl,
end: function () {
$("#pid").val(DeptInfoDlg.data.pid);
......@@ -43,8 +43,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/dept/update", function (data) {
Feng.success("修改成功！");
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/dept";
//传给上个页面，刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
}, function (data) {
Feng.error("修改失败！" + data.responseJSON.message)
......@@ -56,8 +59,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/dept";
});
});
\ No newline at end of file
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/dept/dept_add.html
@layout("/common/_container.html",{js:["/assets/modular/system/dept/dept_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">部门管理--添加</span>
</div>
@layout("/common/_form.html",{js:["/assets/modular/system/dept/dept_add.js"]}){
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="deptForm" lay-filter="deptForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="deptId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
<form class="layui-form" id="deptForm" lay-filter="deptForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
<div class="layui-card">
<div class="layui-card-header">基本信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<input name="deptId" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="pid" name="pid" type="hidden">
<input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="pid" name="pid" type="hidden">
<input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="form-group-bottom text-center">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
</div>
</form>
@}
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/dept/dept_edit.html
@layout("/common/_container.html",{js:["/assets/modular/system/dept/dept_edit.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">添加字典类型</span>
</div>
@layout("/common/_form.html",{js:["/assets/modular/system/dept/dept_edit.js"]}){
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="deptForm" lay-filter="deptForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="deptId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
<form class="layui-form" id="deptForm" lay-filter="deptForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
<div class="layui-card">
<div class="layui-card-header">基本信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<input name="deptId" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">部门名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="simpleName" placeholder="请输入部门名称" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="pid" name="pid" type="hidden">
<input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">上级名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="pid" name="pid" type="hidden">
<input id="pName" name="pName" placeholder="请输入上级名称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">部门全称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="fullName" name="fullName" placeholder="请输入部门全称" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<input name="description" placeholder="请输入备注" type="text" class="layui-input"/>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-input-block">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">排序</label>
<div class="layui-input-block">
<input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="form-group-bottom text-center">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
</div>
</form>
@}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment