【role】角色分类，角色类型

src/main/webapp/assets/modular/system/role/role.js

@@ -25,6 +25,28 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
             {field: 'roleName', align: "center", sort: true, title: '角色名称'},
             {field: 'roleCode', align: "center", sort: true, title: '角色编码'},
             {field: 'roleSort', align: "center", sort: true, title: '排序'},
+            {
+                field: 'roleSystemFlag', align: "center", sort: true, title: '角色级别', templet: function (data) {
+                    if (data.roleSystemFlag === 'Y') {
+                        return '<span class="layui-badge layui-badge-red">系统角色</span>';
+                    } else {
+                        return '<span class="layui-badge layui-badge-green">普通角色</span>';
+                    }
+                }
+            },
+            {
+                field: 'roleTypeCode', align: "center", sort: true, title: '角色类型', templet: function (data) {
+                    if (data.roleTypeCode === 'role_system') {
+                        return '<span class="layui-badge layui-badge-red">系统</span>';
+                    } else if(data.roleTypeCode === 'role_c'){
+                        return '<span class="layui-badge layui-badge-green">C端</span>';
+                    }else if(data.roleTypeCode === 'role_b'){
+                        return '<span class="layui-badge layui-badge-green">B端</span>';
+                    }
+                    return '<span class="layui-badge layui-badge-green">未知</span>';
+                }
+            },
+
             {
                 field: 'dataScopeType', align: "center", sort: true, title: '数据范围类型', templet: function (data) {
                     if (data.dataScopeType === 10) {
@@ -40,7 +62,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
                         return '<span class="layui-badge layui-badge-green">指定部门数据</span>';
                     }
                     if (data.dataScopeType === 50) {
-                        return '<span class="layui-badge layui-badge-green">全部数据</span>';
+                        return '<span class="layui-badge layui-badge-red">全部数据</span>';
                     }
                     return '<span class="layui-badge layui-badge-green">未知</span>';
                 }

src/main/webapp/assets/modular/system/role/role_add.js

@@ -10,7 +10,7 @@ layui.use(['form', 'admin', 'HttpRequest', 'gunsSelect'], function () {
     // 角色类型
     gunsSelect.render({
         url: Feng.ctxPath + '/dict/getDictList',
-        elem: '#roleType',
+        elem: '#roleTypeCode',
         fields: {name: 'dictName', value: 'dictCode'},
         where: {dictTypeCode: 'role_type'}
     });

src/main/webapp/assets/modular/system/role/role_edit.js

@@ -11,7 +11,7 @@ layui.use(['form', 'admin', 'HttpRequest', 'gunsSelect'], function () {
     // 角色类型
     gunsSelect.render({
         url: Feng.ctxPath + '/dict/getDictList',
-        elem: '#roleType',
+        elem: '#roleTypeCode',
         fields: {name: 'dictName', value: 'dictCode'},
         where: {dictTypeCode: 'role_type'}
     });

src/main/webapp/pages/modular/system/role/role_add.html

@@ -11,8 +11,8 @@
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label layui-form-required">角色类型</label>
                         <div class="layui-input-block">
-                            <select name="roleType" id="roleType" lay-verify="" lay-search>
+                            <select name="roleTypeCode" id="roleTypeCode" lay-verify="required" lay-search>
-                                <option value="">请选择</option>
+                                <option value="">请选择角色类型</option>
                             </select>
                         </div>
                     </div>

src/main/webapp/pages/modular/system/role/role_edit.html

@@ -11,8 +11,8 @@
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label layui-form-required">角色类型</label>
                         <div class="layui-input-block">
-                            <select name="roleType" id="roleType" lay-verify="" lay-search>
+                            <select name="roleTypeCode" id="roleTypeCode" lay-verify="required" lay-search>
-                                <option value="">请选择</option>
+                                <option value="">请选择角色类型</option>
                             </select>
                         </div>
                     </div>