From 69a6d7a3584e2281e0b591d24ce123ded607dd00 Mon Sep 17 00:00:00 2001
From: ANHE <1983933789@qq.com>
Date: Wed, 12 Mar 2025 00:03:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=95=B4=E5=90=88=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20commit!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/form.ts                      |   9 +-
 src/router/elegant/imports.ts                 |   1 +
 src/router/elegant/routes.ts                  |   9 +
 src/router/elegant/transform.ts               |   1 +
 src/service/api/system/tenant.ts              |  40 +++
 src/service/api/system/tenantPackage.ts       |  43 +++
 src/typings/api/system.api.d.ts               | 139 ++++++--
 src/typings/components.d.ts                   |   4 +
 src/typings/elegant-router.d.ts               |   2 +
 src/views/system/tenant/index.vue             | 186 ++++++++++
 .../tenant/modules/tenant-operate-drawer.vue  | 321 ++++++++++++++++++
 .../system/tenant/modules/tenant-search.vue   |  72 ++++
 .../gen/modules/gen-table-operate-drawer.vue  |   4 +-
 13 files changed, 792 insertions(+), 39 deletions(-)
 create mode 100644 src/service/api/system/tenant.ts
 create mode 100644 src/service/api/system/tenantPackage.ts
 create mode 100644 src/views/system/tenant/index.vue
 create mode 100644 src/views/system/tenant/modules/tenant-operate-drawer.vue
 create mode 100644 src/views/system/tenant/modules/tenant-search.vue

diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts
index ce48a716..54ee5e63 100644
--- a/src/hooks/common/form.ts
+++ b/src/hooks/common/form.ts
@@ -46,13 +46,17 @@ export function useFormRules() {
   const defaultRequiredRule = createRequiredRule($t('form.required'));
 
   /** the default number required rule */
-  const defaultNumberRequiredRule = createNumberRequiredRule($t('form.required'));
 
   function createRequiredRule(message: string): App.Global.FormRule {
     return {
       required: true,
       trigger: ['change', 'blur'],
-      message
+      validator: (_rule: any, value: any) => {
+        if (value === null || value === undefined || value === '') {
+          return new Error(message);
+        }
+        return true;
+      }
     };
   }
 
@@ -82,7 +86,6 @@ export function useFormRules() {
     patternRules,
     formRules,
     defaultRequiredRule,
-    defaultNumberRequiredRule,
     createRequiredRule,
     createConfirmPwdRule,
     createNumberRequiredRule
diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts
index 54168649..7bfec1ad 100644
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@@ -22,6 +22,7 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
   login: () => import("@/views/_builtin/login/index.vue"),
   home: () => import("@/views/home/index.vue"),
   system_menu: () => import("@/views/system/menu/index.vue"),
+  system_tenant: () => import("@/views/system/tenant/index.vue"),
   system_user: () => import("@/views/system/user/index.vue"),
   tool_gen: () => import("@/views/tool/gen/index.vue"),
 };
diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts
index 06c4ddcf..287b761c 100644
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@@ -97,6 +97,15 @@ export const generatedRoutes: GeneratedRoute[] = [
           order: 3
         }
       },
+      {
+        name: 'system_tenant',
+        path: '/system/tenant',
+        component: 'view.system_tenant',
+        meta: {
+          title: 'system_tenant',
+          i18nKey: 'route.system_tenant'
+        }
+      },
       {
         name: 'system_user',
         path: '/system/user',
diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts
index 4a393f31..317ab22f 100644
--- a/src/router/elegant/transform.ts
+++ b/src/router/elegant/transform.ts
@@ -171,6 +171,7 @@ const routeMap: RouteMap = {
   "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?",
   "system": "/system",
   "system_menu": "/system/menu",
+  "system_tenant": "/system/tenant",
   "system_user": "/system/user",
   "tool": "/tool",
   "tool_gen": "/tool/gen"
diff --git a/src/service/api/system/tenant.ts b/src/service/api/system/tenant.ts
new file mode 100644
index 00000000..5b0423fc
--- /dev/null
+++ b/src/service/api/system/tenant.ts
@@ -0,0 +1,40 @@
+import { request } from '@/service/request';
+
+/** 获取租户列表 */
+export function fetchGetTenantList(params?: Api.System.TenantSearchParams) {
+  return request<Api.System.TenantList>({
+    url: '/system/tenant/list',
+    method: 'get',
+    params
+  });
+}
+
+/** 新增租户 */
+export function fetchCreateTenant(data: Api.System.TenantOperateParams) {
+  return request<boolean>({
+    url: '/system/tenant',
+    method: 'post',
+    headers: {
+      isEncrypt: true,
+      repeatSubmit: true
+    },
+    data
+  });
+}
+
+/** 修改租户 */
+export function fetchUpdateTenant(data: Api.System.TenantOperateParams) {
+  return request<boolean>({
+    url: '/system/tenant',
+    method: 'put',
+    data
+  });
+}
+
+/** 批量删除租户 */
+export function fetchBatchDeleteTenant(ids: CommonType.IdType[]) {
+  return request<boolean>({
+    url: `/system/tenant/${ids.join(',')}`,
+    method: 'delete'
+  });
+}
diff --git a/src/service/api/system/tenantPackage.ts b/src/service/api/system/tenantPackage.ts
new file mode 100644
index 00000000..88bb0f27
--- /dev/null
+++ b/src/service/api/system/tenantPackage.ts
@@ -0,0 +1,43 @@
+import { request } from '@/service/request';
+
+/** 获取租户套餐列表 */
+export function fetchGetTenantPackageList(params?: Api.System.TenantPackageSearchParams) {
+  return request<Api.System.TenantPackageList>({
+    url: '/system/tenant/package/list',
+    method: 'get',
+    params
+  });
+}
+/** 获取租户下拉列表 */
+export function fetchGetTenantPackageSelectList() {
+  return request<Api.System.TenantPackageSelectList[]>({
+    url: '/system/tenant/package/selectList',
+    method: 'get'
+  });
+}
+
+/** 新增租户套餐 */
+export function fetchCreateTenantPackage(data: Api.System.TenantPackageOperateParams) {
+  return request<boolean>({
+    url: '/system/tenant/package',
+    method: 'post',
+    data
+  });
+}
+
+/** 修改租户套餐 */
+export function fetchUpdateTenantPackage(data: Api.System.TenantPackageOperateParams) {
+  return request<boolean>({
+    url: '/system/tenant/package',
+    method: 'put',
+    data
+  });
+}
+
+/** 批量删除租户套餐 */
+export function fetchBatchDeleteTenantPackage(packageIds: CommonType.IdType[]) {
+  return request<boolean>({
+    url: `/system/tenant/package/${packageIds.join(',')}`,
+    method: 'delete'
+  });
+}
diff --git a/src/typings/api/system.api.d.ts b/src/typings/api/system.api.d.ts
index c175c064..f538c0b7 100644
--- a/src/typings/api/system.api.d.ts
+++ b/src/typings/api/system.api.d.ts
@@ -138,40 +138,6 @@ declare namespace Api {
     /** user list */
     type UserList = Common.PaginatingQueryRecord<User>;
 
-    /** tenant */
-    interface Tenant {
-      /** id */
-      id: CommonType.IdType;
-      /** 租户编号 */
-      tenantId: string;
-      /** 联系人 */
-      contactUserName: string;
-      /** 联系电话 */
-      contactPhone: string;
-      /** 企业名称 */
-      companyName: string;
-      /** 统一社会信用代码 */
-      licenseNumber: string;
-      /** 地址 */
-      address: string;
-      /** 域名 */
-      domain: string;
-      /** 企业简介 */
-      intro: string;
-      /** 备注 */
-      remark?: string;
-      /** 租户套餐编号 */
-      packageId: number;
-      /** 过期时间 */
-      expireTime: Date;
-      /** 用户数量（-1不限制） */
-      accountCount: number;
-      /** 租户状态（0正常 1停用） */
-      status: string;
-      /** 删除标志（0代表存在 2代表删除） */
-      delFlag: string;
-    }
-
     /**
      * icon type
      *
@@ -377,5 +343,110 @@ declare namespace Api {
 
     /** post list */
     type PostList = Api.Common.PaginatingQueryRecord<Post>;
+
+    /** tenant */
+    type Tenant = Common.CommonRecord<{
+      /** id */
+      id: CommonType.IdType;
+      /** 租户编号 */
+      tenantId: CommonType.IdType;
+      /** 联系人 */
+      contactUserName: string;
+      /** 联系电话 */
+      contactPhone: string;
+      /** 企业名称 */
+      companyName: string;
+      /** 统一社会信用代码 */
+      licenseNumber: string;
+      /** 地址 */
+      address: string;
+      /** 企业简介 */
+      intro: string;
+      /** 域名 */
+      domain: string;
+      /** 备注 */
+      remark: string;
+      /** 租户套餐编号 */
+      packageId: CommonType.IdType;
+      /** 过期时间 */
+      expireTime: string;
+      /** 用户数量（-1不限制） */
+      accountCount: number;
+      /** 租户状态（0正常 1停用） */
+      status: string;
+      /** 删除标志（0代表存在 1代表删除） */
+      delFlag: string;
+    }>;
+
+    /** tenant search params */
+    type TenantSearchParams = CommonType.RecordNullable<
+      Pick<Api.System.Tenant, 'tenantId' | 'contactUserName' | 'contactPhone' | 'companyName'> &
+        Api.Common.CommonSearchParams
+    >;
+
+    /** tenant operate params */
+    type TenantOperateParams = CommonType.RecordNullable<
+      Pick<
+        Api.System.Tenant,
+        | 'id'
+        | 'tenantId'
+        | 'contactUserName'
+        | 'contactPhone'
+        | 'companyName'
+        | 'licenseNumber'
+        | 'address'
+        | 'intro'
+        | 'domain'
+        | 'remark'
+        | 'packageId'
+        | 'expireTime'
+        | 'accountCount'
+        | 'status'
+      > & {
+        username: string;
+        password: string;
+      }
+    >;
+
+    /** tenant list */
+    type TenantList = Api.Common.PaginatingQueryRecord<Tenant>;
+
+    /** tenant package */
+    type TenantPackage = Common.CommonRecord<{
+      /** 租户套餐id */
+      packageId: CommonType.IdType;
+      /** 套餐名称 */
+      packageName: string;
+      /** 关联菜单id */
+      menuIds: CommonType.IdType;
+      /** 备注 */
+      remark: string;
+      /** 菜单树选择项是否关联显示 */
+      menuCheckStrictly: number;
+      /** 状态（0正常 1停用） */
+      status: string;
+      /** 删除标志（0代表存在 1代表删除） */
+      delFlag: string;
+    }>;
+
+    /** tenant package search params */
+    type TenantPackageSearchParams = CommonType.RecordNullable<
+      Pick<Api.System.TenantPackage, 'packageName' | 'menuIds' | 'menuCheckStrictly' | 'status'> &
+        Api.Common.CommonSearchParams
+    >;
+
+    /** tenant package operate params */
+    type TenantPackageOperateParams = CommonType.RecordNullable<
+      Pick<
+        Api.System.TenantPackage,
+        'packageId' | 'packageName' | 'menuIds' | 'remark' | 'menuCheckStrictly' | 'status'
+      >
+    >;
+
+    /** tenant package list */
+    type TenantPackageList = Api.Common.PaginatingQueryRecord<TenantPackage>;
+
+    /** tenant package select list */
+    type TenantPackageSelectList = Common.CommonRecord<Pick<TenantPackage, 'packageId' | 'packageName'>>;
   }
 }
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index d24a8f79..9efc2f03 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -39,12 +39,16 @@ declare module 'vue' {
     IconIcRoundUpload: typeof import('~icons/ic/round-upload')['default']
     IconLocalBanner: typeof import('~icons/local/banner')['default']
     IconLocalLogo: typeof import('~icons/local/logo')['default']
+    IconMaterialSymbolsHelpOutline: typeof import('~icons/material-symbols/help-outline')['default']
     IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']
     IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default']
     IconMdiDrag: typeof import('~icons/mdi/drag')['default']
     IconMdiKeyboardEsc: typeof import('~icons/mdi/keyboard-esc')['default']
     IconMdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default']
     IconMdiRefresh: typeof import('~icons/mdi/refresh')['default']
+    'IconMingcute:questionLine': typeof import('~icons/mingcute/question-line')['default']
+    'IconPh:questionLight': typeof import('~icons/ph/question-light')['default']
+    'IconStash:questionLight': typeof import('~icons/stash/question-light')['default']
     IconUilSearch: typeof import('~icons/uil/search')['default']
     LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
     LookForward: typeof import('./../components/custom/look-forward.vue')['default']
diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts
index 75c08a12..7e6cbcc3 100644
--- a/src/typings/elegant-router.d.ts
+++ b/src/typings/elegant-router.d.ts
@@ -25,6 +25,7 @@ declare module "@elegant-router/types" {
     "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?";
     "system": "/system";
     "system_menu": "/system/menu";
+    "system_tenant": "/system/tenant";
     "system_user": "/system/user";
     "tool": "/tool";
     "tool_gen": "/tool/gen";
@@ -90,6 +91,7 @@ declare module "@elegant-router/types" {
     | "login"
     | "home"
     | "system_menu"
+    | "system_tenant"
     | "system_user"
     | "tool_gen"
   >;
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
new file mode 100644
index 00000000..66e7a5a5
--- /dev/null
+++ b/src/views/system/tenant/index.vue
@@ -0,0 +1,186 @@
+<script setup lang="tsx">
+import { NButton, NPopconfirm } from 'naive-ui';
+import { fetchBatchDeleteTenant, fetchGetTenantList } from '@/service/api/system/tenant';
+import { $t } from '@/locales';
+import { useAppStore } from '@/store/modules/app';
+import { useTable, useTableOperate } from '@/hooks/common/table';
+import DictTag from '@/components/custom/dict-tag.vue';
+import TenantOperateDrawer from './modules/tenant-operate-drawer.vue';
+import TenantSearch from './modules/tenant-search.vue';
+
+defineOptions({
+  name: 'TenantList'
+});
+
+const appStore = useAppStore();
+
+const {
+  columns,
+  columnChecks,
+  data,
+  getData,
+  getDataByPage,
+  loading,
+  mobilePagination,
+  searchParams,
+  resetSearchParams
+} = useTable({
+  apiFn: fetchGetTenantList,
+  apiParams: {
+    pageNum: 1,
+    pageSize: 10,
+    // if you want to use the searchParams in Form, you need to define the following properties, and the value is null
+    // the value can not be undefined, otherwise the property in Form will not be reactive
+    tenantId: null,
+    contactUserName: null,
+    contactPhone: null,
+    companyName: null
+  },
+  columns: () => [
+    {
+      type: 'selection',
+      align: 'center',
+      width: 48
+    },
+    {
+      key: 'index',
+      title: $t('common.index'),
+      align: 'center',
+      width: 64
+    },
+    {
+      key: 'tenantId',
+      title: '租户编号',
+      align: 'center',
+      minWidth: 80
+    },
+    {
+      key: 'contactUserName',
+      title: '联系人',
+      align: 'center',
+      minWidth: 80
+    },
+    {
+      key: 'contactPhone',
+      title: '联系电话',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'companyName',
+      title: '企业名称',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'expireTime',
+      title: '过期时间',
+      align: 'center',
+      minWidth: 120
+    },
+    {
+      key: 'status',
+      title: '租户状态',
+      align: 'center',
+      minWidth: 120,
+      render(row) {
+        return <DictTag size="small" value={row.status} dictCode="sys_normal_disable" />;
+      }
+    },
+    {
+      key: 'operate',
+      title: $t('common.operate'),
+      align: 'center',
+      width: 180,
+      render: row =>
+        row.tenantId !== '000000' ? (
+          <div class="flex-center gap-8px">
+            <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+              {$t('common.edit')}
+            </NButton>
+            <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+              {{
+                default: () => `确认同步[${row.companyName}]的套餐吗?`,
+                trigger: () => (
+                  <NButton type="success" ghost size="small">
+                    同步
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
+            <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+              {{
+                default: () => $t('common.confirmDelete'),
+                trigger: () => (
+                  <NButton type="error" ghost size="small">
+                    {$t('common.delete')}
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
+          </div>
+        ) : null
+    }
+  ]
+});
+
+const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } =
+  useTableOperate(data, getData);
+
+async function handleBatchDelete() {
+  // request
+  const { error } = await fetchBatchDeleteTenant(checkedRowKeys.value);
+  if (error) return;
+  onBatchDeleted();
+}
+
+async function handleDelete(id: CommonType.IdType) {
+  // request
+  const { error } = await fetchBatchDeleteTenant([id]);
+  if (error) return;
+  onDeleted();
+}
+
+async function edit(id: CommonType.IdType) {
+  handleEdit('id', id);
+}
+</script>
+
+<template>
+  <div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
+    <TenantSearch v-model:model="searchParams" @reset="resetSearchParams" @search="getDataByPage" />
+    <NCard title="租户列表" :bordered="false" size="small" class="sm:flex-1-hidden card-wrapper">
+      <template #header-extra>
+        <TableHeaderOperation
+          v-model:columns="columnChecks"
+          :disabled-delete="checkedRowKeys.length === 0"
+          :loading="loading"
+          @add="handleAdd"
+          @delete="handleBatchDelete"
+          @refresh="getData"
+        />
+      </template>
+      <NDataTable
+        v-model:checked-row-keys="checkedRowKeys"
+        :columns="columns"
+        :data="data"
+        size="small"
+        :flex-height="!appStore.isMobile"
+        :scroll-x="962"
+        :loading="loading"
+        remote
+        :row-key="row => row.id"
+        :pagination="mobilePagination"
+        class="sm:h-full"
+      />
+      <TenantOperateDrawer
+        v-model:visible="drawerVisible"
+        :operate-type="operateType"
+        :row-data="editingData"
+        @submitted="getDataByPage"
+      />
+    </NCard>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/src/views/system/tenant/modules/tenant-operate-drawer.vue b/src/views/system/tenant/modules/tenant-operate-drawer.vue
new file mode 100644
index 00000000..ad57c644
--- /dev/null
+++ b/src/views/system/tenant/modules/tenant-operate-drawer.vue
@@ -0,0 +1,321 @@
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue';
+import { useLoading } from '@sa/hooks';
+import { useFormRules, useNaiveForm } from '@/hooks/common/form';
+import { $t } from '@/locales';
+import { fetchCreateTenant, fetchUpdateTenant } from '@/service/api/system/tenant';
+import { fetchGetTenantPackageSelectList } from '@/service/api/system/tenantPackage';
+
+defineOptions({
+  name: 'TenantOperateDrawer'
+});
+
+interface Props {
+  /** the type of operation */
+  operateType: NaiveUI.TableOperateType;
+  /** the edit row data */
+  rowData?: Api.System.Tenant | null;
+}
+
+const props = defineProps<Props>();
+
+interface Emits {
+  (e: 'submitted'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const visible = defineModel<boolean>('visible', {
+  default: false
+});
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+const { createRequiredRule, patternRules } = useFormRules();
+const { loading: packageLoading, startLoading: startPackageLoading, endLoading: endPackageLoading } = useLoading();
+const title = computed(() => {
+  const titles: Record<NaiveUI.TableOperateType, string> = {
+    add: '新增租户',
+    edit: '编辑租户'
+  };
+  return titles[props.operateType];
+});
+
+type Model = Api.System.TenantOperateParams;
+
+const model: Model = reactive(createDefaultModel());
+
+function createDefaultModel(): Model {
+  return {
+    tenantId: '',
+    contactUserName: '',
+    contactPhone: '',
+    companyName: '',
+    licenseNumber: '',
+    address: '',
+    intro: '',
+    domain: '',
+    remark: '',
+    packageId: null,
+    expireTime: null,
+    accountCount: null,
+    status: '0',
+    username: '',
+    password: ''
+  };
+}
+
+type RuleKey = Extract<
+  keyof Model,
+  'id' | 'contactUserName' | 'contactPhone' | 'companyName' | 'packageId' | 'accountCount' | 'username' | 'password'
+>;
+
+const rules: Record<RuleKey, App.Global.FormRule | App.Global.FormRule[]> = {
+  id: createRequiredRule('id不能为空'),
+  contactUserName: createRequiredRule('联系人不能为空'),
+  contactPhone: [createRequiredRule('联系电话不能为空'), patternRules.phone],
+  companyName: createRequiredRule('企业名称不能为空'),
+  packageId: createRequiredRule('租户套餐不能为空'),
+  accountCount: createRequiredRule('用户数量不能为空'),
+  username: [
+    createRequiredRule('管理员账号不能为空'),
+    {
+      min: 2,
+      max: 20,
+      message: '账号长度必须介于2-20之间',
+      trigger: ['blur', 'change']
+    }
+  ],
+  password: [
+    createRequiredRule('管理员密码不能为空'),
+    {
+      min: 5,
+      max: 20,
+      message: '密码长度必须介于5-20之间',
+      trigger: ['blur', 'change']
+    }
+  ]
+};
+/** the enabled package options */
+const packageOptions = ref<CommonType.Option<CommonType.IdType>[]>([]);
+async function getPackageOptions() {
+  startPackageLoading();
+  const { error, data } = await fetchGetTenantPackageSelectList();
+  if (!error) {
+    packageOptions.value = data.map(item => ({
+      label: item.packageName,
+      value: item.packageId
+    }));
+  }
+  endPackageLoading();
+}
+function handleUpdateModelWhenEdit() {
+  if (props.operateType === 'add') {
+    Object.assign(model, createDefaultModel());
+    return;
+  }
+
+  if (props.operateType === 'edit' && props.rowData) {
+    Object.assign(model, props.rowData);
+  }
+}
+
+function closeDrawer() {
+  visible.value = false;
+}
+
+async function handleSubmit() {
+  await validate();
+
+  // request
+  if (props.operateType === 'add') {
+    const {
+      contactUserName,
+      contactPhone,
+      companyName,
+      licenseNumber,
+      address,
+      intro,
+      domain,
+      remark,
+      packageId,
+      expireTime,
+      accountCount,
+      status,
+      username,
+      password
+    } = model;
+    const { error } = await fetchCreateTenant({
+      contactUserName,
+      contactPhone,
+      companyName,
+      username,
+      password,
+      licenseNumber,
+      address,
+      intro,
+      domain,
+      remark,
+      packageId,
+      expireTime,
+      accountCount,
+      status
+    });
+    if (error) return;
+  }
+
+  if (props.operateType === 'edit') {
+    const {
+      id,
+      tenantId,
+      contactUserName,
+      contactPhone,
+      companyName,
+      licenseNumber,
+      address,
+      intro,
+      domain,
+      remark,
+      packageId,
+      expireTime,
+      accountCount,
+      status
+    } = model;
+    const { error } = await fetchUpdateTenant({
+      id,
+      tenantId,
+      contactUserName,
+      contactPhone,
+      companyName,
+      licenseNumber,
+      address,
+      intro,
+      domain,
+      remark,
+      packageId,
+      expireTime,
+      accountCount,
+      status
+    });
+    if (error) return;
+  }
+
+  window.$message?.success($t('common.updateSuccess'));
+  closeDrawer();
+  emit('submitted');
+}
+
+watch(visible, () => {
+  if (visible.value) {
+    getPackageOptions();
+    handleUpdateModelWhenEdit();
+    restoreValidation();
+  }
+});
+</script>
+
+<template>
+  <NDrawer v-model:show="visible" :title="title" display-directive="show" :width="800" class="max-w-90%">
+    <NDrawerContent :title="title" :native-scrollbar="false" closable>
+      <NForm ref="formRef" :model="model" :rules="rules">
+        <NDivider>基本信息</NDivider>
+        <NFormItem label="企业名称" path="companyName">
+          <NInput v-model:value="model.companyName" placeholder="请输入企业名称" />
+        </NFormItem>
+        <NFormItem label="联系人" path="contactUserName">
+          <NInput v-model:value="model.contactUserName" placeholder="请输入联系人" />
+        </NFormItem>
+        <NFormItem label="联系电话" path="contactPhone">
+          <NInput v-model:value="model.contactPhone" placeholder="请输入联系电话" />
+        </NFormItem>
+        <div v-if="props.operateType === 'add'">
+          <NDivider>管理员信息</NDivider>
+          <NFormItem label="管理员账号" path="username">
+            <NInput v-model:value="model.username" placeholder="请输入管理员账号" />
+          </NFormItem>
+          <NFormItem label="管理员密码" path="password">
+            <NInput
+              v-model:value="model.password"
+              type="password"
+              show-password-on="click"
+              placeholder="请输入管理员密码"
+            />
+          </NFormItem>
+        </div>
+        <NDivider>租户设置</NDivider>
+        <NFormItem label="租户套餐" path="packageId">
+          <NSelect
+            v-model:value="model.packageId"
+            :disabled="props.operateType === 'edit'"
+            placeholder="请选择租户套餐"
+            :options="packageOptions"
+            :loading="packageLoading"
+          />
+        </NFormItem>
+        <NFormItem label="过期时间" path="expireTime">
+          <NDatePicker
+            v-model:formatted-value="model.expireTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            clearable
+            class="w-full"
+          />
+        </NFormItem>
+        <NFormItem label="用户数量" path="accountCount">
+          <template #label>
+            <span class="flex-y-center">
+              用户数量
+              <NTooltip trigger="hover">
+                <template #trigger>
+                  <icon-mingcute:question-line class="ml-4px cursor-pointer text-14px" />
+                </template>
+                -1不限制用户数量
+              </NTooltip>
+            </span>
+          </template>
+          <NInputNumber v-model:value="model.accountCount" placeholder="请输入用户数量" min="-1" class="w-full" />
+        </NFormItem>
+        <NFormItem label="绑定域名" path="domain">
+          <template #label>
+            <span class="flex-y-center">
+              绑定域名
+              <NTooltip trigger="hover">
+                <template #trigger>
+                  <icon-mingcute:question-line class="ml-4px cursor-pointer text-14px" />
+                </template>
+                可填写域名/端口 填写域名如: www.test.com 或者 www.test.com:8080 填写ip:端口如: 127.0.0.1:8080
+              </NTooltip>
+            </span>
+          </template>
+          <NInputGroup>
+            <NInputGroupLabel>http(s)://</NInputGroupLabel>
+            <NInput v-model:value="model.domain" placeholder="请输入" />
+          </NInputGroup>
+        </NFormItem>
+        <NFormItem label="租户状态" path="status">
+          <DictRadio v-model:value="model.status" dict-code="sys_normal_disable" />
+        </NFormItem>
+        <NDivider>企业信息</NDivider>
+        <NFormItem label="企业地址" path="address">
+          <NInput v-model:value="model.address" placeholder="请输入企业地址" />
+        </NFormItem>
+        <NFormItem label="企业代码" path="licenseNumber">
+          <NInput v-model:value="model.licenseNumber" placeholder="请输入企业代码" />
+        </NFormItem>
+        <NFormItem label="企业简介" path="intro">
+          <NInput v-model:value="model.intro" type="textarea" placeholder="请输入企业简介" />
+        </NFormItem>
+        <NFormItem label="备注" path="remark">
+          <NInput v-model:value="model.remark" type="textarea" placeholder="请输入备注" />
+        </NFormItem>
+      </NForm>
+      <template #footer>
+        <NSpace :size="16">
+          <NButton @click="closeDrawer">{{ $t('common.cancel') }}</NButton>
+          <NButton type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</NButton>
+        </NSpace>
+      </template>
+    </NDrawerContent>
+  </NDrawer>
+</template>
+
+<style scoped></style>
diff --git a/src/views/system/tenant/modules/tenant-search.vue b/src/views/system/tenant/modules/tenant-search.vue
new file mode 100644
index 00000000..718c0cc2
--- /dev/null
+++ b/src/views/system/tenant/modules/tenant-search.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import { $t } from '@/locales';
+import { useNaiveForm } from '@/hooks/common/form';
+
+defineOptions({
+  name: 'TenantSearch'
+});
+
+interface Emits {
+  (e: 'reset'): void;
+  (e: 'search'): void;
+}
+
+const emit = defineEmits<Emits>();
+
+const { formRef, validate, restoreValidation } = useNaiveForm();
+
+const model = defineModel<Api.System.TenantSearchParams>('model', { required: true });
+
+async function reset() {
+  await restoreValidation();
+  emit('reset');
+}
+
+async function search() {
+  await validate();
+  emit('search');
+}
+</script>
+
+<template>
+  <NCard :bordered="false" size="small" class="card-wrapper">
+    <NCollapse>
+      <NCollapseItem :title="$t('common.search')" name="user-search">
+        <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
+          <NGrid responsive="screen" item-responsive>
+            <NFormItemGi span="24 s:12 m:6" label="租户编号" path="tenantId" class="pr-24px">
+              <NInput v-model:value="model.tenantId as string" placeholder="请输入租户编号" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="联系人" path="contactUserName" class="pr-24px">
+              <NInput v-model:value="model.contactUserName" placeholder="请输入联系人" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="联系电话" path="contactPhone" class="pr-24px">
+              <NInput v-model:value="model.contactPhone" placeholder="请输入联系电话" />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="企业名称" path="companyName" class="pr-24px">
+              <NInput v-model:value="model.companyName" placeholder="请输入企业名称" />
+            </NFormItemGi>
+            <NFormItemGi span="24" class="pr-24px">
+              <NSpace class="w-full" justify="end">
+                <NButton @click="reset">
+                  <template #icon>
+                    <icon-ic-round-refresh class="text-icon" />
+                  </template>
+                  {{ $t('common.reset') }}
+                </NButton>
+                <NButton type="primary" ghost @click="search">
+                  <template #icon>
+                    <icon-ic-round-search class="text-icon" />
+                  </template>
+                  {{ $t('common.search') }}
+                </NButton>
+              </NSpace>
+            </NFormItemGi>
+          </NGrid>
+        </NForm>
+      </NCollapseItem>
+    </NCollapse>
+  </NCard>
+</template>
+
+<style scoped></style>
diff --git a/src/views/tool/gen/modules/gen-table-operate-drawer.vue b/src/views/tool/gen/modules/gen-table-operate-drawer.vue
index a8550eeb..28ed735b 100644
--- a/src/views/tool/gen/modules/gen-table-operate-drawer.vue
+++ b/src/views/tool/gen/modules/gen-table-operate-drawer.vue
@@ -39,7 +39,7 @@ interface Emits {
 const emit = defineEmits<Emits>();
 
 const appStore = useAppStore();
-const { defaultRequiredRule, defaultNumberRequiredRule } = useFormRules();
+const { defaultRequiredRule } = useFormRules();
 const { loading, startLoading, endLoading } = useLoading();
 const genTableInfo = ref<Api.Tool.GenTableInfo>();
 
@@ -73,7 +73,7 @@ const infoRules: Record<InfoRuleKey, App.Global.FormRule> = {
   moduleName: defaultRequiredRule,
   businessName: defaultRequiredRule,
   functionName: defaultRequiredRule,
-  parentMenuId: defaultNumberRequiredRule,
+  parentMenuId: defaultRequiredRule,
   genType: defaultRequiredRule,
   genPath: defaultRequiredRule
 };