From 58ed978560c445c4e3e628ada547ab4b77c27657 Mon Sep 17 00:00:00 2001
From: chenjinlong <$chenjinlong>
Date: Tue, 26 Jan 2021 23:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90role=E3=80=91=E8=A7=92=E8=89=B2?=
=?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../webapp/assets/modular/system/role/role.js | 24 ++++++++++++++++++-
.../assets/modular/system/role/role_add.js | 2 +-
.../assets/modular/system/role/role_edit.js | 2 +-
.../pages/modular/system/role/role_add.html | 4 ++--
.../pages/modular/system/role/role_edit.html | 4 ++--
5 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/assets/modular/system/role/role.js b/src/main/webapp/assets/modular/system/role/role.js
index e0b94d1e..0668b8da 100644
--- a/src/main/webapp/assets/modular/system/role/role.js
+++ b/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 '系统角色';
+ } else {
+ return '普通角色';
+ }
+ }
+ },
+ {
+ field: 'roleTypeCode', align: "center", sort: true, title: '角色类型', templet: function (data) {
+ if (data.roleTypeCode === 'role_system') {
+ return '系统';
+ } else if(data.roleTypeCode === 'role_c'){
+ return 'C端';
+ }else if(data.roleTypeCode === 'role_b'){
+ return 'B端';
+ }
+ return '未知';
+ }
+ },
+
{
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 '指定部门数据';
}
if (data.dataScopeType === 50) {
- return '全部数据';
+ return '全部数据';
}
return '未知';
}
diff --git a/src/main/webapp/assets/modular/system/role/role_add.js b/src/main/webapp/assets/modular/system/role/role_add.js
index d8bf633c..784cae02 100644
--- a/src/main/webapp/assets/modular/system/role/role_add.js
+++ b/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'}
});
diff --git a/src/main/webapp/assets/modular/system/role/role_edit.js b/src/main/webapp/assets/modular/system/role/role_edit.js
index a23f834f..759389b6 100644
--- a/src/main/webapp/assets/modular/system/role/role_edit.js
+++ b/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'}
});
diff --git a/src/main/webapp/pages/modular/system/role/role_add.html b/src/main/webapp/pages/modular/system/role/role_add.html
index e2b0bc3e..ee8c7901 100644
--- a/src/main/webapp/pages/modular/system/role/role_add.html
+++ b/src/main/webapp/pages/modular/system/role/role_add.html
@@ -11,8 +11,8 @@
diff --git a/src/main/webapp/pages/modular/system/role/role_edit.html b/src/main/webapp/pages/modular/system/role/role_edit.html
index 738ff35e..3bed335b 100644
--- a/src/main/webapp/pages/modular/system/role/role_edit.html
+++ b/src/main/webapp/pages/modular/system/role/role_edit.html
@@ -11,8 +11,8 @@