mkm/dev_oa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善系统设置模块优化

Browse Source
This commit is contained in:
hdm 2021-11-17 00:24:24 +08:00
parent 177dc719f7
commit 661fb0d00c
8 changed files with 63 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/home/controller/Conf.php
View File

@ -60,7 +60,7 @@ class Conf extends BaseController
return to_assign();
}
} else {
$id = empty($param['id']) ? 0 : $param['id'];
$id = isset($param['id']) ? $param['id'] : 0;
if ($id > 0) {
$config = Db::name('Config')->where(['id' => $id])->find();
View::assign('config', $config);
@ -101,7 +101,7 @@ class Conf extends BaseController
}
return to_assign();
} else {
$id = empty($param['id']) ? 0 : $param['id'];
$id = isset($param['id']) ? $param['id'] : 0;
$conf = Db::name('Config')->where('id', $id)->find();
$config = [];
if ($conf['content']) {

18
app/home/controller/Database.php
View File

@ -62,7 +62,7 @@ class Database extends BaseController
add_log('add');
return to_assign(0, '备份成功！');
} else {
return to_assign(1, '请选择要备份的表！');
return to_assign(1, '请选择要备份的表');
}
}
@ -71,14 +71,14 @@ class Database extends BaseController
{
$tables = get_params('id');
if (empty($tables)) {
return to_assign(0, '请选择要优化的表！');
return to_assign(0, '请选择要优化的表');
}
$tables = explode(',', $tables);
if ($this->db->optimize($tables)) {
add_log('edit');
return to_assign(0, '数据表优化成功！');
} else {
return to_assign(1, '数据表优化出错请重试！');
return to_assign(1, '数据表优化出错请重试');
}
}
@ -87,14 +87,14 @@ class Database extends BaseController
{
$tables = get_params('id');
if (empty($tables)) {
return to_assign(1, '请选择要修复的表！');
return to_assign(1, '请选择要修复的表');
}
$tables = explode(',', $tables);
if ($this->db->repair($tables)) {
add_log('edit');
return to_assign(0, '数据表修复成功！');
return to_assign(0, '数据表修复成功');
} else {
return to_assign(1, '数据表修复出错请重试！');
return to_assign(1, '数据表修复出错请重试');
}
}
@ -167,13 +167,13 @@ class Database extends BaseController
$this->db->delFile($v);
}
add_log('delete');
return to_assign(0, "删除成功！");
return to_assign(0, "删除成功");
}
if ($this->db->delFile($id)) {
add_log('delete');
return to_assign(0, "删除成功！");
return to_assign(0, "删除成功");
} else {
return to_assign(1, "备份文件删除失败，请检查文件权限！");
return to_assign(1, "备份文件删除失败，请检查文件权限");
}
}
}

2
app/home/controller/Menu.php
View File

@ -66,7 +66,7 @@ class Menu extends BaseController
clear_cache('adminMenu');
return to_assign();
} else {
$pid = empty($param['pid']) ? 0 : $param['pid'];
$id = isset($param['id']) ? $param['id'] : 0;
View::assign('pid', $pid);
return view();
}

47
app/home/controller/Role.php
View File

@ -39,35 +39,10 @@ class Role extends BaseController
//添加&编辑
public function add()
{
$id = empty(get_params('id')) ? 0 : get_params('id');
$menu = get_admin_menu();
$rule = get_admin_rule();
if($id > 0) {
$group = get_admin_group_info($id);
$role_menu = create_tree_list(0, $menu, $group['menus']);
$role_rule = create_tree_list(0, $rule, $group['rules']);
$role = Db::name('AdminGroup')->where(['id' => $id])->find();
View::assign('role', $role);
}
else{
$role_menu = create_tree_list(0, $menu, []);
$role_rule = create_tree_list(0, $rule, []);
}
View::assign('role_menu', $role_menu);
View::assign('role_rule', $role_rule);
View::assign('id', $id);
return view();
}
//提交保存
public function post_submit()
{
if (request()->isAjax()) {
$param = get_params();
if (request()->isAjax()) {
$menuData = isset($param['menu']) ? $param['menu'] : 0;
$ruleData = isset($param['rule']) ? $param['rule'] : 0;
//sort($menuData);
//sort($ruleData);
$param['menus'] = implode(',',$menuData);
$param['rules'] = implode(',',$ruleData);
if (!empty($param['id']) && $param['id'] > 0) {
@ -98,6 +73,26 @@ class Role extends BaseController
clear_cache('adminRules');
return to_assign();
}
else{
$id = isset($param['id']) ? $param['id'] : 0;
$menu = get_admin_menu();
$rule = get_admin_rule();
if($id > 0) {
$group = get_admin_group_info($id);
$role_menu = create_tree_list(0, $menu, $group['menus']);
$role_rule = create_tree_list(0, $rule, $group['rules']);
$role = Db::name('AdminGroup')->where(['id' => $id])->find();
View::assign('role', $role);
}
else{
$role_menu = create_tree_list(0, $menu, []);
$role_rule = create_tree_list(0, $rule, []);
}
View::assign('role_menu', $role_menu);
View::assign('role_rule', $role_rule);
View::assign('id', $id);
return view();
}
}
//删除

2
app/home/controller/Rule.php
View File

@ -74,7 +74,7 @@ class Rule extends BaseController
clear_cache('adminRules');
return to_assign();
} else {
$pid = empty($param['pid']) ? 0 : $param['pid'];
$pid = isset($param['pid']) ? $param['pid'] : 0;
View::assign('pid', $pid);
return view();
}

2
app/home/view/role/add.html
View File

@ -127,7 +127,7 @@
form.on('submit(webform)', function (obj) {
console.log(obj.field);
$.ajax({
url: "{:url('home/role/post_submit')}",
url: "{:url('home/role/add')}",
data: obj.field,
type: 'post',
success: function (e) {

4
app/home/view/role/index.html
View File

@ -19,7 +19,7 @@
</script>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<a class="layui-btn layui-btn-normal layui-btn-sm" href="/home/role/add">+ 添加管理组</a>
<a class="layui-btn layui-btn-normal layui-btn-sm" href="{:url('home/role/add')}">+ 添加权限组</a>
</div>
</script>
{/block}
@ -59,7 +59,7 @@
var data = obj.data;
//console.log(obj)
if (obj.event === 'del') {
layer.confirm('确定要删除该角色吗？', { icon: 3, title: '提示' }, function (index) {
layer.confirm('确定要删除该权限角色吗？', { icon: 3, title: '提示' }, function (index) {
$.ajax({
url: "{:url('home/role/delete')}",
data: { id: data.id },

51
app/install/data/gouguoa.sql
View File

@ -67,7 +67,7 @@ CREATE TABLE `oa_admin_group` (
-- ----------------------------
-- Records of cms_admin_group
-- ----------------------------
INSERT INTO `oa_admin_group` VALUES ('1', '超级员工', '1', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,112,113', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43', '超级员工，系统自动分配所有可操作权限及菜单。', '0', '0');
INSERT INTO `oa_admin_group` VALUES ('1', '超级员工', '1', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43', '超级员工，系统自动分配所有可操作权限及菜单。', '0', '0');
-- ----------------------------
-- Table structure for oa_admin_log
@ -296,35 +296,36 @@ INSERT INTO `oa_admin_rule` VALUES (86, 84, 'home/article/cate_delete', '删除
INSERT INTO `oa_admin_rule` VALUES (87, 6, 'home/article/index', '知识列表','知识文章', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (88, 87, 'home/article/add', '添加/修改知识文章','知识文章', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (89, 87, 'home/article/delete', '删除知识文章','知识文章', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (90, 87, 'home/article/view', '查看知识文章','知识文章', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (90, 7, 'home/plan/index', '工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (91, 90, 'home/plan/calendar', '工作计划日历','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (92, 90, 'home/plan/add', '添加/编辑工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (93, 90, 'home/plan/delete', '删除工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (94, 90, 'home/plan/detail', '查看工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (91, 7, 'home/plan/index', '工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (92, 91, 'home/plan/calendar', '工作计划日历','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (93, 91, 'home/plan/add', '添加/编辑工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (94, 91, 'home/plan/delete', '删除工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (95, 91, 'home/plan/detail', '查看工作计划','工作计划', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (95, 7, 'home/schedule/index', '工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (96, 95, 'home/schedule/calendar', '工作记录日历','工作日历', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (97, 95, 'home/schedule/add', '添加/编辑工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (98, 95, 'home/schedule/delete', '删除工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (99, 95, 'home/schedule/detail', '查看工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (100, 95, 'home/schedule/update_labor_time', '更改工时','工时', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (96, 7, 'home/schedule/index', '工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (97, 96, 'home/schedule/calendar', '工作记录日历','工作日历', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (98, 96, 'home/schedule/add', '添加/编辑工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (99, 96, 'home/schedule/delete', '删除工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (100, 96, 'home/schedule/detail', '查看工作记录','工作记录', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (101, 96, 'home/schedule/update_labor_time', '更改工时','工时', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (101, 8, 'home/expense/index', '报销管理','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (102, 100, 'home/expense/add', '新增/编辑报销','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (103, 100, 'home/expense/delete', '删除报销','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (104, 100, 'home/expense/view', '查看报销信息','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (105, 100, 'home/expense/check', '设置报销状态','报销状态', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (102, 8, 'home/expense/index', '报销管理','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (103, 102, 'home/expense/add', '新增/编辑报销','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (104, 102, 'home/expense/delete', '删除报销','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (105, 102, 'home/expense/view', '查看报销信息','报销', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (106, 102, 'home/expense/check', '设置报销状态','报销状态', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (106, 8, 'home/invoice/index', '发票管理','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (107, 106, 'home/invoice/add', '新增/编辑发票','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (108, 106, 'home/invoice/delete', '删除发票','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (109, 106, 'home/invoice/view', '查看发票信息','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (110, 106, 'home/invoice/check', '设置发票状态','发票状态', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (107, 8, 'home/invoice/index', '发票管理','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (108, 107, 'home/invoice/add', '新增/编辑发票','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (109, 107, 'home/invoice/delete', '删除发票','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (110, 107, 'home/invoice/view', '查看发票信息','发票', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (111, 107, 'home/invoice/check', '设置发票状态','发票状态', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (111, 8, 'home/income/index', '到账管理','到账', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (112, 111, 'home/income/add', '新增到账','到账', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (113, 111, 'home/income/check', '设置到账状态','到账状态', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (112, 8, 'home/income/index', '到账管理','到账', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (113, 112, 'home/income/add', '新增到账','到账', 0, 0);
INSERT INTO `oa_admin_rule` VALUES (114, 112, 'home/income/check', '设置到账状态','到账状态', 0, 0);
-- ----------------------------
-- Table structure for oa_article