Explorar o código

feat: 取消租户管理员的创建

louhangfei hai 11 meses
pai
achega
5a045aef73
Modificáronse 1 ficheiros con 5 adicións e 53 borrados
  1. 5 53
      src/views/system/user/user.vue

+ 5 - 53
src/views/system/user/user.vue

@@ -10,14 +10,6 @@
     <el-card>
       <template #header>
         <el-space align="center">
-          <el-button @click="openAddAdminDrawer" v-if="!isTargetTenantSys && isCanAddTenant && hasUserPermission()">
-            <template #icon>
-              <el-icon>
-                <Plus />
-              </el-icon>
-            </template>
-            添加租户管理员
-          </el-button>
           <el-button type="primary" @click="openAddSingleDrawer" v-permission="{ action: [PERM_USER.ACCOUNT_MANAGE] }">
             <template #icon>
               <el-icon>
@@ -26,13 +18,7 @@
             </template>
             添加用户
           </el-button>
-          <!-- <el-button
-            color="#1890FF"
-            @click="openAddMultipleDrawer"
-            style="margin-left: 18px"
-            plain
-            v-permission="{ action: [PERM_USER.ACCOUNT_ADD] }"
-          > -->
+
           <el-button color="#1890FF" @click="openAddMultipleDrawer" style="margin-left: 18px" plain>
             <template #icon>
               <el-icon>
@@ -151,17 +137,7 @@
       :width="450"
     />
     <ResetCodeDrawer ref="ResetCodeDrawerRef" :title="drawerTitle" @change="reloadTable" />
-    <CreateAdminDrawer
-      ref="createAdminDrawerRef"
-      :title="createAdminTitle"
-      @change="reloadTable"
-      :editType="createAdminType"
-      :roleData="roleData"
-      :width="450"
-      :isCanAddTenant="isCanAddTenant"
-      :isTargetTenantSys="isTargetTenantSys"
-      :departmentList="departmentList"
-    />
+
     <AddUser
       v-if="showAddPopover"
       :colseAddUser="setShowAddPopoverFalse"
@@ -177,7 +153,7 @@
   import { storeToRefs } from 'pinia';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import { Plus, DocumentAdd, Stamp } from '@element-plus/icons-vue';
-  import { EditType, OptionsProps, SearchParamsProps } from './types';
+  import { OptionsProps, SearchParamsProps } from './types';
   import { RoleTypeEnum } from '@/types/role/constants';
   import { getAllDepartments } from '@/api/auth/dept';
   import { getRoles } from '@/api/system/role';
@@ -190,7 +166,6 @@
   import AddUser from './component/AddUser.vue';
   import CreateDrawer from './CreateDrawer.vue';
   import ResetCodeDrawer from './ResetCodeDrawer.vue';
-  import CreateAdminDrawer from './CreateAdminDrawer.vue';
   import editIcon from '@/assets/icons/edit.png';
   import deleteIcon from '@/assets/icons/delete.png';
   import { SYS_TENANT_ID } from '@/utils/useTargetTenantIdSetting';
@@ -204,12 +179,9 @@
   const searchFormRef = ref<InstanceType<typeof SearchForm>>();
   const createDrawerRef = ref<InstanceType<typeof CreateDrawer>>();
   const ResetCodeDrawerRef = ref<InstanceType<typeof ResetCodeDrawer>>();
-  const createAdminDrawerRef = ref<InstanceType<typeof CreateAdminDrawer>>();
   const drawerTitle = ref('添加用户');
-  const createAdminTitle = ref('添加租户管理员');
   const roleData = ref<OptionsProps[]>([]);
   const departmentList = ref<OptionsProps[]>([]);
-  const createAdminType = ref(EditType.create);
   const { isTargetTenantSys } = useTargetTenantIdSetting();
 
   function reloadTable() {
@@ -217,26 +189,11 @@
   }
 
   const hasResetPasswordPermission = () => userStore.checkPermission(PERM_USER.ACCOUNT_RESET_PASSWORD);
-  const hasUserPermission = () => userStore.checkPermission(PERM_USER.ACCOUNT_MANAGE);
   // 当前用户类型
-  const currrentRoleType = getUserInfo.value.roleType;
   const currrentTenantId = getUserInfo.value.tenantId;
-  // 是否拥有添加租户管理人员权限,条件:1.系统用户,2.选择租户切换到租户选项
-  const isCanAddTenant = Number(currrentRoleType) !== RoleTypeEnum.TENANT_ADMIN && currrentTenantId === SYS_TENANT_ID;
   const openAddSingleDrawer = () => {
     drawerTitle.value = '添加用户';
-    if (isTargetTenantSys) {
-      createAdminTitle.value = '添加用户';
-      createAdminType.value = EditType.create;
-      createAdminDrawerRef.value?.openDrawer();
-    } else {
-      createDrawerRef.value?.openDrawer();
-    }
-  };
-  const openAddAdminDrawer = () => {
-    createAdminTitle.value = '添加租户管理员';
-    createAdminDrawerRef.value?.openDrawer();
-    createAdminType.value = EditType.create;
+    createDrawerRef.value?.openDrawer();
   };
 
   const showAddPopover = ref<boolean>(false);
@@ -251,12 +208,7 @@
 
   function handleEdit(record: Recordable) {
     drawerTitle.value = '编辑用户';
-    if (record.roleType === RoleTypeEnum.TENANT_ADMIN || isTargetTenantSys) {
-      createAdminDrawerRef.value?.openDrawer(record.id);
-      createAdminType.value = EditType.edit;
-    } else {
-      createDrawerRef.value?.openDrawer(record.id);
-    }
+    createDrawerRef.value?.openDrawer(record.id);
   }
 
   function handleResetCode(record: Recordable) {