From da7163f4633b07f2eea86fb8e16a16432e947fbe Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 29 Jan 2026 10:35:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AiAssistant/index.vue         |   2 +-
 src/components/CURD/PageContent.vue          |   2 +-
 src/components/CURD/PageModal.vue            |   2 +-
 src/components/CURD/PageSearch.vue           |  14 +-
 src/components/DictSelect/index.vue          |   2 +-
 src/components/ECharts/index.vue             |  18 +-
 src/components/Hamburger/index.vue           |   2 +-
 src/components/IconSelect/index.vue          |   2 +-
 src/components/WangEditor/index.vue          |  18 +-
 src/layouts/LeftLayout.vue                   |   4 +-
 src/layouts/components/LayoutSettings.vue    |   2 +-
 src/layouts/components/LayoutSidebarItem.vue |   2 +-
 src/layouts/components/LayoutTagsView.vue    |   2 +-
 src/types/api/log.ts                         |   8 +-
 src/types/api/notice.ts                      |   8 +-
 src/utils/request.ts                         |   8 +-
 src/views/demo/dictionary.vue                |   2 +-
 src/views/demo/icon-selector.vue             |   8 +-
 src/views/demo/table-select/index.vue        |   4 +-
 src/views/demo/upload.vue                    |   2 +-
 src/views/system/log/index.vue               |  10 +-
 src/views/system/notice/index.vue            |  36 ++-
 src/views/system/tenant/index.vue            | 249 ++++++++++++++-----
 23 files changed, 279 insertions(+), 128 deletions(-)

diff --git a/src/components/AiAssistant/index.vue b/src/components/AiAssistant/index.vue
index bce943a8..571e871c 100644
--- a/src/components/AiAssistant/index.vue
+++ b/src/components/AiAssistant/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <!-- 悬浮按钮 -->
   <div class="ai-assistant">
     <!-- AI 助手图标按钮 -->
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index cbaef0d3..9db6c91e 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div
     class="rounded bg-[var(--el-bg-color)] border border-[var(--el-border-color)] p-5 h-full md:flex flex-1 flex-col md:overflow-auto"
   >
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index 8006b3eb..bf8ba4f0 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div>
     <!-- drawer -->
     <template v-if="modalConfig.component === 'drawer'">
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 71e2049b..1cdb4610 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -19,7 +19,7 @@
               </span>
             </template>
 
-            <!-- 自定义插�?-->
+            <!-- 自定义插槽 -->
             <slot
               v-if="item.type === 'custom'"
               :name="item.slotName"
@@ -71,14 +71,14 @@ import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
 import type { FormInstance } from "element-plus";
 import InputTag from "@/components/InputTag/index.vue";
 
-// 定义接收的属�?
+// 定义接收的属性
 const props = defineProps<{ searchConfig: ISearchConfig }>();
-// 自定义事�?
+// 自定义事件
 const emit = defineEmits<{
   queryClick: [queryParams: IObject];
   resetClick: [queryParams: IObject];
 }>();
-// 组件映射�?
+// 组件映射表
 const componentMap = new Map<ISearchComponent, any>([
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
@@ -105,7 +105,7 @@ const formItems = reactive(props.searchConfig?.formItems ?? []);
 const isExpandable = ref(props.searchConfig?.isExpandable ?? true);
 // 是否已展开
 const isExpand = ref(false);
-// 表单项展示数量，若可展开，超出展示数量的表单项隐�?
+// 表单项展示数量，若可展开，超出展示数量的表单项隐藏
 const showNumber = computed(() =>
   isExpandable.value ? (props.searchConfig?.showNumber ?? 3) : formItems.length
 );
@@ -113,7 +113,7 @@ const showNumber = computed(() =>
 const cardAttrs = computed<IObject>(() => {
   return { shadow: "never", style: { "margin-bottom": "12px" }, ...props.searchConfig?.cardAttrs };
 });
-// 表单组件自定义属性（label位置、宽度、对齐方式等�?
+// 表单组件自定义属性（label位置、宽度、对齐方式等）
 const formAttrs = computed<IForm>(() => {
   return { inline: true, ...props.searchConfig?.form };
 });
@@ -124,7 +124,7 @@ const isGrid = computed(() =>
     : "flex flex-wrap gap-x-8 gap-y-4"
 );
 
-// 获取tooltip提示框属�?
+// 获取tooltip提示框属性
 const getTooltipProps = (tips: string | IObject) => {
   return typeof tips === "string" ? { content: tips } : tips;
 };
diff --git a/src/components/DictSelect/index.vue b/src/components/DictSelect/index.vue
index e5ddce09..79d98e4d 100644
--- a/src/components/DictSelect/index.vue
+++ b/src/components/DictSelect/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-select
     v-if="type === 'select'"
     v-model="selectedValue"
diff --git a/src/components/ECharts/index.vue b/src/components/ECharts/index.vue
index cd9727f8..03b8b983 100644
--- a/src/components/ECharts/index.vue
+++ b/src/components/ECharts/index.vue
@@ -1,12 +1,12 @@
 <!--
- * 基于 ECharts �?Vue3 图表组件
- * 版权所�?© 2021-present 有来开源组�?
+ * 基于 ECharts 的 Vue3 图表组件
+ * 版权所有 © 2021-present 有来开源组织
  *
  * 开源协议：https://opensource.org/licenses/MIT
  * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
  * 参考：https://echarts.apache.org/handbook/zh/basics/import/#%E6%8C%89%E9%9C%80%E5%BC%95%E5%85%A5-echarts-%E5%9B%BE%E8%A1%A8%E5%92%8C%E7%BB%84%E4%BB%B6
  *
- * 在使用时，请保留此注释，感谢您对开源的支持�?
+ * 在使用时，请保留此注释，感谢您对开源的支持！
  -->
 
 <template>
@@ -14,13 +14,13 @@
 </template>
 
 <script setup lang="ts">
-// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口�?
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
 import * as echarts from "echarts/core";
 // 引入柱状、折线和饼图常用图表
 import { BarChart, LineChart, PieChart } from "echarts/charts";
-// 引入标题，提示框，直角坐标系，数据集，内置数据转换器组件�?
+// 引入标题，提示框，直角坐标系，数据集，内置数据转换器组件，
 import { GridComponent, TooltipComponent, LegendComponent } from "echarts/components";
-// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或�?SVGRenderer 是必须的一�?
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
 import { CanvasRenderer } from "echarts/renderers";
 
 import { useResizeObserver } from "@vueuse/core";
@@ -45,7 +45,7 @@ const props = defineProps<{
 const chartRef = ref<HTMLDivElement | null>(null);
 let chartInstance: echarts.ECharts | null = null;
 
-// 初始化图�?
+// 初始化图表
 const initChart = () => {
   if (chartRef.value) {
     chartInstance = echarts.init(chartRef.value);
@@ -55,12 +55,12 @@ const initChart = () => {
   }
 };
 
-// 监听尺寸变化，自动调�?
+// 监听尺寸变化，自动调整
 useResizeObserver(chartRef, () => {
   chartInstance?.resize();
 });
 
-// 监听 options 变化，更新图�?
+// 监听 options 变化，更新图表
 watch(
   () => props.options,
   (newOptions) => {
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 64418416..b56363c2 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -23,7 +23,7 @@ const hamburgerClass = computed(() => {
     return "hamburger--white";
   }
 
-  // 如果是混合布局 && 侧边栏配色方案是经典�?
+  // 如果是混合布局 && 侧边栏配色方案是经典蓝
   if (
     layout.value === LayoutMode.MIX &&
     settingsStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index b54ec22d..b96e93e4 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -159,7 +159,7 @@ onClickOutside(iconSelectRef, () => (popoverVisible.value = false), {
 });
 
 /**
- * 清空已选图�?
+ * 清空已选图标
  */
 function clearSelectedIcon() {
   selectedIcon.value = "";
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index b74c8f3f..68d39dab 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,23 +1,23 @@
 <!--
- * 基于 wangEditor-next 的富文本编辑器组件二次封�?
- * 版权所�?© 2021-present 有来开源组�?
+ * 基于 wangEditor-next 的富文本编辑器组件二次封装
+ * 版权所属 © 2021-present 有来开源组织
  *
  * 开源协议：https://opensource.org/licenses/MIT
  * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
  *
- * 在使用时，请保留此注释，感谢您对开源的支持�?
+ * 在使用时，请保留此注释，感谢您对开源的支持
 -->
 
 <template>
   <div style="z-index: 999; border: 1px solid var(--el-border-color)">
-    <!-- 工具�?-->
+    <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
       mode="simple"
       :default-config="toolbarConfig"
       style="border-bottom: 1px solid var(--el-border-color)"
     />
-    <!-- 编辑�?-->
+    <!-- 编辑器 -->
     <Editor
       v-model="modelValue"
       :style="{ height: height, overflowY: 'hidden' }"
@@ -51,15 +51,15 @@ const modelValue = defineModel("modelValue", {
   required: false,
 });
 
-// 编辑器实例，必须�?shallowRef，重要！
+// 编辑器实例，必须用 shallowRef，重要！
 const editorRef = shallowRef();
 
-// 工具栏配�?
+// 工具栏配置
 const toolbarConfig = ref<Partial<IToolbarConfig>>({});
 
-// 编辑器配�?
+// 编辑器配置
 const editorConfig = ref<Partial<IEditorConfig>>({
-  placeholder: "请输入内�?..",
+  placeholder: "请输入内容..",
   MENU_CONF: {
     uploadImage: {
       customUpload(file: File, insertFn: InsertFnType) {
diff --git a/src/layouts/LeftLayout.vue b/src/layouts/LeftLayout.vue
index d13bd6a3..ea660e46 100644
--- a/src/layouts/LeftLayout.vue
+++ b/src/layouts/LeftLayout.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseLayout>
-    <!-- 左侧菜单�?-->
+    <!-- 左侧菜单 -->
     <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
       <div :class="{ 'has-logo': showLogo }" class="layout-sidebar">
         <LayoutLogo v-if="showLogo" :collapse="!isSidebarOpen" />
@@ -91,7 +91,7 @@ const { showTagsView, showLogo, isSidebarOpen, routes } = useLayout();
   }
 }
 
-/* 移动端样�?*/
+/* 移动端样式*/
 .mobile {
   .layout__sidebar {
     width: $sidebar-width !important;
diff --git a/src/layouts/components/LayoutSettings.vue b/src/layouts/components/LayoutSettings.vue
index d4acda48..a1f69e94 100644
--- a/src/layouts/components/LayoutSettings.vue
+++ b/src/layouts/components/LayoutSettings.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-drawer
     v-model="drawerVisible"
     size="380"
diff --git a/src/layouts/components/LayoutSidebarItem.vue b/src/layouts/components/LayoutSidebarItem.vue
index f3905136..ee2fe6f1 100644
--- a/src/layouts/components/LayoutSidebarItem.vue
+++ b/src/layouts/components/LayoutSidebarItem.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div v-if="!item.meta || !item.meta.hidden">
     <!--【叶子节点】显示叶子节点或唯一子节点且父节点未配置始终显示 -->
     <template
diff --git a/src/layouts/components/LayoutTagsView.vue b/src/layouts/components/LayoutTagsView.vue
index d7ad47e7..9473bef4 100644
--- a/src/layouts/components/LayoutTagsView.vue
+++ b/src/layouts/components/LayoutTagsView.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <div class="tags-container">
     <!-- 水平滚动容器 -->
     <el-scrollbar
diff --git a/src/types/api/log.ts b/src/types/api/log.ts
index f275a131..fb502d10 100644
--- a/src/types/api/log.ts
+++ b/src/types/api/log.ts
@@ -21,9 +21,9 @@ export interface LogItem {
   /** 日志内容 */
   content: string;
   /** 请求路径 */
-  requestUri: string;
+  requestUri?: string;
   /** 请求方法 */
-  method: string;
+  method?: string;
   /** IP地址 */
   ip: string;
   /** 地区 */
@@ -34,6 +34,10 @@ export interface LogItem {
   os: string;
   /** 执行时间(毫秒) */
   executionTime: number;
+  /** 创建人ID */
+  createBy?: string;
+  /** 操作时间 */
+  createTime?: string;
   /** 操作人 */
   operator: string;
 }
diff --git a/src/types/api/notice.ts b/src/types/api/notice.ts
index afa8e9a6..2457ab60 100644
--- a/src/types/api/notice.ts
+++ b/src/types/api/notice.ts
@@ -26,10 +26,10 @@ export interface NoticeForm {
   type?: number;
   /** 通知等级 */
   level?: string;
-  /** 发布状态(0:草稿;1:已发布;2:已撤回) */
-  publishStatus?: number;
-  /** 目标用户ID(多个以英文逗号(,)分割) */
-  targetUserIds?: string;
+  /** 发布状态(0:草稿;1:已发布;-1:已撤回) */
+  status?: number;
+  /** 目标用户ID列表 */
+  targetUsers?: number[];
   /** 目标类型 (1:全部,2:指定用户等) */
   targetType?: number;
 }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f518b688..58deb517 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -12,7 +12,7 @@ const http = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
   timeout: 50000,
   headers: { "Content-Type": "application/json;charset=utf-8" },
-  paramsSerializer: (params) => qs.stringify(params),
+  paramsSerializer: (params) => qs.stringify(params, { arrayFormat: "repeat" }),
 });
 
 // ============================================
@@ -54,12 +54,6 @@ http.interceptors.response.use(
       if (page != null) return { data, page };
       return data;
     }
-
-    // 需要选择租户（特殊业务码，传递给调用方处理）
-    if (code === ApiCodeEnum.CHOOSE_TENANT) {
-      return Promise.reject({ code, data, msg });
-    }
-
     ElMessage.error(msg || "系统出错");
     return Promise.reject(new Error(msg || "Error"));
   },
diff --git a/src/views/demo/dictionary.vue b/src/views/demo/dictionary.vue
index 8cd3497e..1c225f65 100644
--- a/src/views/demo/dictionary.vue
+++ b/src/views/demo/dictionary.vue
@@ -7,7 +7,7 @@
       target="_blank"
       class="mb-[20px]"
     >
-      示例源码 请点�?>>>
+      示例源码 请点击>>>
     </el-link>
     <el-form>
       <el-form-item label="性别">
diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue
index 86bcb6af..6959d39b 100644
--- a/src/views/demo/icon-selector.vue
+++ b/src/views/demo/icon-selector.vue
@@ -1,4 +1,4 @@
-<!-- 图标选择器示�?-->
+<!-- 图标选择器示例 -->
 <template>
   <div class="app-container">
     <el-link
@@ -7,15 +7,15 @@
       target="_blank"
       class="mb-10"
     >
-      示例源码 请点�?>>>
+      示例源码 请点击>>>
     </el-link>
     <icon-select v-model="iconName" />
   </div>
 </template>
 
 <script setup lang="ts">
-// element-plus 图标格式以el-icon-开�?
+// element-plus 图标格式以el-icon-开头
 const iconName = ref("el-icon-edit");
-// 本地SVG图标格式�?src/assets/icons 下的文件名，不需要svg后缀
+// 本地SVG图标格式为src/assets/icons 下的文件名，不需要svg后缀
 // const iconName = ref("api");
 </script>
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index 925406e6..ff9dd4a7 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -1,4 +1,4 @@
-<!-- 列表选择器示�?-->
+<!-- 列表选择器示例 -->
 <template>
   <div class="app-container">
     <el-link
@@ -7,7 +7,7 @@
       target="_blank"
       class="mb-10"
     >
-      示例源码 请点�?>>>
+      示例源码 请点击>>>
     </el-link>
     <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
       <template #status="scope">
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index c27eea1b..6faf9a41 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -7,7 +7,7 @@
       target="_blank"
       class="mb-10"
     >
-      示例源码 请点�?>>>
+      示例源码 请点击>>>
     </el-link>
 
     <el-form>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 37de3538..65ded950 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <!-- 搜索区域 -->
-    <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+    <div class="filter-section">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
         <el-form-item prop="keywords" label="关键字">
           <el-input
             v-model="queryParams.keywords"
@@ -21,7 +21,7 @@
             start-placeholder="开始时间"
             end-placeholder="截止时间"
             value-format="YYYY-MM-DD"
-            style="width: 200px"
+            style="width: 260px"
           />
         </el-form-item>
 
@@ -40,7 +40,7 @@
         border
         class="data-table__content"
       >
-        <el-table-column label="操作时间" prop="createTime" width="180" />
+        <el-table-column label="操作时间" prop="createTime" width="220" />
         <el-table-column label="操作人" prop="operator" width="120" />
         <el-table-column label="日志模块" prop="module" width="100" />
         <el-table-column label="日志内容" prop="content" min-width="200" />
@@ -80,7 +80,7 @@ const queryParams = reactive<LogQueryParams>({
   pageNum: 1,
   pageSize: 10,
   keywords: "",
-  createTime: ["", ""],
+  createTime: undefined as [string, string] | undefined,
 });
 
 // 日志表格数据
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 1afd8699..570a094d 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -3,7 +3,7 @@
     <!-- 搜索区域 -->
     <div class="filter-section">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-suffix=":">
-        <el-form-item label="标题123" prop="title">
+        <el-form-item label="标题" prop="title">
           <el-input
             v-model="queryParams.title"
             placeholder="标题"
@@ -190,8 +190,8 @@
             <el-radio :value="2">指定</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="formData.targetType == 2" label="指定用户" prop="targetUserIds">
-          <el-select v-model="formData.targetUserIds" multiple search placeholder="请选择指定用户">
+        <el-form-item v-if="formData.targetType == 2" label="指定用户" prop="targetUsers">
+          <el-select v-model="formData.targetUsers" multiple search placeholder="请选择指定用户">
             <el-option
               v-for="item in userOptions"
               :key="item.value"
@@ -359,10 +359,14 @@ function handleOpenDialog(id?: string) {
   if (id) {
     dialog.title = "修改公告";
     NoticeAPI.getFormData(id).then((data) => {
-      Object.assign(formData, data);
+      const normalized = {
+        ...data,
+        targetUsers: normalizeTargetUsers(data?.targetUsers),
+      };
+      Object.assign(formData, normalized);
     });
   } else {
-    Object.assign(formData, { level: 0, targetType: 0 });
+    Object.assign(formData, { level: "L", targetType: 1, targetUsers: [] });
     dialog.title = "新增公告";
   }
 }
@@ -388,6 +392,9 @@ function handleSubmit() {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       loading.value = true;
+      if (formData.targetType !== 2) {
+        formData.targetUsers = [];
+      }
       const id = formData.id;
       if (id) {
         NoticeAPI.update(id, formData)
@@ -416,6 +423,25 @@ function resetForm() {
   dataFormRef.value.clearValidate();
   formData.id = undefined;
   formData.targetType = 1;
+  formData.targetUsers = [];
+}
+
+function normalizeTargetUsers(value?: unknown) {
+  if (!value) {
+    return [];
+  }
+  if (Array.isArray(value)) {
+    return value;
+  }
+  if (typeof value === "string") {
+    try {
+      const parsed = JSON.parse(value);
+      return Array.isArray(parsed) ? parsed : value.split(",").filter(Boolean);
+    } catch {
+      return value.split(",").filter(Boolean);
+    }
+  }
+  return [];
 }
 
 // 关闭通知公告弹窗
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index d34fb652..e5add4f3 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -96,14 +96,14 @@
           <template #default="scope">
             <el-button
               v-if="!isPlatformTenantId(scope.row.id)"
-              v-hasPerm="['sys:tenant:assign']"
+              v-hasPerm="['sys:tenant:plan-assign']"
               type="primary"
               size="small"
               link
               icon="menu"
-              @click="handleOpenTenantMenuDialog(scope.row)"
+              @click="handleOpenTenantPlanDialog(scope.row)"
             >
-              租户菜单
+              设置套餐
             </el-button>
             <el-button
               v-hasPerm="['sys:tenant:update']"
@@ -163,7 +163,11 @@
           <el-input v-model="formData.domain" placeholder="demo.youlai.tech（可选）" />
         </el-form-item>
 
-        <el-form-item v-if="!isPlatformTenant" label="租户套餐" prop="planId">
+        <el-form-item
+          v-if="!isPlatformTenant && (formData.id == null || String(formData.id) === '')"
+          label="租户套餐"
+          prop="planId"
+        >
           <el-select v-model="formData.planId" placeholder="请选择租户套餐" style="width: 100%">
             <el-option
               v-for="item in planOptions"
@@ -228,13 +232,39 @@
       </template>
     </el-dialog>
 
-    <!-- 方案菜单配置 -->
+    <!-- 租户套餐设置 -->
     <el-drawer
-      v-model="tenantMenuDialogVisible"
-      :title="'【' + checkedTenant.name + '】租户菜单配置'"
-      size="600px"
-      @close="handleCloseTenantMenuDialog"
+      v-model="tenantPlanDialogVisible"
+      :title="'【' + checkedTenant.name + '】设置套餐'"
+      size="640px"
+      @close="handleCloseTenantPlanDialog"
     >
+      <el-form label-width="90px" class="mb-3">
+        <el-form-item label="租户套餐">
+          <el-select
+            v-model="tenantPlanId"
+            placeholder="请选择租户套餐"
+            style="width: 100%"
+            @change="handlePlanChange"
+          >
+            <el-option
+              v-for="item in planOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <el-alert
+        type="info"
+        show-icon
+        :closable="false"
+        title="默认展示套餐菜单，如需微调请开启自定义"
+        class="mb-3"
+      />
+
       <div class="flex-x-between">
         <el-input v-model="menuKeywords" clearable class="w-[150px]" placeholder="菜单名称">
           <template #prefix>
@@ -249,14 +279,25 @@
             </template>
             {{ menuExpanded ? "收缩" : "展开" }}
           </el-button>
-          <el-checkbox v-model="menuParentChildLinked" class="ml-5" @change="handleMenuLinkChange">
+          <el-checkbox
+            v-model="menuParentChildLinked"
+            class="ml-5"
+            :disabled="!menuCustomizeEnabled"
+            @change="handleMenuLinkChange"
+          >
             父子联动
           </el-checkbox>
-
+          <el-switch
+            v-model="menuCustomizeEnabled"
+            class="ml-5"
+            inline-prompt
+            active-text="自定义"
+            inactive-text="默认"
+            :disabled="!hasPermTenantMenu"
+            @change="handleCustomizeToggle"
+          />
           <el-tooltip placement="bottom">
-            <template #content>
-              如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
-            </template>
+            <template #content>开启自定义后可覆盖套餐菜单；关闭则仅使用套餐默认菜单</template>
             <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
               <QuestionFilled />
             </el-icon>
@@ -268,6 +309,7 @@
         ref="menuTreeRef"
         node-key="value"
         show-checkbox
+        :props="menuTreeProps"
         :data="menuPermOptions"
         :filter-node-method="handleMenuFilter"
         :default-expand-all="true"
@@ -282,13 +324,13 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button
-            v-hasPerm="['sys:tenant:assign']"
+            v-hasPerm="['sys:tenant:update']"
             type="primary"
-            @click="handleTenantMenuSubmit"
+            @click="handleTenantPlanSubmit"
           >
-            确定
+            保存设置
           </el-button>
-          <el-button @click="tenantMenuDialogVisible = false">取消</el-button>
+          <el-button @click="tenantPlanDialogVisible = false">取消</el-button>
         </div>
       </template>
     </el-drawer>
@@ -341,11 +383,23 @@ const dialog = reactive({
   visible: false,
 });
 
-const tenantMenuDialogVisible = ref(false);
+const tenantPlanDialogVisible = ref(false);
 const checkedTenant = ref<{ id?: number; name?: string; planId?: number }>({});
+const checkedTenantForm = ref<TenantForm | null>(null);
+const tenantPlanId = ref<number | undefined>();
+const menuCustomizeEnabled = ref(false);
+const planMenuIds = ref<number[]>([]);
+const tenantMenuIds = ref<number[]>([]);
 const menuKeywords = ref("");
 const menuExpanded = ref(true);
 const menuParentChildLinked = ref(true);
+const menuSourceOptions = ref<OptionItem[]>([]);
+
+const menuTreeProps = {
+  children: "children",
+  label: "label",
+  disabled: "disabled",
+};
 
 const planOptions = ref<OptionItem[]>([]);
 
@@ -374,9 +428,10 @@ const rules = reactive({
   code: [{ required: true, message: "请输入租户编码", trigger: "blur" }],
   planId: [
     {
-      // 平台租户不绑定套餐
+      // 平台租户不绑定套餐，仅创建时校验
       validator: (_: unknown, value: number | undefined, callback: (error?: Error) => void) => {
         if (isPlatformTenant.value) return callback();
+        if (formData.id != null && String(formData.id) !== "") return callback();
         if (value == null) return callback(new Error("请选择租户套餐"));
         return callback();
       },
@@ -386,6 +441,7 @@ const rules = reactive({
 });
 
 const hasPermChangeStatus = computed(() => hasPerm("sys:tenant:change-status"));
+const hasPermTenantMenu = computed(() => hasPerm("sys:tenant:plan-assign"));
 
 function handleStatusChange(tenantId: string | number | undefined, val: string | number | boolean) {
   if (tenantId == null) return;
@@ -415,60 +471,54 @@ function fetchData() {
     });
 }
 
-async function handleOpenTenantMenuDialog(row: TenantItem) {
+async function handleOpenTenantPlanDialog(row: TenantItem) {
   const tenantId = row.id;
   if (tenantId == null || tenantId === "") return;
-  if (isPlatformTenantId(tenantId)) {
-    return;
-  }
-  const planId = row.planId;
-  if (!planId) {
-    ElMessage.warning("请先为租户选择套餐");
-    return;
-  }
+  if (isPlatformTenantId(tenantId)) return;
 
-  tenantMenuDialogVisible.value = true;
+  tenantPlanDialogVisible.value = true;
   loading.value = true;
+  menuCustomizeEnabled.value = false;
+  menuKeywords.value = "";
+  menuExpanded.value = true;
+  menuParentChildLinked.value = true;
+
   checkedTenant.value = {
     id: Number(tenantId),
     name: row.name || String(tenantId),
-    planId,
+    planId: row.planId != null ? Number(row.planId) : undefined,
   };
 
   try {
-    const [menuOptions, planMenuIds, menuIds] = await Promise.all([
+    const [tenantForm, menuOptions, menuIds] = await Promise.all([
+      TenantAPI.getFormData(String(tenantId)),
       MenuAPI.getOptions(false, MenuScopeEnum.TENANT),
-      TenantPlanAPI.getPlanMenuIds(planId),
-      TenantAPI.getTenantMenuIds(Number(tenantId)),
+      hasPermTenantMenu.value ? TenantAPI.getTenantMenuIds(Number(tenantId)) : Promise.resolve([]),
     ]);
-    const normalizedPlanMenuIds = planMenuIds
-      .map((menuId) => Number(menuId))
-      .filter((menuId) => !Number.isNaN(menuId));
-    const allowedMenuIdSet = new Set(normalizedPlanMenuIds);
-    menuPermOptions.value = allowedMenuIdSet.size
-      ? filterMenuOptionsByIds(menuOptions, allowedMenuIdSet)
-      : menuOptions;
-    const normalizedMenuIds = menuIds
-      .map((menuId) => Number(menuId))
-      .filter((menuId) => !Number.isNaN(menuId));
-    await nextTick();
-    menuTreeRef.value?.setCheckedKeys([], false);
-    const checkedMenuIds = allowedMenuIdSet.size
-      ? normalizedMenuIds.filter((menuId) => allowedMenuIdSet.has(menuId))
-      : normalizedMenuIds;
-    checkedMenuIds.forEach((menuId) => menuTreeRef.value?.setChecked(menuId, true, false));
+    checkedTenantForm.value = tenantForm;
+    tenantPlanId.value = tenantForm.planId != null ? Number(tenantForm.planId) : undefined;
+    menuSourceOptions.value = menuOptions;
+    tenantMenuIds.value = normalizeMenuIds(menuIds);
+    await handlePlanChange(tenantPlanId.value);
   } finally {
     loading.value = false;
   }
 }
 
-function handleCloseTenantMenuDialog() {
-  tenantMenuDialogVisible.value = false;
+function handleCloseTenantPlanDialog() {
+  tenantPlanDialogVisible.value = false;
   menuKeywords.value = "";
   menuExpanded.value = true;
   menuParentChildLinked.value = true;
-  menuTreeRef.value?.setCheckedKeys([], false);
+  menuCustomizeEnabled.value = false;
+  tenantPlanId.value = undefined;
+  planMenuIds.value = [];
+  tenantMenuIds.value = [];
+  menuSourceOptions.value = [];
+  menuPermOptions.value = [];
   checkedTenant.value = {};
+  checkedTenantForm.value = null;
+  menuTreeRef.value?.setCheckedKeys([], false);
 }
 
 function toggleMenuTree() {
@@ -488,6 +538,51 @@ function handleMenuLinkChange(val: string | number | boolean) {
   menuParentChildLinked.value = Boolean(val);
 }
 
+function handleCustomizeToggle() {
+  menuPermOptions.value = applyMenuOptionsDisabled(
+    menuPermOptions.value,
+    !menuCustomizeEnabled.value
+  );
+  updateCheckedMenus();
+}
+
+async function handlePlanChange(planId?: number) {
+  if (!planId) {
+    planMenuIds.value = [];
+    menuPermOptions.value = applyMenuOptionsDisabled(menuSourceOptions.value, true);
+    await nextTick();
+    menuTreeRef.value?.setCheckedKeys([], false);
+    return;
+  }
+  loading.value = true;
+  try {
+    const menuIds = await TenantPlanAPI.getPlanMenuIds(planId);
+    planMenuIds.value = normalizeMenuIds(menuIds);
+    const allowedMenuIdSet = new Set(planMenuIds.value);
+    const filteredOptions = allowedMenuIdSet.size
+      ? filterMenuOptionsByIds(menuSourceOptions.value, allowedMenuIdSet)
+      : menuSourceOptions.value;
+    menuPermOptions.value = applyMenuOptionsDisabled(filteredOptions, !menuCustomizeEnabled.value);
+    await nextTick();
+    updateCheckedMenus();
+  } finally {
+    loading.value = false;
+  }
+}
+
+function updateCheckedMenus() {
+  const allowedMenuIdSet = new Set(planMenuIds.value);
+  const baseCheckedIds =
+    menuCustomizeEnabled.value && tenantMenuIds.value.length > 0
+      ? tenantMenuIds.value
+      : planMenuIds.value;
+  const checkedMenuIds = allowedMenuIdSet.size
+    ? baseCheckedIds.filter((menuId) => allowedMenuIdSet.has(menuId))
+    : baseCheckedIds;
+  menuTreeRef.value?.setCheckedKeys([], false);
+  checkedMenuIds.forEach((menuId) => menuTreeRef.value?.setChecked(menuId, true, false));
+}
+
 watch(menuKeywords, (val) => {
   menuTreeRef.value?.filter(val);
 });
@@ -516,26 +611,58 @@ function filterMenuOptionsByIds(
   }, []);
 }
 
-async function handleTenantMenuSubmit() {
+async function handleTenantPlanSubmit() {
   const tenantId = checkedTenant.value.id;
   if (!tenantId) return;
+  if (!tenantPlanId.value) {
+    ElMessage.warning("请选择租户套餐");
+    return;
+  }
 
-  const checkedMenuIds: number[] = menuTreeRef
-    .value!.getCheckedNodes(false, true)
-    .map((node: any) => node.value);
+  const tenantForm = checkedTenantForm.value;
+  if (!tenantForm) return;
 
   loading.value = true;
   try {
-    await TenantAPI.updateTenantMenus(tenantId, checkedMenuIds);
-    ElMessage.success("租户菜单配置成功");
-    tenantMenuDialogVisible.value = false;
+    const payload: TenantForm = {
+      ...tenantForm,
+      planId: tenantPlanId.value,
+    };
+    await TenantAPI.update(String(tenantId), payload);
+
+    if (hasPermTenantMenu.value) {
+      const allowedMenuIdSet = new Set(planMenuIds.value);
+      const menuIds = menuCustomizeEnabled.value
+        ? menuTreeRef.value!.getCheckedNodes(false, true).map((node: any) => node.value)
+        : planMenuIds.value;
+      const filteredMenuIds = allowedMenuIdSet.size
+        ? menuIds.filter((menuId) => allowedMenuIdSet.has(menuId))
+        : menuIds;
+      await TenantAPI.updateTenantMenus(tenantId, filteredMenuIds);
+    }
+
+    ElMessage.success("套餐设置成功");
+    tenantPlanDialogVisible.value = false;
+    fetchData();
   } catch {
-    ElMessage.error("租户菜单配置失败");
+    ElMessage.error("套餐设置失败");
   } finally {
     loading.value = false;
   }
 }
 
+function normalizeMenuIds(menuIds: Array<number | string>) {
+  return menuIds.map((menuId) => Number(menuId)).filter((menuId) => !Number.isNaN(menuId));
+}
+
+function applyMenuOptionsDisabled(options: OptionItem[], disabled: boolean): OptionItem[] {
+  return options.map((option) => ({
+    ...option,
+    disabled,
+    children: option.children ? applyMenuOptionsDisabled(option.children, disabled) : undefined,
+  }));
+}
+
 function handleQuery() {
   queryParams.pageNum = 1;
   fetchData();