From c79880f1233e440e1664b1ad5b32ec4d092f1722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 25 May 2023 22:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=B1=8F=E8=94=BD=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/RoleList.vue          | 6 +++---
 jshERP-web/src/views/system/modules/RoleModal.vue | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 9d341b99..f2d6c3fa 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -74,7 +74,7 @@
             </span>
             <span slot="priceLimitTitle">
               价格屏蔽
-              <a-tooltip title="价格屏蔽支持多选，主要用于控制首页界面和物料的价格屏蔽">
+              <a-tooltip title="价格屏蔽支持多选，主要用于控制首页和单据的价格屏蔽">
                 <a-icon type="question-circle" />
               </a-tooltip>
             </span>
@@ -146,7 +146,7 @@
             title: '操作',
             dataIndex: 'action',
             align:"center",
-            width: 150,
+            width: 180,
             scopedSlots: { customRender: 'action' },
           },
           {
@@ -157,7 +157,7 @@
             slots: { title: 'typeTitle' }
           },
           {
-            align:"left", dataIndex: 'priceLimitStr', width: 100,
+            align:"left", dataIndex: 'priceLimitStr', width: 300,
             slots: { title: 'priceLimitTitle' }
           },
           {
diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue
index e7a23469..26eabee1 100644
--- a/jshERP-web/src/views/system/modules/RoleModal.vue
+++ b/jshERP-web/src/views/system/modules/RoleModal.vue
@@ -80,9 +80,12 @@
         },
         priceLimitList: {
           options: [
-            { 'value': '1', 'text': '屏蔽采购价'},
-            { 'value': '2', 'text': '屏蔽零售价'},
-            { 'value': '3', 'text': '屏蔽销售价'}
+            { 'value': '1', 'text': '屏蔽首页采购价'},
+            { 'value': '2', 'text': '屏蔽首页零售价'},
+            { 'value': '3', 'text': '屏蔽首页销售价'},
+            { 'value': '4', 'text': '屏蔽单据采购价'},
+            { 'value': '5', 'text': '屏蔽单据零售价'},
+            { 'value': '6', 'text': '屏蔽单据销售价'}
           ],
           value: ''
         },