feat: 新增权限页面

dev001
1 parent 623681bf
Showing 4 changed files with 137 additions and 59 deletions
src/api/system/account.ts
src/views/system/account/tenant/TenantModal.vue
src/views/system/account/tenant/config.ts
src/views/system/account/tenant/index.vue
--- a/src/api/system/account.ts
View file @c61720d
+++ b/src/api/system/account.ts
View file @c61720d
@@ -9,7 +9,7 @@ export const getTenantList = (params: AccountParams) => {
   const url = Api.GET_TENANT_List;
   return defHttp.get({ url: url, params });
 };
-export const addTenantList = (params: AccountParams) => {
+export const addTenantList = (params: any) => {
   const url = Api.ADD_TANANT_LIST;
   return defHttp.post({ url: url, params });
 };
--- a/src/views/system/account/tenant/TenantModal.vue
View file @c61720d
+++ b/src/views/system/account/tenant/TenantModal.vue
View file @c61720d
@@ -71,6 +71,9 @@
   import { useDrawer } from '/@/components/Drawer';
   import RoleDrawer from '../../role/RoleDrawer.vue';
   import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
+  import { useUserStore } from '/@/store/modules/user';
+  import { IsPhoneExist } from '/@/api/system/system';
+  import { phoneRegexp } from '/@/utils/rules';
   export default defineComponent({
     name: 'TenantModal',
@@ -90,9 +93,10 @@
     setup(_, { emit }) {
       const [registerRoleDrawer, { openDrawer }] = useDrawer();
       const { createMessage } = useMessage();
+      const userInfo = useUserStore();
       const roleOptions = ref<TOption[]>([]);
-      const isUpdate = ref(true);
+      const isAdd = ref(true);
       const rowId = ref('');
       const organizationTreeData = ref<TreeItem[]>([]);
       const basicTreeRef = ref();
@@ -118,7 +122,7 @@
       });
       const handleOpenRole = () => {
         openDrawer(true, {
-          isUpdate: false,
+          isAdd: false,
         });
       };
       const clearValidateByField = (field: string) => {
@@ -164,7 +168,7 @@
       const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
         await resetFields();
         setModalProps({ confirmLoading: false });
-        isUpdate.value = !!data?.isUpdate;
+        isAdd.value = !!data?.isAdd;
         const groupListModel = await findCurrentUserGroups();
         if (!unref(organizationTreeData).length) {
           copyTransTreeFun(groupListModel);
@@ -173,39 +177,93 @@
           //设置要展开的id
           treeExpandData.value = getAllIds;
         }
-        if (unref(isUpdate)) {
+
+        if (!unref(isAdd)) {
           rowId.value = data.record.id;
           const roleParams = new RoleOrOrganizationParam(rowId.value, true, false);
           olderPhoneNumber.value = data.record.phoneNumber;
           singleEditPostPhoneNumber.phoneNumber = data.record.phoneNumber;
           findCurrentUserRelation(roleParams).then((result) => {
             Reflect.set(data.record, 'roleIds', result);
-            Reflect.set(data.record, 'password', '******');
             setFieldsValue(data.record);
           });
+          updateSchema([
+            {
+              field: 'phoneNumber',
+              dynamicRules: () => {
+                return [
+                  {
+                    required: true,
+                    validator(_, value) {
+                      return new Promise((resolve, reject) => {
+                        if (value == '') {
+                          reject('请输入手机号');
+                        } else if (!phoneRegexp.test(value)) {
+                          reject('请输入正确的手机号');
+                        } else {
+                          resolve();
+                        }
+                      });
+                    },
+                  },
+                ];
+              },
+            },
+          ]);
           const organizationParams = new RoleOrOrganizationParam(rowId.value, false, true);
           checkGroup.value = await findCurrentUserRelation(organizationParams);
+        } else {
+          updateSchema([
+            {
+              field: 'phoneNumber',
+              dynamicRules: ({ values }) => {
+                return [
+                  {
+                    required: true,
+                    validator(_, value) {
+                      return new Promise((resolve, reject) => {
+                        if (value == '') {
+                          reject('请输入手机号');
+                        } else if (!phoneRegexp.test(value)) {
+                          reject('请输入正确的手机号');
+                        } else {
+                          if (values.phoneNumber != undefined) {
+                            // 此处可以用防抖函数优化性能
+                            IsPhoneExist(value).then(({ data }) => {
+                              if (data != null) {
+                                reject('手机号已存在');
+                              } else {
+                                resolve();
+                              }
+                            });
+                          } else {
+                            resolve();
+                          }
+                        }
+                      });
+                    },
+                  },
+                ];
+              },
+            },
+          ]);
         }
         await updateSchema([
           {
             field: 'username',
-            dynamicDisabled: unref(isUpdate),
-          },
-          {
-            field: 'password',
-            ifShow: !unref(isUpdate),
+            dynamicDisabled: !unref(isAdd),
           },
         ]);
       });
-      const getTitle = computed(() => (!unref(isUpdate) ? '新增账号' : '编辑账号'));
+      const getTitle = computed(() => (unref(isAdd) ? '新增租户账号' : '编辑租户账号'));
       async function handleSubmit() {
         setModalProps({ confirmLoading: true });
         try {
           await validate();
           const values = getFieldsValue();
-          await addTenantList({ ...values, level: 4 });
-          createMessage.success('操作成功');
+          await addTenantList({ ...values, level: 4, tenantId: userInfo.getUserInfo.tenantId! });
+          createMessage.success(unref(isAdd) ? '新增成功' : '编辑成功');
           closeModal();
           emit('success');
         } finally {
@@ -242,7 +300,7 @@
       const [registerDrawer, { openDrawer: addOpenDrawer }] = useDrawer();
       const handleOpenCreate = () => {
-        addOpenDrawer(true, { isUpdate: false });
+        addOpenDrawer(true, { isAdd: false });
       };
       const handleReload = async () => {
         const groupListModel = await findCurrentUserGroups();
--- a/src/views/system/account/tenant/config.ts
View file @c61720d
+++ b/src/views/system/account/tenant/config.ts
View file @c61720d
@@ -26,11 +26,6 @@ export const columns: BasicColumn[] = [
     width: 120,
   },
   {
-    title: '创建时间',
-    dataIndex: 'createTime',
-    width: 180,
-  },
-  {
     title: '状态',
     dataIndex: 'userStatusEnum',
     width: 120,
--- a/src/views/system/account/tenant/index.vue
View file @c61720d
+++ b/src/views/system/account/tenant/index.vue
View file @c61720d
@@ -10,17 +10,17 @@
         class="w-3/4 xl:w-4/5"
       >
         <template #toolbar>
-          <Authority value="api:yt:user:post">
-            <a-button type="primary" @click="handleCreate">新增租户</a-button>
+          <Authority value="api:yt:user:saveCommonTenant:post">
+            <a-button type="primary" @click="handleCreate">新增普通租户</a-button>
           </Authority>
-          <Authority value="api:yt:user:delete">
+          <Authority value="api:yt:admin:user:deleteTenantAdmin:delete">
             <Popconfirm
               title="您确定要批量删除数据"
               ok-text="确定"
               cancel-text="取消"
-              @confirm="() => {}"
+              @confirm="handleDeleteOrBatchDelete(null)"
             >
-              <a-button color="error"> 批量删除 </a-button>
+              <a-button color="error" :disabled="hasBatchDelete"> 批量删除 </a-button>
             </Popconfirm>
           </Authority>
         </template>
@@ -46,33 +46,23 @@
         <template #action="{ record }">
           <TableAction
             :actions="[
-              // {
-              //   label: '进入',
-              //   icon: 'ant-design:login-outlined',
-              //   tooltip: `以${!isAdmin(role) ? '客户' : '平台'}用户身份登录`,
-              //   onClick: handleLoginCustomAdmin.bind(null, record),
-              // },
               {
-                label: '用户详情',
-                auth: 'api:yt:user:get',
-                icon: 'clarity:info-standard-line',
-                tooltip: '用户详情',
-                onClick: handledetail.bind(null, record),
-                ifShow: record.level != 0,
+                label: '进入',
+                icon: 'ant-design:login-outlined',
+                tooltip: `以${!isAdmin(role) ? '租户' : '平台'}用户身份登录`,
+                onClick: handleLoginCustomAdmin.bind(null, record),
               },
               {
                 label: '编辑',
-                auth: 'api:yt:user:update',
+                auth: 'api:yt:user:saveCommonTenant:post',
                 icon: 'clarity:note-edit-line',
                 tooltip: '编辑',
                 onClick: handleEdit.bind(null, record),
                 ifShow: record.level != 0,
               },
-            ]"
-            :drop-down-actions="[
               {
                 label: '删除',
-                auth: 'api:yt:user:delete',
+                auth: 'api:yt:admin:user:deleteTenantAdmin:delete',
                 icon: 'ant-design:delete-outlined',
                 color: 'error',
                 tooltip: '删除',
@@ -82,17 +72,6 @@
                   confirm: handleDeleteOrBatchDelete.bind(null, record),
                 },
               },
-              {
-                label: '清除密码',
-                auth: 'api:yt:user:resetPassword',
-                icon: 'ant-design:delete-outlined',
-                color: 'error',
-                tooltip: '清除密码',
-                popConfirm: {
-                  title: '是否确认清除密码',
-                  confirm: handleClearPassword.bind(null, record),
-                },
-              },
             ]"
           />
         </template>
@@ -107,20 +86,35 @@
   import { getTenantList } from '/@/api/system/account';
   import { columns, searchFormSchema } from './config';
   import { useResetOrganizationTree, OrganizationIdTree } from '/@/views/common/organizationIdTree';
-  import { reactive } from 'vue';
+  import { reactive, nextTick } from 'vue';
   import { Authority } from '/@/components/Authority';
   import { useUserStore } from '/@/store/modules/user';
   import { PageWrapper } from '/@/components/Page';
+  import { useGo } from '/@/hooks/web/usePage';
   import { Tag, Popconfirm } from 'ant-design-vue';
   import TenantModal from './TenantModal.vue';
   import { useModal } from '/@/components/Modal';
+  import { useFastEnter } from '/@/hooks/business/useFastEnter';
+  import { TenantListItemRecord } from '/@/api/tenant/tenantInfo';
+  import { isAdmin } from '/@/enums/roleEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
+  import { deleteTenantAdmin } from '/@/api/tenant/tenantApi';
+  // import { useMessage } from '/@/hooks/web/useMessage';
+
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   const searchInfo = reactive<Recordable>({});
+  const go = useGo();
   const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+  const userRole: any = getAuthCache(USER_INFO_KEY);
+  const role: string = userRole?.roles[0];
+  // const { createMessage } = useMessage();
+
   const userInfo = useUserStore();
-  const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload, setProps }] = useTable({
     title: '租户账号列表',
     columns,
     api: getTenantList,
@@ -150,6 +144,14 @@
       fixed: 'right',
     },
   });
+  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+    deleteTenantAdmin,
+    handleSuccess,
+    setProps
+  );
+  nextTick(() => {
+    setProps(selectionOptions);
+  });
   const [registerModal, { openModal }] = useModal();
@@ -163,9 +165,32 @@
       isAdd: true,
     });
   };
-  const handledetail = (_data?: any[]) => {};
-  const handleEdit = (_data?: any[]) => {};
-  const handleDeleteOrBatchDelete = (_data?: any[]) => {};
-  const handleClearPassword = (_data?: any[]) => {};
-  const handleSuccess = () => {};
+  const handleLoginCustomAdmin = async (record: TenantListItemRecord) => {
+    try {
+      useFastEnter(record, go);
+    } catch (errpr) {
+    } finally {
+    }
+  };
+  const handleEdit = (record: Recordable) => {
+    openModal(true, {
+      isAdd: false,
+      record,
+    });
+  };
+  // const handleDeleteOrBatchDelete = (record: Recordable) => {
+  //   deleteTenantAdmin([record.id]).then(() => {
+  //         createMessage.success('删除成功');
+  //         handleSuccess();
+  //       });
+  // };
+  // const handleClearPassword = async (record: Recordable) => {
+  //   const { id } = record;
+  //   if (!id) return;
+  //   const { message } = await clearUserPassword(id);
+  //   createMessage.success(message);
+  // };
+  function handleSuccess() {
+    reload();
+  }
 </script>