This commit is contained in:
walkor 2022-12-19 14:39:51 +08:00
parent 35a9e84b71
commit 500a8f26b0
4 changed files with 38 additions and 21 deletions

View File

@ -43,7 +43,12 @@ class RoleController extends Crud
public function insert(Request $request): Response public function insert(Request $request): Response
{ {
if ($request->method() === 'POST') { if ($request->method() === 'POST') {
return parent::insert($request); $data = $this->insertInput($request);
if (isset($data['pid']) && $data['pid'] == 0) {
return $this->json(1, '请选择父级权限组');
}
$id = $this->doInsert($data);
return $this->json(0, 'ok', ['id' => $id]);
} }
return view('role/insert'); return view('role/insert');
} }
@ -68,6 +73,14 @@ class RoleController extends Crud
if (isset($data['pid']) && $id == 1) { if (isset($data['pid']) && $id == 1) {
$data['pid'] = 0; $data['pid'] = 0;
} }
if (isset($data['pid'])) {
if ($data['pid'] == $id) {
return $this->json(1, '父集不能是自己');
}
if ($data['pid'] == 0) {
return $this->json(1, '请选择父级权限组');
}
}
$this->doUpdate($id, $data); $this->doUpdate($id, $data);
return $this->json(0); return $this->json(0);
} }

View File

@ -31,8 +31,10 @@
<!-- 表格行工具栏 --> <!-- 表格行工具栏 -->
<script type="text/html" id="table-bar"> <script type="text/html" id="table-bar">
{{# if(d.id!==1){ }}
<button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.role.update">编辑</button> <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.role.update">编辑</button>
<button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.role.delete">删除</button> <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.role.delete">删除</button>
{{# } }}
</script> </script>
<script src="/app/admin/component/layui/layui.js"></script> <script src="/app/admin/component/layui/layui.js"></script>
@ -66,7 +68,7 @@
title: "主键", title: "主键",
field: "id", field: "id",
},{ },{
title: "角色", title: "角色",
field: "name", field: "name",
},{ },{
title: "权限", title: "权限",
@ -79,7 +81,8 @@
items.push(apiResults[field][v] || v); items.push(apiResults[field][v] || v);
}); });
return util.escape(items.join(",")); return util.escape(items.join(","));
} },
hide: true,
},{ },{
title: "创建时间", title: "创建时间",
field: "created_at", field: "created_at",
@ -87,7 +90,7 @@
title: "更新时间", title: "更新时间",
field: "updated_at", field: "updated_at",
},{ },{
title: "上级id", title: "父级",
field: "pid", field: "pid",
templet: function (d) { templet: function (d) {
let field = "pid"; let field = "pid";
@ -97,7 +100,8 @@
items.push(apiResults[field][v] || v); items.push(apiResults[field][v] || v);
}); });
return util.escape(items.join(",")); return util.escape(items.join(","));
} },
hide: true,
},{ },{
title: "操作", title: "操作",
toolbar: "#table-bar", toolbar: "#table-bar",

View File

@ -12,7 +12,14 @@
<div class="mainBox"> <div class="mainBox">
<div class="main-container mr-5"> <div class="main-container mr-5">
<div class="layui-form-item">
<label class="layui-form-label">父级</label>
<div class="layui-input-block">
<div name="pid" id="pid" value="1" ></div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">角色名</label> <label class="layui-form-label required">角色名</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -27,13 +34,6 @@
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">上级id</label>
<div class="layui-input-block">
<div name="pid" id="pid" value="" ></div>
</div>
</div>
</div> </div>
</div> </div>

View File

@ -12,7 +12,14 @@
<div class="mainBox"> <div class="mainBox">
<div class="main-container mr-5"> <div class="main-container mr-5">
<div class="layui-form-item">
<label class="layui-form-label">父级</label>
<div class="layui-input-block">
<div name="pid" id="pid" value="" ></div>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">角色名</label> <label class="layui-form-label required">角色名</label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -27,13 +34,6 @@
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">上级id</label>
<div class="layui-input-block">
<div name="pid" id="pid" value="" ></div>
</div>
</div>
</div> </div>
</div> </div>