diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 09a3126d..287a55c4 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -134,6 +134,9 @@
{
title: '数据类型', align:"left", dataIndex: 'type', width: 100
},
+ {
+ title: '价格屏蔽', align:"left", dataIndex: 'priceLimitStr', width: 100
+ },
{
title: '描述', align:"left", dataIndex: 'description', width: 150
},
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index 00a0dc2d..1ab62f99 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -8,7 +8,7 @@
@cancel="handleCancel"
cancelText="关闭"
wrapClassName="ant-modal-cust-warp"
- style="top:25%;height: 50%;overflow-y: hidden">
+ style="top:20%;height: 60%;overflow-y: hidden">
关闭
@@ -20,13 +20,20 @@
+
+ 全部数据
+ 本机构数据
+ 个人数据
+
-
- 全部数据
- 本机构数据
- 个人数据
-
+ 3、个人数据-该角色对应的用户只可以看到自己的单据。单据是指采购入库、销售出库等">
+
+
+
+
+
+
+
@@ -41,10 +48,14 @@