Commit 492c7f52 by fengshuonan

Merge remote-tracking branch 'origin/dw'

parents d6608557 a89e994a
......@@ -83,15 +83,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
* @param data 点击按钮时候的行数据
*/
Dept.onEditDept = function (data) {
admin.putTempData('formOk', false);
top.layui.admin.open({
type: 2,
title: '修改部门',
content: Feng.ctxPath + '/dept/dept_update?deptId=' + data.deptId,
end: function () {
admin.getTempData('formOk') && table.reload(Dept.tableId);
}
});
window.location.href = Feng.ctxPath + "/dept/dept_update?deptId="+ data.deptId;
};
/**
......@@ -135,7 +127,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
// 添加按钮点击事件
$('#btnAdd').click(function () {
Dept.openAddDept();
window.location.href = Feng.ctxPath + "/dept/dept_add";
});
// 导出excel
......
......@@ -41,15 +41,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/dept/add", function (data) {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/dept";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/dept";
});
});
\ No newline at end of file
......@@ -46,15 +46,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/dept/update", function (data) {
Feng.success("修改成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/dept";
}, function (data) {
Feng.error("修改失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/dept";
});
});
\ No newline at end of file
......@@ -90,15 +90,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
* @param data 点击按钮时候的行数据
*/
Menu.onEditMenu = function (data) {
admin.putTempData('formOk', false);
top.layui.admin.open({
type: 2,
title: '编辑菜单',
content: Feng.ctxPath + '/menu/menu_edit?menuId=' + data.menuId,
end: function () {
admin.getTempData('formOk') && Menu.initTable(Menu.tableId);
}
});
window.location.href = Feng.ctxPath + "/menu/menu_edit?menuId="+ data.menuId;
};
/**
......@@ -170,7 +162,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
// 添加按钮点击事件
$('#btnAdd').click(function () {
Menu.openAddMenu();
window.location.href = Feng.ctxPath + "/menu/menu_add";
});
// 工具条点击事件
......
......@@ -42,15 +42,19 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/menu/add", function (data) {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/menu";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/menu";
});
});
\ No newline at end of file
......@@ -47,15 +47,18 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/menu/edit", function (data) {
Feng.success("修改成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/menu";
}, function (data) {
Feng.error("修改失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/menu";
});
});
\ No newline at end of file
......@@ -60,15 +60,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
* @param data 点击按钮时候的行数据
*/
Notice.onEditNotice = function (data) {
admin.putTempData('formOk', false);
top.layui.admin.open({
type: 2,
title: '通知详情',
content: Feng.ctxPath + '/notice/notice_update/' + data.noticeId,
end: function () {
admin.getTempData('formOk') && table.reload(Notice.tableId);
}
});
window.location.href = Feng.ctxPath + "/notice/notice_update/"+ data.noticeId;
};
/**
......@@ -107,7 +99,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
// 添加按钮点击事件
$('#btnAdd').click(function () {
Notice.openAddNotice();
window.location.href = Feng.ctxPath + "/notice/notice_add";
});
// 工具条点击事件
......
......@@ -13,15 +13,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/notice/add", function (data) {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/notice";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/notice";
});
});
\ No newline at end of file
......@@ -13,15 +13,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/notice/update", function (data) {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/notice";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/notice";
});
});
\ No newline at end of file
......@@ -74,15 +74,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
* @param data 点击按钮时候的行数据
*/
Role.onEditRole = function (data) {
admin.putTempData('formOk', false);
top.layui.admin.open({
type: 2,
title: '修改角色',
content: Feng.ctxPath + '/role/role_edit?roleId=' + data.roleId,
end: function () {
admin.getTempData('formOk') && table.reload(Role.tableId);
}
});
window.location.href = Feng.ctxPath + "/role/role_edit?roleId="+ data.roleId;
};
/**
......@@ -140,7 +132,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
// 添加按钮点击事件
$('#btnAdd').click(function () {
Role.openAddRole();
window.location.href = Feng.ctxPath + "/role/role_add";
});
// 导出excel
......
......@@ -41,15 +41,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/role/add", function (data) {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/role";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/role";
});
});
\ No newline at end of file
......@@ -46,15 +46,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var ajax = new $ax(Feng.ctxPath + "/role/edit", function (data) {
Feng.success("修改成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/role";
}, function (data) {
Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/role";
});
});
\ No newline at end of file
......@@ -93,7 +93,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
* @param data 点击按钮时候的行数据
*/
MgrUser.onEditUser = function (data) {
admin.putTempData('formOk', false);
/*admin.putTempData('formOk', false);
top.layui.admin.open({
type: 2,
title: '编辑用户',
......@@ -101,7 +101,9 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
end: function () {
admin.getTempData('formOk') && table.reload(MgrUser.tableId);
}
});
});*/
//console.info(data.userId);
window.location.href = Feng.ctxPath + "/mgr/user_edit?userId="+ data.userId;
};
/**
......@@ -214,7 +216,8 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
// 添加按钮点击事件
$('#btnAdd').click(function () {
MgrUser.openAddUser();
//MgrUser.openAddUser();
window.location.href = Feng.ctxPath + "/mgr/user_add";
});
// 导出excel
......
......@@ -59,14 +59,25 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
Feng.success("添加成功!");
//传给上个页面,刷新table用
admin.putTempData('formOk', true);
//admin.putTempData('formOk', true);
//关掉对话框
admin.closeThisDialog();
//admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/mgr";
}, function (data) {
Feng.error("添加失败!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/mgr";
});
});
\ No newline at end of file
......@@ -68,10 +68,21 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax'], function () {
//关掉对话框
admin.closeThisDialog();
//跳转列表页面并刷新
window.location.href = Feng.ctxPath + "/mgr";
}, function (data) {
Feng.error("修改成功!" + data.responseJSON.message)
});
ajax.set(data.field);
ajax.start();
//添加 return false 可成功跳转页面
return false;
});
//返回按钮
$("#backupPage").click(function () {
window.location.href = Feng.ctxPath + "/mgr";
});
});
\ No newline at end of file
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/dept/dept_add.js"]}){
<form id="deptForm" lay-filter="deptForm" class="layui-form model-form">
@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>
<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>
......@@ -33,8 +40,12 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" id="backupPage">返回</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/dept/dept_edit.js"]}){
<form id="deptForm" lay-filter="deptForm" class="layui-form model-form">
@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>
<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>
......@@ -33,8 +40,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" id="backupPage">返回</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/menu/menu_add.js"]}){
<form id="menuForm" lay-filter="menuForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/menu/menu_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">菜单管理-添加</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="menuForm" lay-filter="menuForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="menuId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">名称<span style="color: red;">*</span></label>
......@@ -46,8 +53,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/menu/menu_edit.js"]}){
<form id="menuForm" lay-filter="menuForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/menu/menu_edit.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">菜单管理-修改</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="menuForm" lay-filter="menuForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="menuId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">名称<span style="color: red;">*</span></label>
......@@ -46,8 +53,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/notice/notice_add.js"]}){
<form id="noticeForm" lay-filter="noticeForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/notice/notice_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">通知管理-添加</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="noticeForm" lay-filter="noticeForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="noticeId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">标题<span style="color: red;">*</span></label>
......@@ -14,8 +21,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/notice/notice_edit.js"]}){
<form id="noticeForm" lay-filter="noticeForm" class="layui-form model-form">
<div class="layui-body-header">
<span class="layui-body-header-title">通知管理-修改</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="noticeForm" lay-filter="noticeForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="noticeId" value="${noticeId}" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">标题<span style="color: red;">*</span></label>
......@@ -14,8 +21,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/role/role_add.js"]}){
<form id="userForm" lay-filter="roleForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/role/role_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">角色管理-添加</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="userForm" lay-filter="roleForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="roleId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">角色名称<span style="color: red;">*</span></label>
......@@ -27,8 +34,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/role/role_edit.js"]}){
<form id="roleForm" lay-filter="roleForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/role/role_edit.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">角色管理-修改</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="roleForm" lay-filter="roleForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="roleId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">角色名称<span style="color: red;">*</span></label>
......@@ -27,8 +34,12 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/user/user_add.js"]}){
<form id="userForm" lay-filter="userForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_add.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">用户管理-添加</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="userForm" lay-filter="userForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="userId" type="hidden"/>
<div class="layui-form-item">
<label class="layui-form-label">账号<span style="color: red;">*</span></label>
......@@ -58,8 +65,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/user/user_edit.js"]}){
<form id="userForm" lay-filter="userForm" class="layui-form model-form">
@layout("/common/_container.html",{js:["/assets/modular/system/user/user_edit.js"]}){
<div class="layui-body-header">
<span class="layui-body-header-title">用户管理-修改</span>
</div>
<div class="layui-fluid " style="">
<div class="layui-card">
<div class="layui-card-body">
<form id="userForm" lay-filter="userForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
<input name="userId" type="hidden"/>
<input name="account" type="hidden"/>
<div class="layui-form-item">
......@@ -41,8 +48,11 @@
</div>
</div>
<div class="layui-form-item text-right">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
</div>
</form>
</form>
</div>
</div>
</div>
@}
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