From 2c21295c9fdd9a0e29516c0f77e747a12bb2fe47 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Sun, 30 Nov 2025 15:53:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E5=9C=B0=E5=8C=BA=E7=9A=84=E8=8B=B1=E6=96=87=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveDetail1.vue | 2 +-
 src/views/permissions/userPermission.vue               | 4 ++--
 src/views/workspace/index.vue                          | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveDetail1.vue b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
index 9dd27e9..a939432 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail1.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
@@ -1497,7 +1497,7 @@ onMounted(async function () {
 
   if (adminData.value.roleId == 2) {
     superAdmin.value = true
-    if(adminData.value.markets  == '总部' || adminData.value.markets == '研发部'){
+    if(adminData.value.markets  == '总部' || adminData.value.markets == '研发部' || adminData.value.markets == 'headquarters'){
       console.log('提示了吗');
       
       ElMessageBox.alert('管理员账号只能看到所属地区对应地区财务数据，请注意设置所属地区','注意',{
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 7c9b52f..011a12b 100644
--- a/src/views/permissions/userPermission.vue
+++ b/src/views/permissions/userPermission.vue
@@ -810,9 +810,9 @@ const confirmResetPassword = async function () {
 
 
   // 权限检查
-  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部') {
+  if (adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'headquarters' || adminData.value.markets[0] === 'R&D Department') {
 
-    console.log('符合条件，可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部');
+    console.log('符合条件，可以操作', adminData.value.markets.includes(currentRow.value.market) || adminData.value.markets[0] === '总部' || adminData.value.markets[0] === '研发部' || adminData.value.markets[0] === 'headquarters' || adminData.value.markets[0] === 'R&D Department');
     const params = {
       account: currentRow.value.account,
     }
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 4618dcd..e808213 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -38,8 +38,10 @@ const getAdminData = async function () {
   try {
     loading.value = true; // 开始加载
     const result = await API({url: '/admin/userinfo', data: {}});
-    GraphFlag.value = result.markets !== '总部' && result.markets !== '研发部' && result.markets !== 'headquarters'
+    GraphFlag.value = result.markets !== '总部' && result.markets !== '研发部' 
+    && result.markets !== 'headquarters' && result.markets !== 'R&D Department'
 
+    
     ;
     console.log("GraphFlag",GraphFlag.value);
   } catch (error) {