From 79ccbe83db520c63ec670fdf54aac9ee67bb8b01 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Thu, 8 Jan 2026 11:02:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E7=A0=94=E5=8F=91?= =?UTF-8?q?=E9=83=A8=E5=90=8D=E7=A7=B0=E7=BC=A9=E5=86=99=EF=BC=8C=E5=B0=86?= =?UTF-8?q?"R&D=20Department"=E4=BF=AE=E6=AD=A3=E4=B8=BA"R&D=20Dept"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workspace/CashManagement.vue | 2 +- src/views/permissions/userPermission.vue | 4 ++-- src/views/workspace/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue index 97fefaf..aabbc44 100644 --- a/src/components/workspace/CashManagement.vue +++ b/src/components/workspace/CashManagement.vue @@ -204,7 +204,7 @@ const getAdminData = async function () { loading.value = true; // 开始加载 const result = await API({url: '/admin/userinfo', data: {}}); marksFlag.value = result.markets === '总部' || result.markets === '研发部' - || result.markets === 'Headquarters' || result.markets === 'R&D Department'; + || result.markets === 'Headquarters' || result.markets === 'R&D Dept'; console.log("marksFlag", marksFlag.value); // alert(marksFlag.value) } catch (error) { diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue index 69f5822..4707216 100644 --- a/src/views/permissions/userPermission.vue +++ b/src/views/permissions/userPermission.vue @@ -813,9 +813,9 @@ const confirmResetPassword = async function () { // 权限检查 - 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') { + 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 Dept') { - 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'); + 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 Dept'); const params = { account: currentRow.value.account, } diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue index 4aac2fa..6aff596 100644 --- a/src/views/workspace/index.vue +++ b/src/views/workspace/index.vue @@ -42,7 +42,7 @@ const getAdminData = async function () { loading.value = true; // 开始加载 const result = await API({url: '/admin/userinfo', data: {}}); GraphFlag.value = result.markets !== '总部' && result.markets !== '研发部' - && result.markets !== 'Headquarters' && result.markets !== 'R&D Department' + && result.markets !== 'Headquarters' && result.markets !== 'R&D Dept' ;