From 9061f5ac7941e9d2adab6b9ae3094e104d33a26d Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 14 Aug 2024 16:22:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E7=BB=84=E7=BB=87=5F?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=88=97=E8=A1=A8=E6=8E=A7=E5=88=B6=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/systemOrganization.vue         | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index 73bc128753..97c1fcdec7 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -35,37 +35,41 @@
         v-if="hasAnyPermission(['SYSTEM_ORGANIZATION_PROJECT:READ+UPDATE'])"
         class="primary-color"
         @click="showProjectDrawer(record)"
-        >{{ record.projectCount }}</span
       >
+        {{ record.projectCount }}
+      </span>
       <span v-else>{{ record.projectCount }}</span>
     </template>
     <template #operation="{ record }">
       <template v-if="record.deleted">
-        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+RECOVER']" @click="handleRevokeDelete(record)">{{
-          t('common.revokeDelete')
-        }}</MsButton>
+        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+RECOVER']" @click="handleRevokeDelete(record)">
+          {{ t('common.revokeDelete') }}
+        </MsButton>
       </template>
       <template v-else-if="!record.enable">
-        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+DELETE']" @click="handleDelete(record)">{{
-          t('common.delete')
-        }}</MsButton>
+        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+DELETE']" @click="handleDelete(record)">
+          {{ t('common.delete') }}
+        </MsButton>
       </template>
       <template v-else>
-        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+UPDATE']" @click="showOrganizationModal(record)">{{
-          t('common.edit')
-        }}</MsButton>
-        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER']" @click="showAddUserModal(record)">{{
-          t('system.organization.addMember')
-        }}</MsButton>
-        <!-- TODO 后台缺少字段控制  -->
-        <MsButton v-xpack :disabled="appStore.currentOrgId === record.id" @click="enterOrganization(record.id)">{{
-          t('system.project.enterOrganization')
-        }}</MsButton>
+        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+UPDATE']" @click="showOrganizationModal(record)">
+          {{ t('common.edit') }}
+        </MsButton>
+        <MsButton v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER']" @click="showAddUserModal(record)">
+          {{ t('system.organization.addMember') }}
+        </MsButton>
+        <MsButton
+          v-if="record.switchAndEnter && licenseStore.hasLicense()"
+          :disabled="appStore.currentOrgId === record.id"
+          @click="enterOrganization(record.id)"
+        >
+          {{ t('system.project.enterOrganization') }}
+        </MsButton>
         <MsTableMoreAction
           v-permission="['SYSTEM_ORGANIZATION_PROJECT:READ+DELETE']"
           :list="tableActions"
           @select="handleMoreAction($event, record)"
-        ></MsTableMoreAction>
+        />
       </template>
     </template>
   </MsBaseTable>
@@ -113,6 +117,7 @@
   import useModal from '@/hooks/useModal';
   import { useTableStore } from '@/store';
   import useAppStore from '@/store/modules/app';
+  import useLicenseStore from '@/store/modules/setting/license';
   import { characterLimit } from '@/utils';
   import { hasAnyPermission } from '@/utils/permission';
 
@@ -121,6 +126,8 @@
 
   import { enterOrganization } from '@/views/setting/utils';
 
+  const licenseStore = useLicenseStore();
+
   const appStore = useAppStore();
 
   export interface SystemOrganizationProps {