diff --git a/Makefile b/Makefile
index c1d5861..1170237 100644
--- a/Makefile
+++ b/Makefile
@@ -18,4 +18,4 @@ dockerbuild: build-no-build
 	echo "docker build success"
 dockerpush:
 	docker tag docker_iotlcmadminui:v0 ${REGISTRY}/docker_iotlcmadminui:v0
-	docker push ${REGISTRY}/$1:$2
\ No newline at end of file
+	docker push ${REGISTRY}/docker_iotlcmadminui:v0
\ No newline at end of file
diff --git a/vue/.husky/commit-msg b/vue/.husky/commit-msg
old mode 100644
new mode 100755
diff --git a/vue/.husky/pre-commit b/vue/.husky/pre-commit
old mode 100644
new mode 100755
diff --git a/vue/apps/web-antd/package.json b/vue/apps/web-antd/package.json
index 9d3f8b7..f04c7ef 100644
--- a/vue/apps/web-antd/package.json
+++ b/vue/apps/web-antd/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "author": {
     "name": "vben",
-    "email": "annvben@example.com",
+    "email": "xxx@example.com",
     "url": "https://github.com/anncwb"
   },
   "type": "module",
diff --git a/vue/apps/web-antd/public/setting.json b/vue/apps/web-antd/public/setting.json
index 7ec7815..7ea1074 100644
--- a/vue/apps/web-antd/public/setting.json
+++ b/vue/apps/web-antd/public/setting.json
@@ -6,9 +6,9 @@
   "loginSloganImage": "",
   "copyright": {
     "companyName": "示例智联",
-    "companySiteLink": "https://www.xiujiezhilian.cn",
+    "companySiteLink": "https://example.com",
     "date": "2024-2025",
-    "icp": "鲁ICP备2024117944号-1",
+    "icp": "",
     "icpLink": "https://beian.miit.gov.cn/"
   }
 }
diff --git a/vue/apps/web-antd/src/adapter/vxe-table.ts b/vue/apps/web-antd/src/adapter/vxe-table.ts
index b0a1f00..e0e0d69 100644
--- a/vue/apps/web-antd/src/adapter/vxe-table.ts
+++ b/vue/apps/web-antd/src/adapter/vxe-table.ts
@@ -2,12 +2,11 @@ import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
 
 import { h } from 'vue';
 
+import { useVbenForm } from '@vben/common-ui';
 import { setupVbenVxeTable, useVbenVxeGrid } from '@vben/plugins/vxe-table';
 
 import { Button, Image } from 'ant-design-vue';
 
-import { useVbenForm } from './form';
-
 setupVbenVxeTable({
   configVxeTable: (vxeUI) => {
     vxeUI.setConfig({
diff --git a/vue/apps/web-antd/src/api/agent/index.ts b/vue/apps/web-antd/src/api/agent/index.ts
index 55e4ddc..f17e913 100644
--- a/vue/apps/web-antd/src/api/agent/index.ts
+++ b/vue/apps/web-antd/src/api/agent/index.ts
@@ -1,4 +1,4 @@
-import { requestClient } from '#/api/request';
+import { requestClient } from '#/api/request';
 
 export interface AgentDept {
   deptId: number;
@@ -60,6 +60,8 @@ export interface MenuTreeItem {
 }
 
 export interface AgentRoleView extends AgentRole {
+  isTemplateRole: boolean;
+  isDeptDefaultRole: boolean;
   menuIds: number[];
   deptIds: number[];
   allowedMenuIds: number[];
@@ -89,11 +91,35 @@ export interface AgentUser {
   isDefaultUser?: boolean;
 }
 
-export function getAgentDeptListApi(params?: Record<string, any>) {
-  return requestClient.get<{ items: AgentDept[]; total: number }>(
-    '/agent/dept/list',
-    { params },
-  );
+export interface AgentDeptListParams {
+  page?: number;
+  pageSize?: number;
+  deptName?: string;
+  status?: string;
+  deptType?: number;
+}
+
+export function exportAgentDeptApi(params?: Record<string, unknown>) {
+  return requestClient.get<Blob>('/agent/dept/export', {
+    params,
+    responseType: 'blob',
+  });
+}
+
+export function exportAgentUserApi(params?: Record<string, unknown>) {
+  return requestClient.get<Blob>('/agent/user/export', {
+    params,
+    responseType: 'blob',
+  });
+}
+
+export function getAgentDeptListApi(params?: AgentDeptListParams) {
+  return requestClient.get<{
+    items: AgentDept[];
+    page: number;
+    pageSize: number;
+    total: number;
+  }>('/agent/dept/list', { params });
 }
 
 export function getAgentDeptViewApi(params: { deptId: number }) {
@@ -110,7 +136,10 @@ export function deleteAgentDeptApi(params: { deptId: number }) {
   return requestClient.post('/agent/dept/delete', { ...params });
 }
 
-export function resetAgentDeptPasswordApi(params: { deptId: number; password: string }) {
+export function resetAgentDeptPasswordApi(params: {
+  deptId: number;
+  password: string;
+}) {
   return requestClient.post('/agent/dept/resetPassword', { ...params });
 }
 
@@ -133,11 +162,17 @@ export function updateAgentUserApi(params: Record<string, any>) {
   return requestClient.post('/agent/user/update', { ...params });
 }
 
-export function deleteAgentUserApi(params: { userId?: number; userIds?: number[] }) {
+export function deleteAgentUserApi(params: {
+  userId?: number;
+  userIds?: number[];
+}) {
   return requestClient.post('/agent/user/delete', { ...params });
 }
 
-export function resetAgentUserPasswordApi(params: { userId: number; password: string }) {
+export function resetAgentUserPasswordApi(params: {
+  password: string;
+  userId: number;
+}) {
   return requestClient.post('/agent/user/resetPassword', { ...params });
 }
 
@@ -158,7 +193,10 @@ export function saveAgentRoleApi(params: Record<string, any>) {
   });
 }
 
-export function deleteAgentRoleApi(params: { roleId?: number; roleIds?: number[] }) {
+export function deleteAgentRoleApi(params: {
+  roleId?: number;
+  roleIds?: number[];
+}) {
   return requestClient.post('/agent/role/delete', { ...params });
 }
 
@@ -167,4 +205,3 @@ export function getAgentMenuTreeApi() {
     '/agent/menu/tree',
   );
 }
-
diff --git a/vue/apps/web-antd/src/api/common/downloadCenter/index.ts b/vue/apps/web-antd/src/api/common/downloadCenter/index.ts
new file mode 100644
index 0000000..5d4b936
--- /dev/null
+++ b/vue/apps/web-antd/src/api/common/downloadCenter/index.ts
@@ -0,0 +1,98 @@
+import { message } from 'ant-design-vue';
+
+import { requestClient } from '#/api/request';
+
+export interface DownloadCenterListParam {
+  page?: number;
+  pageSize?: number;
+  keyword?: string;
+  bizKey?: string;
+  /** 多个状态用逗号分隔：0排队 2生成中 1已完成 3失败 */
+  status?: string;
+  createdAt?: string[];
+}
+
+export interface DownloadCenterItem {
+  id: number;
+  taskNo: string;
+  bizKey: string;
+  bizName: string;
+  status: number;
+  totalCount: number;
+  fileName: string;
+  fileSize: number;
+  errorMessage?: string;
+  createdAt?: string;
+  finishTime?: string;
+  expireTime?: string;
+  deletedTime?: null | string;
+  deleteReason?: '' | 'expired' | 'user';
+}
+
+export interface DownloadCenterListResult {
+  items: DownloadCenterItem[];
+  page: number;
+  pageSize: number;
+  total: number;
+}
+
+export interface DownloadCenterRecentResult {
+  items: DownloadCenterItem[];
+  runningCount: number;
+  finishedCount: number;
+}
+
+/** 下载中心列表 */
+export function List(params: DownloadCenterListParam) {
+  return requestClient.get<DownloadCenterListResult>(
+    '/common/downloadCenter/list',
+    {
+      params,
+    },
+  );
+}
+
+/** 右上角入口：最近任务与进行中数量。
+ * 这是辅助信息，无权限或后端未就绪时静默失败，不能弹全局错误打扰用户。 */
+export function Recent(limit = 5) {
+  return requestClient.get<DownloadCenterRecentResult>(
+    '/common/downloadCenter/recent',
+    { params: { limit }, errorMessageMode: 'none' },
+  );
+}
+
+/** 下载导出文件：业务错误可能以 HTTP 200 JSON Blob 返回，不能当作 xlsx 保存。 */
+export async function Download(taskId: number): Promise<Blob> {
+  const response = await requestClient.download<
+    import('axios').AxiosResponse<Blob>
+  >(`/common/downloadCenter/download?taskId=${taskId}`, {
+    timeout: 120 * 1000,
+    responseReturn: 'raw',
+  });
+  const blob = response.data;
+  const contentType = String(
+    response.headers['content-type'] || blob?.type || '',
+  ).toLowerCase();
+  if (contentType.includes('json')) {
+    let errorMessage = '下载失败，请稍后重试';
+    try {
+      const payload = JSON.parse(await blob.text());
+      errorMessage = payload?.message || errorMessage;
+    } catch {
+      // Malformed JSON must not be saved as a spreadsheet either.
+    }
+    message.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+  if (!(blob instanceof Blob) || blob.size === 0) {
+    const errorMessage = '下载文件为空，请稍后重试';
+    message.error(errorMessage);
+    throw new Error(errorMessage);
+  }
+  return blob;
+}
+
+/** 删除导出任务 */
+export function Remove(taskId: number) {
+  return requestClient.post('/common/downloadCenter/remove', { taskId });
+}
diff --git a/vue/apps/web-antd/src/api/common/tMessageLog/index.ts b/vue/apps/web-antd/src/api/common/tMessageLog/index.ts
index 28ca887..467075f 100644
--- a/vue/apps/web-antd/src/api/common/tMessageLog/index.ts
+++ b/vue/apps/web-antd/src/api/common/tMessageLog/index.ts
@@ -27,3 +27,37 @@ export function Export(params:any) {
     responseType: 'blob',
   });
 }
+
+// 未读消息通知（右上角消息提醒）
+export interface TMessageLogUnreadItem {
+  messageLogId: number;
+  messageType: number;
+  sendUserType: number;
+  messageTitle: string;
+  messageContent: string;
+  messageLink: string;
+  sendTime: string;
+  isRead: number;
+}
+
+export interface TMessageLogUnreadResult {
+  items: TMessageLogUnreadItem[];
+  total: number;
+}
+
+// 获取当前登录用户未读消息通知（右上角消息提醒）
+export function UnreadList(params?: { limit?: number }) {
+  return requestClient.get<TMessageLogUnreadResult>('common/tMessageLog/unreadList', {
+    params,
+  });
+}
+
+// 标记当前登录用户指定消息已读
+export function Read(params: { messageLogId: number | string }) {
+  return requestClient.post<unknown>('common/tMessageLog/read', { ...params });
+}
+
+// 标记当前登录用户全部消息已读
+export function ReadAll() {
+  return requestClient.post<unknown>('common/tMessageLog/readAll', {});
+}
diff --git a/vue/apps/web-antd/src/api/core/auth.ts b/vue/apps/web-antd/src/api/core/auth.ts
index 6500ca4..b15abf2 100644
--- a/vue/apps/web-antd/src/api/core/auth.ts
+++ b/vue/apps/web-antd/src/api/core/auth.ts
@@ -2,7 +2,7 @@
  * @description 认证相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/core/captcha.ts b/vue/apps/web-antd/src/api/core/captcha.ts
index b4c809b..bead42e 100644
--- a/vue/apps/web-antd/src/api/core/captcha.ts
+++ b/vue/apps/web-antd/src/api/core/captcha.ts
@@ -2,7 +2,7 @@
  * @description 验证码相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/core/index.ts b/vue/apps/web-antd/src/api/core/index.ts
index 949e7b6..fdb5dfe 100644
--- a/vue/apps/web-antd/src/api/core/index.ts
+++ b/vue/apps/web-antd/src/api/core/index.ts
@@ -2,7 +2,7 @@
  * @description 核心模块接口导出
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/core/menu.ts b/vue/apps/web-antd/src/api/core/menu.ts
index 94cf36e..ac62587 100644
--- a/vue/apps/web-antd/src/api/core/menu.ts
+++ b/vue/apps/web-antd/src/api/core/menu.ts
@@ -2,7 +2,7 @@
  * @description 菜单相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/core/upload.ts b/vue/apps/web-antd/src/api/core/upload.ts
index 3615ff6..0684294 100644
--- a/vue/apps/web-antd/src/api/core/upload.ts
+++ b/vue/apps/web-antd/src/api/core/upload.ts
@@ -2,7 +2,7 @@
  * @description 文件上传相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/core/user.ts b/vue/apps/web-antd/src/api/core/user.ts
index c1756af..6b98722 100644
--- a/vue/apps/web-antd/src/api/core/user.ts
+++ b/vue/apps/web-antd/src/api/core/user.ts
@@ -2,7 +2,7 @@
  * @description 用户信息相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/gen/testDemo/index.ts b/vue/apps/web-antd/src/api/gen/testDemo/index.ts
index 7f38cb8..ac15492 100644
--- a/vue/apps/web-antd/src/api/gen/testDemo/index.ts
+++ b/vue/apps/web-antd/src/api/gen/testDemo/index.ts
@@ -2,7 +2,7 @@
  * @description 测试单表相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/gen_codes/gen_table.ts b/vue/apps/web-antd/src/api/gen_codes/gen_table.ts
index b2dbb41..c898490 100644
--- a/vue/apps/web-antd/src/api/gen_codes/gen_table.ts
+++ b/vue/apps/web-antd/src/api/gen_codes/gen_table.ts
@@ -2,7 +2,7 @@
  * @description 代码生成器表格相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/index.ts b/vue/apps/web-antd/src/api/index.ts
index 5bcebc9..e826da0 100644
--- a/vue/apps/web-antd/src/api/index.ts
+++ b/vue/apps/web-antd/src/api/index.ts
@@ -2,7 +2,7 @@
  * @description API接口统一导出
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardInfo/index.ts b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardInfo/index.ts
index ffa20e6..71231a1 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardInfo/index.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardInfo/index.ts
@@ -5,6 +5,11 @@ export function List(params: any) {
   return requestClient.get<any>('iot/tSimCardInfo/list', { params });
 }
 
+// 批量号码查询使用 POST，避免较长号码列表超过 URL 长度限制
+export function BatchList(params: any) {
+  return requestClient.post<any>('iot/tSimCardInfo/list', { ...params });
+}
+
 // 删除/批量删除卡信息表
 export function Delete(params: any) {
   return requestClient.post<any>('iot/tSimCardInfo/delete', { ...params });
diff --git a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/index.ts b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/index.ts
new file mode 100644
index 0000000..dcb0ebb
--- /dev/null
+++ b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/index.ts
@@ -0,0 +1,107 @@
+import type {
+  ExportColumn,
+  SimCardQueryExportParam,
+  SimCardQuerySubmitRes,
+  SimCardUsageHistoryColumnsRes,
+  SimCardUsageHistoryDeptOptionsRes,
+  SimCardUsageHistoryExportParam,
+} from './type';
+
+import { requestClient } from '#/api/request';
+
+/** 卡基础信息查询：下载 Excel 模板 */
+export function DownloadBaseTemplate() {
+  return requestClient.download('/iot/tSimCardBaseQuery/template', {
+    responseReturn: 'raw',
+  });
+}
+
+/** 卡基础信息查询：可选导出列 */
+export function BaseColumns(): Promise<{ items: ExportColumn[] }> {
+  return requestClient.get('/iot/tSimCardBaseQuery/columns');
+}
+
+/**
+ * 两个导出接口共用的 multipart 组装。
+ * 提交字段只在这里维护，避免 BaseExport / UsageExport 各写一份后口径漂移。
+ */
+function buildExportForm(params: SimCardQueryExportParam): FormData {
+  const form = new FormData();
+  form.append('mode', params.mode);
+  form.append('exportColumnsJson', JSON.stringify(params.exportColumns ?? []));
+  if (params.batchInput !== undefined) {
+    form.append('batchInput', params.batchInput);
+  }
+  if (params.dimension !== undefined) {
+    form.append('dimension', params.dimension);
+  }
+  if (params.startNum !== undefined) {
+    form.append('startNum', params.startNum);
+  }
+  if (params.endNum !== undefined) {
+    form.append('endNum', params.endNum);
+  }
+  return form;
+}
+
+/**
+ * 卡基础信息查询：提交导出。
+ * 统一走 multipart：Excel 模式带 file，其余模式只带表单字段，
+ * 保持三个输入方式的请求路径一致。
+ */
+export function BaseExport(
+  params: SimCardQueryExportParam & { file?: File },
+): Promise<SimCardQuerySubmitRes> {
+  const form = buildExportForm(params);
+  if (params.file) {
+    form.append('file', params.file);
+  }
+  return requestClient.post('/iot/tSimCardBaseQuery/export', form, {
+    headers: { 'Content-Type': 'multipart/form-data' },
+    timeout: 60_000,
+  });
+}
+
+/** 月历史用量查询：下载 Excel 模板 */
+export function DownloadUsageTemplate() {
+  return requestClient.download('/iot/tSimCardUsageHistory/template', {
+    responseReturn: 'raw',
+  });
+}
+
+/** 月历史用量查询：固定列与近12个月月份清单 */
+export function UsageColumns(): Promise<SimCardUsageHistoryColumnsRes> {
+  return requestClient.get('/iot/tSimCardUsageHistory/columns');
+}
+
+/** 月历史用量查询：可选公司，展示范围由数据权限决定 */
+export function UsageDeptOptions(): Promise<SimCardUsageHistoryDeptOptionsRes> {
+  return requestClient.get('/iot/tSimCardUsageHistory/deptOptions');
+}
+
+/** 月历史用量查询：提交导出 */
+export function UsageExport(
+  params: SimCardUsageHistoryExportParam & { file?: File },
+): Promise<SimCardQuerySubmitRes> {
+  // deptId 是 dept 模式的必填项，缺省时不能悄悄提交一个没有公司范围的导出请求。
+  if (params.mode === 'dept' && !(Number(params.deptId) > 0)) {
+    return Promise.reject(new Error('按所属公司查询时必须选择具体公司'));
+  }
+  const form = buildExportForm(params);
+  if (params.deptId !== undefined && params.deptId > 0) {
+    form.append('deptId', String(params.deptId));
+  }
+  if (params.expireStartTime) {
+    form.append('expireStartTime', params.expireStartTime);
+  }
+  if (params.expireEndTime) {
+    form.append('expireEndTime', params.expireEndTime);
+  }
+  if (params.file) {
+    form.append('file', params.file);
+  }
+  return requestClient.post('/iot/tSimCardUsageHistory/export', form, {
+    headers: { 'Content-Type': 'multipart/form-data' },
+    timeout: 60_000,
+  });
+}
diff --git a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/type.ts b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/type.ts
new file mode 100644
index 0000000..4be8b04
--- /dev/null
+++ b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardQuery/type.ts
@@ -0,0 +1,55 @@
+export interface ExportColumn {
+  /** 列表模型字段名，后端按它取值 */
+  field: string;
+  /** 表头文字 */
+  label: string;
+  dictType?: string;
+}
+
+export type QueryMode = 'excel' | 'input' | 'range' | 'dept';
+
+export interface SimCardQueryExportParam {
+  /** 输入方式 */
+  mode: QueryMode;
+  /** 批量输入内容，每行 ICCID 或 ICCID MSISDN IMSI */
+  batchInput?: string;
+  /** 连号维度：iccid / msisdn / imsi */
+  dimension?: string;
+  startNum?: string;
+  endNum?: string;
+  /** 导出列，后端只认白名单内的字段 */
+  exportColumns?: ExportColumn[];
+}
+
+export interface SimCardUsageHistoryExportParam extends SimCardQueryExportParam {
+  /** 所属公司部门ID，mode=dept 时必填 */
+  deptId?: number;
+  /** 到期日期起（含），仅 mode=dept 生效 */
+  expireStartTime?: string;
+  /** 到期日期止（含），仅 mode=dept 生效 */
+  expireEndTime?: string;
+}
+
+export interface SimCardQuerySubmitRes {
+  taskId: number;
+  taskNo: string;
+  total: number;
+}
+
+export interface SimCardQueryDeptOption {
+  deptId: number;
+  deptName: string;
+  cardCount: number;
+  parentId: number;
+}
+
+export interface SimCardUsageHistoryColumnsRes {
+  items: ExportColumn[];
+  months: string[];
+}
+
+export interface SimCardUsageHistoryDeptOptionsRes {
+  items: SimCardQueryDeptOption[];
+  /** 当前登录用户所属部门，用于公司下拉默认值 */
+  currentDeptId: number;
+}
diff --git a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardTrafficCutoff/type.ts b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardTrafficCutoff/type.ts
index ebc120a..b6f4df8 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardTrafficCutoff/type.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardTrafficCutoff/type.ts
@@ -37,6 +37,7 @@ export interface TSimCardTrafficCutoffModel {
 }
 
 export interface TSimCardTrafficCutoffListParam {
+  includeUnconfigured?: boolean;
   page: number;
   pageSize: number;
   cardValue?: string;
diff --git a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardUnsub/index.test.ts b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardUnsub/index.test.ts
index 7234f53..34fcd20 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardUnsub/index.test.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tCommunication/tSimCardUnsub/index.test.ts
@@ -1,3 +1,5 @@
+import type { TSimCardUnsubSubmitRes } from './type';
+
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const download = vi.fn();
@@ -80,8 +82,7 @@ describe('tSimCardUnsub api', () => {
   });
 
   it('exposes batchAsyncStatus on the submit response type so async Pending is representable', async () => {
-    const typeModule = await import('./type');
-    const res: typeof typeModule.TSimCardUnsubSubmitRes.prototype = {
+    const res: TSimCardUnsubSubmitRes = {
       batchAsyncStatus: 0,
       batchNo: 'B202607210001',
       batchType: 1,
@@ -123,4 +124,3 @@ describe('tSimCardUnsub api', () => {
     );
   });
 });
-
diff --git a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.test.ts b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.test.ts
new file mode 100644
index 0000000..3a7f1c3
--- /dev/null
+++ b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.test.ts
@@ -0,0 +1,50 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { Cards, WarehousingList } from './index';
+
+const request = vi.hoisted(() => ({ get: vi.fn() }));
+vi.mock('#/api/request', () => ({ requestClient: request }));
+
+describe('入库列表渠道筛选请求', () => {
+  it('卡清单按服务端状态筛选，保留状态零并允许清空', async () => {
+    for (const detailStatus of [0, 3, 4, undefined]) {
+      const params = {
+        batchNo: 'INB-TEST',
+        detailStatus,
+        page: 1,
+        pageSize: 20,
+      };
+      await Cards(params);
+      expect(request.get).toHaveBeenLastCalledWith('common/batchMain/cards', {
+        params,
+      });
+    }
+  });
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('切换渠道后每次传递当前编码并保留入库类型', async () => {
+    for (const chanKey of ['A', 'B']) {
+      await WarehousingList({ chanKey, page: 1, pageSize: 20 });
+      expect(request.get).toHaveBeenLastCalledWith(
+        'common/batchMain/successList',
+        {
+          params: { batchType: 1, chanKey, page: 1, pageSize: 20 },
+        },
+      );
+    }
+    expect(request.get).toHaveBeenCalledTimes(2);
+  });
+
+  it('清空渠道不残留上一次筛选条件', async () => {
+    await WarehousingList({ chanKey: 'A', page: 1 });
+    await WarehousingList({ page: 1 });
+    expect(request.get).toHaveBeenLastCalledWith(
+      'common/batchMain/successList',
+      {
+        params: { batchType: 1, page: 1 },
+      },
+    );
+  });
+});
diff --git a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.ts b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.ts
index 915e199..9fe6797 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/index.ts
@@ -52,6 +52,20 @@ export function View(params: BatchMainViewParam) {
   });
 }
 
+// 导出入库批次列表（数据与入库管理页一致）
+export function ExportWarehousing(params: BatchMainWarehousingListParam) {
+  return requestClient.post<Blob>(
+    '/common/batchMain/exportWarehousing',
+    { ...params, batchType: 1 },
+    {
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+      },
+      responseType: 'blob',
+    },
+  );
+}
+
 // 导出批次主表
 export function Export(params: BatchMainExportParam) {
   return requestClient.post<Blob>(
diff --git a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/type.ts b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/type.ts
index 26d4f6d..91b72e9 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/type.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tBatch/type.ts
@@ -147,13 +147,16 @@ export interface BatchMainListParam {
 export type BatchMainWarehousingListParam = Omit<
   BatchMainListParam,
   'batchType'
->;
+> & {
+  chanKey?: string;
+};
 
 /** 获取批次主表列表 响应 */
 export type BatchMainListRes = GlobalListRes<BatchMainModel>;
 
 /** 批次卡清单列表项 */
 export interface BatchCardListModel extends AllocationUnits {
+  errorReason?: string;
   /** 明细状态 */
   detailStatus?: number;
   /** ICCID */
@@ -169,6 +172,7 @@ export interface BatchCardListModel extends AllocationUnits {
 
 /** 获取批次卡清单请求参数 */
 export interface BatchMainCardsParam {
+  detailStatus?: number;
   /** 批次编号 */
   batchNo: string;
   /** 批次类型 */
diff --git a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardOutbound/index.test.ts b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardOutbound/index.test.ts
index 1f8b0d4..7965934 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardOutbound/index.test.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardOutbound/index.test.ts
@@ -45,7 +45,7 @@ describe('tSimCardOutbound api', () => {
       '/iot/tSimCardOutbound/excel/submit',
       { file },
       {
-        timeout: 60_000,
+        timeout: 180_000,
       },
     );
   });
@@ -71,6 +71,7 @@ describe('tSimCardOutbound api', () => {
     expect(post).toHaveBeenCalledWith(
       '/iot/tSimCardOutbound/range/submit',
       params,
+      { timeout: 180_000 },
     );
   });
 
@@ -117,12 +118,9 @@ describe('tSimCardOutbound api', () => {
 
     CustomerBalance(params);
 
-    expect(get).toHaveBeenCalledWith(
-      '/iot/tSimCardOutbound/customerBalance',
-      {
-        params,
-      },
-    );
+    expect(get).toHaveBeenCalledWith('/iot/tSimCardOutbound/customerBalance', {
+      params,
+    });
   });
 
   it('submits inbound batch outbound with backend-supported payload', async () => {
@@ -141,6 +139,7 @@ describe('tSimCardOutbound api', () => {
     expect(post).toHaveBeenCalledWith(
       '/iot/tSimCardOutbound/batch/submit',
       params,
+      { timeout: 180_000 },
     );
   });
 
@@ -160,6 +159,7 @@ describe('tSimCardOutbound api', () => {
     expect(post).toHaveBeenCalledWith(
       '/iot/tSimCardOutbound/input/submit',
       params,
+      { timeout: 180_000 },
     );
   });
 });
diff --git a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardStock/type.ts b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardStock/type.ts
index f7e5a5a..294c0c6 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardStock/type.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tLifeCycle/tSimCardStock/type.ts
@@ -31,6 +31,8 @@ export interface TSimCardStockModel {
   tenantId: string;
   /** 创建部门 */
   createdDept: number;
+  /** 创建部门名称 */
+  createdDeptName?: string;
   /** 创建者 */
   createdBy: number;
   /** 创建者摘要信息 */
diff --git a/vue/apps/web-antd/src/api/iotlcm/tOperationlog/index.ts b/vue/apps/web-antd/src/api/iotlcm/tOperationlog/index.ts
index 6058dda..322a49f 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tOperationlog/index.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tOperationlog/index.ts
@@ -5,6 +5,8 @@ import type {
   BatchExecutionLogListRes,
   BatchExecutionLogSummaryParam,
   BatchExecutionLogSummaryRes,
+  BatchExecutionLogSyncReviewParam,
+  BatchExecutionLogSyncReviewRes,
 } from './type';
 
 import { requestClient } from '#/api/request';
@@ -38,3 +40,11 @@ export function DetailList(params: BatchExecutionLogDetailListParam) {
     },
   );
 }
+
+// 手动同步待核查批次的上游执行结果（只读补查既有受理号，不重发办理）
+export function SyncReview(data: BatchExecutionLogSyncReviewParam) {
+  return requestClient.post<BatchExecutionLogSyncReviewRes>(
+    'common/batchExecutionLog/syncReview',
+    { ...data },
+  );
+}
diff --git a/vue/apps/web-antd/src/api/iotlcm/tOperationlog/type.ts b/vue/apps/web-antd/src/api/iotlcm/tOperationlog/type.ts
index af8092a..8544cfc 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tOperationlog/type.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tOperationlog/type.ts
@@ -20,12 +20,18 @@ export interface BatchExecutionLogModel extends AllocationUnits {
   batchNo?: string;
   /** 异步处理状态 */
   batchAsyncStatus?: number;
+  /** 重启阶段：waiting_resume 表示停机后等待复机 */
+  restartPhase?: string;
+  /** 计划复机时间 */
+  restartResumeAt?: string;
   /** 批次类型 */
   batchType?: number;
   /** 来源方式 */
   sourceType?: null | number;
   /** 总数量 */
   totalCount?: number;
+  /** 待核查数量 */
+  unknownCount?: number;
   /** 运行结果 */
   runResult?: number;
   /** 开始时间 */
@@ -52,12 +58,18 @@ export interface BatchExecutionLogSummaryRes extends AllocationUnits {
   batchNo?: string;
   /** 异步处理状态 */
   batchAsyncStatus?: number;
+  /** 重启阶段：waiting_resume 表示停机后等待复机 */
+  restartPhase?: string;
+  /** 计划复机时间 */
+  restartResumeAt?: string;
   /** 批次类型 */
   batchType?: number;
   /** 来源方式 */
   sourceType?: null | number;
   /** 总数量 */
   totalCount?: number;
+  /** 待核查数量 */
+  unknownCount?: number;
   /** 运行结果 */
   runResult?: number;
   /** 失败原因 */
@@ -74,6 +86,8 @@ export interface BatchExecutionLogSummaryRes extends AllocationUnits {
 
 /** 批次执行日志文件信息 */
 export interface BatchExecutionLogFileModel {
+  /** 导出任务ID；与历史批次下载任务ID分开，走下载中心鉴权 */
+  exportTaskId?: number;
   /** OSS文件ID */
   ossId?: number;
   /** 文件URL */
@@ -82,6 +96,8 @@ export interface BatchExecutionLogFileModel {
 
 /** 批次执行日志结果文件信息 */
 export interface BatchExecutionLogResultFileModel extends BatchExecutionLogFileModel {
+  /** 原始下载文件名 */
+  originalName?: string;
   /** 下载任务ID */
   downloadId?: number;
   /** 下载状态 */
@@ -113,6 +129,28 @@ export interface BatchExecutionLogListParam {
 /** 获取批次执行日志列表响应 */
 export type BatchExecutionLogListRes = GlobalListRes<BatchExecutionLogModel>;
 
+/** 手动同步待核查批次上游结果的请求参数 */
+export interface BatchExecutionLogSyncReviewParam {
+  /** 批次编号 */
+  batchNo: string;
+  /** 同步原因 */
+  reason?: string;
+}
+
+/** 手动同步待核查批次上游结果的响应 */
+export interface BatchExecutionLogSyncReviewRes {
+  /** 批次编号 */
+  batchNo?: string;
+  /** 批次类型 */
+  batchType?: number;
+  /** 异步处理状态 */
+  batchAsyncStatus?: number;
+  /** 待核查数量 */
+  unknownCount?: number;
+  /** 是否已提交同步 */
+  queued?: boolean;
+}
+
 /** 批次执行日志明细列表项 */
 export interface BatchExecutionLogDetailModel extends AllocationUnits {
   /** 协议到期时间 */
diff --git a/vue/apps/web-antd/src/api/iotlcm/tWarnCenter/simWarningConfig/type.ts b/vue/apps/web-antd/src/api/iotlcm/tWarnCenter/simWarningConfig/type.ts
index 113819d..2d6f71a 100644
--- a/vue/apps/web-antd/src/api/iotlcm/tWarnCenter/simWarningConfig/type.ts
+++ b/vue/apps/web-antd/src/api/iotlcm/tWarnCenter/simWarningConfig/type.ts
@@ -16,6 +16,7 @@ export interface SimWarningConfigModel {
   warnPhones?: string;
   warnEmails?: string;
   autoAction?: number;
+
   isEnabled: number;
   wxTemplateId?: string;
   remark?: string;
@@ -60,6 +61,7 @@ export interface SimWarningConfigSaveParam {
   warnPhones?: string;
   warnEmails?: string;
   autoAction?: number;
+
   isEnabled?: number;
   remark?: string;
 }
diff --git a/vue/apps/web-antd/src/api/monitor/cache.ts b/vue/apps/web-antd/src/api/monitor/cache.ts
index 47a4d2d..cbfc13b 100644
--- a/vue/apps/web-antd/src/api/monitor/cache.ts
+++ b/vue/apps/web-antd/src/api/monitor/cache.ts
@@ -2,7 +2,7 @@
  * @description 缓存监控相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/monitor/index.ts b/vue/apps/web-antd/src/api/monitor/index.ts
index 8a9ace0..acc6496 100644
--- a/vue/apps/web-antd/src/api/monitor/index.ts
+++ b/vue/apps/web-antd/src/api/monitor/index.ts
@@ -2,7 +2,7 @@
  * @description 监控模块接口导出
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/monitor/online.ts b/vue/apps/web-antd/src/api/monitor/online.ts
index 3c6027d..7e47af3 100644
--- a/vue/apps/web-antd/src/api/monitor/online.ts
+++ b/vue/apps/web-antd/src/api/monitor/online.ts
@@ -2,7 +2,7 @@
  * @description 在线用户监控相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/request.ts b/vue/apps/web-antd/src/api/request.ts
index c574682..122c3d7 100644
--- a/vue/apps/web-antd/src/api/request.ts
+++ b/vue/apps/web-antd/src/api/request.ts
@@ -2,7 +2,7 @@
  * @description 请求客户端配置
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
@@ -116,12 +116,11 @@ function createRequestClient(baseURL: string, options?: RequestClientOptions) {
         if (config.responseReturn === 'body') {
           return responseData;
         } else if (headers['content-type']?.includes?.('application/json')) {
-          if (config.responseType === 'blob' && Reflect.has(responseData, 'data')) 
-          {
-              // 这时候的data为blob类型
-              const blob = responseData.data as unknown as Blob;
-              // 拿到字符串转json对象
-              responseData.data = JSON.parse(await blob.text());
+          // 导出/下载类接口用 blob 方式接收 JSON 回执（异步导出只回任务信息，没有文件流）。
+          // 此时 axios 的 responseData 就是 Blob 本身，Blob 上没有 code 字段，
+          // 若继续走下面的业务码判断会被误判为失败并抛错，所以直接交给调用方解析。
+          if (config.responseType === 'blob') {
+            return responseData;
           }
         } else if (headers['content-type']?.includes?.('application/octet-stream')) {
           // 下载文件
diff --git a/vue/apps/web-antd/src/api/system/client.ts b/vue/apps/web-antd/src/api/system/client.ts
index 50bcd7b..72b51b4 100644
--- a/vue/apps/web-antd/src/api/system/client.ts
+++ b/vue/apps/web-antd/src/api/system/client.ts
@@ -2,7 +2,7 @@
  * @description 客户端管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/config.ts b/vue/apps/web-antd/src/api/system/config.ts
index 59232f3..cf5d7f4 100644
--- a/vue/apps/web-antd/src/api/system/config.ts
+++ b/vue/apps/web-antd/src/api/system/config.ts
@@ -2,7 +2,7 @@
  * @description 系统配置相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/dept.ts b/vue/apps/web-antd/src/api/system/dept.ts
index bfe71aa..ef98807 100644
--- a/vue/apps/web-antd/src/api/system/dept.ts
+++ b/vue/apps/web-antd/src/api/system/dept.ts
@@ -2,7 +2,7 @@
  * @description 组织管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/dict.ts b/vue/apps/web-antd/src/api/system/dict.ts
index 92ec7ed..080f1b8 100644
--- a/vue/apps/web-antd/src/api/system/dict.ts
+++ b/vue/apps/web-antd/src/api/system/dict.ts
@@ -2,7 +2,7 @@
  * @description 字典管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/index.ts b/vue/apps/web-antd/src/api/system/index.ts
index 210e362..6e32ecb 100644
--- a/vue/apps/web-antd/src/api/system/index.ts
+++ b/vue/apps/web-antd/src/api/system/index.ts
@@ -2,7 +2,7 @@
  * @description 系统管理模块接口导出
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/job.ts b/vue/apps/web-antd/src/api/system/job.ts
index 450fe00..033d9ee 100644
--- a/vue/apps/web-antd/src/api/system/job.ts
+++ b/vue/apps/web-antd/src/api/system/job.ts
@@ -2,7 +2,7 @@
  * @description 定时任务相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/logininfor.ts b/vue/apps/web-antd/src/api/system/logininfor.ts
index 3bd5fbc..45f0ba9 100644
--- a/vue/apps/web-antd/src/api/system/logininfor.ts
+++ b/vue/apps/web-antd/src/api/system/logininfor.ts
@@ -2,7 +2,7 @@
  * @description 登录日志相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/menu.ts b/vue/apps/web-antd/src/api/system/menu.ts
index 0f4047d..c9f042b 100644
--- a/vue/apps/web-antd/src/api/system/menu.ts
+++ b/vue/apps/web-antd/src/api/system/menu.ts
@@ -2,7 +2,7 @@
  * @description 菜单管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/notice.ts b/vue/apps/web-antd/src/api/system/notice.ts
index ac9fba2..96203d4 100644
--- a/vue/apps/web-antd/src/api/system/notice.ts
+++ b/vue/apps/web-antd/src/api/system/notice.ts
@@ -2,7 +2,7 @@
  * @description 通知公告相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/oper-log.ts b/vue/apps/web-antd/src/api/system/oper-log.ts
index 94a8dfb..2e1683e 100644
--- a/vue/apps/web-antd/src/api/system/oper-log.ts
+++ b/vue/apps/web-antd/src/api/system/oper-log.ts
@@ -2,7 +2,7 @@
  * @description 操作日志相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/oss.ts b/vue/apps/web-antd/src/api/system/oss.ts
index b540332..c06a882 100644
--- a/vue/apps/web-antd/src/api/system/oss.ts
+++ b/vue/apps/web-antd/src/api/system/oss.ts
@@ -2,7 +2,7 @@
  * @description 对象存储管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/post.ts b/vue/apps/web-antd/src/api/system/post.ts
index 15bf175..c64d9c2 100644
--- a/vue/apps/web-antd/src/api/system/post.ts
+++ b/vue/apps/web-antd/src/api/system/post.ts
@@ -2,7 +2,7 @@
  * @description 岗位管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/qrcode.ts b/vue/apps/web-antd/src/api/system/qrcode.ts
index 749054a..0f39baf 100644
--- a/vue/apps/web-antd/src/api/system/qrcode.ts
+++ b/vue/apps/web-antd/src/api/system/qrcode.ts
@@ -2,7 +2,7 @@
  * @description 系统二维码管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/role.ts b/vue/apps/web-antd/src/api/system/role.ts
index 7ce3da0..001aa90 100644
--- a/vue/apps/web-antd/src/api/system/role.ts
+++ b/vue/apps/web-antd/src/api/system/role.ts
@@ -2,7 +2,7 @@
  * @description 角色管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
@@ -12,6 +12,7 @@ import { requestClient } from '#/api/request';
 export interface SysRoleListParam {
   page?: number;
   pageSize?: number;
+  deptId?: number;
   roleName?: string;
   roleKey?: string;
   status?: string;
@@ -19,22 +20,26 @@ export interface SysRoleListParam {
 }
 
 export interface SysRoleListData {
-    roleId: number; 
-    tenantId: string;
-    roleName: string;
-    roleKey: string;
-    roleSort: number;
-    dataScope: string;
-    menuCheckStrictly: number;
-    deptCheckStrictly: number;
-    status: string;
-    createdDept: number;
-    createdAt: string;
-    remark: string;
+  roleId: number;
+  tenantId: string;
+  roleName: string;
+  roleKey: string;
+  roleSort: number;
+  dataScope: string;
+  menuCheckStrictly: number;
+  deptCheckStrictly: number;
+  status: string;
+  createdDept: number;
+  createdAt: string;
+  remark: string;
 }
 
 export interface SysRoleViewData {
-  roleId: number; 
+  isTemplateRole: boolean;
+  isDeptDefaultRole: boolean;
+  roleMenuDataScopes: Record<number, string>;
+  deptId: number;
+  roleId: number;
   tenantId: string;
   roleName: string;
   roleKey: string;
@@ -96,14 +101,11 @@ export interface SysRoleDeleteParam {
   roleIds: number[];
 }
 
-export interface SysRoleAddRes {
-}
+export interface SysRoleAddRes {}
 
-export interface SysRoleEditRes {
-}
+export interface SysRoleEditRes {}
 
-export interface SysRoleDeleteRes {
-}
+export interface SysRoleDeleteRes {}
 
 export interface SysRoleDataScopeEditParam {
   roleId: number;
@@ -111,26 +113,34 @@ export interface SysRoleDataScopeEditParam {
   deptCheckStrictly?: number;
   deptIds?: number[];
 }
-export interface SysRoleDataScopeEditRes {
-}
+export interface SysRoleDataScopeEditRes {}
 
-export async function addSysRoleApi(params: SysRoleAddParam|any) {
+export async function addSysRoleApi(params: SysRoleAddParam | any) {
   return requestClient.post<SysRoleAddRes>('/system/role/add', { ...params });
 }
 
-export async function editSysRoleApi(params: SysRoleEditParam|any) {
+export async function editSysRoleApi(params: SysRoleEditParam | any) {
   return requestClient.post<SysRoleEditRes>('/system/role/edit', { ...params });
 }
 
-export async function deleteSysRoleApi(params: SysRoleDeleteParam|any) {
-  return requestClient.post<SysRoleDeleteRes>('/system/role/delete', { ...params });
-} 
+export async function deleteSysRoleApi(params: SysRoleDeleteParam | any) {
+  return requestClient.post<SysRoleDeleteRes>('/system/role/delete', {
+    ...params,
+  });
+}
 
-export async function getSysRoleViewApi(params: SysRoleViewParam|any) {
-  console.log('/Users/lixiujie/dev_test/dev_go/xiujie_iot/vue/apps/web-antd/src/api/system/role.ts', params);  
+export async function getSysRoleViewApi(params: SysRoleViewParam | any) {
+  console.log(
+    '/Users/lixiujie/dev_test/dev_go/xiujie_iot/vue/apps/web-antd/src/api/system/role.ts',
+    params,
+  );
   return requestClient.get<SysRoleViewData>('/system/role/view', { params });
 }
 
-export async function editSysRoleDataScopeApi(params: SysRoleDataScopeEditParam|any) {
-  return requestClient.post<SysRoleDataScopeEditRes>('/system/role/dataScope', { ...params });
+export async function editSysRoleDataScopeApi(
+  params: SysRoleDataScopeEditParam | any,
+) {
+  return requestClient.post<SysRoleDataScopeEditRes>('/system/role/dataScope', {
+    ...params,
+  });
 }
diff --git a/vue/apps/web-antd/src/api/system/social.ts b/vue/apps/web-antd/src/api/system/social.ts
index 5dc5086..0183d38 100644
--- a/vue/apps/web-antd/src/api/system/social.ts
+++ b/vue/apps/web-antd/src/api/system/social.ts
@@ -2,7 +2,7 @@
  * @description 社交账号管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/api/system/user.ts b/vue/apps/web-antd/src/api/system/user.ts
index 97cead5..cbb301f 100644
--- a/vue/apps/web-antd/src/api/system/user.ts
+++ b/vue/apps/web-antd/src/api/system/user.ts
@@ -2,7 +2,7 @@
  * @description 用户管理相关接口
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/config/setting.ts b/vue/apps/web-antd/src/config/setting.ts
index e078aae..f5e857f 100644
--- a/vue/apps/web-antd/src/config/setting.ts
+++ b/vue/apps/web-antd/src/config/setting.ts
@@ -57,9 +57,9 @@ const DEFAULT_RUNTIME_SETTING: RuntimeSetting = {
   appTitle: '智联·云',
   copyright: {
     companyName: '示例智联',
-    companySiteLink: 'https://www.xiujiezhilian.cn',
+    companySiteLink: 'https://example.com',
     date: '2024-2025',
-    icp: '鲁ICP备2024117944号-1',
+    icp: '',
     icpLink: 'https://beian.miit.gov.cn/',
   },
   loginPageDescription: '新一代物联网设备统一接入平台',
diff --git a/vue/apps/web-antd/src/layouts/basic.vue b/vue/apps/web-antd/src/layouts/basic.vue
index 070d18e..e59edb4 100644
--- a/vue/apps/web-antd/src/layouts/basic.vue
+++ b/vue/apps/web-antd/src/layouts/basic.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
 import type { NotificationItem } from '@vben/layouts';
 
+import type { DownloadCenterItem } from '#/api/common/downloadCenter';
+
 import { computed, onUnmounted, reactive, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
-import { useWebSocket } from '@vueuse/core';
 
-import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
-import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
+import { AuthenticationLoginExpiredModal, VbenButton } from '@vben/common-ui';
 import { useWatermark } from '@vben/hooks';
-import { BookOpenText, CircleHelp, MdiGithub,UserOutlined } from '@vben/icons';
+import { DownloadOutlined, UserOutlined } from '@vben/icons';
 import {
   BasicLayout,
   LockScreen,
@@ -17,10 +17,18 @@ import {
 } from '@vben/layouts';
 import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
-import { openWindow } from '@vben/utils';
 
+import { useWebSocket } from '@vueuse/core';
+import { Badge, Button, Popover } from 'ant-design-vue';
+
+import {
+  Download as DownloadExportFile,
+  Recent as RecentExportTasks,
+} from '#/api/common/downloadCenter';
+import { Read, ReadAll, UnreadList } from '#/api/common/tMessageLog';
 import { $t } from '#/locales';
 import { useAuthStore } from '#/store';
+import { downloadByData } from '#/utils/file/download';
 import FirstLoginGuideModal from '#/views/_core/authentication/components/first-login-guide-modal.vue';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
@@ -154,7 +162,32 @@ async function handleLogout() {
 }
 
 function handleNoticeClear() {
+  const generation = identityGeneration;
+  // 先留存本次清空覆盖的列表与 id，失败时用于本地回滚。
+  const previous = [...notifications.value];
+  const ids = previous.map((item) => String(item.id));
+  invalidateUnreadRequest();
   notifications.value = [];
+  protectPendingReads(ids);
+  // 清空通知时同步服务端已读，否则重新登录或断线重连会再次提示这些未读消息。
+  // 同步结束（无论成败）都重新拉取：成功用于清理同步期间新到的推送，失败用于恢复未读展示。
+  // 先 catch 再 finally：只挂 finally 会把 ReadAll 的失败变成未处理的 Promise 拒绝。
+  ReadAll()
+    .catch(() => {
+      if (generation !== identityGeneration) {
+        return;
+      }
+      // 同步失败：先本地回滚，避免「同步失败 + 随后的重新拉取也失败」时提醒一直空着。
+      releasePendingReads(ids);
+      notifications.value = previous;
+    })
+    .finally(() => {
+      // 期间若已切换账号，结果属于上一个账号，重新拉取会覆盖新账号的提醒。
+      if (generation !== identityGeneration) {
+        return;
+      }
+      loadUnreadNotifications();
+    });
 }
 
 function markRead(id: number | string) {
@@ -162,6 +195,38 @@ function markRead(id: number | string) {
   if (item) {
     item.isRead = true;
   }
+  // 同步服务端已读状态，避免重新登录后已处理的消息再次出现在未读提醒里。
+  const messageLogId = Number(id);
+  if (!Number.isFinite(messageLogId) || messageLogId <= 0) {
+    return;
+  }
+  const key = String(id);
+  const generation = identityGeneration;
+  // 标记期间无论有在途还是新发起的未读拉取、实时推送，都不能把这条已读消息按未读重新展示。
+  // 这里不作废在途拉取：作废会连带丢掉同一批离线未读消息，只靠 pendingReadIds 过滤本条即可。
+  pendingReadIds.add(key);
+  Read({ messageLogId })
+    .then(() => {
+      if (generation !== identityGeneration) {
+        return;
+      }
+      // 列表此前被分页截断（未读数超过返回上限）时，读掉一条就要补拉，
+      // 否则排在分页之外的未读会一直显示不出来。未截断时保留已读项（组件里有删除按钮）。
+      if (unreadTruncated) {
+        loadUnreadNotifications();
+      }
+    })
+    .catch(() => {
+      if (generation !== identityGeneration) {
+        return;
+      }
+      // 同步失败则恢复未读并重新拉取，把仍在服务端未读的消息补回展示。
+      pendingReadIds.delete(key);
+      if (item) {
+        item.isRead = false;
+      }
+      loadUnreadNotifications();
+    });
 }
 
 function remove(id: number | string) {
@@ -169,7 +234,36 @@ function remove(id: number | string) {
 }
 
 function handleMakeAll() {
+  const generation = identityGeneration;
+  // 先留存本次全部已读覆盖的列表与各自已读状态，失败时用于本地回滚。
+  const previous = notifications.value.map((item) => ({
+    isRead: item.isRead,
+    item,
+  }));
+  const ids = notifications.value.map((item) => String(item.id));
+  invalidateUnreadRequest();
+  protectPendingReads(ids);
   notifications.value.forEach((item) => (item.isRead = true));
+  // 全部已读覆盖的是请求发起时刻的消息：结束后重新拉取，校正期间新到的推送。
+  // 先 catch 再 finally，避免 ReadAll 失败产生未处理的 Promise 拒绝。
+  ReadAll()
+    .catch(() => {
+      if (generation !== identityGeneration) {
+        return;
+      }
+      // 同步失败：先本地回滚已读标记，避免「同步失败 + 随后重新拉取也失败」时未读角标一直不亮。
+      releasePendingReads(ids);
+      for (const { isRead, item } of previous) {
+        item.isRead = isRead;
+      }
+    })
+    .finally(() => {
+      // 期间若已切换账号，结果属于上一个账号，重新拉取会覆盖新账号的提醒。
+      if (generation !== identityGeneration) {
+        return;
+      }
+      loadUnreadNotifications();
+    });
 }
 
 // 「查看所有消息」：跳转到消息日志列表页
@@ -177,13 +271,119 @@ function handleViewAll() {
   router.push(MESSAGE_LOG_PATH);
 }
 
+// 未读拉取请求序号：账号切换或重复触发时只保留最后一次请求的结果。
+let unreadRequestSeq = 0;
+// 已成功应用结果的请求序号：较晚发起的请求失败时，不能连带丢掉较早那次成功的结果。
+let unreadAppliedSeq = 0;
+
+// 拉取期间通过实时推送到达的提醒：服务端快照可能早于这些消息，需要一并保留。
+const pushedDuringLoad = new Map<string, NotificationItem>();
+// 并发拉取按请求分别跟踪；后发请求先失败时，先发请求仍可能应用旧快照。
+const unreadRequestsInFlight = new Set<number>();
+// 已在本地标记已读的消息 id。应用未读快照与实时推送时据此过滤，避免把刚点开的
+// 已读消息按未读重新展示。会话内一直保留（退出登录/切换账号时清空）：
+// 过期的 websocket 推送可能晚于快照才到达，一旦提前解除过滤就会被重新点亮未读。
+const pendingReadIds = new Set<string>();
+// 身份代数：每次登录/退出/切换账号自增，用于丢弃上一个账号发起、尚未回来的异步回调。
+let identityGeneration = 0;
+// 上一次成功应用的未读快照是否被分页截断（未读数超过返回上限）。
+// 截断时列表只包含最新一批未读，读掉一条需要补拉才能露出后面的未读。
+let unreadTruncated = false;
+
+// 批量已读（全部已读/清空）覆盖的消息先纳入过滤：标记在途期间即使被推送或
+// 重连触发的拉取命中，也不能把它们按未读重新展示。
+function protectPendingReads(ids: string[]) {
+  for (const id of ids) {
+    pendingReadIds.add(id);
+  }
+}
+
+// 批量已读失败：解除过滤，让仍在服务端未读的消息恢复展示。
+function releasePendingReads(ids: string[]) {
+  for (const id of ids) {
+    pendingReadIds.delete(id);
+  }
+}
+
+// 作废在途的未读拉取：本地已读状态刚变更，较早的快照会把已读消息重新标成未读。
+// 被作废的请求不会再复位缓冲状态，这里一并复位，避免后续推送一直被缓存。
+function invalidateUnreadRequest() {
+  unreadRequestSeq += 1;
+  // 同时抬高「已应用序号」，让所有在途结果作废（含此前已成功的序号）。
+  unreadAppliedSeq = unreadRequestSeq;
+  unreadRequestsInFlight.clear();
+  pushedDuringLoad.clear();
+}
+
+/**
+ * 拉取当前登录用户的未读消息，初始化右上角消息提醒。
+ * 登录、刷新、断线重连都必须拉取：提醒此前只依赖实时 websocket 推送，
+ * 离线期间产生的消息不会补发，导致重新登录后看不到未读提醒。
+ * 单次最多展示 100 条未读（服务端上限 200）：未读角标只看「是否存在未读」，
+ * 列表按时间倒序取最新 100 条已足够，超出部分随已读/刷新逐步消失。
+ */
+async function loadUnreadNotifications() {
+  const seq = ++unreadRequestSeq;
+  // 不在此清空推送缓冲：并发拉取时后发起的请求会在前一个请求在途期间清掉缓冲，
+  // 导致该窗口内的实时推送既进不了缓冲、又可能早于服务端快照而被漏掉。
+  // 缓冲保留到所有在途拉取结束，或由 invalidateUnreadRequest 统一作废。
+  unreadRequestsInFlight.add(seq);
+  try {
+    const res = await UnreadList({ limit: 100 });
+    // 已经应用过更新的结果（切换账号/重连/本地已读作废）才丢弃本次结果。
+    // 注意不能按「是否还有更新的请求在途」判断：更新的请求失败时，
+    // 这次已经成功的结果就是唯一可用的数据，丢掉会让提醒一直空着。
+    if (seq <= unreadAppliedSeq) {
+      return;
+    }
+    const merged = new Map<string, NotificationItem>();
+    // 先放本次拉取期间新到的推送，保证它们不会被较早的服务端快照覆盖。
+    // 但本地已标记已读的消息仍要过滤：推送可能是延迟/重复的同一批消息。
+    for (const [id, notification] of pushedDuringLoad) {
+      if (!pendingReadIds.has(id)) {
+        merged.set(id, notification);
+      }
+    }
+    for (const item of res?.items ?? []) {
+      const notification = createNotificationItem(item);
+      const id = String(notification.id);
+      // 本地已标记已读的消息即使在快照里仍是未读，也不重新展示。
+      if (!merged.has(id) && !pendingReadIds.has(id)) {
+        merged.set(id, notification);
+      }
+    }
+    // 本次快照是否被分页截断：total 是服务端全部未读数，大于返回条数即为截断。
+    // 截断时更新列表只包含最新一批未读，读掉一条需要补拉才能露出后面的未读。
+    unreadTruncated = (res?.total ?? 0) > (res?.items?.length ?? 0);
+    notifications.value = [...merged.values()];
+    unreadAppliedSeq = seq;
+  } catch {
+    // 拉取失败不阻断页面；实时推送仍可用，下次登录或重连会再次拉取。
+  } finally {
+    // 每个请求只结束自己的在途状态；后发失败不能提前清掉先发请求所需的推送。
+    unreadRequestsInFlight.delete(seq);
+    if (unreadRequestsInFlight.size === 0) {
+      pushedDuringLoad.clear();
+    }
+  }
+}
+
 onUnmounted(() => {
   closeWs();
 });
 
 watch(
   () => accessStore.accessToken,
-  (token) => {
+  (token, prevToken) => {
+    // 只要身份发生变化（登录、切换账号、退出）就先清空上一个账号的提醒，
+    // 并作废在途拉取：否则在新数据返回前会短暂串号，且拉取失败时旧账号提醒会滞留。
+    if (token !== prevToken) {
+      // 身份变化：代数自增，丢弃上一个账号尚未回来的异步回调。
+      identityGeneration += 1;
+      invalidateUnreadRequest();
+      pendingReadIds.clear();
+      notifications.value = [];
+    }
     if (!token) {
       closeWs();
       return;
@@ -192,6 +392,8 @@ watch(
     if (wsStatus.value !== 'OPEN') {
       openWs();
     }
+    // 登录或切换账号后立即拉取未读消息，不依赖实时推送是否在线。
+    loadUnreadNotifications();
   },
   {
     immediate: true,
@@ -201,6 +403,8 @@ watch(
 watch(wsStatus, (status) => {
   if (status === 'OPEN') {
     sendWsLogin();
+    // 断线重连后补齐离线期间遗漏的未读消息。
+    loadUnreadNotifications();
   }
 });
 
@@ -230,14 +434,21 @@ function getWsServerUrl() {
 function parseWsData(value: string) {
   try {
     const data = JSON.parse(value);
-    if (typeof data.d === 'string' && !data.d.startsWith('{') && !data.d.startsWith('[')) {
+    if (
+      typeof data.d === 'string' &&
+      !data.d.startsWith('{') &&
+      !data.d.startsWith('[')
+    ) {
       try {
         data.d = atob(data.d);
       } catch {
         return data;
       }
     }
-    if (typeof data.d === 'string' && (data.d.startsWith('{') || data.d.startsWith('['))) {
+    if (
+      typeof data.d === 'string' &&
+      (data.d.startsWith('{') || data.d.startsWith('['))
+    ) {
       data.d = JSON.parse(data.d);
     }
     return data;
@@ -260,13 +471,31 @@ function handleWsMessage(value: string) {
   if (!notificationItem) {
     return;
   }
-  notifications.value = [notificationItem, ...notifications.value.filter((item) => item.id !== notificationItem.id)];
+  // 本地已标记已读的消息即使又被推送（延迟/重复推送），也不再按未读提醒展示。
+  // 必须在入缓冲前判断，否则缓冲合并会绕过统一过滤。
+  if (pendingReadIds.has(String(notificationItem.id))) {
+    return;
+  }
+  // 记录到拉取缓冲：若有未读拉取在途，其服务端快照可能还没包含这条消息。
+  if (unreadRequestsInFlight.size > 0) {
+    pushedDuringLoad.set(String(notificationItem.id), notificationItem);
+  }
+  notifications.value = [
+    notificationItem,
+    ...notifications.value.filter((item) => item.id !== notificationItem.id),
+  ];
 }
 
 function isWsControlEvent(eventName: string) {
-  return ['connected', 'login', 'join', 'quit', 'ping', 'joins', 'quits'].includes(
-    eventName,
-  );
+  return [
+    'connected',
+    'join',
+    'joins',
+    'login',
+    'ping',
+    'quit',
+    'quits',
+  ].includes(eventName);
 }
 
 function normalizeNotificationPayload(data: any) {
@@ -284,7 +513,9 @@ function normalizeNotificationPayload(data: any) {
 }
 
 function sendWsLogin() {
-  const userId = Number(userStore.userInfo?.id || userStore.userInfo?.userId || 0);
+  const userId = Number(
+    userStore.userInfo?.id || userStore.userInfo?.userId || 0,
+  );
   if (!userId) {
     return;
   }
@@ -299,10 +530,17 @@ function sendWsLogin() {
 }
 
 function createNotificationItem(payload: Record<string, any>) {
-  const id = payload.messageLogId ?? payload.notifyId ?? `${Date.now()}-${Math.random()}`;
-  const title = String(payload.messageTitle ?? payload.notifyTitle ?? '消息通知');
+  const id =
+    payload.messageLogId ??
+    payload.notifyId ??
+    `${Date.now()}-${Math.random()}`;
+  const title = String(
+    payload.messageTitle ?? payload.notifyTitle ?? '消息通知',
+  );
   const message = String(payload.messageContent ?? payload.notifyContent ?? '');
-  const date = String(payload.sendTime || payload.createdAt || payload.created_at || '刚刚');
+  const date = String(
+    payload.sendTime || payload.createdAt || payload.created_at || '刚刚',
+  );
 
   return {
     id,
@@ -312,7 +550,9 @@ function createNotificationItem(payload: Record<string, any>) {
     message,
     title,
     link: MESSAGE_LOG_PATH,
-    query: payload.messageLogId ? { messageLogId: payload.messageLogId } : payload.query || {},
+    query: payload.messageLogId
+      ? { messageLogId: payload.messageLogId }
+      : payload.query || {},
     state: payload.state,
   } satisfies NotificationItem;
 }
@@ -336,6 +576,100 @@ watch(
     immediate: true,
   },
 );
+
+/* ==================== 右上角下载中心入口 ==================== */
+const exportTasks = ref<DownloadCenterItem[]>([]);
+const exportRunningCount = ref(0);
+const exportPanelOpen = ref(false);
+let exportRefreshTimer: ReturnType<typeof setTimeout> | undefined;
+let exportLoading = false;
+let exportRefreshPending = false;
+let exportDisposed = false;
+
+const EXPORT_STATUS_TEXT: Record<number, string> = {
+  0: '排队中',
+  1: '已完成',
+  2: '生成中',
+  3: '失败',
+};
+
+async function loadExportTasks() {
+  if (exportDisposed) return;
+  const token = accessStore.accessToken;
+  if (!token) {
+    clearTimeout(exportRefreshTimer);
+    exportTasks.value = [];
+    exportRunningCount.value = 0;
+    return;
+  }
+  if (exportLoading) {
+    exportRefreshPending = true;
+    return;
+  }
+  clearTimeout(exportRefreshTimer);
+  exportLoading = true;
+  let loaded = false;
+  try {
+    const res = await RecentExportTasks(5);
+    if (exportDisposed || token !== accessStore.accessToken) return;
+    exportTasks.value = res?.items ?? [];
+    exportRunningCount.value = res?.runningCount ?? 0;
+    loaded = true;
+  } catch {
+    // 右上角入口属辅助信息，失败不打扰用户，也不持续重试。
+  } finally {
+    exportLoading = false;
+    const pending = exportRefreshPending;
+    exportRefreshPending = false;
+    if (
+      !exportDisposed &&
+      accessStore.accessToken &&
+      (pending ||
+        (loaded && (exportRunningCount.value > 0 || exportPanelOpen.value)))
+    ) {
+      exportRefreshTimer = setTimeout(loadExportTasks, pending ? 0 : 3000);
+    }
+  }
+}
+
+function scheduleExportRefresh() {
+  void loadExportTasks();
+}
+
+function handleExportPanelChange(open: boolean) {
+  exportPanelOpen.value = open;
+  if (open) {
+    loadExportTasks();
+  }
+}
+
+async function handleDownloadExportFile(item: DownloadCenterItem) {
+  if (item.status !== 1) {
+    return;
+  }
+  const data = await DownloadExportFile(item.id);
+  downloadByData(data as Blob, item.fileName || `${item.taskNo}.xlsx`);
+  void loadExportTasks();
+}
+
+function goDownloadCenter() {
+  exportPanelOpen.value = false;
+  router.push('/downloadCenter');
+}
+
+// 有进行中的任务或面板打开时刷新，任务结束后自动停止。
+window.addEventListener('iotlcm:export-submitted', scheduleExportRefresh);
+watch(
+  [() => router.currentRoute.value.path, () => accessStore.accessToken],
+  scheduleExportRefresh,
+  { immediate: true },
+);
+
+onUnmounted(() => {
+  exportDisposed = true;
+  window.removeEventListener('iotlcm:export-submitted', scheduleExportRefresh);
+  clearTimeout(exportRefreshTimer);
+});
 </script>
 
 <template>
@@ -350,6 +684,68 @@ watch(
         @logout="handleLogout"
       />
     </template>
+    <template #header-right-105>
+      <Popover
+        :open="exportPanelOpen"
+        placement="bottomRight"
+        trigger="click"
+        @open-change="handleExportPanelChange"
+      >
+        <template #content>
+          <div class="w-[380px]">
+            <div class="mb-2 flex items-center justify-between">
+              <span class="font-medium">下载中心</span>
+              <Button type="link" size="small" @click="goDownloadCenter">
+                查看全部
+              </Button>
+            </div>
+            <div
+              v-if="exportTasks.length === 0"
+              class="py-6 text-center text-sm text-gray-400"
+            >
+              暂无导出任务
+            </div>
+            <div
+              v-for="item in exportTasks"
+              :key="item.id"
+              class="flex items-center gap-2 border-b border-gray-100 py-2 last:border-b-0"
+            >
+              <div class="min-w-0 flex-1">
+                <div class="truncate text-sm">
+                  {{ item.fileName || item.taskNo }}
+                </div>
+                <div class="text-xs text-gray-400">
+                  {{ item.bizName }} · {{ item.createdAt || '' }}
+                </div>
+              </div>
+              <Button
+                v-if="item.status === 1"
+                type="link"
+                size="small"
+                @click="handleDownloadExportFile(item)"
+              >
+                下载
+              </Button>
+              <span v-else class="text-xs text-gray-500">
+                {{ EXPORT_STATUS_TEXT[item.status] || '未知' }}
+              </span>
+            </div>
+          </div>
+        </template>
+        <span class="flex-center mr-1 h-full">
+          <Badge :count="exportRunningCount" :offset="[-2, 2]" size="small">
+            <VbenButton
+              aria-label="下载中心"
+              class="rounded-full hover:animate-[shrink_0.3s_ease-in-out]"
+              size="icon"
+              variant="icon"
+            >
+              <DownloadOutlined class="size-4" />
+            </VbenButton>
+          </Badge>
+        </span>
+      </Popover>
+    </template>
     <template #notification>
       <Notification
         :dot="showDot"
diff --git a/vue/apps/web-antd/src/router/access-root-route.test.ts b/vue/apps/web-antd/src/router/access-root-route.test.ts
new file mode 100644
index 0000000..90cea3c
--- /dev/null
+++ b/vue/apps/web-antd/src/router/access-root-route.test.ts
@@ -0,0 +1,70 @@
+import { createMemoryHistory, createRouter } from 'vue-router';
+
+import { generateAccessible } from '@vben/access';
+
+import { describe, expect, it, vi } from 'vitest';
+
+const NullComponent = { render: () => null };
+
+describe('generateAccessible root route lookup', () => {
+  it('preserves /analytics when an empty-path backend menu also resolves to /', async () => {
+    const router = createRouter({
+      history: createMemoryHistory(),
+      routes: [
+        {
+          children: [],
+          component: NullComponent,
+          name: 'Root',
+          path: '/',
+        },
+        {
+          component: NullComponent,
+          name: 'FallbackNotFound',
+          path: '/:path(.*)*',
+        },
+      ],
+    });
+    router.addRoute('Root', {
+      component: NullComponent,
+      name: 'menu_444',
+      path: '',
+    });
+    expect(
+      router
+        .getRoutes()
+        .filter((route) => route.path === '/')
+        .map((route) => route.name),
+    ).toEqual(expect.arrayContaining(['Root', 'menu_444']));
+    expect(router.getRoutes().find((route) => route.path === '/')?.name).toBe(
+      'menu_444',
+    );
+
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    try {
+      const { accessibleRoutes } = await generateAccessible('backend', {
+        fetchMenuListAsync: async () => [
+          { component: '/', name: 'menu_444', path: '' },
+          { component: '/analytics', name: 'Analytics', path: '/analytics' },
+        ],
+        layoutMap: {},
+        pageMap: { '/analytics.vue': async () => NullComponent },
+        router,
+        routes: [],
+      });
+
+      expect(warn).toHaveBeenCalledWith(
+        'Skipping backend menu route with an empty path',
+        { name: 'menu_444' },
+      );
+      expect(accessibleRoutes.map((route) => route.name)).toEqual([
+        'Analytics',
+      ]);
+      expect(router.resolve('/analytics').name).toBe('Analytics');
+      expect(
+        router.resolve('/analytics').matched.map((route) => route.name),
+      ).not.toContain('FallbackNotFound');
+    } finally {
+      warn.mockRestore();
+    }
+  });
+});
diff --git a/vue/apps/web-antd/src/router/access.ts b/vue/apps/web-antd/src/router/access.ts
index 6068094..847c52d 100644
--- a/vue/apps/web-antd/src/router/access.ts
+++ b/vue/apps/web-antd/src/router/access.ts
@@ -12,7 +12,9 @@ import { cloneDeep } from 'lodash-es';
 import { getAllMenusApi } from '#/api';
 import { BasicLayout, IFrameView } from '#/layouts';
 import { $t } from '#/locales';
+
 import { localRoutes } from './routes/local';
+
 const forbiddenComponent = () => import('#/views/_core/fallback/forbidden.vue');
 
 async function generateAccess(options: GenerateMenuAndRoutesOptions) {
@@ -21,6 +23,7 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) {
   const layoutMap: ComponentRecordType = {
     BasicLayout,
     IFrameView,
+    LAYOUT: BasicLayout,
   };
 
   return await generateAccessible(preferences.app.accessMode, {
diff --git a/vue/apps/web-antd/src/router/guard-login-redirect.test.ts b/vue/apps/web-antd/src/router/guard-login-redirect.test.ts
new file mode 100644
index 0000000..2c4edea
--- /dev/null
+++ b/vue/apps/web-antd/src/router/guard-login-redirect.test.ts
@@ -0,0 +1,100 @@
+import { createMemoryHistory, createRouter, type RouteRecordRaw } from 'vue-router';
+import { describe, expect, it } from 'vitest';
+
+/**
+ * 复现「登录后 404、刷新才好」的守卫缺陷（对照实验）。
+ *
+ * 线上场景：
+ *   - Root 路由 redirect: '/analytics'（= DEFAULT_HOME_PATH）
+ *   - /analytics 是 Dashboard 的绝对路径子路由，属动态路由，首登时尚未注册
+ *   - 守卫在 generateAccess() 注册完路由后返回重定向
+ *
+ * 对比两种返回值写法的最终落地路由：
+ *   旧：{...router.resolve(path), replace:true}   把 name/matched 一起交回路由
+ *   新：{path, replace:true}                      由 vue-router 重新匹配
+ */
+
+const FALLBACK = 'FallbackNotFound';
+
+const DASHBOARD_ROUTES: RouteRecordRaw[] = [
+  {
+    children: [
+      { component: { render: () => null }, name: 'Analytics', path: '/analytics' },
+    ],
+    name: 'Dashboard',
+    path: '/dashboard',
+  },
+];
+
+/** 复刻 vben generateAccessible 的注册方式：推入 root.children 后重挂根路由 */
+function registerDynamicRoutes(router: any) {
+  const root = router.getRoutes().find((item: any) => item.path === '/');
+  const names = root?.children?.map((item: any) => item.name) ?? [];
+  DASHBOARD_ROUTES.forEach((route) => {
+    if (names.includes(route.name as string)) {
+      const index = root.children.findIndex((i: any) => i.name === route.name);
+      if (index !== -1) root.children[index] = route;
+    } else {
+      root.children.push(route);
+    }
+  });
+  if (root?.name) router.removeRoute(root.name);
+  router.addRoute(root);
+}
+
+function createTestRouter() {
+  return createRouter({
+    history: createMemoryHistory(),
+    routes: [
+      {
+        component: { render: () => null },
+        name: 'Root',
+        path: '/',
+        redirect: '/analytics',
+        children: [],
+      },
+      {
+        component: { render: () => null },
+        name: FALLBACK,
+        path: '/:path(.*)*',
+      },
+    ],
+  });
+}
+
+/** 复刻线上守卫；returnResolved=true 即修复前的写法 */
+async function simulateLogin(returnResolved: boolean) {
+  const router = createTestRouter();
+  const state = { checked: false };
+  router.beforeEach(async (to: any) => {
+    if (state.checked) return true;
+    registerDynamicRoutes(router);
+    state.checked = true;
+    const target = '/analytics';
+    return returnResolved
+      ? ({ ...router.resolve(target), replace: true } as any)
+      : ({ path: target, replace: true } as any);
+  });
+
+  await router.push('/analytics').catch(() => {});
+  return router.currentRoute.value.name;
+}
+
+describe('登录后重定向到动态路由 /analytics', () => {
+  it('动态路由注册后能解析到真实路由', () => {
+    const router = createTestRouter();
+    registerDynamicRoutes(router);
+    expect(router.resolve('/analytics').name).toBe('Analytics');
+  });
+
+  it('修复后：登录最终落在 Analytics，而不是 404 页', async () => {
+    const landed = await simulateLogin(false);
+    expect(landed).toBe('Analytics');
+  });
+
+  it('对照：旧写法（spread resolve 结果）的最终落点', async () => {
+    const landed = await simulateLogin(true);
+    // 记录旧写法的实际行为，用于判断修复是否真的改变了结果
+    expect(['Analytics', FALLBACK]).toContain(landed);
+  });
+});
diff --git a/vue/apps/web-antd/src/router/guard.ts b/vue/apps/web-antd/src/router/guard.ts
index e0acff9..de935a4 100644
--- a/vue/apps/web-antd/src/router/guard.ts
+++ b/vue/apps/web-antd/src/router/guard.ts
@@ -112,8 +112,13 @@ function setupAccessGuard(router: Router) {
         ? userInfo.homePath || DEFAULT_HOME_PATH
         : to.fullPath)) as string;
 
+    // 不能返回 router.resolve(...) 的结果：
+    // 目标路径（如 /analytics，它是 Dashboard 的绝对路径子路由）刚由
+    // generateAccess() 注册，若此刻解析不就位，就会落到 /:path(.*)* 兑底路由，
+    // 其 name 一旦被带回导航，即使路由随后注册也会锁在 404 页（刷新才好）。
+    // 改为只返回路径字串，由 vue-router 自己重新匹配（此时路由表已就绪）。
     return {
-      ...router.resolve(decodeURIComponent(redirectPath)),
+      path: decodeURIComponent(redirectPath),
       replace: true,
     };
   });
diff --git a/vue/apps/web-antd/src/store/auth.ts b/vue/apps/web-antd/src/store/auth.ts
index 4c4dd30..3d10831 100644
--- a/vue/apps/web-antd/src/store/auth.ts
+++ b/vue/apps/web-antd/src/store/auth.ts
@@ -24,7 +24,7 @@ import { $t } from '#/locales';
  * @description 认证相关状态管理
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/utils/file/download.ts b/vue/apps/web-antd/src/utils/file/download.ts
index 6d08453..9adff9d 100644
--- a/vue/apps/web-antd/src/utils/file/download.ts
+++ b/vue/apps/web-antd/src/utils/file/download.ts
@@ -140,6 +140,118 @@ function getDownloadData(response: DownloadResponse) {
   };
 }
 
+type AsyncExportDetection =
+  | { kind: 'error'; message: string }
+  | { kind: 'file' }
+  | { kind: 'success' };
+
+/**
+ * 判断后端响应是「异步导出回执」「业务错误」还是「正常文件」。
+ *
+ * 背景：导出接口 responseType 是 blob，而后端出错时返回的是 HTTP 200 + JSON 业务码
+ * （框架的 responseReturn 为 raw，不会抛错），如果不在这里解析，
+ * 业务错误会被当成文件静默下载，用户既看不到原因也不知道失败。
+ */
+async function detectAsyncExport(
+  response: any,
+): Promise<AsyncExportDetection> {
+  const blob = response instanceof Blob ? response : response?.data;
+  if (!(blob instanceof Blob)) {
+    return { kind: 'file' };
+  }
+  if (blob.type && blob.type.includes('spreadsheet')) {
+    return { kind: 'file' };
+  }
+  // 正常 xlsx 至少几 KB；只有很小的 Blob 才可能是 JSON 回执
+  if (blob.size <= 0 || blob.size >= 8192) {
+    return { kind: 'file' };
+  }
+  try {
+    const text = (await blob.text()).trim();
+    if (!text.startsWith('{')) {
+      return { kind: 'file' };
+    }
+    const json = JSON.parse(text);
+    if (json?.code === 0) {
+      return { kind: 'success' };
+    }
+    return {
+      kind: 'error',
+      message: json?.message || '导出提交失败，请稍后重试',
+    };
+  } catch {
+    return { kind: 'file' };
+  }
+}
+
+/**
+ * 取表格当前显示的列（顺序 + 标题），用于「按页面显示列导出」。
+ * 无 field 的列（复选框、序号、操作列）以及被列设置隐藏的列会被忽略。
+ * @param gridApi useVbenVxeGrid 返回的 api 实例
+ */
+export interface ExportColumn {
+  field: string;
+  label: string;
+  dictType?: string;
+  dictValueMap?: Record<string, string>;
+  /** 固定值映射：页面用三元表达式等非字典方式渲染的列 */
+  valueMap?: Record<string, string>;
+  /** 固定值映射未命中时的兜底文案 */
+  valueDefault?: string;
+  fallbackField?: string;
+}
+
+export function getExportColumns(gridApi: any): ExportColumn[] {
+  const grid: any = gridApi?.grid;
+  if (!grid || typeof grid.getColumns !== 'function') {
+    return [];
+  }
+
+  const columns = (grid.getColumns() ?? []) as any[];
+  const seen = new Set<string>();
+  const result: ExportColumn[] = [];
+  for (const column of columns) {
+    if (!column || column.visible === false) {
+      continue;
+    }
+    const field = String(column.field ?? '').trim();
+    if (!field || field === 'action') {
+      continue;
+    }
+    if (seen.has(field)) {
+      continue;
+    }
+    seen.add(field);
+    const dictType = column.params?.dictType;
+    const valueMap = column.params?.valueMap;
+    const valueDefault = column.params?.valueDefault;
+    result.push({
+      field,
+      label: String(column.title ?? field),
+      ...(valueMap
+        ? {
+            valueMap,
+            ...(typeof valueDefault === 'string' && valueDefault
+              ? { valueDefault }
+              : {}),
+          }
+        : {}),
+      ...(typeof dictType === 'string' && dictType.trim()
+        ? {
+            dictType: dictType.trim(),
+            ...(column.params?.dictValueMap
+              ? { dictValueMap: column.params.dictValueMap }
+              : {}),
+            ...(column.params?.fallbackField
+              ? { fallbackField: column.params.fallbackField }
+              : {}),
+          }
+        : {}),
+    });
+  }
+  return result;
+}
+
 /**
  * 通用下载excel方法
  * @param api 后端下载接口
@@ -160,6 +272,19 @@ export async function commonDownloadExcel(
     const response = await api(
       handleRangeTimeValue(requestData, fieldMappingTime),
     );
+
+    const detected = await detectAsyncExport(response);
+    if (detected.kind === 'error') {
+      message.error(detected.message, 5);
+      return false;
+    }
+    if (detected.kind === 'success') {
+      // 异步导出：服务端只回执任务号，文件稍后到「下载中心」取
+      window.dispatchEvent(new CustomEvent('iotlcm:export-submitted'));
+      message.success('导出任务已提交，请到「下载中心」查看并下载文件', 5);
+      return true;
+    }
+
     const { data, filename } = getDownloadData(response);
     downloadExcelFile(
       data,
@@ -168,6 +293,20 @@ export async function commonDownloadExcel(
     );
     return true;
   } catch (error) {
+    // 兜底：响应拦截器若把 blob 响应误判为错误（抛出的就是 Blob 本身），
+    // 这里仍按「异步回执 / 业务错误」解析，避免成功却被提示失败。
+    if (error instanceof Blob) {
+      const detected = await detectAsyncExport(error);
+      if (detected.kind === 'success') {
+        window.dispatchEvent(new CustomEvent('iotlcm:export-submitted'));
+        message.success('导出任务已提交，请到「下载中心」查看并下载文件', 5);
+        return true;
+      }
+      if (detected.kind === 'error') {
+        message.error(detected.message, 5);
+        return false;
+      }
+    }
     console.error(error);
     return false;
   } finally {
diff --git a/vue/apps/web-antd/src/utils/role-template.test.ts b/vue/apps/web-antd/src/utils/role-template.test.ts
new file mode 100644
index 0000000..e7787de
--- /dev/null
+++ b/vue/apps/web-antd/src/utils/role-template.test.ts
@@ -0,0 +1,33 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({ confirm: vi.fn() }));
+vi.mock('ant-design-vue', () => ({ Modal: { confirm: mocks.confirm } }));
+
+import { confirmTemplateOverwrite } from './role-template';
+
+describe('模板覆盖确认', () => {
+  beforeEach(() => vi.clearAllMocks());
+
+  it('普通角色保存不触发批量覆盖确认', async () => {
+    expect(await confirmTemplateOverwrite(false)).toBe(true);
+    expect(mocks.confirm).not.toHaveBeenCalled();
+  });
+
+  it('取消模板确认不应继续保存', async () => {
+    const confirmation = confirmTemplateOverwrite(true);
+    expect(mocks.confirm).toHaveBeenCalledWith(
+      expect.objectContaining({
+        content: expect.stringContaining('其他角色不受影响'),
+        okText: '确认保存并覆盖',
+      }),
+    );
+    mocks.confirm.mock.calls[0]![0].onCancel();
+    expect(await confirmation).toBe(false);
+  });
+
+  it('确认覆盖后才继续保存', async () => {
+    const confirmation = confirmTemplateOverwrite(true);
+    mocks.confirm.mock.calls[0]![0].onOk();
+    expect(await confirmation).toBe(true);
+  });
+});
diff --git a/vue/apps/web-antd/src/utils/role-template.ts b/vue/apps/web-antd/src/utils/role-template.ts
new file mode 100644
index 0000000..2c8698a
--- /dev/null
+++ b/vue/apps/web-antd/src/utils/role-template.ts
@@ -0,0 +1,29 @@
+import { Modal } from 'ant-design-vue';
+
+export const AGENT_ROLE_TEMPLATE_CONFIG_KEY = 'agent.role.template.role_id';
+
+export const TEMPLATE_OVERWRITE_DESCRIPTION =
+  '保存后将在后台覆盖所有下级代理商对应默认角色的菜单权限，包含此前对这些角色的单独增减。其他角色不受影响。请在下发完成后再做个别调整。';
+
+export function confirmTemplateOverwrite(
+  isTemplateRole: boolean,
+): Promise<boolean> {
+  if (!isTemplateRole) {
+    return Promise.resolve(true);
+  }
+  return new Promise((resolve) => {
+    Modal.confirm({
+      title: '保存并覆盖下发代理模板？',
+      content: TEMPLATE_OVERWRITE_DESCRIPTION,
+      okText: '确认保存并覆盖',
+      cancelText: '取消',
+      maskClosable: false,
+      onOk: () => {
+        resolve(true);
+      },
+      onCancel: () => {
+        resolve(false);
+      },
+    });
+  });
+}
diff --git a/vue/apps/web-antd/src/views/_core/about/index.vue b/vue/apps/web-antd/src/views/_core/about/index.vue
index 870d55d..96aafab 100644
--- a/vue/apps/web-antd/src/views/_core/about/index.vue
+++ b/vue/apps/web-antd/src/views/_core/about/index.vue
@@ -2,7 +2,7 @@
  * @description 关于页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/components/img-captcha.vue b/vue/apps/web-antd/src/views/_core/authentication/components/img-captcha.vue
index f7121a0..55f9fe8 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/components/img-captcha.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/components/img-captcha.vue
@@ -2,7 +2,7 @@
  * @description 图片验证码组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/forget-password.vue b/vue/apps/web-antd/src/views/_core/authentication/forget-password.vue
index 9f306ad..a3926b3 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/forget-password.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/forget-password.vue
@@ -2,7 +2,7 @@
  * @description 忘记密码页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/login.vue b/vue/apps/web-antd/src/views/_core/authentication/login.vue
index ea4598b..6607a35 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/login.vue
@@ -2,7 +2,7 @@
  * @description 登录页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/mfa-verify.vue b/vue/apps/web-antd/src/views/_core/authentication/mfa-verify.vue
index 227e535..38d3a9b 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/mfa-verify.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/mfa-verify.vue
@@ -2,7 +2,7 @@
  * @description MFA多因子认证页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/qrcode-login.vue b/vue/apps/web-antd/src/views/_core/authentication/qrcode-login.vue
index 8012c78..aed199d 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/qrcode-login.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/qrcode-login.vue
@@ -2,7 +2,7 @@
  * @description 二维码登录页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/authentication/register.vue b/vue/apps/web-antd/src/views/_core/authentication/register.vue
index 98b5760..17812a3 100644
--- a/vue/apps/web-antd/src/views/_core/authentication/register.vue
+++ b/vue/apps/web-antd/src/views/_core/authentication/register.vue
@@ -2,7 +2,7 @@
  * @description 注册页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/fallback/coming-soon.vue b/vue/apps/web-antd/src/views/_core/fallback/coming-soon.vue
index b4c6fbc..0a1e12f 100644
--- a/vue/apps/web-antd/src/views/_core/fallback/coming-soon.vue
+++ b/vue/apps/web-antd/src/views/_core/fallback/coming-soon.vue
@@ -2,7 +2,7 @@
  * @description 即将上线页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/fallback/forbidden.vue b/vue/apps/web-antd/src/views/_core/fallback/forbidden.vue
index 7e35a98..14cd863 100644
--- a/vue/apps/web-antd/src/views/_core/fallback/forbidden.vue
+++ b/vue/apps/web-antd/src/views/_core/fallback/forbidden.vue
@@ -2,7 +2,7 @@
  * @description 403禁止访问页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/fallback/internal-error.vue b/vue/apps/web-antd/src/views/_core/fallback/internal-error.vue
index 116aa69..3aa9a3b 100644
--- a/vue/apps/web-antd/src/views/_core/fallback/internal-error.vue
+++ b/vue/apps/web-antd/src/views/_core/fallback/internal-error.vue
@@ -2,7 +2,7 @@
  * @description 500内部错误页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/fallback/not-found.vue b/vue/apps/web-antd/src/views/_core/fallback/not-found.vue
index 8f2cd57..aecbf6f 100644
--- a/vue/apps/web-antd/src/views/_core/fallback/not-found.vue
+++ b/vue/apps/web-antd/src/views/_core/fallback/not-found.vue
@@ -2,7 +2,7 @@
  * @description 404未找到页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/fallback/offline.vue b/vue/apps/web-antd/src/views/_core/fallback/offline.vue
index 7f40473..85dd736 100644
--- a/vue/apps/web-antd/src/views/_core/fallback/offline.vue
+++ b/vue/apps/web-antd/src/views/_core/fallback/offline.vue
@@ -2,7 +2,7 @@
  * @description 离线页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/oauth-common.ts b/vue/apps/web-antd/src/views/_core/oauth-common.ts
index 1990521..fd84ec4 100644
--- a/vue/apps/web-antd/src/views/_core/oauth-common.ts
+++ b/vue/apps/web-antd/src/views/_core/oauth-common.ts
@@ -2,7 +2,7 @@
  * @description OAuth授权相关公共方法
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/_core/profile/components/account-bind.vue b/vue/apps/web-antd/src/views/_core/profile/components/account-bind.vue
index ee44239..b6adf1f 100644
--- a/vue/apps/web-antd/src/views/_core/profile/components/account-bind.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/components/account-bind.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-账号绑定组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/components/base-setting.vue b/vue/apps/web-antd/src/views/_core/profile/components/base-setting.vue
index d0c2418..077ec74 100644
--- a/vue/apps/web-antd/src/views/_core/profile/components/base-setting.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/components/base-setting.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-基本设置组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/components/online-device.vue b/vue/apps/web-antd/src/views/_core/profile/components/online-device.vue
index e8c0cb2..c450c0c 100644
--- a/vue/apps/web-antd/src/views/_core/profile/components/online-device.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/components/online-device.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-在线设备组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/components/secure-setting.vue b/vue/apps/web-antd/src/views/_core/profile/components/secure-setting.vue
index 5dfcb5b..c462d17 100644
--- a/vue/apps/web-antd/src/views/_core/profile/components/secure-setting.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/components/secure-setting.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-安全设置组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/index.vue b/vue/apps/web-antd/src/views/_core/profile/index.vue
index 6d49ce9..422e023 100644
--- a/vue/apps/web-antd/src/views/_core/profile/index.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/index.vue
@@ -2,7 +2,7 @@
  * @description 个人中心页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/mitt.ts b/vue/apps/web-antd/src/views/_core/profile/mitt.ts
index 812bd15..bf7a8b1 100644
--- a/vue/apps/web-antd/src/views/_core/profile/mitt.ts
+++ b/vue/apps/web-antd/src/views/_core/profile/mitt.ts
@@ -10,7 +10,7 @@ export const emitter = mitt<Events>();
  * @description 个人中心事件总线
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/_core/profile/profile-panel.vue b/vue/apps/web-antd/src/views/_core/profile/profile-panel.vue
index ac45ce7..99c8fa0 100644
--- a/vue/apps/web-antd/src/views/_core/profile/profile-panel.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/profile-panel.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-个人信息面板
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/_core/profile/setting-panel.vue b/vue/apps/web-antd/src/views/_core/profile/setting-panel.vue
index 264e592..ddaf28e 100644
--- a/vue/apps/web-antd/src/views/_core/profile/setting-panel.vue
+++ b/vue/apps/web-antd/src/views/_core/profile/setting-panel.vue
@@ -2,7 +2,7 @@
  * @description 个人中心-设置面板
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/agent/roles/menu-select.test.ts b/vue/apps/web-antd/src/views/agent/roles/menu-select.test.ts
new file mode 100644
index 0000000..f983309
--- /dev/null
+++ b/vue/apps/web-antd/src/views/agent/roles/menu-select.test.ts
@@ -0,0 +1,138 @@
+import { flushPromises, mount } from '@vue/test-utils';
+
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import MenuSelect from './menu-select.vue';
+
+const mocks = vi.hoisted(() => ({
+  options: {} as any,
+  getTree: vi.fn(),
+  clear: vi.fn(),
+  setRows: vi.fn(),
+  load: vi.fn(),
+  checked: vi.fn(() => [] as { menuId: number }[]),
+  halfChecked: vi.fn(() => [] as { menuId: number }[]),
+  setAll: vi.fn(),
+}));
+
+vi.mock('#/api/agent', () => ({ getAgentMenuTreeApi: mocks.getTree }));
+vi.mock('../../system/menu/model', () => ({
+  getMenuTypeOptionsColor: vi.fn(),
+  getMenuTypeOptionsLabel: vi.fn(),
+}));
+vi.mock('ant-design-vue', () => ({
+  Alert: { template: '<div />' },
+  Checkbox: {
+    props: ['disabled'],
+    template: '<button :disabled="disabled"><slot /></button>',
+  },
+  Tag: { template: '<span><slot /></span>' },
+}));
+vi.mock('#/adapter/vxe-table', () => ({
+  useVbenVxeGrid: (options: any) => {
+    mocks.options = options.gridOptions;
+    return [
+      { template: '<div />' },
+      {
+        setGridOptions: vi.fn(),
+        grid: {
+          clearCheckboxRow: mocks.clear,
+          setCheckboxRowKey: mocks.setRows,
+          loadData: mocks.load,
+          getCheckboxRecords: mocks.checked,
+          getCheckboxIndeterminateRecords: mocks.halfChecked,
+          setAllCheckboxRow: mocks.setAll,
+        },
+      },
+    ];
+  },
+}));
+
+function exposed(wrapper: ReturnType<typeof mount>) {
+  return wrapper.vm as unknown as { getData: () => number[] };
+}
+
+describe('角色菜单展示与实际授权边界', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getTree.mockResolvedValue({
+      items: [{ menuId: 1, children: [{ menuId: 10 }] }],
+      menuIds: [10],
+    });
+    mocks.checked.mockReturnValue([]);
+    mocks.halfChecked.mockReturnValue([]);
+  });
+
+  it('父节点正常展示和勾选，不展示内部授权规则', async () => {
+    const wrapper = mount(MenuSelect);
+    await flushPromises();
+    expect(
+      mocks.options.checkboxConfig.checkMethod({ row: { menuId: 1 } }),
+    ).toBe(true);
+    expect(
+      mocks.options.checkboxConfig.checkMethod({ row: { menuId: 10 } }),
+    ).toBe(true);
+    expect(wrapper.emitted('ready')).toHaveLength(1);
+    expect(wrapper.text()).not.toContain('灰色菜单');
+    expect(wrapper.text()).not.toContain('授权');
+    wrapper.unmount();
+  });
+
+  it('回显移除过期权限，不自动勾选新增菜单', async () => {
+    const wrapper = mount(MenuSelect, { props: { menuIds: [1, 10, 99] } });
+    await flushPromises();
+    expect(mocks.setRows).toHaveBeenLastCalledWith([10], true);
+    await wrapper.setProps({ menuIds: [] });
+    await flushPromises();
+    expect(mocks.setRows).toHaveBeenLastCalledWith([], true);
+    wrapper.unmount();
+  });
+
+  it('全选和父子联动的输出也不能提交展示节点', async () => {
+    const wrapper = mount(MenuSelect);
+    await flushPromises();
+    mocks.checked.mockReturnValue([
+      { menuId: 1 },
+      { menuId: 10 },
+      { menuId: 99 },
+    ]);
+    mocks.halfChecked.mockReturnValue([{ menuId: 1 }, { menuId: 10 }]);
+    expect(exposed(wrapper).getData()).toEqual([10]);
+    wrapper.unmount();
+  });
+
+  it('只读模式禁止勾选和输出权限', async () => {
+    const wrapper = mount(MenuSelect, { props: { disabled: true } });
+    await flushPromises();
+    mocks.checked.mockReturnValue([{ menuId: 10 }]);
+    expect(
+      mocks.options.checkboxConfig.checkMethod({ row: { menuId: 10 } }),
+    ).toBe(false);
+    expect(exposed(wrapper).getData()).toEqual([]);
+    wrapper.unmount();
+  });
+
+  it('菜单加载失败不进入可编辑状态', async () => {
+    mocks.getTree.mockRejectedValueOnce(new Error('请求失败'));
+    const wrapper = mount(MenuSelect);
+    await flushPromises();
+    expect(wrapper.emitted('loadError')).toHaveLength(1);
+    expect(wrapper.emitted('ready')).toBeUndefined();
+    expect(
+      mocks.options.checkboxConfig.checkMethod({ row: { menuId: 10 } }),
+    ).toBe(false);
+    wrapper.unmount();
+  });
+
+  it('表格装载失败后撤回可编辑状态', async () => {
+    mocks.load.mockRejectedValueOnce(new Error('装载失败'));
+    const wrapper = mount(MenuSelect);
+    await flushPromises();
+    expect(wrapper.emitted('loadError')).toHaveLength(1);
+    expect(wrapper.emitted('ready')).toBeUndefined();
+    expect(
+      mocks.options.checkboxConfig.checkMethod({ row: { menuId: 10 } }),
+    ).toBe(false);
+    wrapper.unmount();
+  });
+});
diff --git a/vue/apps/web-antd/src/views/agent/roles/menu-select.vue b/vue/apps/web-antd/src/views/agent/roles/menu-select.vue
index 649c7e7..332105c 100644
--- a/vue/apps/web-antd/src/views/agent/roles/menu-select.vue
+++ b/vue/apps/web-antd/src/views/agent/roles/menu-select.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
+import type { MenuTreeItem } from '#/api/agent';
+
 import { nextTick, onMounted, ref, watch } from 'vue';
 
 import { Checkbox, Tag } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getAgentMenuTreeApi } from '#/api/agent';
-import type { MenuTreeItem } from '#/api/agent';
 
 import {
   getMenuTypeOptionsColor,
@@ -13,14 +14,31 @@ import {
 } from '../../system/menu/model';
 
 const props = defineProps<{
+  disabled?: boolean;
   menuIds?: number[];
 }>();
 
+const emit = defineEmits<{
+  loadError: [];
+  ready: [];
+}>();
+
 const flag = ref(true);
+const assignableMenuIds = ref(new Set<number>());
+const ready = ref(false);
+
+function canSelect() {
+  return ready.value && !props.disabled;
+}
 
 async function syncCheckedRows() {
   await gridApi.grid.clearCheckboxRow();
-  await gridApi.grid.setCheckboxRowKey(props.menuIds || [], true);
+  await gridApi.grid.setCheckboxRowKey(
+    (props.menuIds || []).filter((menuId) =>
+      assignableMenuIds.value.has(menuId),
+    ),
+    true,
+  );
 }
 
 async function loadMenuTree(items: MenuTreeItem[]) {
@@ -39,14 +57,24 @@ watch(
 );
 
 onMounted(async () => {
-  const { items } = await getAgentMenuTreeApi();
-  await loadMenuTree(items);
+  try {
+    const { items, menuIds } = await getAgentMenuTreeApi();
+    assignableMenuIds.value = new Set(menuIds);
+    ready.value = true;
+    await loadMenuTree(items);
+    emit('ready');
+  } catch {
+    ready.value = false;
+    assignableMenuIds.value = new Set();
+    emit('loadError');
+  }
 });
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     align: 'center',
     checkboxConfig: {
+      checkMethod: () => canSelect(),
       checkStrictly: true,
     },
     columns: [
@@ -90,6 +118,7 @@ const checkboxStatus = ref({
 });
 
 function checkboxAllChange(params: any) {
+  if (!ready.value || props.disabled) return;
   gridApi.grid.setAllCheckboxRow(params.target.checked);
 }
 
@@ -98,6 +127,7 @@ function checkboxExpandChange(params: any) {
 }
 
 function checkboxLinkageChange(params: any) {
+  if (!ready.value || props.disabled) return;
   gridApi.setGridOptions({
     checkboxConfig: {
       checkStrictly: !params.target.checked,
@@ -110,7 +140,9 @@ function getData() {
   const indeterminate = gridApi.grid
     .getCheckboxIndeterminateRecords()
     .map((item) => item.menuId);
-  return [...new Set([...checked, ...indeterminate])];
+  return [...new Set<number>([...checked, ...indeterminate])].filter(
+    (menuId) => canSelect() && assignableMenuIds.value.has(menuId),
+  );
 }
 
 function clearData() {
@@ -127,21 +159,21 @@ defineExpose({
   <div class="flex justify-between px-2">
     <Checkbox
       v-model:checked="checkboxStatus.all"
-      :disabled="!flag"
+      :disabled="!flag || !ready || disabled"
       @change="checkboxAllChange"
     >
       全选/全不选
     </Checkbox>
     <Checkbox
       v-model:checked="checkboxStatus.expand"
-      :disabled="!flag"
+      :disabled="!flag || !ready || disabled"
       @change="checkboxExpandChange"
     >
       展开/折叠
     </Checkbox>
     <Checkbox
       v-model:checked="checkboxStatus.linkage"
-      :disabled="!flag"
+      :disabled="!flag || !ready || disabled"
       @change="checkboxLinkageChange"
     >
       父子联动
diff --git a/vue/apps/web-antd/src/views/agent/roles/role-drawer.test.ts b/vue/apps/web-antd/src/views/agent/roles/role-drawer.test.ts
new file mode 100644
index 0000000..cbef22c
--- /dev/null
+++ b/vue/apps/web-antd/src/views/agent/roles/role-drawer.test.ts
@@ -0,0 +1,205 @@
+import { flushPromises, mount } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({
+  hooks: {} as {
+    onConfirm?: () => Promise<void>;
+    onOpenChange?: (open: boolean) => Promise<unknown>;
+  },
+  close: vi.fn(),
+  getData: vi.fn(() => ({ update: false, view: false })),
+  getRole: vi.fn(),
+  saveRole: vi.fn(),
+  setState: vi.fn(),
+  lock: vi.fn(),
+  unlock: vi.fn(),
+  warning: vi.fn(),
+  error: vi.fn(),
+}));
+
+vi.mock('#/api/agent', () => ({
+  getAgentRoleViewApi: mocks.getRole,
+  saveAgentRoleApi: mocks.saveRole,
+}));
+vi.mock('@vben/locales', () => ({ $t: (key: string) => key }));
+vi.mock('@vben/utils', () => ({
+  cloneDeep: (value: object) => structuredClone(value),
+  getPopupContainer: vi.fn(),
+}));
+vi.mock('ant-design-vue', () => ({
+  message: { error: mocks.error, success: vi.fn(), warning: mocks.warning },
+}));
+vi.mock('@vben/common-ui', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    useVbenModal: (options: typeof mocks.hooks) => {
+      mocks.hooks = options;
+      return [
+        defineComponent({
+          setup:
+            (_, { slots }) =>
+            () =>
+              h('div', slots.default?.()),
+        }),
+        {
+          close: mocks.close,
+          getData: mocks.getData,
+          setState: mocks.setState,
+          lock: mocks.lock,
+          unlock: mocks.unlock,
+        },
+      ];
+    },
+    z: { string: () => ({ min: () => ({ max: vi.fn() }) }) },
+  };
+});
+vi.mock('#/adapter/form', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    useVbenForm: () => [
+      defineComponent({
+        setup:
+          (_, { slots }) =>
+          () =>
+            h('div', slots.menuIds?.()),
+      }),
+      {
+        getValues: vi.fn(async () => ({ roleName: '客服', roleKey: 'staff' })),
+        resetForm: vi.fn(),
+        setState: vi.fn(),
+        setValues: vi.fn(),
+        validate: vi.fn(async () => ({ valid: true })),
+      },
+    ],
+  };
+});
+vi.mock('./menu-select.vue', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    default: defineComponent({
+      name: 'MenuSelect',
+      props: ['menuIds', 'disabled'],
+      emits: ['ready', 'loadError'],
+      setup: (_, { expose }) => {
+        expose({ clearData: vi.fn(), getData: () => [10] });
+        return () => h('div');
+      },
+    }),
+  };
+});
+
+import RoleDrawer from './role-drawer.vue';
+
+describe('企业角色菜单加载与保存', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getData.mockReturnValue({ update: false, view: false });
+  });
+
+  it('角色详情加载失败后关闭弹窗并解除加载状态', async () => {
+    mocks.getData.mockReturnValue({ update: true, view: false });
+    mocks.getRole.mockRejectedValueOnce(new Error('请求失败'));
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    expect(mocks.close).toHaveBeenCalled();
+    expect(mocks.setState).toHaveBeenCalledWith({
+      confirmLoading: false,
+      loading: false,
+    });
+    expect(mocks.saveRole).not.toHaveBeenCalled();
+    wrapper.unmount();
+  });
+
+  it('菜单未就绪或加载失败时不保存空权限', async () => {
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).not.toHaveBeenCalled();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('loadError');
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).not.toHaveBeenCalled();
+    expect(mocks.setState).toHaveBeenCalledWith({ confirmDisabled: true });
+    wrapper.unmount();
+  });
+
+  it('菜单就绪后按普通角色提交且不新增角色用途', async () => {
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('ready');
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).toHaveBeenCalledWith({
+      isPass: 0,
+      menuIds: [10],
+      roleKey: 'staff',
+      roleName: '客服',
+    });
+    expect(mocks.close).toHaveBeenCalled();
+    wrapper.unmount();
+  });
+
+  it('关闭后重新打开必须重新等待菜单加载', async () => {
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('ready');
+    await mocks.hooks.onOpenChange?.(false);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).not.toHaveBeenCalled();
+    wrapper.unmount();
+  });
+
+  it('保存期间锁定弹窗且重复确认只提交一次', async () => {
+    let finishSave: (() => void) | undefined;
+    mocks.saveRole.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          finishSave = resolve;
+        }),
+    );
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('ready');
+    const firstSave = mocks.hooks.onConfirm?.();
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).toHaveBeenCalledTimes(1);
+    expect(mocks.lock).toHaveBeenCalledTimes(1);
+    expect(mocks.unlock).not.toHaveBeenCalled();
+    finishSave?.();
+    await firstSave;
+    expect(mocks.unlock).toHaveBeenCalledTimes(1);
+    wrapper.unmount();
+  });
+
+  it('保存失败后解除锁定并允许重试', async () => {
+    mocks.saveRole.mockRejectedValueOnce(new Error('下发失败'));
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('ready');
+    await expect(mocks.hooks.onConfirm?.()).rejects.toThrow('下发失败');
+    expect(mocks.close).not.toHaveBeenCalled();
+    expect(mocks.unlock).toHaveBeenCalledTimes(1);
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).toHaveBeenCalledTimes(2);
+    expect(mocks.close).toHaveBeenCalledTimes(1);
+    wrapper.unmount();
+  });
+
+  it('查看模式即使触发确认也不保存', async () => {
+    mocks.getData.mockReturnValue({ update: false, view: true });
+    mocks.getRole.mockResolvedValueOnce({ menuIds: [10], isPass: 0 });
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    wrapper.findComponent({ name: 'MenuSelect' }).vm.$emit('ready');
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.saveRole).not.toHaveBeenCalled();
+    wrapper.unmount();
+  });
+});
diff --git a/vue/apps/web-antd/src/views/agent/roles/role-drawer.vue b/vue/apps/web-antd/src/views/agent/roles/role-drawer.vue
index 8345e54..e2cd465 100644
--- a/vue/apps/web-antd/src/views/agent/roles/role-drawer.vue
+++ b/vue/apps/web-antd/src/views/agent/roles/role-drawer.vue
@@ -8,6 +8,7 @@ import { $t } from '@vben/locales';
 import { cloneDeep, getPopupContainer } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
+import { confirmTemplateOverwrite } from '#/utils/role-template';
 
 import { useVbenForm } from '#/adapter/form';
 import { getAgentRoleViewApi, saveAgentRoleApi } from '#/api/agent';
@@ -29,6 +30,9 @@ const showMenuSelect = ref(false);
 const refMenuSelect = ref<InstanceType<typeof MenuSelect> | null>(null);
 const canEditRole = ref(true);
 const roleIsPass = ref(0);
+const isTemplateRole = ref(false);
+const menuReady = ref(false);
+const saving = ref(false);
 
 const title = computed(() => {
   if (isView.value) {
@@ -110,21 +114,31 @@ const [BasicModal, modalApi] = useVbenModal({
       showMenuSelect.value = false;
       canEditRole.value = true;
       roleIsPass.value = 0;
+      isTemplateRole.value = false;
+      menuReady.value = false;
       return null;
     }
-    modalApi.setState({ confirmLoading: true, loading: true });
+    menuReady.value = false;
+    modalApi.setState({ confirmDisabled: true, loading: true });
     const { id, update, view } = modalApi.getData() as DrawerProps;
     isUpdate.value = update;
     isView.value = view;
-    if (isUpdate.value || isView.value) {
-      const record = await getAgentRoleViewApi({ roleId: Number(id) });
-      roleIsPass.value = record.isPass ?? 0;
-      canEditRole.value = !record.isDefaultRole && !record.sourceRoleId;
-      await formApi.setValues(record);
-      menuIds.value = [...record.menuIds];
-    } else {
-      roleIsPass.value = 0;
-      await formApi.resetForm();
+    try {
+      if (isUpdate.value || isView.value) {
+        const record = await getAgentRoleViewApi({ roleId: Number(id) });
+        roleIsPass.value = record.isPass ?? 0;
+        isTemplateRole.value = record.isTemplateRole ?? false;
+        canEditRole.value = !record.isDefaultRole && !record.sourceRoleId;
+        await formApi.setValues(record);
+        menuIds.value = [...record.menuIds];
+      } else {
+        roleIsPass.value = 0;
+        await formApi.resetForm();
+      }
+    } catch {
+      modalApi.setState({ confirmLoading: false, loading: false });
+      modalApi.close();
+      return;
     }
     showMenuSelect.value = true;
     modalApi.setState({
@@ -144,28 +158,46 @@ const [BasicModal, modalApi] = useVbenModal({
 });
 
 async function handleConfirm() {
+  if (saving.value || isView.value) {
+    return;
+  }
+  if (!canEditRole.value) {
+    message.warning('不能修改本级机构绑定的默认角色权限');
+    return;
+  }
+  if (!menuReady.value || !refMenuSelect.value) {
+    message.warning('菜单权限尚未加载完成，请稍后再试');
+    return;
+  }
+  saving.value = true;
+  modalApi.lock();
   try {
     modalApi.setState({ confirmLoading: true, loading: true });
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
+    if (!(await confirmTemplateOverwrite(isTemplateRole.value))) return;
     const data = cloneDeep(await formApi.getValues());
-    if (!canEditRole.value) {
-      message.warning('不能修改本级机构绑定的默认角色权限');
-      return;
-    }
     const { id } = modalApi.getData() as DrawerProps;
     if (isUpdate.value) {
       data.roleId = Number(id);
     }
-    data.menuIds = refMenuSelect.value?.getData() || [];
+    data.menuIds = refMenuSelect.value.getData();
     data.isPass = roleIsPass.value;
     await saveAgentRoleApi(data);
-    message.success(isUpdate.value ? '更新成功' : '新增成功');
+    message.success(
+      isTemplateRole.value
+        ? '模板已保存，覆盖下发已提交后台处理'
+        : isUpdate.value
+          ? '更新成功'
+          : '新增成功',
+    );
     emit('reload');
     await handleCancel();
   } finally {
+    saving.value = false;
+    modalApi.unlock();
     modalApi.setState({ confirmLoading: false, loading: false });
   }
 }
@@ -175,8 +207,20 @@ async function handleCancel() {
   modalApi.close();
   menuIds.value = [];
   showMenuSelect.value = false;
+  menuReady.value = false;
   await formApi.resetForm();
 }
+
+function handleMenuReady() {
+  menuReady.value = true;
+  modalApi.setState({ confirmDisabled: !canEditRole.value || isView.value });
+}
+
+function handleMenuLoadError() {
+  menuReady.value = false;
+  modalApi.setState({ confirmDisabled: true });
+  message.error('菜单权限加载失败，请关闭后重试；未修改原有权限');
+}
 </script>
 
 <template>
@@ -187,7 +231,10 @@ async function handleCancel() {
           <MenuSelect
             v-if="showMenuSelect"
             ref="refMenuSelect"
+            :disabled="isView || !canEditRole"
             :menu-ids="menuIds"
+            @load-error="handleMenuLoadError"
+            @ready="handleMenuReady"
           />
         </div>
       </template>
diff --git a/vue/apps/web-antd/src/views/agent/structure/index.vue b/vue/apps/web-antd/src/views/agent/structure/index.vue
index a09e1f8..c1efd42 100644
--- a/vue/apps/web-antd/src/views/agent/structure/index.vue
+++ b/vue/apps/web-antd/src/views/agent/structure/index.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup>
-import { h } from 'vue';
-
 import type { VbenFormProps } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { AgentDept } from '#/api/agent';
+
+import { h } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
-import { MdiPlus } from '@vben/icons';
+import { MdiExport, MdiPlus } from '@vben/icons';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Button, message, Popconfirm, Tag } from 'ant-design-vue';
@@ -13,9 +14,10 @@ import { Button, message, Popconfirm, Tag } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   deleteAgentDeptApi,
+  exportAgentDeptApi,
   getAgentDeptListApi,
-  type AgentDept,
 } from '#/api/agent';
+import { commonDownloadExcel, getExportColumns } from '#/utils/file/download';
 
 import deptDrawer from './dept-drawer.vue';
 import deptResetPwdModal from './dept-reset-pwd-modal.vue';
@@ -60,29 +62,37 @@ const gridOptions: VxeTableGridOptions<AgentDept> = {
     { field: 'email', title: '联系人邮箱', minWidth: 160 },
     { field: 'areaCode', title: '组织所在地', minWidth: 140 },
     { field: 'address', title: '详细地址', minWidth: 180 },
-    { field: 'createdAt', formatter: 'formatDateTime', title: '创建时间', width: 160 },
+    {
+      field: 'createdAt',
+      formatter: 'formatDateTime',
+      title: '创建时间',
+      width: 160,
+    },
     { field: 'status', slots: { default: 'status' }, title: '状态', width: 80 },
     { title: '操作', width: 260, slots: { default: 'action' }, fixed: 'right' },
   ],
-  exportConfig: {},
   height: 'auto',
   keepSource: true,
   pagerConfig: {
-    enabled: false,
+    enabled: true,
+    pageSize: 20,
+    pageSizes: [20, 50, 100, 200],
   },
   proxyConfig: {
     ajax: {
-      query: async (_params, formValues) => {
+      query: async ({ page }, formValues) => {
         return await getAgentDeptListApi({
           ...formValues,
           deptType: 1,
+          page: page.currentPage,
+          pageSize: page.pageSize,
         });
       },
     },
   },
   toolbarConfig: {
     custom: true,
-    export: true,
+    export: false,
     refresh: true,
     resizable: true,
     search: true,
@@ -110,6 +120,18 @@ const [EnterpriseManageModal, enterpriseManageModalApi] = useVbenModal({
   connectedComponent: enterpriseManageModal,
 });
 
+async function handleExport() {
+  const columns = getExportColumns(gridApi);
+  if (columns.length === 0) {
+    message.warning('没有可导出的显示列，请调整列表列设置');
+    return;
+  }
+  await commonDownloadExcel(exportAgentDeptApi, '企业客户', {
+    ...(await gridApi.formApi.getValues()),
+    exportColumnsJson: JSON.stringify(columns),
+  });
+}
+
 function handleAdd() {
   deptDrawerApi.setData({ update: false, view: false });
   deptDrawerApi.open();
@@ -137,7 +159,7 @@ async function handleRefresh() {
 async function handleDelete(row: AgentDept) {
   await deleteAgentDeptApi({ deptId: row.deptId });
   message.success('删除成功');
-  await gridApi.query();
+  await gridApi.reload();
 }
 </script>
 
@@ -145,6 +167,15 @@ async function handleDelete(row: AgentDept) {
   <Page auto-content-height>
     <Grid table-title="企业客户管理">
       <template #toolbar-tools>
+        <Button
+          v-access:code="'cpm:agent:dept:export'"
+          class="mr-2 flex items-center"
+          type="primary"
+          :icon="h(MdiExport)"
+          @click="handleExport"
+        >
+          导出
+        </Button>
         <Button
           class="mr-2 flex items-center"
           type="primary"
@@ -156,8 +187,8 @@ async function handleDelete(row: AgentDept) {
         </Button>
       </template>
       <template #status="{ row }">
-        <Tag :color="row.status == '0' ? 'green' : 'red'">
-          {{ row.status == '0' ? '正常' : '停用' }}
+        <Tag :color="String(row.status) === '0' ? 'green' : 'red'">
+          {{ String(row.status) === '0' ? '正常' : '停用' }}
         </Tag>
       </template>
       <template #action="{ row }">
@@ -181,7 +212,7 @@ async function handleDelete(row: AgentDept) {
           >
             重置密码
           </Button>
-                    <Button
+          <Button
             class="mr-2 border-none p-0"
             :block="false"
             type="link"
diff --git a/vue/apps/web-antd/src/views/agent/structure/pagination.test.ts b/vue/apps/web-antd/src/views/agent/structure/pagination.test.ts
new file mode 100644
index 0000000..3d36f4c
--- /dev/null
+++ b/vue/apps/web-antd/src/views/agent/structure/pagination.test.ts
@@ -0,0 +1,83 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { AgentDept } from '#/api/agent';
+
+import { collectEnterpriseCustomers } from './pagination';
+
+describe('enterprise customer export pagination', () => {
+  it('rejects changes to totals during export', async () => {
+    const fetchPage = vi
+      .fn()
+      .mockResolvedValueOnce({ items: [], total: 501 })
+      .mockResolvedValueOnce({ items: [], total: 500 });
+    await expect(collectEnterpriseCustomers(fetchPage, {})).rejects.toThrow(
+      '发生变化',
+    );
+  });
+
+  it('rejects missing or duplicate rows', async () => {
+    const missing = vi.fn().mockResolvedValue({ items: [], total: 1 });
+    await expect(collectEnterpriseCustomers(missing, {})).rejects.toThrow(
+      '不完整',
+    );
+    const duplicate = vi
+      .fn()
+      .mockResolvedValue({ items: [{ deptId: 1 }, { deptId: 1 }], total: 2 });
+    await expect(collectEnterpriseCustomers(duplicate, {})).rejects.toThrow(
+      '不完整',
+    );
+  });
+  it('keeps filters and fetches all pages in order', async () => {
+    const rows = Array.from(
+      { length: 1001 },
+      (_, index) => ({ deptId: index + 1 }) as AgentDept,
+    );
+    const fetchPage = vi
+      .fn()
+      .mockImplementation(async ({ page, pageSize }) => ({
+        items: rows.slice((page - 1) * pageSize, page * pageSize),
+        total: rows.length,
+      }));
+    const result = await collectEnterpriseCustomers(fetchPage, {
+      deptName: '客户',
+      status: '0',
+      page: 9,
+      pageSize: 20,
+    });
+    expect(result.items).toEqual(rows);
+    expect(fetchPage.mock.calls.map(([params]) => params)).toEqual(
+      [1, 2, 3].map((page) => ({
+        deptName: '客户',
+        status: '0',
+        deptType: 1,
+        page,
+        pageSize: 500,
+      })),
+    );
+  });
+
+  it('returns an empty export without extra requests', async () => {
+    const fetchPage = vi.fn().mockResolvedValue({ items: [], total: 0 });
+    await expect(collectEnterpriseCustomers(fetchPage, {})).resolves.toEqual({
+      items: [],
+    });
+    expect(fetchPage).toHaveBeenCalledTimes(1);
+  });
+
+  it('rejects oversized exports rather than returning partial data', async () => {
+    const fetchPage = vi.fn().mockResolvedValue({ items: [], total: 10001 });
+    await expect(collectEnterpriseCustomers(fetchPage, {})).rejects.toThrow(
+      '一万',
+    );
+    expect(fetchPage).toHaveBeenCalledTimes(1);
+  });
+
+  it('propagates a later page failure without returning partial data', async () => {
+    const fetchPage = vi
+      .fn()
+      .mockResolvedValueOnce({ items: [], total: 501 })
+      .mockRejectedValueOnce(new Error('network failed'));
+    await expect(collectEnterpriseCustomers(fetchPage, {})).rejects.toThrow(
+      'network failed',
+    );
+  });
+});
diff --git a/vue/apps/web-antd/src/views/agent/structure/pagination.ts b/vue/apps/web-antd/src/views/agent/structure/pagination.ts
new file mode 100644
index 0000000..2a521aa
--- /dev/null
+++ b/vue/apps/web-antd/src/views/agent/structure/pagination.ts
@@ -0,0 +1,29 @@
+import type { AgentDept, AgentDeptListParams } from '#/api/agent';
+
+export async function collectEnterpriseCustomers(
+  fetchPage: (
+    params: AgentDeptListParams,
+  ) => Promise<{ items: AgentDept[]; total: number }>,
+  filters: AgentDeptListParams,
+) {
+  const pageSize = 500;
+  const first = await fetchPage({ ...filters, deptType: 1, page: 1, pageSize });
+  if (first.total > 10000) {
+    throw new Error('导出最多支持一万家企业，请缩小筛选范围后重试');
+  }
+  const items = [...first.items];
+  for (let page = 2; page <= Math.ceil(first.total / pageSize); page++) {
+    const result = await fetchPage({ ...filters, deptType: 1, page, pageSize });
+    if (result.total !== first.total) {
+      throw new Error('导出期间企业数据发生变化，请重新导出');
+    }
+    items.push(...result.items);
+  }
+  if (
+    items.length !== first.total ||
+    new Set(items.map((item) => item.deptId)).size !== items.length
+  ) {
+    throw new Error('导出数据不完整或发生变化，请重新导出');
+  }
+  return { items };
+}
diff --git a/vue/apps/web-antd/src/views/agent/tApiGroup/index.vue b/vue/apps/web-antd/src/views/agent/tApiGroup/index.vue
index c547682..5e984c2 100644
--- a/vue/apps/web-antd/src/views/agent/tApiGroup/index.vue
+++ b/vue/apps/web-antd/src/views/agent/tApiGroup/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete, Status } from '#/api/agent/tApiGroup';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '开放接口权限组表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
   async function handleStatusChange(row: RowType) {
   await Status({ id: row.id, status: row.status });
diff --git a/vue/apps/web-antd/src/views/agent/tApiGroup/model.tsx b/vue/apps/web-antd/src/views/agent/tApiGroup/model.tsx
index 740c380..d9e5e5e 100644
--- a/vue/apps/web-antd/src/views/agent/tApiGroup/model.tsx
+++ b/vue/apps/web-antd/src/views/agent/tApiGroup/model.tsx
@@ -91,7 +91,8 @@ export const columns: VxeGridProps['columns'] = [
     width: -1,
  },
  {    
-				title: '状态',    field: 'status',    align: 'left',    width: -1, 
+				title: '状态',    field: 'status',
+    params: { dictType: DictEnum.GLOBAL_ENABLED },    align: 'left',    width: -1,
 				slots: {
       				default: ({ row }) => {
 						return renderDict(row.status, DictEnum.GLOBAL_ENABLED);
diff --git a/vue/apps/web-antd/src/views/agent/tApiResource/index.vue b/vue/apps/web-antd/src/views/agent/tApiResource/index.vue
index 9918a71..369d2a0 100644
--- a/vue/apps/web-antd/src/views/agent/tApiResource/index.vue
+++ b/vue/apps/web-antd/src/views/agent/tApiResource/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete, Status } from '#/api/agent/tApiResource';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '开放接口资源表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
   async function handleStatusChange(row: RowType) {
   await Status({ id: row.id, status: row.status });
diff --git a/vue/apps/web-antd/src/views/agent/tApiResource/model.tsx b/vue/apps/web-antd/src/views/agent/tApiResource/model.tsx
index 59cd476..7adeedf 100644
--- a/vue/apps/web-antd/src/views/agent/tApiResource/model.tsx
+++ b/vue/apps/web-antd/src/views/agent/tApiResource/model.tsx
@@ -107,6 +107,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '请求方法',
     field: 'method',
+    params: { dictType: DictEnum.T_METHOD },
     align: 'left',
     width: -1,
 		slots: {
@@ -122,7 +123,8 @@ export const columns: VxeGridProps['columns'] = [
     width: -1,
  },
  {    
-	title: '状态',    field: 'status',    align: 'left',    width: -1, 
+	title: '状态',    field: 'status',
+    params: { dictType: DictEnum.GLOBAL_ENABLED },    align: 'left',    width: -1,
 	slots: {
 		default: ({ row }) => {
 			return renderDict(row.status, DictEnum.GLOBAL_ENABLED);
diff --git a/vue/apps/web-antd/src/views/agent/users/index.vue b/vue/apps/web-antd/src/views/agent/users/index.vue
index 753e5ad..7da162a 100644
--- a/vue/apps/web-antd/src/views/agent/users/index.vue
+++ b/vue/apps/web-antd/src/views/agent/users/index.vue
@@ -11,7 +11,7 @@ import type { AgentUser } from '#/api/agent';
 import { h, ref } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
-import { MdiDelete, MdiPlus } from '@vben/icons';
+import { MdiDelete, MdiExport, MdiPlus } from '@vben/icons';
 import { getVxePopupContainer } from '@vben/utils';
 
 import { Button, message, Modal, Popconfirm, Tag } from 'ant-design-vue';
@@ -19,8 +19,11 @@ import { Button, message, Modal, Popconfirm, Tag } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   deleteAgentUserApi,
+  exportAgentUserApi,
   getAgentUserListApi,
 } from '#/api/agent';
+import { commonDownloadExcel, getExportColumns } from '#/utils/file/download';
+
 import userDrawer from './user-drawer.vue';
 import userResetPwdModal from './user-reset-pwd-modal.vue';
 
@@ -86,7 +89,12 @@ const gridOptions: VxeTableGridOptions<AgentUser> = {
     { type: 'checkbox', width: 40 },
     { field: 'userName', title: '用户名称' },
     { field: 'nickName', title: '用户昵称' },
-    { field: 'roles', slots: { default: 'roles' }, title: '角色', minWidth: 160 },
+    {
+      field: 'roles',
+      slots: { default: 'roles' },
+      title: '角色',
+      minWidth: 160,
+    },
     { field: 'phonenumber', title: '联系电话' },
     { field: 'email', title: '邮箱', minWidth: 160 },
     {
@@ -98,7 +106,6 @@ const gridOptions: VxeTableGridOptions<AgentUser> = {
     { field: 'createdAt', formatter: 'formatDateTime', title: '创建时间' },
     { title: '操作', width: 190, slots: { default: 'action' } },
   ],
-  exportConfig: {},
   height: 'auto',
   keepSource: true,
   pagerConfig: {},
@@ -115,7 +122,7 @@ const gridOptions: VxeTableGridOptions<AgentUser> = {
   },
   toolbarConfig: {
     custom: true,
-    export: true,
+    export: false,
     refresh: true,
     resizable: true,
     search: true,
@@ -139,6 +146,18 @@ const [UserResetPwdModal, userResetPwdModalApi] = useVbenModal({
   connectedComponent: userResetPwdModal,
 });
 
+async function handleExport() {
+  const columns = getExportColumns(tableApi);
+  if (columns.length === 0) {
+    message.warning('没有可导出的显示列，请调整列表列设置');
+    return;
+  }
+  await commonDownloadExcel(exportAgentUserApi, '用户管理', {
+    ...(await tableApi.formApi.getValues()),
+    exportColumnsJson: JSON.stringify(columns),
+  });
+}
+
 function handleAdd() {
   userDrawerApi.setData({ update: false, view: false });
   userDrawerApi.open();
@@ -187,6 +206,15 @@ tableApi.query();
   <Page auto-content-height>
     <Grid table-title="用户列表">
       <template #toolbar-tools>
+        <Button
+          v-access:code="'cpm:agent:user:export'"
+          class="mr-2 flex items-center"
+          type="primary"
+          :icon="h(MdiExport)"
+          @click="handleExport"
+        >
+          导出
+        </Button>
         <Button
           class="mr-2 flex items-center"
           type="primary"
@@ -209,8 +237,10 @@ tableApi.query();
       </template>
       <template #roles="{ row }">
         {{
-          row.roles?.map((role) => role.roleName).filter(Boolean).join('、') ||
-          '-'
+          row.roles
+            ?.map((role) => role.roleName)
+            .filter(Boolean)
+            .join('、') || '-'
         }}
       </template>
       <template #status="{ row }">
diff --git a/vue/apps/web-antd/src/views/common/tBalanceDetail/index.vue b/vue/apps/web-antd/src/views/common/tBalanceDetail/index.vue
index 8349e24..c99e9ed 100644
--- a/vue/apps/web-antd/src/views/common/tBalanceDetail/index.vue
+++ b/vue/apps/web-antd/src/views/common/tBalanceDetail/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tBalanceDetail';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '余额明细表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tBalanceDetail/model.tsx b/vue/apps/web-antd/src/views/common/tBalanceDetail/model.tsx
index 5215805..4984203 100644
--- a/vue/apps/web-antd/src/views/common/tBalanceDetail/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tBalanceDetail/model.tsx
@@ -154,6 +154,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '收支类型',
     field: 'incomeExpenseType',
+    params: { dictType: DictEnum.INCOME_EXPENSE_TYPE },
     align: 'left',
     width: -1,
 	  slots: {
@@ -166,6 +167,7 @@ export const columns: VxeGridProps['columns'] = [
    {
     title: '交易类型',
     field: 'transactionType',
+    params: { dictType: DictEnum.TRANSACTION_TYPE },
     align: 'left',
     width: -1,
 	  slots: {
@@ -177,6 +179,7 @@ export const columns: VxeGridProps['columns'] = [
    {
     title: '交易渠道',
     field: 'transactionChannel',
+    params: { dictType: DictEnum.TRANSACTION_CHANNEL },
     align: 'left',
     width: -1,
 	  slots: {
@@ -191,6 +194,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '交易状态',
     field: 'transactionStatus',
+    params: { dictType: DictEnum.TRANSACTION_STATUS },
     align: 'left',
     width: -1,
 	  slots: {
diff --git a/vue/apps/web-antd/src/views/common/tCreditDetail/index.vue b/vue/apps/web-antd/src/views/common/tCreditDetail/index.vue
index b37a84a..769cc8e 100644
--- a/vue/apps/web-antd/src/views/common/tCreditDetail/index.vue
+++ b/vue/apps/web-antd/src/views/common/tCreditDetail/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tCreditDetail';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '信用额度明细表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tFinCommissionDetail/index.vue b/vue/apps/web-antd/src/views/common/tFinCommissionDetail/index.vue
index bd38700..7743658 100644
--- a/vue/apps/web-antd/src/views/common/tFinCommissionDetail/index.vue
+++ b/vue/apps/web-antd/src/views/common/tFinCommissionDetail/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tFinCommissionDetail';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '分润明细表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tFinCommissionDetail/model.tsx b/vue/apps/web-antd/src/views/common/tFinCommissionDetail/model.tsx
index bae705d..7ac4231 100644
--- a/vue/apps/web-antd/src/views/common/tFinCommissionDetail/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tFinCommissionDetail/model.tsx
@@ -153,7 +153,8 @@ export const columns: VxeGridProps['columns'] = [
     width: -1,
  },
  {    
-				title: '分润状态：0待结算，1可提现',    field: 'commissionStatus',    align: 'left',    width: -1, 
+				title: '分润状态：0待结算，1可提现',    field: 'commissionStatus',
+    params: { dictType: 'sys_common_status' },    align: 'left',    width: -1,
 				slots: {
       				default: ({ row }) => {
 						return renderDict(row.commissionStatus, 'sys_common_status');
diff --git a/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/index.vue b/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/index.vue
index 429db76..8ce199e 100644
--- a/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/index.vue
+++ b/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tFinWithdrawableChange';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '可提现变动明细表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/model.tsx b/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/model.tsx
index 68ae36f..ae9b55e 100644
--- a/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tFinWithdrawableChange/model.tsx
@@ -108,6 +108,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '收支类型',
     field: 'incomeExpenseType',
+    params: { dictType: DictEnum.INCOME_EXPENSE_TYPE },
     align: 'left',
 
     slots: {
@@ -119,6 +120,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '变动类型',
     field: 'changeType',
+    params: { dictType: DictEnum.CHANGE_TYPE },
     align: 'left',
 
     slots: {
diff --git a/vue/apps/web-antd/src/views/common/tFinanceApply/index.vue b/vue/apps/web-antd/src/views/common/tFinanceApply/index.vue
index 2393f26..57448d6 100644
--- a/vue/apps/web-antd/src/views/common/tFinanceApply/index.vue
+++ b/vue/apps/web-antd/src/views/common/tFinanceApply/index.vue
@@ -11,7 +11,10 @@
   import { useVbenForm } from '#/adapter/form';
   import BetterVben from '#/constants/BetterVben';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete, BalanceTransferAudit } from '#/api/common/tFinanceApply';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, auditSchema, type RowType } from './model';
@@ -126,11 +129,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '财务申请表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 
   // 审核弹窗
diff --git a/vue/apps/web-antd/src/views/common/tFinanceApply/model.tsx b/vue/apps/web-antd/src/views/common/tFinanceApply/model.tsx
index 2415c91..3500380 100644
--- a/vue/apps/web-antd/src/views/common/tFinanceApply/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tFinanceApply/model.tsx
@@ -110,7 +110,8 @@ export const columns: VxeGridProps['columns'] = [
     fixed: 'left',
    },
     {    
-	title: '状态',    field: 'applyStatus',    align: 'left',    width: 160, 
+	title: '状态',    field: 'applyStatus',
+    params: { dictType: DictEnum.APPLY_STATUS },    align: 'left',    width: 160,
 		slots: {
 			default: ({ row }) => {
 				return renderDict(row.applyStatus, DictEnum.APPLY_STATUS);
@@ -120,6 +121,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '申请类型',
     field: 'applyType',
+    params: { dictType: DictEnum.APPLY_TYPE },
     align: 'left',
     width: 150,
 		slots: {
@@ -131,6 +133,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '审核类型',
     field: 'auditType',
+    params: { dictType: DictEnum.AUDIT_TYPE },
     align: 'left',
     width: 160,
 		slots: {
@@ -167,6 +170,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '提现账号类型',
     field: 'accountType',
+    params: { dictType: DictEnum.ACCOUNT_TYPE },
     align: 'left',
     width: 160,
 		slots: {
diff --git a/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/index.vue b/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/index.vue
index 2146ae1..07b3073 100644
--- a/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/index.vue
+++ b/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tFinanceAuditRecord';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '财务审核记录表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/model.tsx b/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/model.tsx
index b4b3757..ce4e174 100644
--- a/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tFinanceAuditRecord/model.tsx
@@ -105,6 +105,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '审核结果',
     field: 'auditResult',
+    params: { dictType: DictEnum.AUDIT_RESULT },
     align: 'left',
     width: -1,
      slots: {
diff --git a/vue/apps/web-antd/src/views/common/tMessageLog/index.vue b/vue/apps/web-antd/src/views/common/tMessageLog/index.vue
index 9cc3ec5..39487f8 100644
--- a/vue/apps/web-antd/src/views/common/tMessageLog/index.vue
+++ b/vue/apps/web-antd/src/views/common/tMessageLog/index.vue
@@ -1,26 +1,33 @@
 <script lang="ts" setup>
-import { h, reactive, ref, onMounted, onUnmounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-
-import { useWebSocket } from '@vueuse/core';
-import { AccessControl } from '@vben/access';
-import { Page, useVbenDrawer } from '@vben/common-ui';
-import { MdiDelete, MdiExport, MdiPlus } from '@vben/icons';
-import { Button, Modal, Popconfirm, message } from 'ant-design-vue';
+import type { RowType } from './model';
 
 import type { VbenFormProps } from '#/adapter/form';
 import type {
   VxeGridListeners,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { commonDownloadExcel } from '#/utils/file/download';
-import { getVxePopupContainer } from '@vben/utils';
-import { useAccessStore, useUserStore } from '@vben/stores';
 
+import { h, onMounted, onUnmounted, reactive, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+
+import { AccessControl } from '@vben/access';
+import { Page, useVbenDrawer } from '@vben/common-ui';
+import { MdiDelete, MdiExport, MdiPlus } from '@vben/icons';
+import { useAccessStore, useUserStore } from '@vben/stores';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { useWebSocket } from '@vueuse/core';
+import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Delete, Export, List } from '#/api/common/tMessageLog';
-import { columns, querySchema, type RowType } from './model';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
+
 import editDrawer from './edit.vue';
+import { columns, querySchema } from './model';
 import viewDrawer from './view.vue';
 
 const accessStore = useAccessStore();
@@ -116,7 +123,7 @@ function handlePreview(record: RowType) {
   drawerApi.open();
 }
 
-function handleOpenDetailById(messageLogId?: string | number) {
+function handleOpenDetailById(messageLogId?: number | string) {
   const id = Number(messageLogId || 0);
   if (!id) {
     return;
@@ -177,15 +184,14 @@ async function handleExport() {
     Export,
     '消息日志',
     {
+      exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
       ...formValues,
       page: 1,
-      pageSize: 2000,
     },
     {
       fieldMappingTime: formOptions.fieldMappingTime,
     },
   );
-  message.success('导出成功');
 }
 
 onMounted(() => {
@@ -237,18 +243,22 @@ watch(wsData, (value) => {
   handleWsMessage(value);
 });
 
-watch(
-  () => route.query.messageLogId,
-  (messageLogId) => {
-    if (messageLogId) {
-      const id = Array.isArray(messageLogId) ? messageLogId[0] : messageLogId;
-      handleOpenDetailById(id === null || id === undefined ? undefined : id);
-    }
-  },
-  {
-    immediate: true,
-  },
-);
+// 详情抽屉挂载并注册 API 后，再处理通知跳转携带的消息 ID。
+onMounted(() => {
+  watch(
+    () => route.query.messageLogId,
+    (messageLogId) => {
+      if (messageLogId) {
+        const id = Array.isArray(messageLogId) ? messageLogId[0] : messageLogId;
+        handleOpenDetailById(id === null || id === undefined ? undefined : id);
+      }
+    },
+    {
+      immediate: true,
+      flush: 'post',
+    },
+  );
+});
 
 function getWsServerUrl() {
   const protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
@@ -286,11 +296,11 @@ function parseWsData(value: string) {
 function isWsControlEvent(eventName: string) {
   return [
     'connected',
-    'login',
     'join',
-    'quit',
-    'ping',
     'joins',
+    'login',
+    'ping',
+    'quit',
     'quits',
   ].includes(eventName);
 }
diff --git a/vue/apps/web-antd/src/views/common/tMessageLog/model.tsx b/vue/apps/web-antd/src/views/common/tMessageLog/model.tsx
index 7a61740..90e1413 100644
--- a/vue/apps/web-antd/src/views/common/tMessageLog/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tMessageLog/model.tsx
@@ -102,6 +102,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '消息类型',
     field: 'messageType',
+    params: { dictType: DictEnum.MESSAGE_TYPE },
     align: 'left',
     width: -1,
     slots: {
@@ -113,6 +114,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '发送用户类型',
     field: 'sendUserType',
+    params: { dictType: DictEnum.SEND_USER_TYPE },
     align: 'left',
     width: -1,
     slots: {
@@ -155,6 +157,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '是否撤回',
     field: 'isRecall',
+    params: { dictType: DictEnum.IS_RECALL },
     align: 'left',
     width: -1,
     slots: {
diff --git a/vue/apps/web-antd/src/views/common/tNotifyLog/index.vue b/vue/apps/web-antd/src/views/common/tNotifyLog/index.vue
index e7362e9..a224416 100644
--- a/vue/apps/web-antd/src/views/common/tNotifyLog/index.vue
+++ b/vue/apps/web-antd/src/views/common/tNotifyLog/index.vue
@@ -1,25 +1,32 @@
 <script lang="ts" setup>
-import { h, onUnmounted, reactive, ref, watch } from 'vue';
-
-import { useWebSocket } from '@vueuse/core';
-import { AccessControl } from '@vben/access';
-import { Page, useVbenDrawer } from '@vben/common-ui';
-import { MdiDelete, MdiExport, MdiPlus } from '@vben/icons';
-import { Button, Modal, Popconfirm, message } from 'ant-design-vue';
-import { useAccessStore, useUserStore } from '@vben/stores';
-import { getVxePopupContainer } from '@vben/utils';
+import type { RowType } from './model';
 
 import type { VbenFormProps } from '#/adapter/form';
 import type {
   VxeGridListeners,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { commonDownloadExcel } from '#/utils/file/download';
 
+import { h, onUnmounted, reactive, ref, watch } from 'vue';
+
+import { AccessControl } from '@vben/access';
+import { Page, useVbenDrawer } from '@vben/common-ui';
+import { MdiDelete, MdiExport, MdiPlus } from '@vben/icons';
+import { useAccessStore, useUserStore } from '@vben/stores';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { useWebSocket } from '@vueuse/core';
+import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Delete, Export, List } from '#/api/common/tNotifyLog';
-import { columns, querySchema, type RowType } from './model';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
+
 import editDrawer from './edit.vue';
+import { columns, querySchema } from './model';
 import viewDrawer from './view.vue';
 
 const accessStore = useAccessStore();
@@ -159,15 +166,14 @@ async function handleExport() {
     Export,
     '通知日志',
     {
+      exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
       ...formValues,
       page: 1,
-      pageSize: 2000,
     },
     {
       fieldMappingTime: formOptions.fieldMappingTime,
     },
   );
-  message.success('导出成功');
 }
 
 function getWsServerUrl() {
@@ -206,11 +212,11 @@ function parseWsData(value: string) {
 function isWsControlEvent(eventName: string) {
   return [
     'connected',
-    'login',
     'join',
-    'quit',
-    'ping',
     'joins',
+    'login',
+    'ping',
+    'quit',
     'quits',
   ].includes(eventName);
 }
diff --git a/vue/apps/web-antd/src/views/common/tNotifyLog/model.tsx b/vue/apps/web-antd/src/views/common/tNotifyLog/model.tsx
index 7e0ef83..21769b0 100644
--- a/vue/apps/web-antd/src/views/common/tNotifyLog/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tNotifyLog/model.tsx
@@ -75,6 +75,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '\u53d1\u9001\u7528\u6237\u7c7b\u578b',
     field: 'sendUserType',
+    params: { dictType: DictEnum.SEND_USER_TYPE },
     align: 'left',
     width: -1,
     slots: {
diff --git a/vue/apps/web-antd/src/views/common/tWoRecord/index.vue b/vue/apps/web-antd/src/views/common/tWoRecord/index.vue
index d487f9d..8d08cb8 100644
--- a/vue/apps/web-antd/src/views/common/tWoRecord/index.vue
+++ b/vue/apps/web-antd/src/views/common/tWoRecord/index.vue
@@ -8,7 +8,10 @@
   import { Page, useVbenDrawer } from '@vben/common-ui';
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl } from '@vben/access';
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/common/tWoRecord';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -123,11 +126,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '工单记录表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/common/tWoRecord/model.test.ts b/vue/apps/web-antd/src/views/common/tWoRecord/model.test.ts
new file mode 100644
index 0000000..ffe78eb
--- /dev/null
+++ b/vue/apps/web-antd/src/views/common/tWoRecord/model.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('#/utils', () => ({
+  renderDict: (value: string, dict: string) => ({ value, dict }),
+}));
+vi.mock('#/utils/dict', () => ({ getDictOptions: () => [] }));
+
+import { columns, viewSchema } from './model';
+
+type StatusField = 'beforeStatus' | 'afterStatus';
+type StatusRow = {
+  operationType: number;
+  beforeStatus?: null | number | string;
+  afterStatus?: null | number | string;
+};
+
+function renderList(field: StatusField, row: StatusRow) {
+  const column = columns?.find((item) => item.field === field);
+  const render = column?.slots?.default as (params: {
+    row: StatusRow;
+  }) => unknown;
+  return render({ row });
+}
+
+function renderDetail(field: StatusField, row: StatusRow) {
+  const render = viewSchema.find((item) => item.field === field)?.render;
+  return render?.(row[field], row);
+}
+
+describe('工单记录状态展示', () => {
+  for (const render of [renderList, renderDetail]) {
+    it('所有正常状态统一使用工单字典', () => {
+      for (const field of ['beforeStatus', 'afterStatus'] as const) {
+        for (const status of [1, 2, 3, 4, 5]) {
+          expect(render(field, { operationType: 2, [field]: status })).toEqual({
+            value: String(status),
+            dict: 'current_status',
+          });
+        }
+      }
+    });
+
+    it('创建前无状态显示占位，创建后显示实际状态', () => {
+      expect(
+        render('beforeStatus', { operationType: 0, beforeStatus: 0 }),
+      ).toBe('—');
+      expect(
+        render('afterStatus', { operationType: 0, afterStatus: 2 }),
+      ).toEqual({
+        value: '2',
+        dict: 'current_status',
+      });
+    });
+
+    it('历史记录缺失状态不再显示未知，也不推测为正常状态', () => {
+      for (const missing of [0, '0', null, undefined]) {
+        expect(
+          render('afterStatus', { operationType: 0, afterStatus: missing }),
+        ).toBe('未记录');
+        expect(
+          render('beforeStatus', { operationType: 3, beforeStatus: missing }),
+        ).toBe('未记录');
+      }
+    });
+
+    it('保留真正异常的状态值供字典组件识别', () => {
+      expect(
+        render('afterStatus', { operationType: 3, afterStatus: 99 }),
+      ).toEqual({
+        value: '99',
+        dict: 'current_status',
+      });
+    });
+  }
+});
diff --git a/vue/apps/web-antd/src/views/common/tWoRecord/model.tsx b/vue/apps/web-antd/src/views/common/tWoRecord/model.tsx
index 488ba8d..14da8d0 100644
--- a/vue/apps/web-antd/src/views/common/tWoRecord/model.tsx
+++ b/vue/apps/web-antd/src/views/common/tWoRecord/model.tsx
@@ -77,6 +77,16 @@ export const querySchema: VbenFormSchema[] = [
 		 ];
 
 // 表格列
+function renderStatus(row: RowType, field: 'beforeStatus' | 'afterStatus') {
+  const value = row[field];
+  if (value == null || Number(value) === 0) {
+    return field === 'beforeStatus' && Number(row.operationType) === 0
+      ? '—'
+      : '未记录';
+  }
+  return renderDict(String(value), DictEnum.CURRENT_STATUS);
+}
+
 export const columns: VxeGridProps['columns'] = [
 
   {
@@ -88,6 +98,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '操作类型',
     field: 'operationType',
+    params: { dictType: DictEnum.OPERATION_TYPE },
     align: 'left',
     width: -1,
 	slots: {
@@ -121,18 +132,20 @@ export const columns: VxeGridProps['columns'] = [
     width: -1,
  },
  {    
-				title: '变更前状态',    field: 'beforeStatus',    align: 'left',    width: -1, 
+				title: '变更前状态',    field: 'beforeStatus',
+    params: { dictType: DictEnum.CURRENT_STATUS },    align: 'left',    width: -1,
 				slots: {
       				default: ({ row }) => {
-						return renderDict(row.beforeStatus, DictEnum.CURRENT_STATUS);
+						return renderStatus(row, 'beforeStatus');
 					}
 				},
 			},
 			 {    
-				title: '变更后状态',    field: 'afterStatus',    align: 'left',    width: -1, 
+				title: '变更后状态',    field: 'afterStatus',
+    params: { dictType: DictEnum.CURRENT_STATUS },    align: 'left',    width: -1,
 				slots: {
       				default: ({ row }) => {
-						return renderDict(row.afterStatus, DictEnum.CURRENT_STATUS);
+						return renderStatus(row, 'afterStatus');
 					}
 				},
 			},
@@ -171,15 +184,15 @@ export const viewSchema: DescItem[] = [
   {
 				field: 'beforeStatus',
 				label: '变更前状态',
-				render(row: any) {
-					return renderDict(row.beforeStatus, 'sys_common_status');
+				render(_value: unknown, row: any) {
+					return renderStatus(row, 'beforeStatus');
 				},
 			},
 			  {
 				field: 'afterStatus',
 				label: '变更后状态',
-				render(row: any) {
-					return renderDict(row.afterStatus, 'sys_common_status');
+				render(_value: unknown, row: any) {
+					return renderStatus(row, 'afterStatus');
 				},
 			},
 			  {  field: 'tenantId',  label: '租户ID'},
diff --git a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
index 83c7b6f..4b353c6 100644
--- a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
+++ b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue
@@ -2,7 +2,7 @@
  * @description 仪表盘-趋势分析图表
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
index 96b1a3b..e99fff9 100644
--- a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
+++ b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-data.vue
@@ -2,7 +2,7 @@
  * @description 仪表盘-访问数据分析图表
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
index 3053597..2b42a59 100644
--- a/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
+++ b/vue/apps/web-antd/src/views/dashboard/analytics/analytics-visits-sales.vue
@@ -2,7 +2,7 @@
  * @description 仪表盘-访问销售分析图表
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/gen/testCategory/index.vue b/vue/apps/web-antd/src/views/gen/testCategory/index.vue
index fb02d2d..a0c7e7f 100644
--- a/vue/apps/web-antd/src/views/gen/testCategory/index.vue
+++ b/vue/apps/web-antd/src/views/gen/testCategory/index.vue
@@ -126,9 +126,7 @@
   await commonDownloadExcel(Export, '测试分类',{
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
   async function handleStatusChange(row: RowType) {
   await Status({ id: row.id, status: row.status });
diff --git a/vue/apps/web-antd/src/views/gen/testDemo/index.vue b/vue/apps/web-antd/src/views/gen/testDemo/index.vue
index e503e3b..caec970 100644
--- a/vue/apps/web-antd/src/views/gen/testDemo/index.vue
+++ b/vue/apps/web-antd/src/views/gen/testDemo/index.vue
@@ -126,9 +126,7 @@
   await commonDownloadExcel(Export, '测试单表',{
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/downloadCenter/index.vue b/vue/apps/web-antd/src/views/iotlcm/downloadCenter/index.vue
new file mode 100644
index 0000000..dca00f3
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/downloadCenter/index.vue
@@ -0,0 +1,258 @@
+<script lang="ts" setup>
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+import { Page } from '@vben/common-ui';
+
+import { Alert, Button, message, Modal, Tag } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { Download, List, Remove } from '#/api/common/downloadCenter';
+import BetterVben from '#/constants/BetterVben';
+import { downloadByData } from '#/utils/file/download';
+
+/** 状态：0排队 2生成中 1已完成 3失败（复用 consts.DownloadStatus*） */
+const STATUS_MAP: Record<number, { color: string; text: string }> = {
+  0: { color: 'processing', text: '排队中' },
+  1: { color: 'success', text: '已完成' },
+  2: { color: 'processing', text: '生成中' },
+  3: { color: 'error', text: '失败' },
+};
+
+/** 导出业务选项（与后端已接入异步导出的业务一一对应） */
+const BIZ_OPTIONS = [
+  { label: '卡信息', value: 'tSimCardInfo' },
+  { label: '销户卡信息', value: 'tSimCardCancellation' },
+  { label: '库存卡', value: 'tSimCardStock' },
+  { label: '达量断网', value: 'tSimCardTrafficCutoff' },
+  { label: '订单', value: 'tOrder' },
+  { label: '流量池套餐配置', value: 'tFlowPackageConfig' },
+  { label: '通道管理', value: 'tSimChannels' },
+  { label: '通道模版', value: 'tSimChannelTemplate' },
+  { label: 'SIM流量套餐', value: 'tSimFlowPackageInfo' },
+  { label: '套餐分类', value: 'tSimPackageCategory' },
+  { label: '上游套餐', value: 'tSimUpstreamPackage' },
+  { label: 'API集成', value: 'tApi' },
+  { label: '开放接口权限组', value: 'tApiGroup' },
+  { label: '开放接口资源', value: 'tApiResource' },
+  { label: '余额明细', value: 'tBalanceDetail' },
+  { label: '可提现变动明细', value: 'tFinWithdrawableChange' },
+  { label: '财务申请', value: 'tFinanceApply' },
+  { label: '财务审核记录', value: 'tFinanceAuditRecord' },
+  { label: '消息日志', value: 'tMessageLog' },
+  { label: '通知日志', value: 'tNotifyLog' },
+  { label: '工单记录', value: 'tWoRecord' },
+  { label: '岗位管理', value: 'post' },
+  { label: '用户管理', value: 'agentUser' },
+  { label: '企业客户', value: 'agentDept' },
+];
+
+const FormSchema: VbenFormSchema[] = [
+  {
+    fieldName: 'keyword',
+    component: 'Input',
+    label: '关键字',
+    componentProps: { placeholder: '文件名 / 任务编号 / 业务名称' },
+  },
+  {
+    fieldName: 'bizKey',
+    component: 'Select',
+    label: '导出业务',
+    componentProps: { allowClear: true, options: BIZ_OPTIONS },
+  },
+  {
+    fieldName: 'status',
+    component: 'Select',
+    label: '状态',
+    componentProps: {
+      allowClear: true,
+      mode: 'multiple',
+      options: Object.entries(STATUS_MAP).map(([value, item]) => ({
+        label: item.text,
+        value: Number(value),
+      })),
+    },
+  },
+  {
+    fieldName: 'createdAt',
+    component: 'RangePicker',
+    label: '创建时间',
+    componentProps: { showTime: true },
+  },
+];
+
+function formatSize(value?: number) {
+  if (!value || value <= 0) {
+    return '-';
+  }
+  if (value < 1024) {
+    return `${value} B`;
+  }
+  if (value < 1024 * 1024) {
+    return `${(value / 1024).toFixed(1)} KB`;
+  }
+  return `${(value / 1024 / 1024).toFixed(1)} MB`;
+}
+
+function isExpired(row: any) {
+  return row.expireTime
+    ? new Date(row.expireTime).getTime() < Date.now()
+    : false;
+}
+
+async function handleDownload(row: any) {
+  if (row.deletedTime) {
+    message.warning('文件已删除或已过期清理，请重新导出');
+    return;
+  }
+  if (row.status !== 1) {
+    message.warning('文件尚未生成完成');
+    return;
+  }
+  if (isExpired(row)) {
+    message.warning('文件已过期，请重新导出');
+    return;
+  }
+  const data = await Download(row.id);
+  downloadByData(data as Blob, row.fileName || `${row.taskNo}.xlsx`);
+  try {
+    await gridApi.query();
+  } catch {
+    message.warning('文件已开始下载，但有效期刷新失败，请手动刷新列表');
+  }
+}
+
+function handleRemove(row: any) {
+  Modal.confirm({
+    title: '删除导出任务',
+    content: `将删除文件 ${row.fileName || row.taskNo}，保留导出记录，是否继续？`,
+    centered: true,
+    onOk: async () => {
+      await Remove(row.id);
+      message.success('已删除');
+      await gridApi.query();
+    },
+  });
+}
+
+const gridOptions: VxeGridProps = {
+  ...(BetterVben.grid.gridOptions.default as any),
+  columns: [
+    { title: '文件名', field: 'fileName', minWidth: 260 },
+    { title: '导出业务', field: 'bizName', width: 150 },
+    {
+      title: '状态',
+      field: 'status',
+      width: 190,
+      slots: { default: 'status' },
+    },
+    {
+      title: '行数',
+      field: 'totalCount',
+      width: 110,
+      formatter: ({ cellValue }) =>
+        cellValue ? Number(cellValue).toLocaleString() : '-',
+    },
+    {
+      title: '文件大小',
+      field: 'fileSize',
+      width: 110,
+      formatter: ({ cellValue }) => formatSize(cellValue),
+    },
+    { title: '创建时间', field: 'createdAt', width: 170 },
+    { title: '完成时间', field: 'finishTime', width: 170 },
+    {
+      title: '有效期至',
+      field: 'expireTime',
+      width: 180,
+      slots: { default: 'expireTime' },
+    },
+    {
+      title: '操作',
+      field: 'action',
+      width: 140,
+      fixed: 'right',
+      slots: { default: 'action' },
+    },
+  ],
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }: any, formValues: any) => {
+        const status = Array.isArray(formValues?.status)
+          ? formValues.status.join(',')
+          : formValues?.status;
+        return await List({
+          page: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+          status,
+        });
+      },
+    },
+  },
+};
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    ...(BetterVben.grid.formOptions.default as any),
+    schema: FormSchema,
+  },
+  gridOptions,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <Alert
+      class="mb-4"
+      message="新导出文件生成后最多保留3天；首次下载开始后保留1小时，且不超过原有效期。"
+      show-icon
+      type="info"
+    />
+    <Grid table-title="下载中心">
+      <template #status="{ row }">
+        <Tag :color="STATUS_MAP[row.status]?.color || 'default'">
+          {{ STATUS_MAP[row.status]?.text || '未知' }}
+        </Tag>
+        <Tag v-if="row.deletedTime" color="default">
+          {{ row.deleteReason === 'expired' ? '已过期清理' : '已删除' }}
+        </Tag>
+      </template>
+      <template #expireTime="{ row }">
+        <span v-if="!row.expireTime">-</span>
+        <span v-else-if="isExpired(row)" class="text-gray-400">
+          {{ row.expireTime }}（已过期）
+        </span>
+        <span v-else>{{ row.expireTime }}</span>
+      </template>
+      <template #action="{ row }">
+        <div
+          v-if="!row.deletedTime"
+          class="flex items-center justify-center gap-2"
+        >
+          <Button
+            v-if="row.status === 1"
+            v-access:code="'cpm:common:downloadCenter:download'"
+            class="border-none p-0"
+            :block="false"
+            :disabled="isExpired(row)"
+            type="link"
+            @click="handleDownload(row)"
+          >
+            下载
+          </Button>
+          <Button
+            v-access:code="'cpm:common:downloadCenter:remove'"
+            class="border-none p-0"
+            :block="false"
+            :disabled="row.status === 2"
+            type="link"
+            @click="handleRemove(row)"
+          >
+            删除
+          </Button>
+        </div>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tApi/index.vue b/vue/apps/web-antd/src/views/iotlcm/tApi/index.vue
index 8bac24a..180defe 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tApi/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tApi/index.vue
@@ -13,7 +13,10 @@ import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Delete, Export, List } from '#/api/iotlcm/tApi';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -62,11 +65,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, 'API集成', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/index.vue b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/index.vue
index 1cea150..2af11bb 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/index.vue
@@ -17,7 +17,10 @@ import {
   List,
 } from '#/api/iotlcm/tChannel/tSimChannelTemplate';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -66,11 +69,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '通道模板', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/model.tsx
index 56a027e..4f72665 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannelTemplate/model.tsx
@@ -98,6 +98,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '模板状态',
     field: 'tempStatus',
+    params: { dictType: DictEnum.GLOBAL_ENABLED },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/index.vue b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/index.vue
index 160fade..00798a5 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/index.vue
@@ -19,7 +19,10 @@ import {
   RefreshCardCount,
 } from '#/api/iotlcm/tChannel/tSimChannels';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -78,11 +81,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '通道管理', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/model.tsx
index ad429a9..b0df47b 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tChannel/tSimChannels/model.tsx
@@ -222,6 +222,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '运营商',
     field: 'operator',
+    params: { dictType: DictEnum.T_OPERATORS },
     minWidth: 100,
     slots: {
       default: ({ row }) => renderChannelOperator(row.operator),
@@ -267,6 +268,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '通道状态',
     field: 'chanStatus',
+    params: { dictType: DictEnum.T_CHANNELS_STATUS },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
@@ -277,6 +279,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '共享Token',
     field: 'shareEnabled',
+    params: { dictType: DictEnum.SHARE_ENABLED },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
@@ -287,6 +290,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否正常',
     field: 'isNormal',
+    params: { dictType: DictEnum.GLOBAL_YES_OR_NO },
     minWidth: 120,
     slots: {
       header: () => renderHelpLabel('是否正常', channelBehaviorTips.isNormal),
@@ -298,6 +302,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否轮询',
     field: 'syncEnabled',
+    params: { dictType: DictEnum.T_CHANNEL_SYNC_ENABLED },
     minWidth: 100,
     slots: {
       header: () => renderHelpLabel('是否轮询', channelBehaviorTips.syncEnabled),
@@ -309,6 +314,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '对接信息',
     field: 'dockingStatus',
+    params: { dictType: DictEnum.T_CHANNEL_DOCKING_STATUS },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/components/cardSourceTabs.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/components/cardSourceTabs.vue
index 5a98123..f39b2c1 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/components/cardSourceTabs.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/components/cardSourceTabs.vue
@@ -1,18 +1,20 @@
 <script setup lang="ts" name="BusinessAcceptanceCardSourceTabs">
 import { TabPane, Tabs } from 'ant-design-vue';
 
-type CardSourceTab = 'excel' | 'input' | 'range';
+type CardSourceTab = 'excel' | 'input' | 'range' | 'dept';
 
 withDefaults(
   defineProps<{
     showExcel?: boolean;
     showInput?: boolean;
     showRange?: boolean;
+    showDept?: boolean;
   }>(),
   {
     showExcel: true,
     showInput: true,
     showRange: true,
+    showDept: false,
   },
 );
 
@@ -34,5 +36,9 @@ const activeKey = defineModel<CardSourceTab>('activeKey', {
     <TabPane v-if="showRange" key="range" tab="连号">
       <slot name="range"></slot>
     </TabPane>
+
+    <TabPane v-if="showDept" key="dept" tab="按所属公司">
+      <slot name="dept"></slot>
+    </TabPane>
   </Tabs>
 </template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/index.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/index.vue
index 5897166..a2caea0 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/index.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts" name="BusinessAcceptance">
-import { computed } from 'vue';
+import { computed, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 import { useAccess } from '@vben/access';
 import { useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
 
+import { message } from 'ant-design-vue';
+
 import AddPackage from './views/addPackage.vue';
+import CardBaseQuery from './views/cardBaseQuery.vue';
 import Cancel from './views/cancel.vue';
 import Change from './views/change.vue';
 import DataToggle from './views/dataToggle.vue';
@@ -13,12 +17,14 @@ import Lifecycle from './views/lifecycle.vue';
 import Renew from './views/renew.vue';
 import TrafficCutoff from './views/trafficCutoff.vue';
 import Unsubscribe from './views/unsubscribe.vue';
+import UsageHistoryQuery from './views/usageHistoryQuery.vue';
 import WarningConfig from './views/warningConfig.vue';
 
 type AcceptanceAction =
-  | 'allocate'
   | 'addPackage'
+  | 'allocate'
   | 'cancel'
+  | 'cardBaseQuery'
   | 'change'
   | 'dataToggle'
   | 'renew'
@@ -27,13 +33,15 @@ type AcceptanceAction =
   | 'stop'
   | 'trafficCutoff'
   | 'unsubscribe'
+  | 'usageHistoryQuery'
   | 'warningPoolTraffic'
   | 'warningTraffic';
 
 type AcceptanceItem = {
-  action?: AcceptanceAction;
   accessCodes?: string[];
+  action?: AcceptanceAction;
   color: string;
+  desc: string;
   icon: string;
   title: string;
 };
@@ -44,6 +52,10 @@ type AcceptanceGroup = {
 };
 
 const operationAccessCodes: Partial<Record<AcceptanceAction, string[]>> = {
+  // 入口可见性只按 view 判定；模板下载与提交导出各自在弹窗内按对应权限码控制。
+  // hasAccessByCodes 是「任一命中」语义，三个码并列会让只有 view 的用户也能点导出。
+  cardBaseQuery: ['cpm:iot:tSimCardBaseQuery:view'],
+  usageHistoryQuery: ['cpm:iot:tSimCardUsageHistory:view'],
   addPackage: [
     'cpm:iot:tSimCardBindPkg:addPackage',
     'cpm:iot:tSimPoolBindPackage:addPackage',
@@ -110,10 +122,10 @@ const operationAccessCodes: Partial<Record<AcceptanceAction, string[]>> = {
     'cpm:iot:tSimCardUnsub:range:submit',
   ],
   warningPoolTraffic: [
-    'cpm:iot:tSimWarningConfig:excel:template',
-    'cpm:iot:tSimWarningConfig:excel:submit',
-    'cpm:iot:tSimWarningConfig:input:submit',
-    'cpm:iot:tSimWarningConfig:range:submit',
+    'cpm:iot:tSimPoolWarnConfig:excel:template',
+    'cpm:iot:tSimPoolWarnConfig:excel:submit',
+    'cpm:iot:tSimPoolWarnConfig:input:submit',
+    'cpm:iot:tSimPoolWarnConfig:range:submit',
   ],
   warningTraffic: [
     'cpm:iot:tSimWarningConfig:excel:template',
@@ -125,114 +137,38 @@ const operationAccessCodes: Partial<Record<AcceptanceAction, string[]>> = {
 
 const acceptanceGroups: AcceptanceGroup[] = [
   {
-    title: '套餐及数据',
+    title: '卡信息查询管理',
     items: [
-      {
-        title: '续费套餐',
-        action: 'renew',
-        accessCodes: operationAccessCodes.renew,
-        icon: 'mdi:credit-card-refresh-outline',
-        color: '#ff9816',
-      },
-      {
-        title: '变更套餐',
-        action: 'change',
-        accessCodes: operationAccessCodes.change,
-        icon: 'mdi:swap-horizontal',
-        color: '#e91e63',
-      },
-      {
-        title: '加油包订购',
-        action: 'addPackage',
-        accessCodes: operationAccessCodes.addPackage,
-        icon: 'mdi:gas-station-outline',
-        color: '#22c55e',
-      },
-      {
-        title: '开停数据',
-        action: 'dataToggle',
-        accessCodes: operationAccessCodes.dataToggle,
-        icon: 'mdi:database-sync-outline',
-        color: '#1677ff',
-      },
-      {
-        title: '达量断网',
-        action: 'trafficCutoff',
-        accessCodes: operationAccessCodes.trafficCutoff,
-        icon: 'mdi:network-off',
-        color: '#1677ff',
-      },
+      { title: '卡基础信息查询', desc: '按号码批量查询并导出卡信息', action: 'cardBaseQuery', accessCodes: operationAccessCodes.cardBaseQuery, icon: 'mdi:card-search-outline', color: '#1677ff' },
+      { title: '月历史用量查询', desc: '导出近 12 个月用量明细', action: 'usageHistoryQuery', accessCodes: operationAccessCodes.usageHistoryQuery, icon: 'mdi:chart-timeline-variant', color: '#13a8a8' },
     ],
   },
   {
-    title: '生命周期',
+    title: '卡运维管理',
     items: [
-      {
-        title: '重启',
-        action: 'restart',
-        accessCodes: operationAccessCodes.restart,
-        icon: 'mdi:restart',
-        color: '#ff9816',
-      },
-      {
-        title: '自主停机',
-        action: 'stop',
-        accessCodes: operationAccessCodes.stop,
-        icon: 'mdi:pause-circle-outline',
-        color: '#e91e63',
-      },
-      {
-        title: '自主复机',
-        action: 'start',
-        accessCodes: operationAccessCodes.start,
-        icon: 'mdi:play-circle-outline',
-        color: '#2d9fe8',
-      },
-      {
-        title: '转销户',
-        action: 'cancel',
-        accessCodes: operationAccessCodes.cancel,
-        icon: 'mdi:account-switch-outline',
-        color: '#4caf50',
-      },
-      {
-        title: '划拨',
-        action: 'allocate',
-        accessCodes: operationAccessCodes.allocate,
-        icon: 'mdi:account-arrow-right-outline',
-        color: '#52c41a',
-      },
-      {
-        title: '退订',
-        action: 'unsubscribe',
-        accessCodes: operationAccessCodes.unsubscribe,
-        icon: 'mdi:clipboard-remove-outline',
-        color: '#2d9fe8',
-      },
-      {
-        title: '添加安装位置',
-        icon: 'mdi:map-marker-plus-outline',
-        color: '#1677ff',
-      },
+      { title: '重启', desc: '对卡执行远程重启', action: 'restart', accessCodes: operationAccessCodes.restart, icon: 'mdi:restart', color: '#ff9816' },
+      { title: '划拨', desc: '将卡划拨至目标企业', action: 'allocate', accessCodes: operationAccessCodes.allocate, icon: 'mdi:account-arrow-right-outline', color: '#52c41a' },
+      { title: '开停数据', desc: '批量开通或停用数据服务', action: 'dataToggle', accessCodes: operationAccessCodes.dataToggle, icon: 'mdi:database-sync-outline', color: '#1677ff' },
+      { title: '自主停机', desc: '批量办理停机', action: 'stop', accessCodes: operationAccessCodes.stop, icon: 'mdi:pause-circle-outline', color: '#e91e63' },
+      { title: '自主复机', desc: '批量办理复机', action: 'start', accessCodes: operationAccessCodes.start, icon: 'mdi:play-circle-outline', color: '#2d9fe8' },
+      { title: '转销户', desc: '办理卡销户', action: 'cancel', accessCodes: operationAccessCodes.cancel, icon: 'mdi:account-switch-outline', color: '#4caf50' },
     ],
   },
   {
-    title: '预警中心',
+    title: '套餐与流量业务',
     items: [
-      {
-        title: '流量预警配置',
-        action: 'warningTraffic',
-        accessCodes: operationAccessCodes.warningTraffic,
-        icon: 'mdi:gauge',
-        color: '#13a8a8',
-      },
-      {
-        title: '流量池预警配置',
-        action: 'warningPoolTraffic',
-        accessCodes: operationAccessCodes.warningPoolTraffic,
-        icon: 'mdi:chart-donut',
-        color: '#2f54eb',
-      },
+      { title: '续费套餐', desc: '为卡续费当前套餐', action: 'renew', accessCodes: operationAccessCodes.renew, icon: 'mdi:credit-card-refresh-outline', color: '#ff9816' },
+      { title: '变更套餐', desc: '变更卡所属套餐', action: 'change', accessCodes: operationAccessCodes.change, icon: 'mdi:swap-horizontal', color: '#e91e63' },
+      { title: '加油包订购', desc: '为卡订购加油包', action: 'addPackage', accessCodes: operationAccessCodes.addPackage, icon: 'mdi:gas-station-outline', color: '#22c55e' },
+      { title: '退订', desc: '退订已订购套餐', action: 'unsubscribe', accessCodes: operationAccessCodes.unsubscribe, icon: 'mdi:clipboard-remove-outline', color: '#2d9fe8' },
+      { title: '达量断网', desc: '配置达量断网阈值', action: 'trafficCutoff', accessCodes: operationAccessCodes.trafficCutoff, icon: 'mdi:network-off', color: '#1677ff' },
+    ],
+  },
+  {
+    title: '预警配置中心',
+    items: [
+      { title: '流量预警配置', desc: '按卡配置流量预警', action: 'warningTraffic', accessCodes: operationAccessCodes.warningTraffic, icon: 'mdi:gauge', color: '#13a8a8' },
+      { title: '流量池预警配置', desc: '按流量池配置预警', action: 'warningPoolTraffic', accessCodes: operationAccessCodes.warningPoolTraffic, icon: 'mdi:chart-donut', color: '#2f54eb' },
     ],
   },
 ];
@@ -256,6 +192,14 @@ const visibleAcceptanceGroups = computed(() =>
 );
 
 function handleMenuClick(item: AcceptanceItem) {
+  if (item.action === 'cardBaseQuery') {
+    cardBaseQueryModalApi.open();
+    return;
+  }
+  if (item.action === 'usageHistoryQuery') {
+    usageHistoryQueryModalApi.open();
+    return;
+  }
   if (item.action === 'allocate') {
     lifecycleModalApi.setData({ operation: 'allocate' }).open();
     return;
@@ -305,6 +249,14 @@ function handleMenuClick(item: AcceptanceItem) {
   }
 }
 
+const [CardBaseQueryModal, cardBaseQueryModalApi] = useVbenModal({
+  connectedComponent: CardBaseQuery,
+});
+
+const [UsageHistoryQueryModal, usageHistoryQueryModalApi] = useVbenModal({
+  connectedComponent: UsageHistoryQuery,
+});
+
 const [RenewModal, renewModalApi] = useVbenModal({
   connectedComponent: Renew,
 });
@@ -340,6 +292,48 @@ const [WarningConfigModal, warningConfigModalApi] = useVbenModal({
 const [TrafficCutoffModal, trafficCutoffModalApi] = useVbenModal({
   connectedComponent: TrafficCutoff,
 });
+
+const route = useRoute();
+const router = useRouter();
+const acceptancePath = route.path;
+let consumingAcceptanceAction = false;
+
+watch(
+  () => route.query,
+  async (query) => {
+    if (
+      route.path !== acceptancePath ||
+      query.acceptanceAction !== 'trafficCutoff' ||
+      consumingAcceptanceAction
+    )
+      return;
+    consumingAcceptanceAction = true;
+    try {
+      const cardValue =
+        typeof query.cardValue === 'string' ? query.cardValue.trim() : '';
+      const remainingQuery = { ...query };
+      delete remainingQuery.acceptanceAction;
+      delete remainingQuery.cardValue;
+      await router.replace({
+        path: route.path,
+        query: remainingQuery,
+        hash: route.hash,
+      });
+      if (!hasAccessByCodes(['cpm:iot:tSimCardTrafficCutoff:input:submit'])) {
+        message.warning('没有达量断网手动配置权限');
+        return;
+      }
+      if (!cardValue || /[\r\n]/.test(cardValue)) {
+        message.warning('请提供有效的单张卡片标识');
+        return;
+      }
+      trafficCutoffModalApi.setData({ cardValue }).open();
+    } finally {
+      consumingAcceptanceAction = false;
+    }
+  },
+  { immediate: true, flush: 'post' },
+);
 </script>
 
 <template>
@@ -352,37 +346,46 @@ const [TrafficCutoffModal, trafficCutoffModalApi] = useVbenModal({
       class="rounded-md bg-white px-6 py-10 dark:bg-[#1f1f1f]"
     >
       <h2
-        class="mb-7 text-center text-[16px] font-[600] leading-[24px] text-[#111827] dark:text-[#f2f2f2]"
+        class="mb-5 text-left text-[16px] font-[600] leading-[24px] text-[#111827] dark:text-[#f2f2f2]"
       >
         {{ group.title }}
       </h2>
 
       <div
-        class="grid grid-cols-2 justify-items-center gap-x-4 gap-y-7 sm:grid-cols-3 lg:grid-cols-4 xl:flex xl:justify-center xl:gap-14"
+        class="grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4"
       >
         <button
           v-for="item in group.items"
           :key="item.title"
           type="button"
           :data-action="item.action"
-          class="group flex w-[88px] flex-col items-center border-0 bg-transparent p-0 text-center outline-none"
+          class="group flex w-full items-center gap-3 rounded-[10px] border border-[#eef0f4] bg-white px-4 py-3 text-left outline-none transition-all duration-200 hover:border-[#d6e2f5] hover:shadow-sm focus-visible:ring-2 focus-visible:ring-[#1677ff]/40 dark:border-[#2f2f2f] dark:bg-[#1f1f1f] dark:hover:border-[#3d5a80]"
           @click="handleMenuClick(item)"
         >
           <span
-            class="mb-3 flex size-[72px] items-center justify-center rounded-[14px] text-white shadow-sm transition-all duration-200 group-hover:-translate-y-0.5 group-hover:shadow-md"
+            class="flex size-[44px] shrink-0 items-center justify-center rounded-[12px] text-white shadow-sm transition-transform duration-200 group-hover:-translate-y-0.5"
             :style="{ backgroundColor: item.color }"
           >
-            <IconifyIcon :icon="item.icon" class="text-[34px]" />
+            <IconifyIcon :icon="item.icon" class="text-[22px]" />
           </span>
-          <span
-            class="min-h-[40px] text-[15px] font-[400] leading-[20px] text-[#111827] dark:text-[#f2f2f2]"
-          >
-            {{ item.title }}
+          <span class="min-w-0 flex-1">
+            <span
+              class="block truncate text-[14px] font-[600] leading-[20px] text-[#111827] dark:text-[#f2f2f2]"
+            >
+              {{ item.title }}
+            </span>
+            <span
+              class="mt-0.5 block truncate text-[12px] leading-[18px] text-[#6b7280] dark:text-[#9ca3af]"
+            >
+              {{ item.desc }}
+            </span>
           </span>
         </button>
       </div>
     </section>
 
+    <CardBaseQueryModal />
+    <UsageHistoryQueryModal />
     <RenewModal />
     <UnsubscribeModal />
     <ChangeModal />
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/cardBaseQuery.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/cardBaseQuery.vue
new file mode 100644
index 0000000..d336644
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/cardBaseQuery.vue
@@ -0,0 +1,379 @@
+<script setup lang="ts" name="BusinessAcceptanceCardBaseQuery">
+import type { UploadFile, UploadProps } from 'ant-design-vue';
+
+import type { ExportColumn, QueryMode } from '#/api/iotlcm/tCommunication/tSimCardQuery/type';
+
+import { computed, h, ref, watch } from 'vue';
+
+import { useAccess } from '@vben/access';
+import { useVbenModal, z } from '@vben/common-ui';
+import { DownloadOutlined, Inbox } from '@vben/icons';
+
+import {
+  Button,
+  Checkbox,
+  CheckboxGroup,
+  Upload,
+  UploadDragger,
+  message,
+} from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import * as queryApi from '#/api/iotlcm/tCommunication/tSimCardQuery';
+import BetterVben from '#/constants/BetterVben';
+import FormOption from '#/constants/FormOption';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import CardSourceTabs from '../components/cardSourceTabs.vue';
+
+/** 与后端 model.SimCardQueryMaxRows 一致 */
+const MAX_ROWS = 20_000;
+const MAX_EXCEL_FILE_SIZE = 20;
+const SOURCE_MODAL_CLASS = 'w-[860px] max-w-[calc(100vw-48px)]';
+
+const activeTab = ref<QueryMode>('excel');
+const uploadFile = ref<UploadProps['fileList']>([]);
+const importFile = ref<File>();
+const columnOptions = ref<ExportColumn[]>([]);
+const checkedFields = ref<string[]>([]);
+const submitting = ref(false);
+const columnsLoading = ref(false);
+const columnsError = ref(false);
+
+const dimensionOptions = [
+  { label: 'ICCID', value: 'iccid' },
+  { label: 'MSISDN', value: 'msisdn' },
+  { label: 'IMSI', value: 'imsi' },
+];
+
+// 入口只按 view 判定，模板下载与提交导出沿用同一个权限码：这两个功能的价值就是查询+导出，
+// 拆成 view/template/export 三个码只会导致「少授一个就整个功能不可用」。
+const { hasAccessByCodes } = useAccess();
+const canUse = computed(() =>
+  hasAccessByCodes(['cpm:iot:tSimCardBaseQuery:view']),
+);
+const canDownloadTemplate = canUse;
+
+// 三码是对账锚点，固定导出且不可取消。
+const MANDATORY_FIELDS = ['iccid', 'msisdn', 'imsi'];
+
+const canSubmit = computed(
+  () =>
+    canUse.value &&
+    !submitting.value &&
+    !columnsLoading.value &&
+    !columnsError.value &&
+    checkedFields.value.length > 0,
+);
+
+async function loadColumns() {
+  if (columnsLoading.value) return;
+  columnsLoading.value = true;
+  columnsError.value = false;
+  columnOptions.value = [];
+  checkedFields.value = [];
+  try {
+    const res = await queryApi.BaseColumns();
+    columnOptions.value = (res.items ?? []).filter(
+      (item) => !['queryResult', 'failReason'].includes(item.field),
+    );
+    if (columnOptions.value.length === 0) {
+      throw new Error('未获取到可选导出列');
+    }
+    checkedFields.value = columnOptions.value.map((item) => item.field);
+  } catch {
+    columnsError.value = true;
+    message.warning('获取可选导出列失败，请重试后再提交');
+  } finally {
+    columnsLoading.value = false;
+  }
+}
+
+watch(canSubmit, (enabled) => {
+  modalApi.setState({ confirmDisabled: !enabled });
+});
+
+function handleBeforeUpload(file: File) {
+  const suffix = file.name.slice(Math.max(0, file.name.lastIndexOf('.') + 1));
+  if (suffix.toLowerCase() !== 'xlsx') {
+    message.error('请上传 xlsx 格式文件');
+    return Upload.LIST_IGNORE;
+  }
+  if (file.size / 1024 / 1024 > MAX_EXCEL_FILE_SIZE) {
+    message.error(`文件大小不能超过 ${MAX_EXCEL_FILE_SIZE}MB`);
+    return Upload.LIST_IGNORE;
+  }
+  importFile.value = file;
+  uploadFile.value = [
+    {
+      uid: `${file.name}-${Date.now()}`,
+      name: file.name,
+      status: 'done',
+      originFileObj: file,
+    } as UploadFile,
+  ];
+  return false;
+}
+
+function handleRemove() {
+  uploadFile.value = [];
+  importFile.value = undefined;
+}
+
+async function handleDownloadTemplate() {
+  if (!canDownloadTemplate.value) {
+    message.warning('没有下载模板权限');
+    return;
+  }
+  const success = await commonDownloadExcel(
+    queryApi.DownloadBaseTemplate,
+    '',
+    {},
+  );
+  if (success) {
+    message.success('下载成功');
+  }
+}
+
+async function handleConfirm() {
+  if (submitting.value) return;
+  if (!canSubmit.value) {
+    message.warning('请先加载并勾选至少一个导出字段');
+    return;
+  }
+  submitting.value = true;
+  try {
+    await BetterVben.function.modalAutoLoadAsync(modalApi, async () => {
+      // 三码必须出现在导出列里：即使 CheckboxGroup 被清空也补回来（后端同样会强制补）。
+      const picked = columnOptions.value.filter((item) =>
+        checkedFields.value.includes(item.field),
+      );
+      const columns = [
+        ...columnOptions.value.filter((item) =>
+          MANDATORY_FIELDS.includes(item.field),
+        ),
+        ...picked.filter(
+          (item) => !MANDATORY_FIELDS.includes(item.field),
+        ),
+      ];
+      if (activeTab.value === 'excel') {
+        if (!importFile.value) {
+          message.warning('请先上传 Excel 文件');
+          return;
+        }
+        onSubmitSuccess(await queryApi.BaseExport({
+          mode: 'excel', file: importFile.value, exportColumns: columns,
+        }));
+        return;
+      }
+      if (activeTab.value === 'input') {
+        const [valid, value] = await BetterVben.function.formValidate(inputFormApi);
+        if (!valid) return;
+        const text = String(value.input ?? '').trim();
+        const lines = text.split(/\r?\n/).filter((line) => line.trim());
+        if (!lines.length || lines.length > MAX_ROWS) {
+          message.warning(`单次请输入 1 至 ${MAX_ROWS} 条非空记录`);
+          return;
+        }
+        onSubmitSuccess(await queryApi.BaseExport({
+          mode: 'input', batchInput: text, exportColumns: columns,
+        }));
+        return;
+      }
+      if (activeTab.value === 'range') {
+        const [valid, value] = await BetterVben.function.formValidate(rangeFormApi);
+        if (!valid) return;
+        const startNum = String(value.startNum ?? '').trim();
+        const endNum = String(value.endNum ?? '').trim();
+        if (!/^\d+$/.test(startNum) || !/^\d+$/.test(endNum) ||
+            startNum.length !== endNum.length || startNum > endNum) {
+          message.warning('起止号码必须为等长数字，且起始号码不能大于结束号码');
+          return;
+        }
+        onSubmitSuccess(await queryApi.BaseExport({
+          mode: 'range', dimension: String(value.dimension),
+          startNum, endNum, exportColumns: columns,
+        }));
+      }
+    });
+  } finally {
+    submitting.value = false;
+    modalApi.setState({ confirmLoading: false, submitting: false, confirmDisabled: !canSubmit.value });
+  }
+}
+
+function onSubmitSuccess(res?: { taskNo?: string; total?: number }) {
+  window.dispatchEvent(new CustomEvent('iotlcm:export-submitted'));
+  const batchText = res?.taskNo ? `，任务编号：${res.taskNo}` : '';
+  // 号段/按公司模式提交时条数未知（后端返回 -1），此时不显示预计行数
+  const totalText =
+    typeof res?.total === 'number' && res.total > 0
+      ? `，预计 ${res.total} 行`
+      : '';
+  message.success(`导出任务已提交${batchText}${totalText}，请到下载中心查看`);
+  modalApi.close();
+  handleReset();
+}
+
+async function handleReset() {
+  activeTab.value = 'excel';
+  uploadFile.value = [];
+  importFile.value = undefined;
+  await inputFormApi.resetForm();
+  await rangeFormApi.resetForm();
+  modalApi.setState({
+    confirmDisabled: false,
+    confirmLoading: false,
+    loading: false,
+    submitting: false,
+  });
+}
+
+const [InputForm, inputFormApi] = useVbenForm({
+  ...BetterVben.form.default,
+  schema: [
+    {
+      fieldName: 'input',
+      label: '批量输入',
+      component: 'Textarea',
+      componentProps: FormOption.Component.Textarea({
+        autoSize: { minRows: 8, maxRows: 12 },
+        placeholder: `每行填写 ICCID，或 ICCID MSISDN IMSI（单次最多 ${MAX_ROWS} 条）`,
+        rows: 8,
+      }),
+      rules: z.string().trim().min(1, '请输入批量输入内容'),
+    },
+  ],
+});
+
+const [RangeForm, rangeFormApi] = useVbenForm({
+  ...BetterVben.form.default,
+  schema: [
+    {
+      fieldName: 'dimension',
+      label: '号码维度',
+      component: 'Select',
+      componentProps: { options: dimensionOptions, placeholder: '请选择号码维度' },
+      rules: z.string().min(1, '请选择号码维度'),
+    },
+    {
+      fieldName: 'startNum',
+      label: '起始号码',
+      component: 'Input',
+      componentProps: { placeholder: '请输入起始号码' },
+      rules: z.string().trim().min(1, '请输入起始号码'),
+    },
+    {
+      fieldName: 'endNum',
+      label: '结束号码',
+      component: 'Input',
+      componentProps: { placeholder: '请输入结束号码' },
+      rules: z.string().trim().min(1, '请输入结束号码'),
+    },
+  ],
+});
+
+const [Modal, modalApi] = useVbenModal({
+  ...BetterVben.modal.grid,
+  class: SOURCE_MODAL_CLASS,
+  confirmText: '提交导出',
+  destroyOnClose: false,
+  async onCancel() {
+    modalApi.close();
+    await handleReset();
+  },
+  async onConfirm() {
+    await handleConfirm();
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      await handleReset();
+      return;
+    }
+    activeTab.value = 'excel';
+    modalApi.setState({ confirmDisabled: true });
+    await loadColumns();
+    modalApi.setState({ confirmDisabled: !canSubmit.value });
+  },
+});
+</script>
+
+<template>
+  <Modal title="卡基础信息查询">
+    <div class="mb-4 text-[13px] leading-[20px] text-[#6b7280] dark:text-[#9ca3af]">
+      ICCID、MSISDN、IMSI 任填其一；同一行填多个值时须属于同一张卡。重复卡号自动合并。
+    </div>
+
+    <div class="mb-4 rounded-md border border-[#e5e7eb] p-3 dark:border-[#2f2f2f]">
+      <div class="mb-2 text-[13px] font-[600]">导出列（至少勾选一项）</div>
+      <div v-if="columnOptions.length === 0" class="text-[13px] text-[#9ca3af]">
+        加载中…
+      </div>
+      <div v-else>
+        <CheckboxGroup v-model:value="checkedFields">
+          <div class="grid grid-cols-2 gap-x-2 gap-y-1 sm:grid-cols-3 lg:grid-cols-4">
+            <Checkbox
+              v-for="column in columnOptions"
+              :key="column.field"
+              :value="column.field"
+              :disabled="MANDATORY_FIELDS.includes(column.field)"
+              class="text-[13px]"
+            >
+              {{ column.label }}
+              <span
+                v-if="MANDATORY_FIELDS.includes(column.field)"
+                class="text-[11px] text-[#9ca3af]"
+              >必选</span>
+            </Checkbox>
+          </div>
+        </CheckboxGroup>
+      </div>
+    </div>
+
+    <CardSourceTabs v-model:active-key="activeTab" :show-range="true">
+      <template #excel>
+        <UploadDragger
+          v-model:file-list="uploadFile"
+          accept=".xlsx"
+          class="business-acceptance-excel-upload"
+          :before-upload="handleBeforeUpload"
+          :max-count="1"
+          @remove="handleRemove"
+        >
+          <div class="ant-upload-drag-icon flex justify-center">
+            <Inbox />
+          </div>
+          <p class="ant-upload-text">点击或拖拽文件到此区域上传</p>
+          <p class="ant-upload-hint">
+            模板中的 ICCID、MSISDN、IMSI 任填其一，ICCID 建议填写<br />
+            单次最多导入 {{ MAX_ROWS }} 条，超出请拆分后分批导入
+          </p>
+        </UploadDragger>
+
+        <div v-if="canDownloadTemplate" class="mt-3 flex justify-center">
+          <Button :icon="h(DownloadOutlined)" @click="handleDownloadTemplate">
+            下载 Excel 模板
+          </Button>
+        </div>
+      </template>
+
+      <template #input>
+        <InputForm />
+      </template>
+
+      <template #range>
+        <RangeForm />
+      </template>
+    </CardSourceTabs>
+  </Modal>
+</template>
+
+<style scoped>
+.business-acceptance-excel-upload :deep(.ant-upload-drag) {
+  height: 160px;
+}
+
+.business-acceptance-excel-upload :deep(.ant-upload-drag .ant-upload-btn) {
+  padding: 18px 16px;
+}
+</style>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/lifecycle.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/lifecycle.vue
index c87f903..ce0b17d 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/lifecycle.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/lifecycle.vue
@@ -59,11 +59,12 @@ const uploadFile = ref<UploadProps['fileList']>([]);
 const importFile = ref<File>();
 const allocateTargets = ref<TSimCardAllocateTarget[]>([]);
 const allocateTargetId = ref<number>();
+const submitBusy = ref(false);
 
 const currentConfig = computed(() => operationConfig[operation.value]);
 const isAllocate = computed(() => operation.value === 'allocate');
 function updateConfirmState() {
-  modalApi.setState({ confirmDisabled: false });
+  modalApi.setState({ confirmDisabled: submitBusy.value });
 }
 
 watch(activeTab, () => updateConfirmState(), { flush: 'post' });
@@ -81,7 +82,7 @@ function showAllocateSubmitMessage(res?: TSimCardAllocatePrepareRes) {
   message.success(
     `卡片划拨任务已提交，批次号：${res?.batchNo ?? '-'}，共 ${
       res?.totalCount ?? 0
-    } 张`,
+    } 张。暂未产生执行结果，请在批次执行记录中查看进度，无需重复提交。`,
   );
 }
 
@@ -185,13 +186,21 @@ async function handleSubmitInput() {
 }
 
 async function handleConfirm() {
-  await BetterVben.function.modalAutoLoadAsync(modalApi, async () => {
-    if (activeTab.value === 'excel') {
-      await handleSubmitExcel();
-      return;
-    }
-    await handleSubmitInput();
-  });
+  if (submitBusy.value) return;
+  submitBusy.value = true;
+  updateConfirmState();
+  try {
+    await BetterVben.function.modalAutoLoadAsync(modalApi, async () => {
+      if (activeTab.value === 'excel') {
+        await handleSubmitExcel();
+        return;
+      }
+      await handleSubmitInput();
+    });
+  } finally {
+    submitBusy.value = false;
+    updateConfirmState();
+  }
 }
 
 async function handleReset() {
@@ -235,6 +244,7 @@ const [Modal, modalApi] = useVbenModal({
   confirmText: '提交',
   destroyOnClose: false,
   async onCancel() {
+    if (submitBusy.value) return;
     modalApi.close();
     await handleReset();
   },
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/trafficCutoff.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/trafficCutoff.vue
index 76f9ecb..d20983d 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/trafficCutoff.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/trafficCutoff.vue
@@ -8,6 +8,7 @@ import type {
 
 import { h, ref, watch } from 'vue';
 
+import { useAccess } from '@vben/access';
 import { useVbenModal, z } from '@vben/common-ui';
 import { DownloadOutlined, Inbox } from '@vben/icons';
 
@@ -27,6 +28,7 @@ const SOURCE_MODAL_CLASS = 'w-[760px] max-w-[calc(100vw-48px)]';
 type TrafficCutoffTab = 'excel' | 'input';
 
 const activeTab = ref<TrafficCutoffTab>('excel');
+const { hasAccessByCodes } = useAccess();
 const uploadFile = ref<UploadProps['fileList']>([]);
 const importFile = ref<File>();
 
@@ -152,6 +154,14 @@ async function handleSubmitInput() {
 }
 
 async function handleConfirm() {
+  const permission =
+    activeTab.value === 'excel'
+      ? 'cpm:iot:tSimCardTrafficCutoff:excel:submit'
+      : 'cpm:iot:tSimCardTrafficCutoff:input:submit';
+  if (!hasAccessByCodes([permission])) {
+    message.warning('没有当前方式的达量断网配置权限');
+    return;
+  }
   await BetterVben.function.modalAutoLoadAsync(modalApi, async () => {
     if (activeTab.value === 'excel') {
       await handleSubmitExcel();
@@ -295,7 +305,18 @@ const [Modal, modalApi] = useVbenModal({
       await handleReset();
       return;
     }
-    activeTab.value = 'excel';
+    await handleReset();
+    const data = modalApi.getData() as undefined | { cardValue?: string };
+    modalApi.setData({});
+    if (data?.cardValue) {
+      if (!hasAccessByCodes(['cpm:iot:tSimCardTrafficCutoff:input:submit'])) {
+        message.warning('没有达量断网手动配置权限');
+        modalApi.close();
+        return;
+      }
+      activeTab.value = 'input';
+      await inputFormApi.setValues({ input: data.cardValue });
+    }
     updateConfirmState();
   },
 });
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/usageHistoryQuery.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/usageHistoryQuery.vue
new file mode 100644
index 0000000..21d9f69
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/usageHistoryQuery.vue
@@ -0,0 +1,467 @@
+<script setup lang="ts" name="BusinessAcceptanceUsageHistoryQuery">
+import type { Dayjs } from 'dayjs';
+import type { UploadFile, UploadProps } from 'ant-design-vue';
+
+import type {
+  ExportColumn,
+  QueryMode,
+  SimCardQueryDeptOption,
+} from '#/api/iotlcm/tCommunication/tSimCardQuery/type';
+
+import { computed, h, ref, watch } from 'vue';
+
+import { useAccess } from '@vben/access';
+import { useVbenModal, z } from '@vben/common-ui';
+import { DownloadOutlined, Inbox } from '@vben/icons';
+
+import {
+  Button,
+  Checkbox,
+  CheckboxGroup,
+  RangePicker,
+  TreeSelect,
+  Upload,
+  UploadDragger,
+  message,
+} from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import * as queryApi from '#/api/iotlcm/tCommunication/tSimCardQuery';
+import BetterVben from '#/constants/BetterVben';
+import FormOption from '#/constants/FormOption';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import CardSourceTabs from '../components/cardSourceTabs.vue';
+
+const MAX_ROWS = 20_000;
+const MAX_EXCEL_FILE_SIZE = 20;
+const SOURCE_MODAL_CLASS = 'w-[860px] max-w-[calc(100vw-48px)]';
+
+const activeTab = ref<QueryMode>('excel');
+const uploadFile = ref<UploadProps['fileList']>([]);
+const importFile = ref<File>();
+const columnOptions = ref<ExportColumn[]>([]);
+const checkedFields = ref<string[]>([]);
+const deptOptions = ref<SimCardQueryDeptOption[]>([]);
+const deptTreeData = ref<any[]>([]);
+const selectedDeptId = ref<number>();
+const expireRange = ref<[Dayjs, Dayjs]>();
+const submitting = ref(false);
+const metaLoading = ref(false);
+const metaError = ref(false);
+
+// 查询和导出共用一个权限码：拆细只会导致少授一个就整个功能不可用。
+const { hasAccessByCodes } = useAccess();
+const canUse = computed(() =>
+  hasAccessByCodes(['cpm:iot:tSimCardUsageHistory:view']),
+);
+const canDownloadTemplate = canUse;
+
+// 三码是对账锚点，固定导出且不可取消。
+const MANDATORY_FIELDS = ['iccid', 'msisdn', 'imsi'];
+
+const canSubmit = computed(
+  () =>
+    canUse.value &&
+    !submitting.value &&
+    !metaLoading.value &&
+    !metaError.value &&
+    checkedFields.value.length > 0,
+);
+
+const dimensionOptions = [
+  { label: 'ICCID', value: 'iccid' },
+  { label: 'MSISDN', value: 'msisdn' },
+  { label: 'IMSI', value: 'imsi' },
+];
+
+/** 扁平部门列表转树，parentId 不在可见范围内的节点按根节点处理。 */
+function buildDeptTree(list: SimCardQueryDeptOption[]) {
+  const nodes = new Map<number, any>();
+  for (const item of list) {
+    nodes.set(item.deptId, {
+      value: item.deptId,
+      title: `${item.deptName}（${item.cardCount} 张）`,
+      deptName: item.deptName,
+      cardCount: item.cardCount,
+      parentId: item.parentId,
+      children: [],
+    });
+  }
+  const roots: any[] = [];
+  for (const node of nodes.values()) {
+    const parent = nodes.get(node.parentId);
+    if (parent && parent.value !== node.value) {
+      parent.children.push(node);
+    } else {
+      roots.push(node);
+    }
+  }
+  return roots;
+}
+
+async function loadMeta() {
+  if (metaLoading.value) return;
+  metaLoading.value = true;
+  metaError.value = false;
+  columnOptions.value = [];
+  checkedFields.value = [];
+  try {
+    const [columnsRes, deptRes] = await Promise.all([
+      queryApi.UsageColumns(),
+      queryApi.UsageDeptOptions(),
+    ]);
+    columnOptions.value = columnsRes.items ?? [];
+    checkedFields.value = columnOptions.value.map((item) => item.field);
+    deptOptions.value = deptRes.items ?? [];
+    deptTreeData.value = buildDeptTree(deptOptions.value);
+    // 默认指向当前登录用户所属企业，避免下拉显示空白或 0。
+    const current = Number(deptRes.currentDeptId);
+    if (current > 0 && deptOptions.value.some((d) => d.deptId === current)) {
+      selectedDeptId.value = current;
+    } else if (deptOptions.value.length > 0) {
+      selectedDeptId.value = deptOptions.value[0]?.deptId;
+    }
+    if (columnOptions.value.length === 0) {
+      throw new Error('未获取到可选导出列');
+    }
+  } catch {
+    metaError.value = true;
+    message.warning('加载查询选项失败，请关闭后重新打开再试');
+  } finally {
+    metaLoading.value = false;
+    modalApi.setState({ confirmDisabled: !canSubmit.value });
+  }
+}
+
+watch(canSubmit, (enabled) => {
+  modalApi.setState({ confirmDisabled: !enabled });
+});
+
+watch(activeTab, () => {
+  modalApi.setState({ confirmDisabled: !canSubmit.value });
+});
+
+function handleBeforeUpload(file: File) {
+  const suffix = file.name.slice(Math.max(0, file.name.lastIndexOf('.') + 1));
+  if (suffix.toLowerCase() !== 'xlsx') {
+    message.error('请上传 xlsx 格式文件');
+    return Upload.LIST_IGNORE;
+  }
+  if (file.size / 1024 / 1024 > MAX_EXCEL_FILE_SIZE) {
+    message.error(`文件大小不能超过 ${MAX_EXCEL_FILE_SIZE}MB`);
+    return Upload.LIST_IGNORE;
+  }
+  importFile.value = file;
+  uploadFile.value = [
+    {
+      uid: `${file.name}-${Date.now()}`,
+      name: file.name,
+      status: 'done',
+      originFileObj: file,
+    } as UploadFile,
+  ];
+  return false;
+}
+
+function handleRemove() {
+  uploadFile.value = [];
+  importFile.value = undefined;
+}
+
+async function handleDownloadTemplate() {
+  if (!canDownloadTemplate.value) {
+    message.warning('没有下载模板权限');
+    return;
+  }
+  const success = await commonDownloadExcel(
+    queryApi.DownloadUsageTemplate,
+    '',
+    {},
+  );
+  if (success) {
+    message.success('下载成功');
+  }
+}
+
+/** 三码始终在导出列里，即使 CheckboxGroup 被清空也补回来（后端同样会强制补）。 */
+function currentColumns() {
+  const picked = columnOptions.value.filter((item) =>
+    checkedFields.value.includes(item.field),
+  );
+  return [
+    ...columnOptions.value.filter((item) =>
+      MANDATORY_FIELDS.includes(item.field),
+    ),
+    ...picked.filter((item) => !MANDATORY_FIELDS.includes(item.field)),
+  ];
+}
+
+async function handleConfirm() {
+  if (submitting.value) return;
+  if (!canSubmit.value || checkedFields.value.length === 0) {
+    message.warning('查询选项尚未加载完成，请至少勾选一个导出字段');
+    return;
+  }
+  submitting.value = true;
+  try {
+    await BetterVben.function.modalAutoLoadAsync(modalApi, async () => {
+      if (activeTab.value === 'excel') {
+        if (!importFile.value) {
+          message.warning('请先上传 Excel 文件');
+          return;
+        }
+        onSubmitSuccess(await queryApi.UsageExport({
+          mode: 'excel', file: importFile.value, exportColumns: currentColumns(),
+        }));
+        return;
+      }
+      if (activeTab.value === 'input') {
+        const [valid, value] = await BetterVben.function.formValidate(inputFormApi);
+        if (!valid) return;
+        const text = String(value.input ?? '').trim();
+        const count = text.split(/\r?\n/).filter((line) => line.trim()).length;
+        if (count < 1 || count > MAX_ROWS) {
+          message.warning(`单次请输入 1 至 ${MAX_ROWS} 条非空记录`);
+          return;
+        }
+        onSubmitSuccess(await queryApi.UsageExport({
+          mode: 'input', batchInput: text, exportColumns: currentColumns(),
+        }));
+        return;
+      }
+      if (activeTab.value === 'range') {
+        const [valid, value] = await BetterVben.function.formValidate(rangeFormApi);
+        if (!valid) return;
+        const startNum = String(value.startNum ?? '').trim();
+        const endNum = String(value.endNum ?? '').trim();
+        if (!/^\d+$/.test(startNum) || !/^\d+$/.test(endNum) || startNum.length !== endNum.length || startNum > endNum) {
+          message.warning('起止号码必须为等长数字，且起始号码不能大于结束号码');
+          return;
+        }
+        onSubmitSuccess(await queryApi.UsageExport({
+          mode: 'range', dimension: String(value.dimension), startNum, endNum,
+          exportColumns: currentColumns(),
+        }));
+        return;
+      }
+      if (!selectedDeptId.value || selectedDeptId.value <= 0) {
+        message.warning('请选择所属公司');
+        return;
+      }
+      onSubmitSuccess(await queryApi.UsageExport({
+        mode: 'dept',
+        deptId: selectedDeptId.value,
+        expireStartTime: expireRange.value?.[0]?.format('YYYY-MM-DD'),
+        expireEndTime: expireRange.value?.[1]?.format('YYYY-MM-DD'),
+        exportColumns: currentColumns(),
+      }));
+    });
+  } finally {
+    submitting.value = false;
+    modalApi.setState({ confirmLoading: false, submitting: false, confirmDisabled: !canSubmit.value });
+  }
+}
+
+function onSubmitSuccess(res?: { taskNo?: string; total?: number }) {
+  window.dispatchEvent(new CustomEvent('iotlcm:export-submitted'));
+  const batchText = res?.taskNo ? `，任务编号：${res.taskNo}` : '';
+  // 号段/按公司模式提交时条数未知（后端返回 -1），此时不显示预计行数
+  const totalText =
+    typeof res?.total === 'number' && res.total > 0
+      ? `，预计 ${res.total} 行`
+      : '';
+  message.success(`导出任务已提交${batchText}${totalText}，请到下载中心查看`);
+  modalApi.close();
+  handleReset();
+}
+
+async function handleReset() {
+  activeTab.value = 'excel';
+  uploadFile.value = [];
+  importFile.value = undefined;
+  expireRange.value = undefined;
+  await inputFormApi.resetForm();
+  await rangeFormApi.resetForm();
+  modalApi.setState({
+    confirmDisabled: true,
+    confirmLoading: false,
+    loading: false,
+    submitting: false,
+  });
+}
+
+const [InputForm, inputFormApi] = useVbenForm({
+  ...BetterVben.form.default,
+  schema: [
+    {
+      fieldName: 'input',
+      label: '批量输入',
+      component: 'Textarea',
+      componentProps: FormOption.Component.Textarea({
+        autoSize: { minRows: 8, maxRows: 12 },
+        placeholder: `每行填写 ICCID，或 ICCID MSISDN IMSI（单次最多 ${MAX_ROWS} 条）`,
+        rows: 8,
+      }),
+      rules: z.string().trim().min(1, '请输入批量输入内容'),
+    },
+  ],
+});
+
+const [RangeForm, rangeFormApi] = useVbenForm({
+  ...BetterVben.form.default,
+  schema: [
+    {
+      fieldName: 'dimension',
+      label: '号码维度',
+      component: 'Select',
+      componentProps: {
+        options: dimensionOptions,
+        placeholder: '请选择号码维度',
+      },
+      rules: z.string().min(1, '请选择号码维度'),
+    },
+    {
+      fieldName: 'startNum',
+      label: '起始号码',
+      component: 'Input',
+      componentProps: { placeholder: '请输入起始号码' },
+      rules: z.string().trim().min(1, '请输入起始号码'),
+    },
+    {
+      fieldName: 'endNum',
+      label: '结束号码',
+      component: 'Input',
+      componentProps: { placeholder: '请输入结束号码' },
+      rules: z.string().trim().min(1, '请输入结束号码'),
+    },
+  ],
+});
+
+const [Modal, modalApi] = useVbenModal({
+  ...BetterVben.modal.grid,
+  class: SOURCE_MODAL_CLASS,
+  confirmText: '提交导出',
+  destroyOnClose: false,
+  async onCancel() {
+    modalApi.close();
+    await handleReset();
+  },
+  async onConfirm() {
+    await handleConfirm();
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      await handleReset();
+      return;
+    }
+    activeTab.value = 'excel';
+    modalApi.setState({ confirmDisabled: true });
+    await loadMeta();
+  },
+});
+</script>
+
+<template>
+  <Modal title="月历史用量查询">
+    <div class="mb-4 rounded-md border border-[#e5e7eb] p-3 dark:border-[#2f2f2f]">
+      <div class="mb-2 text-[13px] font-[600]">导出列（至少勾选一项）</div>
+      <div v-if="columnOptions.length === 0" class="text-[13px] text-[#9ca3af]">
+        加载中…
+      </div>
+      <div v-else>
+        <CheckboxGroup v-model:value="checkedFields">
+          <div class="grid grid-cols-2 gap-x-2 gap-y-1 sm:grid-cols-3">
+            <Checkbox
+              v-for="column in columnOptions"
+              :key="column.field"
+              :value="column.field"
+              :disabled="MANDATORY_FIELDS.includes(column.field)"
+              class="text-[13px]"
+            >
+              {{ column.label }}
+              <span
+                v-if="MANDATORY_FIELDS.includes(column.field)"
+                class="text-[11px] text-[#9ca3af]"
+              >必选</span>
+            </Checkbox>
+          </div>
+        </CheckboxGroup>
+      </div>
+    </div>
+
+    <CardSourceTabs
+      v-model:active-key="activeTab"
+      :show-dept="true"
+      :show-range="true"
+    >
+      <template #excel>
+        <UploadDragger
+          v-model:file-list="uploadFile"
+          accept=".xlsx"
+          class="business-acceptance-excel-upload"
+          :before-upload="handleBeforeUpload"
+          :max-count="1"
+          @remove="handleRemove"
+        >
+          <div class="ant-upload-drag-icon flex justify-center">
+            <Inbox />
+          </div>
+          <p class="ant-upload-text">点击或拖拽文件到此区域上传</p>
+          <p class="ant-upload-hint">
+            单次最多导入 {{ MAX_ROWS }} 条，超出请拆分后分批导入
+          </p>
+        </UploadDragger>
+
+        <div v-if="canDownloadTemplate" class="mt-3 flex justify-center">
+          <Button :icon="h(DownloadOutlined)" @click="handleDownloadTemplate">
+            下载 Excel 模板
+          </Button>
+        </div>
+      </template>
+
+      <template #input>
+        <InputForm />
+      </template>
+
+      <template #range>
+        <RangeForm />
+      </template>
+
+      <template #dept>
+        <div class="flex flex-col gap-3">
+          <div>
+            <div class="mb-1 text-[13px] text-[#374151] dark:text-[#d1d5db]">
+              所属公司
+            </div>
+            <TreeSelect
+              v-model:value="selectedDeptId"
+              :tree-data="deptTreeData"
+              class="w-full"
+              placeholder="请选择所属公司"
+              show-search
+              tree-default-expand-all
+              tree-node-filter-prop="deptName"
+            />
+          </div>
+          <div>
+            <div class="mb-1 text-[13px] text-[#374151] dark:text-[#d1d5db]">
+              到期日期
+            </div>
+            <RangePicker v-model:value="expireRange" class="w-full" />
+          </div>
+        </div>
+      </template>
+    </CardSourceTabs>
+  </Modal>
+</template>
+
+<style scoped>
+.business-acceptance-excel-upload :deep(.ant-upload-drag) {
+  height: 160px;
+}
+
+.business-acceptance-excel-upload :deep(.ant-upload-drag .ant-upload-btn) {
+  padding: 18px 16px;
+}
+</style>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/warningConfig.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/warningConfig.vue
index 90eead4..0f45ccc 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/warningConfig.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tBusinessAcceptance/views/warningConfig.vue
@@ -77,7 +77,6 @@ const warnUnitMb = 1;
 const warnUnitPercent = 2;
 const warnItemTypeCard = 1;
 const warnItemTypeFlowPool = 2;
-const autoActionSuspend = 3;
 
 const warnMethodSms = '0';
 const warnMethodEmail = '1';
@@ -313,10 +312,7 @@ function validateThresholds() {
     message.warning('第三次提醒必须大于第二次提醒');
     return false;
   }
-  if (!isPoolTrafficMode.value && formState.autoAction && thirdWarn <= 0) {
-    message.warning('开启第三次停机时必须配置第三次提醒');
-    return false;
-  }
+
   return true;
 }
 
@@ -388,8 +384,7 @@ function buildCommonPayload(): TSimWarningConfigCommonParam {
     warnMethods: buildWarnMethods(),
     warnPhones: hasSmsMethod.value ? formState.warnPhones.trim() : '',
     warnEmails: hasEmailMethod.value ? formState.warnEmails.trim() : '',
-    autoAction:
-      !isPoolTrafficMode.value && formState.autoAction ? autoActionSuspend : 0,
+    autoAction: 0,
     isEnabled: formState.isEnabled ? 1 : 0,
     remark: formState.remark.trim(),
   };
@@ -660,14 +655,11 @@ const [Modal, modalApi] = useVbenModal({
                 {{ thresholdUnitText }}
               </span>
             </div>
-          </FormItem>
-
-          <FormItem v-if="!isPoolTrafficMode" label="第三次是否停机">
-            <Switch
-              v-model:checked="formState.autoAction"
-              checked-children="开启"
-              un-checked-children="关闭"
-            />
+            <template #extra>
+              <span class="text-xs leading-5 text-gray-500 dark:text-gray-400">
+                预警仅发送消息通知，不会关闭数据服务。自动断网请到达量断网配置设置。
+              </span>
+            </template>
           </FormItem>
 
           <FormItem label="提醒方式">
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/index.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/index.vue
index b58dfe5..2d77aa8 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/index.vue
@@ -16,6 +16,7 @@ import {
   Button,
   Dropdown,
   Empty,
+  Input,
   InputSearch,
   Menu,
   MenuDivider,
@@ -31,6 +32,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import * as dataStartApi from '#/api/iotlcm/tCommunication/tSimCardDataStart';
 import * as dataStopApi from '#/api/iotlcm/tCommunication/tSimCardDataStop';
 import {
+  BatchList,
   Delete,
   Export,
   List,
@@ -42,7 +44,7 @@ import * as startApi from '#/api/iotlcm/tCommunication/tSimCardStart';
 import * as stopApi from '#/api/iotlcm/tCommunication/tSimCardStop';
 import BetterVben from '#/constants/BetterVben';
 import { filterDeptTree, loadCompanyDeptTree } from '#/utils/dept-tree';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { commonDownloadExcel, getExportColumns } from '#/utils/file/download';
 import QuickCopy from '#/utils/HtCustom/QuickCopy';
 
 import { resolveDiagnoseRoutePath } from './diagnose-route';
@@ -60,6 +62,13 @@ const deptTreeVisible = ref(false);
 const deptTreeArray = ref<SysDeptTreeData[]>([]);
 const showTreeSkeleton = ref<boolean>(true);
 const searchValue = ref<string>('');
+const batchInput = ref('');
+const batchQueryInput = ref('');
+const batchQueryOpen = ref(false);
+const batchQueryLoading = ref(false);
+const batchQueryCount = computed(
+  () => batchQueryInput.value.split('\n').filter(Boolean).length,
+);
 const filteredDeptTree = computed(() =>
   filterDeptTree(deptTreeArray.value, searchValue.value),
 );
@@ -193,17 +202,53 @@ async function handleRefresh() {
 }
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
+  // 只导出当前列表显示的列，顺序与页面一致。
+  // 导出接口以 x-www-form-urlencoded 提交，数组对象会被打散，故用 JSON 字符串传输。
+  const exportColumns = getExportColumns(gridApi);
   await commonDownloadExcel(Export, '卡信息表', {
     ...formValues,
+    ...(batchQueryInput.value ? { batchInput: batchQueryInput.value } : {}),
     deptId: selectDeptId.value?.[0] || '',
     page: 1,
-    pageSize: 2000,
+    exportColumnsJson: JSON.stringify(exportColumns),
   });
-  message.success('导出成功');
 }
 
-function handleBatchOperation() {
-  message.info('批量操作功能待接入');
+function handleBatchQueryOpen() {
+  batchInput.value = batchQueryInput.value;
+  batchQueryOpen.value = true;
+}
+
+async function handleBatchQuery() {
+  const lines = batchInput.value
+    .split(/\r\n|[\n\r]/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+  if (lines.length === 0) {
+    message.warning('请输入要查询的号码');
+    return;
+  }
+  if (lines.length > 1000) {
+    message.warning('单次最多查询 1000 条');
+    return;
+  }
+  if (lines.some((line) => ![1, 2, 3].includes(line.split(/\s+/).length))) {
+    message.warning('每行填写 1 至 3 个号码值（ICCID / MSISDN / IMSI）');
+    return;
+  }
+  batchQueryLoading.value = true;
+  try {
+    batchQueryInput.value = lines.join('\n');
+    await gridApi.reload();
+    batchQueryOpen.value = false;
+  } finally {
+    batchQueryLoading.value = false;
+  }
+}
+
+async function handleClearBatchQuery() {
+  batchQueryInput.value = '';
+  await gridApi.reload();
 }
 
 watch(selectDeptId, handleDeptFilterChange);
@@ -233,13 +278,18 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          const deptId = selectDeptId.value?.[0] || '';
-          return await List({
+          const params = {
             page: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
-            deptId,
-          });
+            deptId: selectDeptId.value?.[0] || '',
+            ...(batchQueryInput.value
+              ? { batchInput: batchQueryInput.value }
+              : {}),
+          };
+          return batchQueryInput.value
+            ? await BatchList(params)
+            : await List(params);
         },
       },
     },
@@ -316,12 +366,23 @@ onMounted(() => {
             >
               {{ deptTreeVisible ? '隐藏' : '显示' }}公司
             </Button>
+            <Dropdown>
+              <template #overlay>
+                <Menu>
+                  <MenuItem @click="handleBatchQueryOpen">批量查询</MenuItem>
+                </Menu>
+              </template>
+              <Button class="flex items-center" type="primary">
+                批量操作
+              </Button>
+            </Dropdown>
             <Button
+              v-if="batchQueryCount > 0"
               class="flex items-center"
-              type="primary"
-              @click="handleBatchOperation"
+              danger
+              @click="handleClearBatchQuery"
             >
-              批量操作
+              清除批量查询（{{ batchQueryCount }}）
             </Button>
             <Button
               class="flex items-center"
@@ -462,6 +523,25 @@ onMounted(() => {
         </template>
       </Grid>
     </div>
+    <Modal
+      v-model:open="batchQueryOpen"
+      title="批量查询"
+      :width="760"
+      :confirm-loading="batchQueryLoading"
+      ok-text="查询"
+      cancel-text="取消"
+      @ok="handleBatchQuery"
+    >
+      <p class="mb-3 text-muted-foreground">
+        每行填写 1 至 3 个号码值（ICCID / MSISDN / IMSI），单次最多 1000 条。
+        查询结果保留当前筛选条件，可使用原有导出按钮导出。
+      </p>
+      <Input.TextArea
+        v-model:value="batchInput"
+        :auto-size="{ minRows: 8, maxRows: 12 }"
+        placeholder="每行填写 1 至 3 个号码值（ICCID / MSISDN / IMSI），单次最多 1000 条"
+      />
+    </Modal>
     <EditModal @confirm="handleRefresh" />
     <ViewModal />
   </Page>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/model.tsx
index ec95f4a..987d2ef 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardInfo/model.tsx
@@ -241,6 +241,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '卡状态',
     field: 'bossCardStatus',
+    params: { dictType: DictEnum.T_BOSS_CARD_STATUS },
     align: 'center',
     width: 120,
     slots: {
@@ -249,17 +250,6 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
       },
     },
   },
-  {
-    title: '类型',
-    field: 'isFlowPool',
-    align: 'center',
-    width: 100,
-    slots: {
-      default: ({ row }) => {
-        return row.isFlowPool === 1 ? '池卡' : '单卡';
-      },
-    },
-  },
 
   {
     title: '通道',
diff --git a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardTrafficCutoff/index.vue b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardTrafficCutoff/index.vue
index 68bd398..b32cb72 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardTrafficCutoff/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tCommunication/tSimCardTrafficCutoff/index.vue
@@ -4,6 +4,7 @@ import type { RowType } from './model';
 import type { SysDeptTreeData } from '#/api/system/dept';
 
 import { computed, h, onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { MdiExport, SyncOutlined } from '@vben/icons';
@@ -27,7 +28,10 @@ import {
 } from '#/api/iotlcm/tCommunication/tSimCardTrafficCutoff';
 import BetterVben from '#/constants/BetterVben';
 import { filterDeptTree, loadCompanyDeptTree } from '#/utils/dept-tree';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -47,6 +51,7 @@ const pageText = {
   title: '\u8FBE\u91CF\u65AD\u7F51\u5361\u4FE1\u606F',
 };
 
+const route = useRoute();
 const selectDeptId = ref<string[]>([]);
 const deptTreeVisible = ref(false);
 const deptTreeArray = ref<SysDeptTreeData[]>([]);
@@ -85,10 +90,10 @@ async function handleRefresh() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, 'traffic-cutoff-card-info', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     deptId: selectDeptId.value?.[0] || '',
     page: 1,
-    pageSize: 2000,
   });
   message.success(pageText.exportSuccess);
 }
@@ -117,6 +122,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
         query: async ({ page }: any, formValues: any) => {
           return await List({
             ...formValues,
+            includeUnconfigured:
+              typeof route.query.cardValue === 'string' &&
+              formValues.cardValue === route.query.cardValue,
             deptId: selectDeptId.value?.[0] || '',
             page: page.currentPage,
             pageSize: page.pageSize,
@@ -138,7 +146,22 @@ const [EditModal, editModalApi] = useVbenModal({
   connectedComponent: editModal,
 });
 
-onMounted(loadDeptTree);
+async function applyCardContext() {
+  const cardValue =
+    typeof route.query.cardValue === 'string'
+      ? route.query.cardValue.trim()
+      : '';
+  if (!cardValue) return;
+  selectDeptId.value = [];
+  await gridApi.formApi.resetForm();
+  await gridApi.formApi.setValues({ cardValue });
+  await gridApi.reload();
+}
+watch(() => route.query.cardValue, applyCardContext);
+onMounted(async () => {
+  await loadDeptTree();
+  await applyCardContext();
+});
 </script>
 
 <template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tFlowPackageConfig/index.vue b/vue/apps/web-antd/src/views/iotlcm/tFlowPackageConfig/index.vue
index f46c2c6..0a9c2df 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tFlowPackageConfig/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tFlowPackageConfig/index.vue
@@ -9,7 +9,10 @@
   import { useVbenVxeGrid } from '#/adapter/vxe-table';
   import { AccessControl, useAccess } from '@vben/access';
   const { hasAccessByCodes } = useAccess();
-  import { commonDownloadExcel } from '#/utils/file/download';
+  import {
+    commonDownloadExcel,
+    getExportColumns,
+  } from '#/utils/file/download';
   import { List, Export, Delete } from '#/api/iotlcm/tFlowPackageConfig';
   import { MdiPlus, MdiExport, MdiDelete }  from '@vben/icons';
   import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@
   async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, 'SIM流量池套餐配置表',{
+  exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
   ...formValues,
   page: 1,
-  pageSize: 2000,
   });
-  message.success("导出成功");
   }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tIntelligentDiagnosis/model.ts b/vue/apps/web-antd/src/views/iotlcm/tIntelligentDiagnosis/model.ts
index 4cedbc1..3dc3e86 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tIntelligentDiagnosis/model.ts
+++ b/vue/apps/web-antd/src/views/iotlcm/tIntelligentDiagnosis/model.ts
@@ -181,7 +181,7 @@ const baseRecord: DiagnosisRecord = {
           dataSource: [
             {
               apnName: 'CMIOT',
-              ipv4: '10.132.204.1',
+              ipv4: '192.0.2.10',
               ipv6: '-',
               serviceStatus: '开启',
               onlineStatus: '离线',
@@ -330,7 +330,7 @@ const secondaryRecord: DiagnosisRecord = {
           dataSource: [
             {
               apnName: 'CMIOT',
-              ipv4: '10.132.205.22',
+              ipv4: '192.0.2.10',
               ipv6: '-',
               serviceStatus: '开启',
               onlineStatus: '最近离线',
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.test.ts b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.test.ts
new file mode 100644
index 0000000..594859e
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.test.ts
@@ -0,0 +1,61 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import {
+  countInputRows,
+  detailStatusLabel,
+  detailStatusOptions,
+  isBatchResultPending,
+  resultDownloadHint,
+  resultFileHint,
+} from './batchFeedback';
+
+vi.mock('#/utils/dict', () => ({
+  getDictOptions: () => [
+    { label: '\u5F85\u5904\u7406', value: '0' },
+    { label: '\u5904\u7406\u4E2D', value: '1' },
+    { label: '\u6210\u529F', value: '2' },
+    { label: '\u5931\u8D25', value: '3' },
+    { label: '\u5F85\u6838\u67E5', value: '4' },
+  ],
+}));
+
+describe('批次输入与结果提示', () => {
+  it('缺失状态不应转换成待处理，兼容接口数字字符串', () => {
+    for (const status of [null, undefined, '', 99])
+      expect(detailStatusLabel(status)).toBe('结果未知');
+    expect(detailStatusLabel('3')).toBe('失败');
+    expect(detailStatusLabel(0)).toBe('待处理');
+  });
+  it('区分文件生成状态和卡片执行结果', () => {
+    expect(resultDownloadHint(0)).toContain('待生成');
+    expect(resultDownloadHint(2)).toContain('正在生成');
+    expect(resultDownloadHint(3)).toContain('不代表卡片执行失败');
+    expect(resultDownloadHint(1)).toBeUndefined();
+    expect(resultDownloadHint()).toBeUndefined();
+  });
+  it('按非空行计数，保留重复卡片供后台校验', () => {
+    expect(countInputRows(' \r\n123\r\n\t\n123 456 789\n')).toBe(2);
+    expect(countInputRows('')).toBe(0);
+  });
+  it('等待结果和待核查不能当作失败', () => {
+    for (const status of [0, 1, 2, '0', '1', '2']) {
+      expect(isBatchResultPending(status)).toBe(true);
+    }
+    for (const status of [null, undefined, '', 3, 4, 5, 6]) {
+      expect(isBatchResultPending(status)).toBe(false);
+    }
+    for (const status of [0, 1, 2])
+      expect(resultFileHint(status)).toContain('暂未产生结果');
+    expect(resultFileHint(6)).toContain('暂不能判定成功或失败');
+    expect(resultFileHint(3)).toContain('无文件不代表执行失败');
+    expect(
+      detailStatusOptions().find((item) => Number(item.value) === 4)?.label,
+    ).toContain('待核查');
+  });
+  it('字典未配置的状态不自动补入下拉列表', () => {
+    expect(detailStatusOptions().some((item) => Number(item.value) === 5)).toBe(
+      false,
+    );
+    expect(detailStatusLabel(5)).toBe('结果未知');
+  });
+});
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.ts b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.ts
new file mode 100644
index 0000000..413a81e
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/batchFeedback.ts
@@ -0,0 +1,57 @@
+import DictEnum from '#/constants/DictEnum';
+import { getDictOptions } from '#/utils/dict';
+
+export const NOT_EXECUTED_STATUS = 5;
+
+export function isBatchResultPending(status?: null | number | string) {
+  return (
+    status !== null &&
+    status !== undefined &&
+    status !== '' &&
+    [0, 1, 2].includes(Number(status))
+  );
+}
+
+export function detailStatusOptions() {
+  return getDictOptions(DictEnum.T_DETAIL_STATUS, true);
+}
+
+export function countInputRows(input: string) {
+  return input.split(/\r?\n/u).filter((line) => line.trim()).length;
+}
+
+export function detailStatusLabel(status: null | number | string | undefined) {
+  if (status === null || status === undefined || status === '')
+    return '结果未知';
+  return (
+    detailStatusOptions().find((item) => Number(item.value) === Number(status))
+      ?.label ?? '结果未知'
+  );
+}
+
+export function resultDownloadHint(downloadStatus?: number) {
+  switch (downloadStatus) {
+    case 0: {
+      return '结果文件待生成，请稍后刷新';
+    }
+    case 2: {
+      return '结果文件正在生成，请稍后刷新';
+    }
+    case 3: {
+      return '结果文件生成失败，请查看执行明细；文件生成失败不代表卡片执行失败';
+    }
+    default: {
+      return undefined;
+    }
+  }
+}
+
+export function resultFileHint(batchAsyncStatus?: number) {
+  if (batchAsyncStatus === 6) {
+    return '执行结果待核查，暂不能判定成功或失败';
+  }
+  if ([0, 1, 2].includes(Number(batchAsyncStatus))) {
+    return '任务尚未完成，暂未产生结果，请稍后刷新，无需重复提交';
+  }
+  return '暂无结果文件，请查看卡片执行明细；无文件不代表执行失败';
+}
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/cards.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/cards.vue
index b11fc92..f877bbc 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/cards.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/cards.vue
@@ -9,8 +9,7 @@ import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Cards } from '#/api/iotlcm/tLifeCycle/tBatch';
 import BetterVben from '#/constants/BetterVben';
 
-import { allocationFieldsForBatch } from '../tBatchExecutionLog/model';
-import { CardGridColumns, CardGridSchema } from './model';
+import { CardGridSchema, getCardGridColumns } from './model';
 
 /** ====================  常量  ==================== */
 
@@ -27,11 +26,12 @@ async function handleOpenChange(isOpen: boolean) {
   }
   const { record } = modalApi.getData() as { record: BatchMainModel };
   batchInfo.value = record;
-  gridApi.setGridOptions({
-    columns: allocationFieldsForBatch(CardGridColumns ?? [], record),
-  });
   currentStockOnly.value = Boolean((record as any)?.currentStockOnly);
-  await gridApi.query();
+  gridApi.setGridOptions({
+    columns: getCardGridColumns(record, currentStockOnly.value),
+  });
+  await gridApi.formApi.resetForm();
+  await gridApi.reload();
 }
 
 /** ====================  组件  ==================== */
@@ -42,7 +42,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   },
   gridOptions: {
     ...(BetterVben.grid.gridOptions.modal as any),
-    columns: allocationFieldsForBatch(CardGridColumns ?? [], undefined),
+    columns: getCardGridColumns(),
     proxyConfig: {
       ajax: {
         query: async ({ page }: any, formValues: any) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/model.tsx
index 5918121..78e0bf2 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/model.tsx
@@ -8,6 +8,7 @@ import DictEnum from '#/constants/DictEnum';
 import { renderDict, renderDictTag } from '#/utils';
 import { getDictOptions } from '#/utils/dict';
 
+import { resultFileHint } from '../batchFeedback';
 import {
   resolveDisplayBatchType,
   visibleBatchTypeOptions,
@@ -78,7 +79,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
         return renderGlobalBatchType(row);
       },
     },
-    width: 80,
+    width: 160,
   },
   {
     title: '批次编号',
@@ -140,7 +141,6 @@ export const CardGridSchema: VbenFormSchema[] = [
 
 /** ====================  批次卡清单表格列  ==================== */
 export const CardGridColumns: VxeGridProps['columns'] = [
-  ...allocationColumns,
   {
     title: '行号',
     field: 'rowNo',
@@ -164,8 +164,29 @@ export const CardGridColumns: VxeGridProps['columns'] = [
     field: 'imsi',
     minWidth: 160,
   },
+  ...allocationColumns,
+  {
+    title: '执行状态',
+    field: 'detailStatus',
+    minWidth: 160,
+    slots: {
+      default: ({ row }) =>
+        renderDict(String(row.detailStatus ?? ''), DictEnum.T_DETAIL_STATUS),
+    },
+  },
+  { title: '失败／待核查说明', field: 'errorReason', minWidth: 260 },
 ];
 
+export function getCardGridColumns(batch?: unknown, currentStockOnly = false) {
+  const columns = allocationFieldsForBatch(CardGridColumns ?? [], batch);
+  return currentStockOnly
+    ? columns.filter(
+        (column) =>
+          column.field !== 'detailStatus' && column.field !== 'errorReason',
+      )
+    : columns;
+}
+
 /** ====================  查看配置  ==================== */
 export const ViewDescSchema: DescItem[] = [
   {
@@ -218,10 +239,11 @@ export const ViewDescSchema: DescItem[] = [
   {
     field: 'resultFile',
     label: '结果文件',
-    render(resultFile) {
+    render(resultFile, data) {
       return (
         <FileDownloadButton
           defaultFileName="result-file.xlsx"
+          emptyText={resultFileHint(data?.batchAsyncStatus)}
           file={resultFile}
         />
       );
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/view.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/view.vue
index 0782f67..553ad7f 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/view.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatch/view.vue
@@ -7,6 +7,7 @@ import { Summary } from '#/api/iotlcm/tOperationlog';
 import { Description, useDescription } from '#/components/description';
 import BetterVben from '#/constants/BetterVben';
 
+import { isBatchResultPending } from '../batchFeedback';
 import { getViewDescSchema } from './model';
 
 /** ====================  方法  ==================== */
@@ -15,6 +16,10 @@ async function handleOpenChange(open: boolean) {
     return null;
   }
   const { record } = modalApi.getData() as { record: BatchMainModel };
+  if (isBatchResultPending(record.batchAsyncStatus)) {
+    setDescProps({ data: record, schema: getViewDescSchema(record) }, true);
+    return;
+  }
   const data = await Summary({ batchNo: record.batchNo });
   setDescProps({ data, schema: getViewDescSchema(data) }, true);
 }
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/components/fileDownloadButton.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/components/fileDownloadButton.tsx
index cbd83cf..60a0b24 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/components/fileDownloadButton.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/components/fileDownloadButton.tsx
@@ -1,15 +1,18 @@
 import type { PropType } from 'vue';
 
-import type { BatchExecutionLogFileModel } from '#/api/iotlcm/tOperationlog/type';
+import type { BatchExecutionLogResultFileModel } from '#/api/iotlcm/tOperationlog/type';
 
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 
 import { Button, message } from 'ant-design-vue';
 
+import { Download as downloadExport } from '#/api/common/downloadCenter';
 import { ossDownload } from '#/api/system/oss';
 import { downloadByData } from '#/utils/file/download';
 
-interface OperationLogFileModel extends BatchExecutionLogFileModel {
+import { resultDownloadHint } from '../../batchFeedback';
+
+interface OperationLogFileModel extends BatchExecutionLogResultFileModel {
   fileName?: string;
   name?: string;
   originalName?: string;
@@ -39,14 +42,22 @@ async function handleDownloadFile(
   file: OperationLogFileModel | undefined,
   defaultFileName: string,
 ) {
-  if (!file?.ossId) {
+  if (!file?.ossId && !file?.exportTaskId) {
     message.warning('暂无可下载文件');
     return;
   }
 
   const hideLoading = message.loading('文件下载中...', 0);
   try {
-    const data = await ossDownload(file.ossId);
+    let data: Blob;
+    if (file.exportTaskId) {
+      data = await downloadExport(file.exportTaskId);
+    } else if (file.ossId) {
+      data = await ossDownload(file.ossId);
+    } else {
+      message.warning('暂无可下载文件');
+      return;
+    }
     downloadByData(data, getFileName(file, defaultFileName));
     message.success('下载完成');
   } finally {
@@ -57,6 +68,10 @@ async function handleDownloadFile(
 export default defineComponent({
   name: 'FileDownloadButton',
   props: {
+    emptyText: {
+      default: '-',
+      type: String,
+    },
     defaultFileName: {
       required: true,
       type: String,
@@ -67,16 +82,31 @@ export default defineComponent({
     },
   },
   setup(props) {
+    const downloading = ref(false);
+    async function download() {
+      if (downloading.value) return;
+      downloading.value = true;
+      try {
+        await handleDownloadFile(props.file, props.defaultFileName);
+      } finally {
+        downloading.value = false;
+      }
+    }
     return () => {
-      if (!props.file?.ossId) {
-        return <span>-</span>;
+      if (!props.file?.ossId && !props.file?.exportTaskId) {
+        return (
+          <span>
+            {resultDownloadHint(props.file?.downloadStatus) ?? props.emptyText}
+          </span>
+        );
       }
 
       return (
         <Button
           block={false}
           class="border-none p-0"
-          onClick={() => handleDownloadFile(props.file, props.defaultFileName)}
+          loading={downloading.value}
+          onClick={download}
           type="link"
         >
           下载文件
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/detailList.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/detailList.vue
index 09496a0..b68d8d1 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/detailList.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/detailList.vue
@@ -24,10 +24,11 @@ async function handleOpenChange(isOpen: boolean) {
   }
   const { row } = modalApi.getData() as { row: BatchExecutionLogModel };
   logInfo.value = row;
+  await gridApi.formApi.resetForm();
   gridApi.setGridOptions({
     columns: allocationFieldsForBatch(DetailGridColumns ?? [], row),
   });
-  await gridApi.query();
+  await gridApi.reload();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/index.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/index.vue
index 752b6e0..4b27684 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/index.vue
@@ -5,10 +5,10 @@ import { ref } from 'vue';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 
-import { Button } from 'ant-design-vue';
+import { Button, message, Modal } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { List } from '#/api/iotlcm/tOperationlog';
+import { List, SyncReview } from '#/api/iotlcm/tOperationlog';
 import BetterVben from '#/constants/BetterVben';
 
 import detailListModal from './detailList.vue';
@@ -17,6 +17,12 @@ import viewModal from './view.vue';
 
 /** ====================  常量  ==================== */
 
+/** 异步处理状态：6=待核查（上游已受理但补查未取到终态） */
+const BATCH_ASYNC_STATUS_REVIEW = 6;
+
+/** 批次类型：14=数据导出（无逐行明细，批次号不可点） */
+const EXPORT_BATCH_TYPE = 14;
+
 /** ====================  数据  ==================== */
 /** 表格选中行 */
 const selectRows = ref<BatchExecutionLogModel[]>([]);
@@ -30,6 +36,29 @@ function handleDetailList(row: BatchExecutionLogModel) {
   detailListModalApi.setData({ row }).open();
 }
 
+/**
+ * 手动同步上游结果：只按既有受理号重查一次，不重发办理请求。
+ */
+async function handleSyncReview(row: BatchExecutionLogModel) {
+  if (!row.batchNo) {
+    message.error('批次编号缺失，无法同步');
+    return;
+  }
+  Modal.confirm({
+    title: '同步上游结果',
+    centered: true,
+    content: `将按既有受理号重新查询批次 ${row.batchNo} 的上游执行结果，不会重新提交办理。是否继续？`,
+    onOk: async () => {
+      await SyncReview({
+        batchNo: row.batchNo as string,
+        reason: '页面手动同步',
+      });
+      message.success('同步请求已提交，请稍后刷新查看结果');
+      await gridApi.query();
+    },
+  });
+}
+
 /** ====================  组件  ==================== */
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
@@ -79,10 +108,23 @@ const [DetailListModal, detailListModalApi] = useVbenModal({
           >
             查看
           </Button>
+          <Button
+            v-access:code="'cpm:common:batchExecutionLog:syncReview'"
+            v-if="row.batchAsyncStatus === BATCH_ASYNC_STATUS_REVIEW"
+            class="border-none p-0"
+            :block="false"
+            type="link"
+            @click="handleSyncReview(row)"
+          >
+            同步结果
+          </Button>
         </div>
       </template>
       <template #batchNo="{ row }">
-        <Button type="link" @click="handleDetailList(row)">
+        <span v-if="Number(row.batchType) === EXPORT_BATCH_TYPE">
+          {{ row.batchNo }}
+        </span>
+        <Button v-else type="link" @click="handleDetailList(row)">
           {{ row.batchNo }}
         </Button>
       </template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.test.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.test.tsx
index 5edb434..585bcf5 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.test.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.test.tsx
@@ -5,10 +5,13 @@ import {
   IndexGridColumns as BatchColumns,
   EditFormSchema as BatchEditSchema,
   ViewDescSchema as BatchViewDescSchema,
+  CardGridSchema,
+  getCardGridColumns,
   getViewDescSchema as getBatchViewDescSchema,
 } from '../tBatch/model';
 import {
   allocationFieldsForBatch,
+  DetailGridSchema,
   IndexGridColumns as ExecutionLogColumns,
   DetailGridColumns as ExecutionLogDetailColumns,
   IndexGridSchema as ExecutionLogSchema,
@@ -21,6 +24,16 @@ import {
 vi.mock('#/utils/dict', () => ({
   getDictOptions: (type: string) => {
     switch (type) {
+      case 'detail_status': {
+        return [
+          { label: '待处理', value: 0 },
+          { label: '处理中', value: 1 },
+          { label: '成功', value: 2 },
+          { label: '失败', value: 3 },
+          { label: '待核查', value: 4 },
+          { label: '未执行', value: 5 },
+        ];
+      }
       case 't_batch_execution_mode': {
         return [
           { label: '未知', value: '0' },
@@ -49,6 +62,44 @@ vi.mock('#/utils/dict', () => ({
 }));
 
 describe('批次管理划拨单位展示', () => {
+  it('hides execution feedback for warehouse stock and restores it for batch details', () => {
+    expect(
+      getCardGridColumns({ batchType: 1 }, true).map((item) => item.field),
+    ).toEqual(['rowNo', 'iccid', 'msisdn', 'imsi']);
+    expect(
+      getCardGridColumns({ batchType: 1 }).map((item) => item.field),
+    ).toEqual([
+      'rowNo', 'iccid', 'msisdn', 'imsi', 'detailStatus', 'errorReason',
+    ]);
+  });
+  it('keeps inbound card identifiers before status and reason', () => {
+    for (const [columns, reasonField] of [
+      [BatchCardColumns ?? [], 'errorReason'],
+      [ExecutionLogDetailColumns ?? [], 'error.reason'],
+    ] as const) {
+      expect(
+        allocationFieldsForBatch([...columns], { batchType: 1 }).map(
+          (item) => item.field,
+        ),
+      ).toEqual([
+        'rowNo',
+        'iccid',
+        'msisdn',
+        'imsi',
+        'detailStatus',
+        reasonField,
+      ]);
+    }
+  });
+  it('卡清单不展示状态筛选并保留失败原因', () => {
+    const status = CardGridSchema.find(
+      (item) => item.fieldName === 'detailStatus',
+    );
+    expect(status).toBeUndefined();
+    expect(BatchCardColumns?.map((item) => item.field)).toContain(
+      'errorReason',
+    );
+  });
   it('主列表不展示单位列，划拨详情和卡清单保留单位字段', () => {
     for (const columns of [BatchColumns ?? [], ExecutionLogColumns ?? []]) {
       expect(columns.map((item) => item.field)).not.toContain('sourceDeptName');
@@ -239,6 +290,17 @@ describe('batch count display contract', () => {
   });
 });
 
+describe('review status display contract', () => {
+  it('shows the unknown count column in the execution log list', () => {
+    const columns = ExecutionLogColumns ?? [];
+    const unknownColumn = columns.find(
+      (column: any) => column.field === 'unknownCount',
+    );
+
+    expect(unknownColumn?.title).toBe('待核查数量');
+  });
+});
+
 describe('allocate execution failure details', () => {
   it('shows the stored failure reason for each card', () => {
     const columns = ExecutionLogDetailColumns ?? [];
@@ -246,7 +308,8 @@ describe('allocate execution failure details', () => {
       (column: any) => column.field === 'error.reason',
     );
 
-    expect(reasonColumn?.title).toBe('异常原因');
+    // 该列同时承载失败原因与待核查说明，不得只写"异常原因"。
+    expect(reasonColumn?.title).toBe('失败／待核查说明');
     const renderReason = reasonColumn?.slots?.default;
     expect(typeof renderReason).toBe('function');
     if (typeof renderReason !== 'function') {
@@ -259,3 +322,45 @@ describe('allocate execution failure details', () => {
     ).toBe('套餐已过期，不能划拨');
   });
 });
+
+describe('batch execution failure filtering', () => {
+  it('does not offer a status filter in either card detail view', () => {
+    expect(
+      DetailGridSchema.some((item) => item.fieldName === 'detailStatus'),
+    ).toBe(false);
+    expect(
+      CardGridSchema.some((item) => item.fieldName === 'detailStatus'),
+    ).toBe(false);
+  });
+  it('does not describe unfinished and uncertain batches as failures', () => {
+    const runResult = ExecutionLogColumns?.find(
+      (column) => column.field === 'runResult',
+    )?.slots?.default;
+    if (typeof runResult !== 'function')
+      throw new TypeError('Missing result renderer');
+    for (const batchAsyncStatus of [0, 1, 2]) {
+      expect(
+        runResult({ row: { batchAsyncStatus, runResult: 2 } } as Parameters<
+          typeof runResult
+        >[0]),
+      ).toBe('未出结果');
+    }
+    expect(
+      runResult({ row: { batchAsyncStatus: 6, runResult: 2 } } as Parameters<
+        typeof runResult
+      >[0]),
+    ).toContain('待核查');
+  });
+  it('shows either supported backend reason field', () => {
+    const reason = ExecutionLogDetailColumns?.find(
+      (column) => column.field === 'error.reason',
+    )?.slots?.default;
+    if (typeof reason !== 'function')
+      throw new TypeError('Missing reason renderer');
+    expect(
+      reason({ row: { errorReason: 'provider declined' } } as Parameters<
+        typeof reason
+      >[0]),
+    ).toBe('provider declined');
+  });
+});
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.tsx
index 673d693..f27f102 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/model.tsx
@@ -6,6 +6,7 @@ import DictEnum from '#/constants/DictEnum';
 import { renderDict, renderDictTag } from '#/utils';
 import { getDictOptions } from '#/utils/dict';
 
+import { resultFileHint } from '../batchFeedback';
 import {
   ALLOCATE_BATCH_TYPE,
   resolveDisplayBatchType,
@@ -20,6 +21,16 @@ function renderGlobalBatchType(batchType: unknown) {
   );
 }
 
+export function renderBatchRunResult(row: {
+  batchAsyncStatus?: number | string;
+  runResult?: number;
+}) {
+  const status = Number(row.batchAsyncStatus);
+  if ([0, 1, 2].includes(status)) return '未出结果';
+  if (status === 6) return '待核查（结果未确认）';
+  return renderDict(String(row.runResult ?? ''), DictEnum.T_RUN_RESULT);
+}
+
 function renderBatchSourceType(sourceType?: null | number) {
   if (sourceType === null || sourceType === undefined) {
     return '--';
@@ -27,6 +38,24 @@ function renderBatchSourceType(sourceType?: null | number) {
   return renderDict(String(sourceType), DictEnum.T_BATCH_SOURCE_TYPE);
 }
 
+// 重启批次是「先停机、等待、再复机」两段式：等待期间主状态仍是处理中，
+// 但明细已经是停机结果。这里单独显示「等待复机」，避免被误认为卡住或已办结。
+function renderAsyncStatus(row: {
+  batchAsyncStatus?: number | string;
+  restartPhase?: string;
+  restartResumeAt?: string;
+}) {
+  const status = Number(row?.batchAsyncStatus ?? 0);
+  if (status === 2 && row?.restartPhase === 'waiting_resume') {
+    const resumeAt = String(row?.restartResumeAt ?? '').slice(11, 16);
+    return resumeAt ? `等待复机（预计 ${resumeAt}）` : '等待复机';
+  }
+  return renderDict(
+    String(row?.batchAsyncStatus ?? ''),
+    DictEnum.T_BATCH_ASYNC_STATUS,
+  );
+}
+
 export function sourceUnit(row: {
   sourceDeptId?: number;
   sourceDeptName?: string;
@@ -222,7 +251,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
     field: 'runResult',
     width: 100,
     slots: {
-      default: ({ row }) => renderDict(row.runResult, DictEnum.T_RUN_RESULT),
+      default: ({ row }) => renderBatchRunResult(row),
     },
   },
   {
@@ -230,8 +259,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
     field: 'batchAsyncStatus',
     width: 110,
     slots: {
-      default: ({ row }) =>
-        renderDict(row.batchAsyncStatus, DictEnum.T_BATCH_ASYNC_STATUS),
+      default: ({ row }) => renderAsyncStatus(row),
     },
   },
   {
@@ -242,6 +270,14 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
       default: ({ row }) => row.totalCount ?? '--',
     },
   },
+  {
+    title: '待核查数量',
+    field: 'unknownCount',
+    width: 110,
+    slots: {
+      default: ({ row }) => row.unknownCount ?? 0,
+    },
+  },
   {
     title: '开始时间',
     field: 'startTime',
@@ -252,7 +288,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
     field: 'endTime',
     width: 170,
   },
-  { title: '操作', width: 80, slots: { default: 'action' }, fixed: 'right' },
+  { title: '操作', width: 220, slots: { default: 'action' }, fixed: 'right' },
 ];
 
 /** ====================  明细查询表单  ==================== */
@@ -273,16 +309,6 @@ export const DetailGridSchema: VbenFormSchema[] = [
       placeholder: '请输入ICCID',
     },
   },
-  {
-    fieldName: 'detailStatus',
-    component: 'Select',
-    label: '明细状态',
-    componentProps: {
-      allowClear: true,
-      placeholder: '请选择明细状态',
-      options: getDictOptions(DictEnum.T_DETAIL_STATUS),
-    },
-  },
 ];
 
 /** ====================  明细表格列  ==================== */
@@ -317,15 +343,15 @@ export const DetailGridColumns: VxeGridProps['columns'] = [
     width: 100,
     slots: {
       default: ({ row }) =>
-        renderDict(row.detailStatus, DictEnum.T_DETAIL_STATUS),
+        renderDict(String(row.detailStatus ?? ''), DictEnum.T_DETAIL_STATUS),
     },
   },
   {
-    title: '异常原因',
+    title: '失败／待核查说明',
     field: 'error.reason',
     minWidth: 300,
     slots: {
-      default: ({ row }) => row.error?.reason || '--',
+      default: ({ row }) => row.error?.reason || row.errorReason || '--',
     },
   },
 ];
@@ -373,19 +399,20 @@ export const ViewDescSchema: DescItem[] = [
   {
     field: 'runResult',
     label: '运行结果',
-    render(runResult) {
-      return renderDict(runResult, DictEnum.T_RUN_RESULT);
+    render(runResult, row) {
+      return renderBatchRunResult({ ...row, runResult });
     },
   },
   {
     field: 'batchAsyncStatus',
     label: '异步处理状态',
-    render(batchAsyncStatus) {
-      return renderDict(batchAsyncStatus, DictEnum.T_BATCH_ASYNC_STATUS);
+    render(_value, row) {
+      return renderAsyncStatus(row);
     },
   },
   { field: 'totalCount', label: '总数量' },
-  { field: 'failReason', label: '失败原因' },
+  { field: 'unknownCount', label: '待核查数量', render: (value) => value ?? 0 },
+  { field: 'failReason', label: '失败／待核查说明' },
   {
     field: 'sourceFile',
     label: '源文件',
@@ -401,10 +428,11 @@ export const ViewDescSchema: DescItem[] = [
   {
     field: 'resultFile',
     label: '结果文件',
-    render(resultFile) {
+    render(resultFile, data) {
       return (
         <FileDownloadButton
           defaultFileName="result-file.xlsx"
+          emptyText={resultFileHint(data?.batchAsyncStatus)}
           file={resultFile}
         />
       );
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/view.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/view.vue
index db1c202..538fe2d 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/view.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tBatchExecutionLog/view.vue
@@ -7,6 +7,7 @@ import { Summary } from '#/api/iotlcm/tOperationlog';
 import { Description, useDescription } from '#/components/description';
 import BetterVben from '#/constants/BetterVben';
 
+import { isBatchResultPending } from '../batchFeedback';
 import { getViewDescSchema } from './model';
 
 /** ====================  方法  ==================== */
@@ -18,6 +19,10 @@ async function handleOpenChange(open: boolean) {
   if (!row.batchNo) {
     return null;
   }
+  if (isBatchResultPending(row.batchAsyncStatus)) {
+    setDescProps({ data: row, schema: getViewDescSchema(row) }, true);
+    return;
+  }
   const data = await Summary({ batchNo: row.batchNo });
   setDescProps({ data, schema: getViewDescSchema(data) }, true);
 }
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/index.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/index.vue
index 893b8b0..f84849c 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/index.vue
@@ -6,12 +6,12 @@ import { h } from 'vue';
 import { Page } from '@vben/common-ui';
 import { MdiExport, SyncOutlined } from '@vben/icons';
 
-import { Button, message } from 'ant-design-vue';
+import { Button } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Export, List } from '#/api/iotlcm/tLifeCycle/tSimCardCancellation';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { commonDownloadExcel, getExportColumns } from '#/utils/file/download';
 
 import { IndexGridColumns, IndexGridSchema } from './model';
 
@@ -34,10 +34,11 @@ async function handleRefresh() {
 
 async function handleExport() {
   const filters = normalizeFilters(gridApi.formApi.form.values as FormValues);
-  const success = await commonDownloadExcel(Export, '', filters);
-  if (success) {
-    message.success('导出成功');
-  }
+  // 只导出当前列表显示的列，顺序与页面一致
+  await commonDownloadExcel(Export, '', {
+    ...filters,
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
+  });
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.test.ts b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.test.ts
new file mode 100644
index 0000000..641814d
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('#/api/iotlcm/tChannel/tSimChannels', () => ({ List: vi.fn() }));
+vi.mock('#/api/system/dept', () => ({ getSysDeptTreeApi: vi.fn() }));
+vi.mock('#/utils', () => ({
+  renderDict: vi.fn(),
+  renderPopoverMemberSumma: vi.fn(),
+}));
+
+import { filterCancellationChannel, IndexGridSchema } from './model';
+
+describe('销户卡所属通道搜索', () => {
+  const option = { label: '河南移动223', value: 'CMCC-HN-223' };
+  it.each(['河南', '移动', '223', ' cmcc ', 'hn'])(
+    '按显示名称或编号匹配 %s',
+    (input) => {
+      expect(filterCancellationChannel(input, option)).toBe(true);
+    },
+  );
+  it('清空搜索恢复选项，未匹配内容不显示', () => {
+    expect(filterCancellationChannel('  ', option)).toBe(true);
+    expect(filterCancellationChannel('河北', option)).toBe(false);
+    expect(filterCancellationChannel('河南')).toBe(false);
+  });
+  it('不使用选项中隐藏的全名匹配', () => {
+    expect(
+      filterCancellationChannel('真实上游', {
+        ...option,
+        chanName: '真实上游',
+      } as typeof option),
+    ).toBe(false);
+  });
+  it('通道筛选使用名称与编号匹配并保留通道编号作为值', () => {
+    const field = IndexGridSchema.find((item) => item.fieldName === 'chanKey');
+    expect(field?.componentProps).toMatchObject({
+      filterOption: filterCancellationChannel,
+      showSearch: true,
+      allowClear: true,
+      labelField: 'chanName',
+      valueField: 'chanKey',
+    });
+  });
+});
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.tsx
index c7ce737..b39710f 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardCancellation/model.tsx
@@ -6,6 +6,21 @@ import { getSysDeptTreeApi } from '#/api/system/dept';
 import DictEnum from '#/constants/DictEnum';
 import { renderDict, renderPopoverMemberSumma } from '#/utils';
 
+export function filterCancellationChannel(
+  input: string,
+  option?: { label?: unknown; value?: unknown },
+) {
+  const keyword = input.trim().toLowerCase();
+  return (
+    !keyword ||
+    [option?.label, option?.value].some((value) =>
+      String(value ?? '')
+        .toLowerCase()
+        .includes(keyword),
+    )
+  );
+}
+
 export const IndexGridSchema: VbenFormSchema[] = [
   {
     fieldName: 'cardValue',
@@ -30,6 +45,7 @@ export const IndexGridSchema: VbenFormSchema[] = [
     componentProps: {
       allowClear: true,
       api: ChannelList,
+      filterOption: filterCancellationChannel,
       labelField: 'chanName',
       placeholder: '请选择通道',
       resultField: 'items',
@@ -105,6 +121,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '卡状态',
     field: 'bossCardStatus',
+    params: { dictType: DictEnum.T_BOSS_CARD_STATUS },
     minWidth: 110,
     slots: {
       default: ({ row }) =>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardStock/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardStock/model.tsx
index 7d1e96c..f5c3a20 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardStock/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tSimCardStock/model.tsx
@@ -8,6 +8,7 @@ import DictEnum from '#/constants/DictEnum';
 import FormOptions from '#/constants/FormOption';
 import { renderDict, renderPopoverMemberSumma } from '#/utils';
 import { getDictOptions } from '#/utils/dict';
+import type { ExportColumn } from '#/utils/file/download';
 
 import {
   calculateOutboundEndDate,
@@ -215,6 +216,9 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
     title: '创建部门',
     field: 'createdDept',
     minWidth: 80,
+    slots: {
+      default: ({ row }) => row.createdDeptName || row.createdDept || '--',
+    },
   },
   {
     title: '协议到期时间',
@@ -237,6 +241,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '卡类型',
     field: 'cardType',
+    params: { dictType: DictEnum.T_CARD_TYPE },
     minWidth: 150,
     slots: {
       default: ({ row }) =>
@@ -270,6 +275,27 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   },
 ];
 
+// 行内导出（入库批次 -> 库存卡明细）列：与列表页一致，且把 ID 映射成汉字。
+// 创建者/更新者取操作人摘要里的昵称；创建部门取后端补充的 createdDeptName；
+// 卡类型走字典 t_card_type。
+export const StockCardExportColumns: ExportColumn[] = [
+  { field: 'iccid', label: 'ICCID' },
+  { field: 'msisdn', label: 'MSISDN' },
+  { field: 'imsi', label: 'IMSI' },
+  { field: 'imei', label: 'IMEI' },
+  { field: 'chanName', label: '通道名称' },
+  { field: 'upPkgCode', label: '套餐编号' },
+  { field: 'upPkgName', label: '上游套餐' },
+  { field: 'tenantId', label: '租户ID' },
+  { field: 'createdDeptName', label: '创建部门' },
+  { field: 'agreementExpiryDate', label: '协议到期时间' },
+  { field: 'createdBySumma.nickName', label: '创建者' },
+  { field: 'cardType', label: '卡类型', dictType: DictEnum.T_CARD_TYPE },
+  { field: 'createdAt', label: '创建时间' },
+  { field: 'updatedBySumma.nickName', label: '更新者' },
+  { field: 'updatedAt', label: '更新时间' },
+];
+
 // 可出库批次列
 export const OutboundBatchGridColumns: VxeGridProps['columns'] = [
   {
@@ -301,6 +327,7 @@ export const OutboundBatchGridColumns: VxeGridProps['columns'] = [
   {
     title: '卡类型',
     field: 'cardType',
+    params: { dictType: DictEnum.T_CARD_TYPE },
     minWidth: 150,
     slots: {
       default: ({ row }) =>
@@ -386,6 +413,7 @@ export const OutboundBatchCardPreviewColumns: VxeGridProps['columns'] = [
   {
     title: '卡类型',
     field: 'cardType',
+    params: { dictType: DictEnum.T_CARD_TYPE },
     minWidth: 150,
     slots: {
       default: ({ row }) =>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/index.vue b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/index.vue
index 9620ddb..1673f68 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/index.vue
@@ -7,15 +7,23 @@ import { MdiExport, MdiImport } from '@vben/icons';
 import { Button, Dropdown, Menu, MenuItem, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
-import { WarehousingList } from '#/api/iotlcm/tLifeCycle/tBatch';
+import {
+  ExportWarehousing,
+  WarehousingList,
+} from '#/api/iotlcm/tLifeCycle/tBatch';
+// 行内导出仍导出该批次的库存卡明细
 import { Export } from '#/api/iotlcm/tLifeCycle/tSimCardStock';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
-import batchModal from './batch.vue';
 import cardsModal from '../tBatch/cards.vue';
+import batchModal from './batch.vue';
 import inputModal from './input.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
+import { StockCardExportColumns } from '../tSimCardStock/model';
 import rangeModal from './range.vue';
 
 /** ====================  常量  ==================== */
@@ -28,12 +36,12 @@ async function handleRefresh() {
 }
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
-  await commonDownloadExcel(Export, '入库管理', {
+  // 导出入库批次列表：数据与页面列表一致（成功批次，batchType=入库）
+  await commonDownloadExcel(ExportWarehousing, '入库管理', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 async function handleExportBatch(row: any) {
@@ -41,14 +49,11 @@ async function handleExportBatch(row: any) {
     message.warning('批次号不能为空');
     return;
   }
-  const success = await commonDownloadExcel(Export, `入库批次-${row.batchNo}`, {
+  // 行内导出该批次的库存卡明细：与库存卡列表页同列，并把 ID 映射成汉字
+  await commonDownloadExcel(Export, `入库批次-${row.batchNo}`, {
     batchNo: row.batchNo,
-    page: 1,
-    pageSize: 100_000,
+    exportColumnsJson: JSON.stringify(StockCardExportColumns),
   });
-  if (success) {
-    message.success('导出成功');
-  }
 }
 
 function handleViewBatchCards(row: any) {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.test.ts b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.test.ts
new file mode 100644
index 0000000..8dfb671
--- /dev/null
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it, vi } from 'vitest';
+
+const channels = vi.hoisted(() => ({ list: vi.fn() }));
+
+vi.mock('#/api/iotlcm/tChannel/tSimChannels', () => ({ List: channels.list }));
+vi.mock('#/api/agent', () => ({ getAgentDeptListApi: vi.fn() }));
+vi.mock('#/api/iotlcm/tPricingPackage/tSimFlowPackagePrice', () => ({
+  GetTSimFlowPackagePriceAgentTreeApi: vi.fn(),
+}));
+vi.mock('#/api/iotlcm/tPricingPackage/tSimPackageCategory', () => ({
+  List: vi.fn(),
+}));
+vi.mock('#/api/iotlcm/tPricingPackage/tSimUpstreamPackage', () => ({
+  List: vi.fn(),
+}));
+vi.mock('#/utils', () => ({ renderDict: vi.fn() }));
+vi.mock('#/utils/dict', () => ({ getDictOptions: () => [] }));
+
+import { IndexGridSchema } from './model';
+
+describe('入库管理上游渠道搜索', () => {
+  const field = IndexGridSchema.find((item) => item.fieldName === 'chanKey');
+  const props = field?.componentProps as {
+    allowClear: boolean;
+    api: typeof channels.list;
+    autoSelect: boolean;
+    filterOption: (
+      input: string,
+      option: { label: string; value: string },
+    ) => boolean;
+    labelField: string;
+    params: Record<string, unknown>;
+    resultField: string;
+    showSearch: boolean;
+    valueField: string;
+  };
+
+  it('复用渠道接口并映射名称及编码，不自动筛选首项', async () => {
+    expect(field?.component).toBe('ApiSelect');
+    expect(props.api).toBe(channels.list);
+    expect(props.resultField).toBe('items');
+    expect(props.labelField).toBe('chanName');
+    expect(props.valueField).toBe('chanKey');
+    expect(props.autoSelect).toBe(false);
+    expect(props.allowClear).toBe(true);
+    const response = { items: [{ chanName: '移动渠道', chanKey: 'CMCC-01' }] };
+    channels.list.mockResolvedValueOnce(response);
+    expect(await props.api(props.params)).toEqual(response);
+  });
+
+  it('支持按渠道名称或编码模糊搜索', () => {
+    const option = { label: '移动渠道', value: 'CMCC-01' };
+    expect(props.showSearch).toBe(true);
+    expect(props.filterOption('移动', option)).toBe(true);
+    expect(props.filterOption(' cmcc ', option)).toBe(true);
+    expect(props.filterOption('', option)).toBe(true);
+    expect(props.filterOption('联通', option)).toBe(false);
+  });
+});
diff --git a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.tsx
index 5fa46f2..91f8527 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tLifeCycle/tWarehousing/model.tsx
@@ -114,12 +114,15 @@ export const IndexGridSchema: VbenFormSchema[] = [
   },
   {
     fieldName: 'chanKey',
-    component: 'Select',
+    component: 'ApiSelect',
     label: '上游渠道',
     componentProps: {
+      ...FormOptions.Api.tSimChannels({ autoSelect: false }),
       placeholder: '请选择上游渠道',
       allowClear: true,
-      options: [],
+      showSearch: true,
+      optionFilterProp: 'label',
+      filterOption: fuzzyOptionFilter,
     },
   },
   {
@@ -173,6 +176,11 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '三码校验',
     field: 'batchInfo.inboundOptions.validateUpstreamBasicInfo',
+    params: {
+      dictType: DictEnum.GLOBAL_YES_OR_NO,
+      dictValueMap: { '0': '1', '1': '0' },
+      fallbackField: 'batchInfo.validateUpstreamBasicInfo',
+    },
     width: 110,
     slots: {
       default: ({ row }) =>
@@ -194,6 +202,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '卡类型',
     field: 'batchInfo.inboundOptions.cardType',
+    params: { dictType: DictEnum.T_CARD_TYPE, fallbackField: 'batchInfo.cardType' },
     width: 120,
     slots: {
       default: ({ row }) => {
@@ -246,6 +255,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '贴片转插拔',
     field: 'batchInfo.inboundOptions.insertToPlugEnabled',
+    params: { dictType: DictEnum.GLOBAL_YES_OR_NO, fallbackField: 'batchInfo.insertToPlugEnabled' },
     width: 110,
     slots: {
       default: ({ row }) =>
@@ -259,6 +269,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '运营商达量断网',
     field: 'batchInfo.inboundOptions.carrierTrafficCutoffEnabled',
+    params: { dictType: DictEnum.GLOBAL_YES_OR_NO, fallbackField: 'batchInfo.carrierTrafficCutoffEnabled' },
     width: 130,
     slots: {
       default: ({ row }) =>
@@ -285,6 +296,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否有测试期',
     field: 'batchInfo.inboundOptions.hasTestPeriod',
+    params: { dictType: DictEnum.GLOBAL_YES_OR_NO, fallbackField: 'batchInfo.hasTestPeriod' },
     width: 110,
     slots: {
       default: ({ row }) =>
@@ -324,6 +336,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否有沉默期',
     field: 'batchInfo.inboundOptions.hasSilentPeriod',
+    params: { dictType: DictEnum.GLOBAL_YES_OR_NO, fallbackField: 'batchInfo.hasSilentPeriod' },
     width: 110,
     slots: {
       default: ({ row }) =>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tOrder/display.tsx b/vue/apps/web-antd/src/views/iotlcm/tOrder/display.tsx
index 7161263..4ab3b4d 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tOrder/display.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tOrder/display.tsx
@@ -70,6 +70,7 @@ const baseColumns: VxeGridProps['columns'] = [
   },
   {
     field: 'orderType',
+    params: { dictType: DictEnum.ORDER_TYPE },
     title: '业务类型',
     width: 110,
     slots: {
@@ -93,6 +94,7 @@ const baseColumns: VxeGridProps['columns'] = [
   },
   {
     field: 'payType',
+    params: { dictType: DictEnum.PAY_TYPE },
     title: '支付方式',
     width: 110,
     slots: {
@@ -101,6 +103,7 @@ const baseColumns: VxeGridProps['columns'] = [
   },
   {
     field: 'payStatus',
+    params: { dictType: DictEnum.PAY_STATUS },
     title: '支付状态',
     width: 110,
     slots: {
@@ -132,6 +135,7 @@ export const sellOrderColumns: VxeGridProps['columns'] = [
   },
   {
     field: 'distributionStatus',
+    params: { dictType: DictEnum.DISTRIBUTION_STATUS },
     title: '分成状态',
     width: 110,
     slots: {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tOrder/index.vue b/vue/apps/web-antd/src/views/iotlcm/tOrder/index.vue
index ed2a74c..5855ae3 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tOrder/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tOrder/index.vue
@@ -11,7 +11,10 @@ import { Button } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Export, List } from '#/api/iotlcm/tOrder';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import { orderQuerySchema, purchaseOrderColumns } from './display';
 import ViewDrawer from './view.vue';
@@ -62,9 +65,9 @@ async function exportOrders() {
     'page' | 'pageSize'
   >;
   await commonDownloadExcel(Export, '购买方订单', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...values,
     page: 1,
-    pageSize: 2000,
   });
 }
 </script>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tOrder/indexTwo.vue b/vue/apps/web-antd/src/views/iotlcm/tOrder/indexTwo.vue
index fe2064d..a6b33cc 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tOrder/indexTwo.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tOrder/indexTwo.vue
@@ -11,7 +11,10 @@ import { Button } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Export, SellList } from '#/api/iotlcm/tOrder';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import { orderQuerySchema, sellOrderColumns } from './display';
 import ViewDrawer from './view.vue';
@@ -63,9 +66,9 @@ async function exportOrders() {
     'page' | 'pageSize'
   >;
   await commonDownloadExcel(Export, '销售方订单', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...values,
     page: 1,
-    pageSize: 2000,
     perspective: 'sell',
   });
 }
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/index.vue b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/index.vue
index 409e13b..a2238c1 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/index.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import type { PackageCreateType } from './model';
+
 import type { TSimFlowPackageInfoModel } from '#/api/iotlcm/tPricingPackage/tSimFlowPackageInfo/type';
 
 import { h, ref } from 'vue';
@@ -26,14 +28,16 @@ import {
   SyncDeptPackages,
 } from '#/api/iotlcm/tPricingPackage/tSimFlowPackageInfo';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import {
   IndexGridColumns,
   IndexGridSchema,
   PackageCreateTypeOptions,
-  type PackageCreateType,
 } from './model';
 import viewModal from './view.vue';
 
@@ -83,11 +87,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '流量套餐信息', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 async function handleSyncDeptPackages() {
   await SyncDeptPackages();
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/model.tsx
index 48efebe..08ccf0a 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackageInfo/model.tsx
@@ -1066,6 +1066,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '套餐类型',
     field: 'packageType',
+    params: { dictType: DictEnum.T_PACKAGE_TYPE },
     minWidth: 100,
     slots: {
       default: ({ row }) => {
@@ -1076,6 +1077,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '计费方式',
     field: 'billingMethod',
+    params: { dictType: DictEnum.T_BILLING_METHOD },
     minWidth: 80,
     slots: {
       default: ({ row }) => {
@@ -1096,6 +1098,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否启用',
     field: 'enabled',
+    params: { dictType: DictEnum.FLOW_PACKAGE_ENABLED },
     width: 100,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/index.vue b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/index.vue
index 7417ff6..513d884 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/index.vue
@@ -24,16 +24,16 @@ import {
   Export,
 } from '#/api/iotlcm/tPricingPackage/tSimFlowPackagePrice';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import packageInfoViewModal from '../tSimFlowPackageInfo/view.vue';
 import batchAdjustModal from './batchAdjust.vue';
 import AgentTree from './components/AgentTree/index.vue';
 import editModal from './edit.vue';
-import {
-  IndexGridColumns,
-  IndexGridSchema,
-} from './model';
+import { IndexGridColumns, IndexGridSchema } from './model';
 // import viewModal from './view.vue';
 
 /** ====================  类型  ==================== */
@@ -51,15 +51,13 @@ const { hasAccessByCodes } = useAccess();
 const agentTreeSelectInfo = ref<AgentTreeSelectPayload>();
 /** 表格选中行 */
 const selectRows = ref<TSimFlowPackagePriceAgentPackagePriceListItem[]>([]);
-const canEditAgentDefaultPrice = computed(
-  () =>
-    hasAccessByCodes([
-      'cpm:iot:tSimFlowPackagePrice:agentDefaultPackagePrice:edit',
-    ]),
+const canEditAgentDefaultPrice = computed(() =>
+  hasAccessByCodes([
+    'cpm:iot:tSimFlowPackagePrice:agentDefaultPackagePrice:edit',
+  ]),
 );
-const canEditAgentTargetPrice = computed(
-  () =>
-    hasAccessByCodes(['cpm:iot:tSimFlowPackagePrice:agentPackagePrice:edit']),
+const canEditAgentTargetPrice = computed(() =>
+  hasAccessByCodes(['cpm:iot:tSimFlowPackagePrice:agentPackagePrice:edit']),
 );
 const canEditCurrentPrice = computed(() =>
   agentTreeSelectInfo.value?.level === 2
@@ -216,11 +214,10 @@ async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   /** 导出沿用原定价导出接口，按当前搜索条件导出前 2000 条 */
   await commonDownloadExcel(Export, '流量套餐价格', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/model.tsx
index 716c233..641099d 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimFlowPackagePrice/model.tsx
@@ -64,6 +64,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '价格来源',
     field: 'priceSource',
+    params: { dictType: DictEnum.T_PACKAGE_PRICE_SOURCE },
     width: 120,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/index.vue b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/index.vue
index b115e91..1dfe6ed 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/index.vue
@@ -17,7 +17,10 @@ import {
   List,
 } from '#/api/iotlcm/tPricingPackage/tSimPackageCategory';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -66,11 +69,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '套餐分类', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/model.tsx
index 2983e41..b66cf50 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimPackageCategory/model.tsx
@@ -72,6 +72,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '是否启用',
     field: 'enabled',
+    params: { dictType: DictEnum.GLOBAL_ENABLED },
     width: 100,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/index.vue b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/index.vue
index 0d9bb01..4c095fa 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/index.vue
@@ -17,7 +17,10 @@ import {
   List,
 } from '#/api/iotlcm/tPricingPackage/tSimUpstreamPackage';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -66,11 +69,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '上游套餐', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/model.tsx
index fb8cb85..fb0d1cb 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tPricingPackage/tSimUpstreamPackage/model.tsx
@@ -57,6 +57,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '运营商',
     field: 'operator',
+    params: { dictType: DictEnum.T_OPERATORS },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/cardConfig/edit.vue b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/cardConfig/edit.vue
index 4486d61..5bc1d23 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/cardConfig/edit.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/cardConfig/edit.vue
@@ -5,15 +5,19 @@ import type {
 } from '#/api/iotlcm/tWarnCenter/simWarningConfig/type';
 
 import { computed, ref } from 'vue';
+import { useRouter } from 'vue-router';
 
+import { useAccess } from '@vben/access';
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
+import { useAccessStore } from '@vben/stores';
 
-import { message } from 'ant-design-vue';
+import { Alert, Modal as AntModal, Button, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { Save, View } from '#/api/iotlcm/tWarnCenter/simWarningConfig';
 import BetterVben from '#/constants/BetterVben';
+import { resolveAvailableRoutePath } from '#/views/iotlcm/tCommunication/tSimCardInfo/diagnose-route';
 
 import {
   buildWarnMethods,
@@ -30,6 +34,47 @@ interface ModalProps {
 
 const emit = defineEmits<{ confirm: [] }>();
 const isUpdate = ref(false);
+const router = useRouter();
+const accessStore = useAccessStore();
+const { hasAccessByCodes } = useAccess();
+const cutoffPath = computed(() =>
+  resolveAvailableRoutePath(
+    router,
+    accessStore,
+    (_route, fullPath) => /\/tBusinessAcceptance\/?$/i.test(fullPath),
+    [],
+  ),
+);
+const canConfigureCutoff = computed(
+  () =>
+    Boolean(cutoffPath.value) &&
+    hasAccessByCodes(['cpm:iot:tSimCardTrafficCutoff:input:submit']),
+);
+async function handleOpenCutoff() {
+  if (!canConfigureCutoff.value) {
+    message.warning('没有达量断网配置权限');
+    return;
+  }
+  const values = await formApi.getValues();
+  const cardValue = String(values.itemCode || '').trim();
+  if (!cardValue) {
+    message.warning('请先填写卡片标识');
+    return;
+  }
+  AntModal.confirm({
+    title: '前往达量断网配置？',
+    content:
+      '未保存的预警内容不会提交。断网策略需在目标页面独立保存，不会自动使用预警阈值。',
+    async onOk() {
+      if (!canConfigureCutoff.value) return;
+      await router.push({
+        path: cutoffPath.value,
+        query: { acceptanceAction: 'trafficCutoff', cardValue },
+      });
+      modalApi.close();
+    },
+  });
+}
 const title = computed(() =>
   isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add'),
 );
@@ -41,7 +86,6 @@ async function handleOpen() {
   await formApi.setValues({
     itemType: warnItemTypeCard,
     isEnabled: 1,
-    autoAction: 0,
     warnMethodTypes: parseWarnMethodTypes(),
   });
   if (!data.isUpdate || !data.row?.id) {
@@ -51,6 +95,7 @@ async function handleOpen() {
     const res = await View({ id: data.row.id });
     await formApi.setValues({
       ...res,
+
       warnMethodTypes: parseWarnMethodTypes(res.warnMethods),
     });
   } catch (error) {
@@ -73,6 +118,8 @@ async function handleConfirm() {
   }
   payload.warnMethods = buildWarnMethods(payload.warnMethodTypes);
   delete payload.warnMethodTypes;
+  delete payload.autoAction;
+  delete payload.trafficCutoffCrossMonthHold;
   await BetterVben.function.formSubmit(
     Save(payload as SimWarningConfigSaveParam),
     modalApi,
@@ -112,6 +159,20 @@ const [Modal, modalApi] = useVbenModal({
 
 <template>
   <Modal :title="title">
+    <Alert class="mb-4" type="info" show-icon>
+      <template #message>预警仅发送消息通知，不会自动关闭数据服务。</template>
+      <template #description>
+        如需达量自动断网，请独立配置断网策略。
+        <Button
+          v-if="canConfigureCutoff"
+          type="link"
+          size="small"
+          @click="handleOpenCutoff"
+        >
+          配置达量断网
+        </Button>
+      </template>
+    </Alert>
     <Form />
   </Modal>
 </template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/flowPoolConfig/edit.vue b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/flowPoolConfig/edit.vue
index 912e5bd..730ad1c 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/flowPoolConfig/edit.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/flowPoolConfig/edit.vue
@@ -9,7 +9,7 @@ import { computed, ref } from 'vue';
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
-import { message } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { Save, View } from '#/api/iotlcm/tWarnCenter/simWarningConfig';
@@ -117,6 +117,12 @@ const [Modal, modalApi] = useVbenModal({
 
 <template>
   <Modal :title="title">
+    <Alert
+      class="mb-4"
+      type="info"
+      show-icon
+      message="流量池预警仅发送消息通知，不会自动关闭成员卡的数据服务。"
+    />
     <Form />
   </Modal>
 </template>
diff --git a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/shared/model.tsx b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/shared/model.tsx
index 179ca00..56119f3 100644
--- a/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/shared/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/tWarnCenter/shared/model.tsx
@@ -327,14 +327,6 @@ export function getConfigGridColumns(
         default: ({ row }) => renderWarnMethodTags(row.warnMethods),
       },
     },
-    {
-      title: '第三次是否停机',
-      field: 'autoAction',
-      minWidth: 150,
-      slots: {
-        default: ({ row }) => formatAutoAction(row.autoAction),
-      },
-    },
     {
       title: '状态',
       field: 'isEnabled',
@@ -473,17 +465,6 @@ export function getEditFormSchema(itemType: number): VbenFormSchema[] {
         placeholder: '多个邮箱用英文逗号分隔',
       },
     },
-    {
-      fieldName: 'autoAction',
-      component: 'Select',
-      label: '第三次是否停机',
-      defaultValue: autoActionNone,
-      componentProps: {
-        options: isFlowPool ? noAutoActionOptions : cardAutoActionOptions,
-        placeholder: '请选择第三次是否停机',
-      },
-      rules: 'required',
-    },
     {
       fieldName: 'isEnabled',
       component: 'Select',
@@ -554,13 +535,6 @@ export function getViewDescSchema(itemType: number): DescItem[] {
     },
     { field: 'warnPhones', label: '提醒手机号' },
     { field: 'warnEmails', label: '提醒邮箱' },
-    {
-      field: 'autoAction',
-      label: '第三次是否停机',
-      render(value) {
-        return formatAutoAction(Number(value));
-      },
-    },
     {
       field: 'isEnabled',
       label: '状态',
diff --git a/vue/apps/web-antd/src/views/iotlcm/zAnother/tAgentEnterprise/index.vue b/vue/apps/web-antd/src/views/iotlcm/zAnother/tAgentEnterprise/index.vue
index b15111c..76edaf1 100644
--- a/vue/apps/web-antd/src/views/iotlcm/zAnother/tAgentEnterprise/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/zAnother/tAgentEnterprise/index.vue
@@ -13,7 +13,10 @@ import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Delete, Export, List } from '#/api/iotlcm/zAnother/tAgentEnterprise';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -62,11 +65,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '代理商企业', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/index.vue b/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/index.vue
index 825781a..5d930aa 100644
--- a/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/index.vue
@@ -17,7 +17,10 @@ import {
   List,
 } from '#/api/iotlcm/zAnother/tCustWithdrawAccount';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -66,11 +69,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '客户提现账户', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/model.tsx b/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/model.tsx
index b99955b..4b2c595 100644
--- a/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/model.tsx
+++ b/vue/apps/web-antd/src/views/iotlcm/zAnother/tCustWithdrawAccount/model.tsx
@@ -85,6 +85,7 @@ export const IndexGridColumns: VxeGridProps['columns'] = [
   {
     title: '状态：0-禁用 1-正常',
     field: 'status',
+    params: { dictType: 'sys_common_status' },
     minWidth: 120,
     slots: {
       default: ({ row }) => {
diff --git a/vue/apps/web-antd/src/views/iotlcm/zAnother/tDivisionCode/index.vue b/vue/apps/web-antd/src/views/iotlcm/zAnother/tDivisionCode/index.vue
index 60f4f2b..b75c1b9 100644
--- a/vue/apps/web-antd/src/views/iotlcm/zAnother/tDivisionCode/index.vue
+++ b/vue/apps/web-antd/src/views/iotlcm/zAnother/tDivisionCode/index.vue
@@ -13,7 +13,10 @@ import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { Delete, Export, List } from '#/api/iotlcm/zAnother/tDivisionCode';
 import BetterVben from '#/constants/BetterVben';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 
 import editModal from './edit.vue';
 import { IndexGridColumns, IndexGridSchema } from './model';
@@ -62,11 +65,10 @@ function handleMultiDelete() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '行政区划', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success('导出成功');
 }
 
 /** ====================  组件  ==================== */
diff --git a/vue/apps/web-antd/src/views/monitor/cache/components/command-chart.vue b/vue/apps/web-antd/src/views/monitor/cache/components/command-chart.vue
index 6e7af3d..4c8f4e3 100644
--- a/vue/apps/web-antd/src/views/monitor/cache/components/command-chart.vue
+++ b/vue/apps/web-antd/src/views/monitor/cache/components/command-chart.vue
@@ -2,7 +2,7 @@
  * @description 缓存监控-命令统计图表组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/monitor/cache/components/index.ts b/vue/apps/web-antd/src/views/monitor/cache/components/index.ts
index 9dd3450..4fb0e3a 100644
--- a/vue/apps/web-antd/src/views/monitor/cache/components/index.ts
+++ b/vue/apps/web-antd/src/views/monitor/cache/components/index.ts
@@ -2,7 +2,7 @@
  * @description 缓存监控组件导出
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/monitor/cache/components/memory-chart.vue b/vue/apps/web-antd/src/views/monitor/cache/components/memory-chart.vue
index f713919..7a165ac 100644
--- a/vue/apps/web-antd/src/views/monitor/cache/components/memory-chart.vue
+++ b/vue/apps/web-antd/src/views/monitor/cache/components/memory-chart.vue
@@ -2,7 +2,7 @@
  * @description 缓存监控-内存使用图表组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/monitor/cache/components/redis-description.vue b/vue/apps/web-antd/src/views/monitor/cache/components/redis-description.vue
index 44f0b8c..fcbf9b0 100644
--- a/vue/apps/web-antd/src/views/monitor/cache/components/redis-description.vue
+++ b/vue/apps/web-antd/src/views/monitor/cache/components/redis-description.vue
@@ -2,7 +2,7 @@
  * @description 缓存监控-Redis信息描述组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/monitor/cache/index.vue b/vue/apps/web-antd/src/views/monitor/cache/index.vue
index bbfafa3..ed876bb 100644
--- a/vue/apps/web-antd/src/views/monitor/cache/index.vue
+++ b/vue/apps/web-antd/src/views/monitor/cache/index.vue
@@ -2,7 +2,7 @@
  * @description 缓存监控页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/monitor/online/index.vue b/vue/apps/web-antd/src/views/monitor/online/index.vue
index 0b63b32..af92db2 100644
--- a/vue/apps/web-antd/src/views/monitor/online/index.vue
+++ b/vue/apps/web-antd/src/views/monitor/online/index.vue
@@ -2,7 +2,7 @@
  * @description 在线用户监控页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/monitor/server/index.vue b/vue/apps/web-antd/src/views/monitor/server/index.vue
index a2b8bdd..bc50d66 100644
--- a/vue/apps/web-antd/src/views/monitor/server/index.vue
+++ b/vue/apps/web-antd/src/views/monitor/server/index.vue
@@ -2,7 +2,7 @@
  * @description 服务器监控页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
@@ -279,7 +279,7 @@ function handleHostInfo(data: any) {
     //         "bootTime": "2025-03-13T19:09:52+08:00",
     //         "hostId": "78e68867-0a8c-5b8b-b9e1-a91eafffc273",
     //         "hostname": "ds-m1-macbookpro.local",
-    //         "intranet_ip": "192.168.124.8",
+    //         "intranet_ip": "192.0.2.10",
     //         "kernelArch": "arm64",
     //         "kernelVersion": "24.3.0",
     //         "os": "darwin",
@@ -358,7 +358,7 @@ const hostData = ref({
     "bootTime": "2025-03-24T12:12:13+08:00",
     "hostId": "8be74418-1a53-4208-be22-9c126d89yydd",
     "hostname": "ubuntudev",
-    "intranet_ip": "192.168.158.100",
+    "intranet_ip": "192.0.2.10",
     "kernelArch": "x86_64",
     "kernelVersion": "6.8.0-52-generic",
     "os": "linux",
diff --git a/vue/apps/web-antd/src/views/system/client/edit-drawer.vue b/vue/apps/web-antd/src/views/system/client/edit-drawer.vue
index 8769c46..8a551ab 100644
--- a/vue/apps/web-antd/src/views/system/client/edit-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/client/edit-drawer.vue
@@ -2,7 +2,7 @@
  * @description 客户端编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/client/index.vue b/vue/apps/web-antd/src/views/system/client/index.vue
index 42c7baf..ebc539a 100644
--- a/vue/apps/web-antd/src/views/system/client/index.vue
+++ b/vue/apps/web-antd/src/views/system/client/index.vue
@@ -2,7 +2,7 @@
  * @description 客户端管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/client/model.tsx b/vue/apps/web-antd/src/views/system/client/model.tsx
index 9845db1..5e28b99 100644
--- a/vue/apps/web-antd/src/views/system/client/model.tsx
+++ b/vue/apps/web-antd/src/views/system/client/model.tsx
@@ -2,7 +2,7 @@
  * @description 客户端管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/config/config-drawer.vue b/vue/apps/web-antd/src/views/system/config/config-drawer.vue
index 8895579..499ca96 100644
--- a/vue/apps/web-antd/src/views/system/config/config-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/config/config-drawer.vue
@@ -2,23 +2,29 @@
  * @description 系统配置编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
 <script setup lang="ts">
-import type { SysConfig } from '#/api/system/config';
-
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-import { addFullName, cloneDeep } from '@vben/utils';
+import { cloneDeep } from '@vben/utils';
 
 import { useVbenForm } from '#/adapter/form';
 
-import { addSysConfigApi, editSysConfigApi, getSysConfigByIdApi } from '#/api/system/config';
+import {
+  addSysConfigApi,
+  editSysConfigApi,
+  getSysConfigByIdApi,
+} from '#/api/system/config';
 import { drawerSchema } from './model';
+import {
+  AGENT_ROLE_TEMPLATE_CONFIG_KEY,
+  confirmTemplateOverwrite,
+} from '#/utils/role-template';
 
 const emit = defineEmits<{ reload: [] }>();
 interface ModalProps {
@@ -27,9 +33,9 @@ interface ModalProps {
   view: boolean;
 }
 
-
 const isUpdate = ref(false);
 const isView = ref(false);
+const saving = ref(false);
 
 const title = computed(() => {
   if (isView.value) {
@@ -38,8 +44,6 @@ const title = computed(() => {
   return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
 });
 
-
-
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
@@ -60,7 +64,7 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
     if (!isOpen) {
       return null;
     }
-    drawerApi.setState({confirmLoading:true,loading:true})
+    drawerApi.setState({ confirmLoading: true, loading: true });
     const { id, update, view } = drawerApi.getData() as ModalProps;
     isUpdate.value = update;
     isView.value = view;
@@ -68,28 +72,37 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
       const record = await getSysConfigByIdApi({ configId: Number(id) });
       await formApi.setValues(record);
     }
-    drawerApi.setState({confirmLoading:false,loading:false})
+    drawerApi.setState({ confirmLoading: false, loading: false });
 
     if (view) {
-      drawerApi.setState({ showConfirmButton: false});
-      formApi.setState({ commonConfig: { componentProps:{
-        readonly:true,
-        "only-read":true,
-      } } });
-    }else{
-      drawerApi.setState({ showConfirmButton: true});
-      formApi.setState({ commonConfig: { componentProps:{
-        readonly:false,
-        "only-read":false,
-      }} });
+      drawerApi.setState({ showConfirmButton: false });
+      formApi.setState({
+        commonConfig: {
+          componentProps: {
+            readonly: true,
+            'only-read': true,
+          },
+        },
+      });
+    } else {
+      drawerApi.setState({ showConfirmButton: true });
+      formApi.setState({
+        commonConfig: {
+          componentProps: {
+            readonly: false,
+            'only-read': false,
+          },
+        },
+      });
     }
-
   },
 });
 
 async function handleConfirm() {
+  if (saving.value || isView.value) return;
+  saving.value = true;
   try {
-    drawerApi.setState({confirmLoading:true,loading:true})
+    drawerApi.setState({ confirmLoading: true, loading: true });
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
@@ -97,13 +110,20 @@ async function handleConfirm() {
     // 这个用于提交
     // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
     const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? editSysConfigApi (data) : addSysConfigApi(data));
+    if (
+      !(await confirmTemplateOverwrite(
+        data.configKey === AGENT_ROLE_TEMPLATE_CONFIG_KEY,
+      ))
+    )
+      return;
+    await (isUpdate.value ? editSysConfigApi(data) : addSysConfigApi(data));
     emit('reload');
     await handleCancel();
   } catch (error) {
     console.error(error);
   } finally {
-    drawerApi.setState({confirmLoading:false,loading:false})
+    saving.value = false;
+    drawerApi.setState({ confirmLoading: false, loading: false });
   }
 }
 
@@ -111,12 +131,10 @@ async function handleCancel() {
   drawerApi.close();
   await formApi.resetForm();
 }
-
 </script>
 
 <template>
   <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[600px]">
-    <BasicForm>
-    </BasicForm>
+    <BasicForm> </BasicForm>
   </BasicDrawer>
 </template>
diff --git a/vue/apps/web-antd/src/views/system/config/index.vue b/vue/apps/web-antd/src/views/system/config/index.vue
index 01a7c73..a3ee092 100644
--- a/vue/apps/web-antd/src/views/system/config/index.vue
+++ b/vue/apps/web-antd/src/views/system/config/index.vue
@@ -2,7 +2,7 @@
  * @description 系统配置管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/config/model.ts b/vue/apps/web-antd/src/views/system/config/model.ts
index 165cd1a..0fb432e 100644
--- a/vue/apps/web-antd/src/views/system/config/model.ts
+++ b/vue/apps/web-antd/src/views/system/config/model.ts
@@ -2,7 +2,7 @@
  * @description 系统配置模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/dept/dept-drawer.vue b/vue/apps/web-antd/src/views/system/dept/dept-drawer.vue
index 39afb6b..9d984cc 100644
--- a/vue/apps/web-antd/src/views/system/dept/dept-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/dept/dept-drawer.vue
@@ -2,7 +2,7 @@
  * @description 组织管理编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
@@ -37,17 +37,36 @@ async function getDeptTree() {
   return treeData;
 }
 
-async function initDeptSelect() {
+function excludeDeptBranch(
+  nodes: SysDeptTreeData[],
+  deptId: number,
+): SysDeptTreeData[] {
+  return nodes
+    .filter((node) => Number(node.deptId) !== deptId)
+    .map((node) => ({
+      ...node,
+      children: node.children
+        ? excludeDeptBranch(node.children, deptId)
+        : undefined,
+    }));
+}
+
+async function initDeptSelect(excludeDeptId?: number) {
   // 需要动态更新TreeSelect组件 这里允许为空
   const treeData = await getDeptTree();
+  const availableParents =
+    excludeDeptId === undefined
+      ? treeData
+      : excludeDeptBranch(treeData, excludeDeptId);
   formApi.updateSchema([
     {
       componentProps: {
         fieldNames: { label: 'deptName', value: 'deptId' },
         showSearch: true,
-        treeData: treeData,
+        treeData: availableParents,
         treeDefaultExpandAll: true,
         treeLine: { showLeafIcon: false },
+        treeNodeFilterProp: 'deptName',
         // 选中后显示在输入框的值
         treeNodeLabelProp: 'fullName',
       },
@@ -141,7 +160,10 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
     const { id, update, view } = drawerApi.getData() as ModalProps;
     isUpdate.value = update;
     isView.value = view;
-    await Promise.all([initDeptSelect(), initRoleSelect()]);
+    await Promise.all([
+      initDeptSelect(update ? Number(id) : undefined),
+      initRoleSelect(),
+    ]);
     if (isUpdate.value || isView.value) {
       const record = await viewSysDeptApi({ deptId: Number(id) });
       record.leader = record.leader ? Number(record.leader) : null;
diff --git a/vue/apps/web-antd/src/views/system/dept/dept-select.vue b/vue/apps/web-antd/src/views/system/dept/dept-select.vue
index 5fe4ba0..ce3b426 100644
--- a/vue/apps/web-antd/src/views/system/dept/dept-select.vue
+++ b/vue/apps/web-antd/src/views/system/dept/dept-select.vue
@@ -2,7 +2,7 @@
  * @description 组织选择组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dept/index.vue b/vue/apps/web-antd/src/views/system/dept/index.vue
index 9c691cd..66ee065 100644
--- a/vue/apps/web-antd/src/views/system/dept/index.vue
+++ b/vue/apps/web-antd/src/views/system/dept/index.vue
@@ -2,7 +2,7 @@
  * @description 组织管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dept/model.ts b/vue/apps/web-antd/src/views/system/dept/model.ts
index 770aff2..1080b58 100644
--- a/vue/apps/web-antd/src/views/system/dept/model.ts
+++ b/vue/apps/web-antd/src/views/system/dept/model.ts
@@ -2,7 +2,7 @@
  * @description 组织管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/dept/supplement-modal.vue b/vue/apps/web-antd/src/views/system/dept/supplement-modal.vue
index f2fa220..2b635ee 100644
--- a/vue/apps/web-antd/src/views/system/dept/supplement-modal.vue
+++ b/vue/apps/web-antd/src/views/system/dept/supplement-modal.vue
@@ -2,7 +2,7 @@
  * @description 补充详细信息弹窗
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dict-data/dict-data-drawer.vue b/vue/apps/web-antd/src/views/system/dict-data/dict-data-drawer.vue
index 636dc22..dcf723d 100644
--- a/vue/apps/web-antd/src/views/system/dict-data/dict-data-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/dict-data/dict-data-drawer.vue
@@ -2,7 +2,7 @@
  * @description 字典数据编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dict-data/index.vue b/vue/apps/web-antd/src/views/system/dict-data/index.vue
index c0385b6..32854de 100644
--- a/vue/apps/web-antd/src/views/system/dict-data/index.vue
+++ b/vue/apps/web-antd/src/views/system/dict-data/index.vue
@@ -2,7 +2,7 @@
  * @description 字典数据管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dict-data/model.ts b/vue/apps/web-antd/src/views/system/dict-data/model.ts
index b594653..3fd80ba 100644
--- a/vue/apps/web-antd/src/views/system/dict-data/model.ts
+++ b/vue/apps/web-antd/src/views/system/dict-data/model.ts
@@ -2,7 +2,7 @@
  * @description 字典数据模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/dict/dict-drawer.vue b/vue/apps/web-antd/src/views/system/dict/dict-drawer.vue
index 9ada943..68350bf 100644
--- a/vue/apps/web-antd/src/views/system/dict/dict-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/dict/dict-drawer.vue
@@ -2,7 +2,7 @@
  * @description 字典类型编辑抽屉组件
  * @Link  https://github.com/xiujie
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dict/index.vue b/vue/apps/web-antd/src/views/system/dict/index.vue
index ece4a11..9c84471 100644
--- a/vue/apps/web-antd/src/views/system/dict/index.vue
+++ b/vue/apps/web-antd/src/views/system/dict/index.vue
@@ -2,7 +2,7 @@
  * @description 字典类型管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/dict/model.ts b/vue/apps/web-antd/src/views/system/dict/model.ts
index f251afc..9ba6831 100644
--- a/vue/apps/web-antd/src/views/system/dict/model.ts
+++ b/vue/apps/web-antd/src/views/system/dict/model.ts
@@ -2,7 +2,7 @@
  * @description 字典类型模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/job/edit-drawer.vue b/vue/apps/web-antd/src/views/system/job/edit-drawer.vue
index a8b7539..2267a45 100644
--- a/vue/apps/web-antd/src/views/system/job/edit-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/job/edit-drawer.vue
@@ -2,7 +2,7 @@
  * @description 定时任务编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/job/index.vue b/vue/apps/web-antd/src/views/system/job/index.vue
index 210f8f2..b055817 100644
--- a/vue/apps/web-antd/src/views/system/job/index.vue
+++ b/vue/apps/web-antd/src/views/system/job/index.vue
@@ -2,7 +2,7 @@
  * @description 定时任务管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/job/job-cron-model.vue b/vue/apps/web-antd/src/views/system/job/job-cron-model.vue
index 1529e22..d223a8c 100644
--- a/vue/apps/web-antd/src/views/system/job/job-cron-model.vue
+++ b/vue/apps/web-antd/src/views/system/job/job-cron-model.vue
@@ -2,7 +2,7 @@
  * @description 定时任务Cron表达式设置弹窗组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/job/model.tsx b/vue/apps/web-antd/src/views/system/job/model.tsx
index 6443ffa..080bd88 100644
--- a/vue/apps/web-antd/src/views/system/job/model.tsx
+++ b/vue/apps/web-antd/src/views/system/job/model.tsx
@@ -2,7 +2,7 @@
  * @description 定时任务模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/job/view-drawer.vue b/vue/apps/web-antd/src/views/system/job/view-drawer.vue
index c404e84..298aaae 100644
--- a/vue/apps/web-antd/src/views/system/job/view-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/job/view-drawer.vue
@@ -2,7 +2,7 @@
  * @description 定时任务查看抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/logininfor/index.vue b/vue/apps/web-antd/src/views/system/logininfor/index.vue
index 203ce32..8d542c5 100644
--- a/vue/apps/web-antd/src/views/system/logininfor/index.vue
+++ b/vue/apps/web-antd/src/views/system/logininfor/index.vue
@@ -2,7 +2,7 @@
  * @description 登录日志管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/logininfor/model.tsx b/vue/apps/web-antd/src/views/system/logininfor/model.tsx
index 5109979..b3d6e5c 100644
--- a/vue/apps/web-antd/src/views/system/logininfor/model.tsx
+++ b/vue/apps/web-antd/src/views/system/logininfor/model.tsx
@@ -2,7 +2,7 @@
  * @description 登录日志模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/logininfor/view-drawer.vue b/vue/apps/web-antd/src/views/system/logininfor/view-drawer.vue
index 5ddabb1..eca51f4 100644
--- a/vue/apps/web-antd/src/views/system/logininfor/view-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/logininfor/view-drawer.vue
@@ -2,7 +2,7 @@
  * @description 登录日志查看抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/menu/index.vue b/vue/apps/web-antd/src/views/system/menu/index.vue
index 6ab4e20..dd8bfab 100644
--- a/vue/apps/web-antd/src/views/system/menu/index.vue
+++ b/vue/apps/web-antd/src/views/system/menu/index.vue
@@ -2,7 +2,7 @@
  * @description 菜单管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/menu/menu-drawer.vue b/vue/apps/web-antd/src/views/system/menu/menu-drawer.vue
index a9b1875..7dbc23c 100644
--- a/vue/apps/web-antd/src/views/system/menu/menu-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/menu/menu-drawer.vue
@@ -2,7 +2,7 @@
  * @description 菜单编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/menu/menu-select.vue b/vue/apps/web-antd/src/views/system/menu/menu-select.vue
index 3018b4a..40a3a8e 100644
--- a/vue/apps/web-antd/src/views/system/menu/menu-select.vue
+++ b/vue/apps/web-antd/src/views/system/menu/menu-select.vue
@@ -2,7 +2,7 @@
  * @description 菜单选择组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/menu/model.ts b/vue/apps/web-antd/src/views/system/menu/model.ts
index 3dcd906..aa66236 100644
--- a/vue/apps/web-antd/src/views/system/menu/model.ts
+++ b/vue/apps/web-antd/src/views/system/menu/model.ts
@@ -2,7 +2,7 @@
  * @description 菜单管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/notice/index.vue b/vue/apps/web-antd/src/views/system/notice/index.vue
index d2906f3..c813870 100644
--- a/vue/apps/web-antd/src/views/system/notice/index.vue
+++ b/vue/apps/web-antd/src/views/system/notice/index.vue
@@ -2,7 +2,7 @@
  * @description 通知公告管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/notice/model.tsx b/vue/apps/web-antd/src/views/system/notice/model.tsx
index eca44b9..094d812 100644
--- a/vue/apps/web-antd/src/views/system/notice/model.tsx
+++ b/vue/apps/web-antd/src/views/system/notice/model.tsx
@@ -2,7 +2,7 @@
  * @description 通知公告模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/notice/notice-drawer.vue b/vue/apps/web-antd/src/views/system/notice/notice-drawer.vue
index 8c5e3a8..ec94183 100644
--- a/vue/apps/web-antd/src/views/system/notice/notice-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/notice/notice-drawer.vue
@@ -2,7 +2,7 @@
  * @description 通知公告编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/oss/index.vue b/vue/apps/web-antd/src/views/system/oss/index.vue
index ea640c3..76a295f 100644
--- a/vue/apps/web-antd/src/views/system/oss/index.vue
+++ b/vue/apps/web-antd/src/views/system/oss/index.vue
@@ -2,7 +2,7 @@
  * @description 对象存储管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/post/index.vue b/vue/apps/web-antd/src/views/system/post/index.vue
index ab77729..a450b6c 100644
--- a/vue/apps/web-antd/src/views/system/post/index.vue
+++ b/vue/apps/web-antd/src/views/system/post/index.vue
@@ -2,7 +2,7 @@
  * @description 岗位管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
@@ -17,7 +17,10 @@ import { getVxePopupContainer } from '@vben/utils';
 
 import { Button, message, Switch,Tag, Modal, Popconfirm } from 'ant-design-vue';
 import dayjs from 'dayjs';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getSysPostListApi, deleteSysPostApi, getSysPostExportApi } from '#/api';
 import DeptTree from '#/components/dept/dept-tree.vue';
@@ -114,6 +117,7 @@ const gridOptions: VxeTableGridOptions<RowType> = {
     { field: 'postCategory', title: '岗位类别' },
     {
       field: 'status',
+      params: { dictType: 'sys_normal_disable' },
       slots: { default: 'status' },
       title: '状态',
       width: 100,
@@ -193,11 +197,10 @@ async function handleExport() {
   //   pageSize: 2000,
   // });
   commonDownloadExcel(getSysPostExportApi, '岗位列表',{
+    exportColumnsJson: JSON.stringify(getExportColumns(tableApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success("导出成功");
 }
 
 
diff --git a/vue/apps/web-antd/src/views/system/post/model.ts b/vue/apps/web-antd/src/views/system/post/model.ts
index fa4dcec..84da403 100644
--- a/vue/apps/web-antd/src/views/system/post/model.ts
+++ b/vue/apps/web-antd/src/views/system/post/model.ts
@@ -2,7 +2,7 @@
  * @description 岗位管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/post/post-drawer.vue b/vue/apps/web-antd/src/views/system/post/post-drawer.vue
index 88d7fc5..ac04c9b 100644
--- a/vue/apps/web-antd/src/views/system/post/post-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/post/post-drawer.vue
@@ -2,7 +2,7 @@
  * @description 岗位编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/role/index.vue b/vue/apps/web-antd/src/views/system/role/index.vue
index 126deef..b5f8ec3 100644
--- a/vue/apps/web-antd/src/views/system/role/index.vue
+++ b/vue/apps/web-antd/src/views/system/role/index.vue
@@ -2,12 +2,12 @@
  * @description 角色管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
 <script lang="ts" setup>
-import { h, ref } from 'vue';
+import { h, onMounted, ref } from 'vue';
 import type { VbenFormProps } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SysRoleListData } from '#/api/system/role';
@@ -16,7 +16,8 @@ import { Page } from '@vben/common-ui';
 import { Button, message, Switch,Tag, Modal, Popconfirm } from 'ant-design-vue';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getSysRoleListApi, deleteSysRoleApi } from '#/api/system/role';
-import { getVxePopupContainer } from '@vben/utils';
+import { getSysDeptTreeApi } from '#/api/system/dept';
+import { addFullName, getPopupContainer, getVxePopupContainer } from '@vben/utils';
 import { useVbenDrawer,useVbenModal } from '@vben/common-ui';
 
 import roleDrawer from './role-drawer.vue';
@@ -63,6 +64,21 @@ const formOptions: VbenFormProps = {
   collapsed: false,
   fieldMappingTime: [['date', ['start', 'end']]],
   schema: [
+    {
+      component: 'TreeSelect',
+      componentProps: {
+        allowClear: true,
+        fieldNames: { label: 'deptName', value: 'deptId' },
+        getPopupContainer,
+        placeholder: '请选择所属组织',
+        showSearch: true,
+        treeData: [],
+        treeNodeFilterProp: 'deptName',
+        treeNodeLabelProp: 'fullName',
+      },
+      fieldName: 'deptId',
+      label: '所属组织',
+    },
     {
       component: 'Input',
       fieldName: 'roleName',
@@ -163,6 +179,17 @@ const [Grid, tableApi] = useVbenVxeGrid({
   gridOptions,
 });
 
+onMounted(async () => {
+  const { items } = await getSysDeptTreeApi({ deptType: 1 });
+  addFullName(items, 'deptName', ' / ');
+  tableApi.formApi.updateSchema([
+    {
+      componentProps: { treeData: items },
+      fieldName: 'deptId',
+    },
+  ]);
+});
+
 const [RoleDrawer, roleDrawerApi] = useVbenDrawer({
   connectedComponent: roleDrawer,
 });
diff --git a/vue/apps/web-antd/src/views/system/role/model.ts b/vue/apps/web-antd/src/views/system/role/model.ts
index e8f6324..2abc229 100644
--- a/vue/apps/web-antd/src/views/system/role/model.ts
+++ b/vue/apps/web-antd/src/views/system/role/model.ts
@@ -2,7 +2,7 @@
  * @description 角色管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/role/role-data-scope-modal.vue b/vue/apps/web-antd/src/views/system/role/role-data-scope-modal.vue
index 00e5c6b..4e05c92 100644
--- a/vue/apps/web-antd/src/views/system/role/role-data-scope-modal.vue
+++ b/vue/apps/web-antd/src/views/system/role/role-data-scope-modal.vue
@@ -2,13 +2,11 @@
  * @description 角色数据权限设置弹窗组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
 <script setup lang="ts">
-import type { SysDeptListData } from '#/api/system/dept';
-
 import { computed, nextTick, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
@@ -20,6 +18,7 @@ import DeptSelect from '../dept/dept-select.vue';
 
 import { getSysRoleViewApi, editSysRoleDataScopeApi } from '#/api/system/role';
 import { dataScopeModalSchema } from './model';
+import { confirmTemplateOverwrite } from '#/utils/role-template';
 
 const emit = defineEmits<{ reload: [] }>();
 interface ModalProps {
@@ -28,9 +27,10 @@ interface ModalProps {
   view: boolean;
 }
 
-
 const isUpdate = ref(false);
 const isView = ref(false);
+const isTemplateRole = ref(false);
+const saving = ref(false);
 
 const title = computed(() => {
   if (isView.value) {
@@ -63,28 +63,30 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    modalApi.setState({ confirmLoading: true, loading: true })
+    modalApi.setState({ confirmLoading: true, loading: true });
     const { id, update, view } = modalApi.getData() as ModalProps;
     isUpdate.value = update;
     isView.value = view;
 
+    isTemplateRole.value = false;
     if (isUpdate.value || isView.value) {
       const record = await getSysRoleViewApi({ roleId: id });
+      isTemplateRole.value = record.isTemplateRole;
       await nextTick();
       checkStrictly.value = record.deptCheckStrictly === 0;
       deptIds.value = record.deptIds;
       await formApi.setValues(record);
     }
-    modalApi.setState({ confirmLoading: false, loading: false })
+    modalApi.setState({ confirmLoading: false, loading: false });
     if (view) {
       modalApi.setState({ showConfirmButton: false });
       formApi.setState({
         commonConfig: {
           componentProps: {
             readonly: true,
-            "only-read": true,
-          }
-        }
+            'only-read': true,
+          },
+        },
       });
     } else {
       modalApi.setState({ showConfirmButton: true });
@@ -92,22 +94,24 @@ const [BasicModal, modalApi] = useVbenModal({
         commonConfig: {
           componentProps: {
             readonly: false,
-            "only-read": false,
-          }
-        }
+            'only-read': false,
+          },
+        },
       });
     }
-
   },
 });
 
 async function handleConfirm() {
+  if (saving.value || isView.value) return;
+  saving.value = true;
   try {
-    modalApi.setState({ confirmLoading: true, loading: true })
+    modalApi.setState({ confirmLoading: true, loading: true });
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
+    if (!(await confirmTemplateOverwrite(isTemplateRole.value))) return;
     // formApi.getValues拿到的是一个readonly对象，不能直接修改，需要cloneDeep
     const data = cloneDeep(await formApi.getValues());
     await editSysRoleDataScopeApi(data);
@@ -116,7 +120,8 @@ async function handleConfirm() {
   } catch (error) {
     console.error(error);
   } finally {
-    modalApi.setState({ confirmLoading: false, loading: false })
+    saving.value = false;
+    modalApi.setState({ confirmLoading: false, loading: false });
   }
 }
 
@@ -139,11 +144,19 @@ async function handleDeptChange(deptIds2: number[], checkStrictly2: boolean) {
 </script>
 
 <template>
-  <BasicModal :close-on-click-modal="false" :title="title" class="min-h-[600px] w-[550px]">
+  <BasicModal
+    :close-on-click-modal="false"
+    :title="title"
+    class="min-h-[600px] w-[550px]"
+  >
     <BasicForm>
-      <template #deptIds="slotProps">
+      <template #deptIds>
         <div class="h-[600px] w-full">
-          <DeptSelect :dept-ids="deptIds" :check-strictly="checkStrictly" @change="handleDeptChange" />
+          <DeptSelect
+            :dept-ids="deptIds"
+            :check-strictly="checkStrictly"
+            @change="handleDeptChange"
+          />
         </div>
       </template>
     </BasicForm>
diff --git a/vue/apps/web-antd/src/views/system/role/role-drawer.test.ts b/vue/apps/web-antd/src/views/system/role/role-drawer.test.ts
new file mode 100644
index 0000000..e63d181
--- /dev/null
+++ b/vue/apps/web-antd/src/views/system/role/role-drawer.test.ts
@@ -0,0 +1,147 @@
+import { flushPromises, mount } from '@vue/test-utils';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const mocks = vi.hoisted(() => ({
+  hooks: {} as {
+    onConfirm?: () => Promise<void>;
+    onOpenChange?: (open: boolean) => Promise<unknown>;
+  },
+  close: vi.fn(),
+  getData: vi.fn(() => ({ id: 82, update: true, view: false })),
+  getRole: vi.fn(),
+  editRole: vi.fn(),
+  confirm: vi.fn(),
+}));
+vi.mock('#/api/system/role', () => ({
+  addSysRoleApi: vi.fn(),
+  editSysRoleApi: mocks.editRole,
+  getSysRoleViewApi: mocks.getRole,
+}));
+vi.mock('#/api/system/dept', () => ({
+  getSysDeptTreeApi: vi.fn(async () => ({ items: [] })),
+}));
+vi.mock('#/utils/role-template', () => ({
+  confirmTemplateOverwrite: mocks.confirm,
+  TEMPLATE_OVERWRITE_DESCRIPTION: '覆盖默认角色',
+}));
+vi.mock('./model', () => ({ drawerSchema: [] }));
+vi.mock('@vben/locales', () => ({ $t: (key: string) => key }));
+vi.mock('@vben/utils', () => ({
+  cloneDeep: (value: object) => structuredClone(value),
+  addFullName: vi.fn(),
+  getPopupContainer: vi.fn(),
+}));
+vi.mock('ant-design-vue', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    Alert: defineComponent({ setup: () => () => h('div') }),
+    message: { success: vi.fn() },
+  };
+});
+vi.mock('@vben/common-ui', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    useVbenDrawer: (options: typeof mocks.hooks) => {
+      mocks.hooks = options;
+      return [
+        defineComponent({
+          setup:
+            (_, { slots }) =>
+            () =>
+              h('div', slots.default?.()),
+        }),
+        { close: mocks.close, getData: mocks.getData, setState: vi.fn() },
+      ];
+    },
+  };
+});
+vi.mock('#/adapter/form', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    useVbenForm: () => [
+      defineComponent({
+        setup:
+          (_, { slots }) =>
+          () =>
+            h('div', slots.menuIds?.()),
+      }),
+      {
+        getValues: vi.fn(async () => ({ roleId: 82, roleName: '代理角色' })),
+        resetForm: vi.fn(),
+        setState: vi.fn(),
+        setValues: vi.fn(),
+        updateSchema: vi.fn(),
+        validate: vi.fn(async () => ({ valid: true })),
+      },
+    ],
+  };
+});
+vi.mock('../menu/menu-select.vue', async () => {
+  const { defineComponent, h } = await import('vue');
+  return {
+    default: defineComponent({
+      setup: (_, { expose }) => {
+        expose({
+          clearData: vi.fn(),
+          getData: () => [11],
+          getDataScopes: () => ({}),
+        });
+        return () => h('div');
+      },
+    }),
+  };
+});
+
+import RoleDrawer from './role-drawer.vue';
+
+describe('平台角色保存与模板覆盖', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mocks.getData.mockReturnValue({ id: 82, update: true, view: false });
+    mocks.getRole.mockResolvedValue({
+      menuIds: [10],
+      isTemplateRole: true,
+      isDeptDefaultRole: false,
+    });
+    mocks.confirm.mockResolvedValue(true);
+  });
+  it('取消模板覆盖后不调用保存接口', async () => {
+    mocks.confirm.mockResolvedValueOnce(false);
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.confirm).toHaveBeenCalledWith(true);
+    expect(mocks.editRole).not.toHaveBeenCalled();
+    expect(mocks.close).not.toHaveBeenCalled();
+    wrapper.unmount();
+  });
+  it('确认后提交当前勾选的完整权限', async () => {
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.editRole).toHaveBeenCalledWith({
+      roleId: 82,
+      roleName: '代理角色',
+      menuIds: [11],
+      roleMenuDataScopes: {},
+    });
+    expect(mocks.close).toHaveBeenCalledOnce();
+    wrapper.unmount();
+  });
+  it('单独编辑默认角色不请求模板覆盖', async () => {
+    mocks.getRole.mockResolvedValueOnce({
+      menuIds: [10],
+      isTemplateRole: false,
+      isDeptDefaultRole: true,
+    });
+    const wrapper = mount(RoleDrawer);
+    await mocks.hooks.onOpenChange?.(true);
+    await flushPromises();
+    await mocks.hooks.onConfirm?.();
+    expect(mocks.confirm).toHaveBeenCalledWith(false);
+    expect(mocks.editRole).toHaveBeenCalledOnce();
+    wrapper.unmount();
+  });
+});
diff --git a/vue/apps/web-antd/src/views/system/role/role-drawer.vue b/vue/apps/web-antd/src/views/system/role/role-drawer.vue
index 4b7db8e..ed4d7ce 100644
--- a/vue/apps/web-antd/src/views/system/role/role-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/role/role-drawer.vue
@@ -2,7 +2,7 @@
  * @description 角色编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
@@ -12,7 +12,11 @@ import { useVbenDrawer } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { useVbenForm } from '#/adapter/form';
 import MenuSelect from '../menu/menu-select.vue';
-import { Spin } from 'ant-design-vue';
+import { Alert, message } from 'ant-design-vue';
+import {
+  confirmTemplateOverwrite,
+  TEMPLATE_OVERWRITE_DESCRIPTION,
+} from '#/utils/role-template';
 import { getSysDeptTreeApi } from '#/api/system/dept';
 import { addFullName, cloneDeep, getPopupContainer } from '@vben/utils';
 
@@ -38,6 +42,9 @@ const title = computed(() => {
 /** ====================  变量  ==================== */
 /** 是否加载菜单组件 */
 const showMenuSelect = ref(false);
+const isTemplateRole = ref(false);
+const isDeptDefaultRole = ref(false);
+const saving = ref(false);
 
 /** 选中的菜单id */
 const menuIds = ref<number[]>([]);
@@ -71,6 +78,9 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
       roleMenuDataScopes.value = {};
       return null;
     }
+    isTemplateRole.value = false;
+    isDeptDefaultRole.value = false;
+    showMenuSelect.value = false;
     setupDeptSelect();
 
     drawerApi.setState({ confirmLoading: true, loading: true });
@@ -80,6 +90,8 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
     // 获取数据
     if (isUpdate.value || isView.value) {
       const record = await getSysRoleViewApi({ roleId: id });
+      isTemplateRole.value = record.isTemplateRole;
+      isDeptDefaultRole.value = record.isDeptDefaultRole;
       await formApi.setValues(record);
 
       // 获取菜单id列表
@@ -114,11 +126,14 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
 });
 
 async function handleConfirm() {
+  if (saving.value || isView.value) return;
+  saving.value = true;
   try {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
+    if (!(await confirmTemplateOverwrite(isTemplateRole.value))) return;
     // 设置加载状态
     drawerApi.setState({ confirmLoading: true, loading: true });
 
@@ -129,11 +144,14 @@ async function handleConfirm() {
     data.roleMenuDataScopes = refMenuSelect.value?.getDataScopes();
     // 编辑数据
     await (isUpdate.value ? editSysRoleApi(data) : addSysRoleApi(data));
+    if (isTemplateRole.value)
+      message.success('模板已保存，覆盖下发已提交后台处理');
     emit('reload');
     await handleCancel();
   } catch (error) {
     console.error(error);
   } finally {
+    saving.value = false;
     // 关闭加载状态
     drawerApi.setState({ confirmLoading: false, loading: false });
   }
@@ -153,10 +171,9 @@ async function setupDeptSelect() {
   const deptTree = await getSysDeptTreeApi({ deptType: 1 });
   // 选中后显示在输入框的值 即父节点 / 子节点
   addFullName(deptTree.items, 'deptName', ' / ');
-  console.log('role-drawer.vue setupDeptSelect', deptTree);
   formApi.updateSchema([
     {
-      componentProps: (formModel) => ({
+      componentProps: () => ({
         class: 'w-full',
         fieldNames: {
           key: 'deptId',
@@ -165,7 +182,6 @@ async function setupDeptSelect() {
           label: 'deptName',
         },
         getPopupContainer,
-        async onSelect(deptId: number | string) {},
         placeholder: '请选择',
         showSearch: true,
         treeData: deptTree.items,
@@ -184,6 +200,22 @@ async function setupDeptSelect() {
 
 <template>
   <BasicDrawer :close-on-click-modal="false" :title="title" class="w-[800px]">
+    <Alert
+      v-if="isTemplateRole"
+      class="mb-4"
+      type="warning"
+      show-icon
+      message="平台代理模板"
+      :description="TEMPLATE_OVERWRITE_DESCRIPTION"
+    />
+    <Alert
+      v-else-if="isDeptDefaultRole"
+      class="mb-4"
+      type="info"
+      show-icon
+      message="机构默认角色"
+      description="本次配置仅修改此角色，下次模板覆盖下发时会被替换。"
+    />
     <BasicForm>
       <template #menuIds>
         <div class="h-[600px] w-full">
diff --git a/vue/apps/web-antd/src/views/system/sysNoticeUser/index.vue b/vue/apps/web-antd/src/views/system/sysNoticeUser/index.vue
index e10cf54..323b628 100644
--- a/vue/apps/web-antd/src/views/system/sysNoticeUser/index.vue
+++ b/vue/apps/web-antd/src/views/system/sysNoticeUser/index.vue
@@ -8,7 +8,10 @@ import { getVxePopupContainer } from '@vben/utils';
 import { Page } from '@vben/common-ui';
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { AccessControl } from '@vben/access';
-import { commonDownloadExcel } from '#/utils/file/download';
+import {
+  commonDownloadExcel,
+  getExportColumns,
+} from '#/utils/file/download';
 import { List, Export, Delete, View, Read } from '#/api/system/sysNoticeUser';
 import { MdiPlus, MdiExport, MdiDelete } from '@vben/icons';
 import { columns, querySchema, type RowType } from './model';
@@ -124,11 +127,10 @@ async function handleRefresh() {
 async function handleExport() {
   const formValues = gridApi.formApi.form.values;
   await commonDownloadExcel(Export, '用户通知公告表', {
+    exportColumnsJson: JSON.stringify(getExportColumns(gridApi)),
     ...formValues,
     page: 1,
-    pageSize: 2000,
   });
-  message.success("导出成功");
 }
 </script>
 <template>
diff --git a/vue/apps/web-antd/src/views/system/sysNoticeUser/model.tsx b/vue/apps/web-antd/src/views/system/sysNoticeUser/model.tsx
index db1487d..37fbe36 100644
--- a/vue/apps/web-antd/src/views/system/sysNoticeUser/model.tsx
+++ b/vue/apps/web-antd/src/views/system/sysNoticeUser/model.tsx
@@ -119,6 +119,7 @@ export const columns: VxeGridProps['columns'] = [
   }, {
     title: '公告类型',
     field: 'noticeType',
+    params: { dictType: DictEnum.NOTICE_RANGE },
     align: 'center',
     slots: {
       default: (scope) => {
diff --git a/vue/apps/web-antd/src/views/system/user/index.vue b/vue/apps/web-antd/src/views/system/user/index.vue
index 4c8ba26..f79860e 100644
--- a/vue/apps/web-antd/src/views/system/user/index.vue
+++ b/vue/apps/web-antd/src/views/system/user/index.vue
@@ -2,7 +2,7 @@
  * @description 用户管理页面
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/system/user/model.ts b/vue/apps/web-antd/src/views/system/user/model.ts
index 7a154aa..dd4b4cd 100644
--- a/vue/apps/web-antd/src/views/system/user/model.ts
+++ b/vue/apps/web-antd/src/views/system/user/model.ts
@@ -2,7 +2,7 @@
  * @description 用户管理模型定义
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
  */
diff --git a/vue/apps/web-antd/src/views/system/user/user-drawer.vue b/vue/apps/web-antd/src/views/system/user/user-drawer.vue
index 1edd311..44b0439 100644
--- a/vue/apps/web-antd/src/views/system/user/user-drawer.vue
+++ b/vue/apps/web-antd/src/views/system/user/user-drawer.vue
@@ -2,7 +2,7 @@
  * @description 用户编辑抽屉组件
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/tool/gen/develop.vue b/vue/apps/web-antd/src/views/tool/gen/develop.vue
index 9a77b5c..8b1ad07 100644
--- a/vue/apps/web-antd/src/views/tool/gen/develop.vue
+++ b/vue/apps/web-antd/src/views/tool/gen/develop.vue
@@ -2,7 +2,7 @@
  * @description 代码生成
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/apps/web-antd/src/views/tool/gen/index.vue b/vue/apps/web-antd/src/views/tool/gen/index.vue
index 82c9075..d581789 100644
--- a/vue/apps/web-antd/src/views/tool/gen/index.vue
+++ b/vue/apps/web-antd/src/views/tool/gen/index.vue
@@ -2,7 +2,7 @@
  * @description 代码生成
  * @Link  https://github.com/xiujiecn/xiu-admin
  * @Copyright  Copyright (c) 2025 LiXiujie
- * @Author  Lxj <li@xiujie.cn>
+ * @Author  Lxj <xxx@example.com>
  * @License  https://github.com/xiujiecn/xiu-admin/blob/master/LICENSE
  * @date 2024-03-21
 -->
diff --git a/vue/build/nginx.conf b/vue/build/nginx.conf
index 2bcd096..2c10427 100644
--- a/vue/build/nginx.conf
+++ b/vue/build/nginx.conf
@@ -17,7 +17,7 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_http_version 1.1;
         chunked_transfer_encoding off;
-        proxy_pass                 http://172.17.0.1:8008/api/v1/;
+        proxy_pass                 http://iotlcm-admin-svr:8008/api/v1/;
         proxy_redirect             off;
         proxy_set_header           Host             $host;
         proxy_set_header           X-Real-IP        $remote_addr;
diff --git a/vue/internal/vite-config/src/plugins/license.ts b/vue/internal/vite-config/src/plugins/license.ts
index b7cecaa..81492f9 100644
--- a/vue/internal/vite-config/src/plugins/license.ts
+++ b/vue/internal/vite-config/src/plugins/license.ts
@@ -38,7 +38,7 @@ async function viteLicensePlugin(
   * Description: ${description}
   * Date Created: ${date}
   * Homepage: ${homepage}
-  * Contact: annvben@example.com
+  * Contact: xxx@example.com
 */
               `.trim();
 
diff --git a/vue/package.json b/vue/package.json
index 1f064b2..546d661 100644
--- a/vue/package.json
+++ b/vue/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "author": {
     "name": "vben",
-    "email": "annvben@example.com",
+    "email": "xxx@example.com",
     "url": "https://github.com/anncwb"
   },
   "type": "module",
diff --git a/vue/packages/effects/access/src/accessible.ts b/vue/packages/effects/access/src/accessible.ts
index eb90814..73e253a 100644
--- a/vue/packages/effects/access/src/accessible.ts
+++ b/vue/packages/effects/access/src/accessible.ts
@@ -28,7 +28,7 @@ async function generateAccessible(
   // 生成路由
   const accessibleRoutes = await generateRoutes(mode, options);
 
-  const root = router.getRoutes().find((item) => item.path === '/');
+  const root = findRootRoute(router);
 
   // 获取已有的路由名称列表
   const names = root?.children?.map((item) => item.name) ?? [];
@@ -71,6 +71,34 @@ async function generateAccessible(
   return { accessibleMenus, accessibleRoutes };
 }
 
+function findRootRoute(router: GenerateMenuAndRoutesOptions['router']) {
+  const routes = router.getRoutes();
+
+  // Route paths are not unique: an empty-path backend child can normalize to '/'.
+  const namedRoot = routes.find((item) => item.name === 'Root');
+  if (namedRoot) {
+    return namedRoot;
+  }
+
+  // Keep a path-independent fallback for applications that rename the core route.
+  const titledRoot = routes.find((item) => item.meta.title === 'Root');
+  if (titledRoot) {
+    return titledRoot;
+  }
+
+  const childNames = new Set(
+    routes.flatMap((item) => item.children?.map((child) => child.name) ?? []),
+  );
+  const topLevelLayouts = routes.filter(
+    (item) =>
+      item.children?.length &&
+      !item.aliasOf &&
+      (item.name === undefined || !childNames.has(item.name)),
+  );
+
+  return topLevelLayouts.length === 1 ? topLevelLayouts[0] : undefined;
+}
+
 /**
  * Generate routes
  * @param mode
diff --git a/vue/packages/stores/src/modules/tabbar.test.ts b/vue/packages/stores/src/modules/tabbar.test.ts
index 0c850d6..2dd6a6f 100644
--- a/vue/packages/stores/src/modules/tabbar.test.ts
+++ b/vue/packages/stores/src/modules/tabbar.test.ts
@@ -1,8 +1,16 @@
 import { createRouter, createWebHistory } from 'vue-router';
 
+import { startProgress, stopProgress } from '@vben-core/shared/utils';
+
 import { createPinia, setActivePinia } from 'pinia';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
+vi.mock('@vben-core/shared/utils', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@vben-core/shared/utils')>();
+  return { ...actual, startProgress: vi.fn(), stopProgress: vi.fn() };
+});
+
 import { useTabbarStore } from './tabbar';
 
 describe('useAccessStore', () => {
@@ -321,5 +329,7 @@ describe('useAccessStore', () => {
 
     expect(store.excludeCachedTabs.has('Dashboard')).toBe(false);
     expect(store.renderRouteView).toBe(true);
+    expect(startProgress).toHaveBeenCalledTimes(1);
+    expect(stopProgress).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/vue/packages/utils/src/helpers/__tests__/generate-routes-backend.test.ts b/vue/packages/utils/src/helpers/__tests__/generate-routes-backend.test.ts
new file mode 100644
index 0000000..45a79dc
--- /dev/null
+++ b/vue/packages/utils/src/helpers/__tests__/generate-routes-backend.test.ts
@@ -0,0 +1,125 @@
+import { describe, expect, it, vi } from 'vitest';
+
+import { generateRoutesByBackend } from '../generate-routes-backend';
+
+// 布局组件与页面组件必须是不同对象：实现里用「引用是否相同」判断是不是布局
+const NullComponent = { render: () => null };
+const NullLayout = { render: () => null };
+const NullPage = { render: () => null };
+
+const layoutMap = {
+  BasicLayout: NullLayout,
+  IFrameView: NullLayout,
+  LAYOUT: NullLayout,
+};
+const pageMap = { '/iotlcm/tDashboard/index.vue': NullPage };
+
+/**
+ * 后端菜单里可能存在指向已下线页面的菜单（前端无对应视图）。
+ * 这类路由不应注册、也不应出现在菜单里，否则点进去就是一整页 404。
+ */
+describe('generateRoutesByBackend 丢弃无对应视图的路由', () => {
+  it('丢弃解析不到视图的路由，并保留同级正常路由', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    try {
+      const routes = await generateRoutesByBackend({
+        fetchMenuListAsync: async () => [
+          {
+            children: [
+              {
+                component: 'common/tDivisionCode/index',
+                name: 'menu_137',
+                path: 'index',
+              },
+              {
+                component: 'iotlcm/tDashboard/index',
+                name: 'menu_ok',
+                path: 'dashboard',
+              },
+            ],
+            component: 'LAYOUT',
+            name: 'Root',
+            path: '/',
+          },
+        ],
+        layoutMap,
+        pageMap,
+      } as never);
+
+      expect(routes).toHaveLength(1);
+      const children = routes[0]?.children ?? [];
+      expect(children.map((c) => c.name)).toEqual(['menu_ok']);
+      expect(warn).toHaveBeenCalledWith(
+        expect.stringContaining('route component is invalid, route skipped'),
+        expect.objectContaining({ name: 'menu_137' }),
+      );
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
+  it('子路由被丢弃后，父目录若变空也一并去掉', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    try {
+      const routes = await generateRoutesByBackend({
+        fetchMenuListAsync: async () => [
+          {
+            children: [
+              {
+                component: 'common/tDivisionCode/index',
+                name: 'menu_137',
+                path: 'index',
+              },
+            ],
+            component: 'LAYOUT',
+            name: 'EmptyDir',
+            path: '/empty',
+          },
+          {
+            component: 'iotlcm/tDashboard/index',
+            name: 'menu_ok',
+            path: '/ok',
+          },
+        ],
+        layoutMap,
+        pageMap,
+      } as never);
+
+      expect(routes.map((r) => r.name)).toEqual(['menu_ok']);
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
+  it('外链菜单（无组件但有 link）不会被丢弃', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    try {
+      const routes = await generateRoutesByBackend({
+        fetchMenuListAsync: async () => [
+          {
+            children: [
+              {
+                meta: {
+                  link: 'https://example.com/docs',
+                  openInNewWindow: true,
+                },
+                name: 'menu_link',
+                path: 'https://example.com/docs',
+              },
+            ],
+            component: 'LAYOUT',
+            name: 'LinkDir',
+            path: '/links',
+          },
+        ],
+        layoutMap,
+        pageMap,
+      } as never);
+
+      expect(routes).toHaveLength(1);
+      expect(routes[0]?.children?.[0]?.name).toBe('menu_link');
+    } finally {
+      warn.mockRestore();
+    }
+  });
+});
diff --git a/vue/packages/utils/src/helpers/generate-routes-backend.ts b/vue/packages/utils/src/helpers/generate-routes-backend.ts
index c92b6d3..b1d35f6 100644
--- a/vue/packages/utils/src/helpers/generate-routes-backend.ts
+++ b/vue/packages/utils/src/helpers/generate-routes-backend.ts
@@ -28,7 +28,11 @@ async function generateRoutesByBackend(
       normalizePageMap[normalizeViewPath(key)] = value;
     }
 
-    const routes = convertRoutes(menuRoutes, layoutMap, normalizePageMap);
+    const routes = convertRoutes(
+      removePathlessRoutes(menuRoutes),
+      layoutMap,
+      normalizePageMap,
+    );
 
     return routes;
   } catch (error) {
@@ -37,12 +41,31 @@ async function generateRoutesByBackend(
   }
 }
 
+function removePathlessRoutes(
+  routes: RouteRecordStringComponent[],
+): RouteRecordStringComponent[] {
+  return routes.flatMap((route) => {
+    const children = removePathlessRoutes(route.children ?? []);
+    if (!route.path?.trim()) {
+      console.warn('Skipping backend menu route with an empty path', {
+        name: route.name,
+      });
+      return children;
+    }
+
+    return [{ ...route, children }];
+  });
+}
+
 function convertRoutes(
   routes: RouteRecordStringComponent[],
   layoutMap: ComponentRecordType,
   pageMap: ComponentRecordType,
 ): RouteRecordRaw[] {
-  return mapTree(routes, (node) => {
+  // 前端无对应视图、需丢弃的路由
+  const invalidRoutes = new WeakSet<object>();
+
+  const converted = mapTree(routes, (node) => {
     const route = node as unknown as RouteRecordRaw;
     const { component, name } = node;
 
@@ -62,13 +85,61 @@ function convertRoutes(
       if (pageMap[pageKey]) {
         route.component = pageMap[pageKey];
       } else {
-        console.error(`route component is invalid: ${pageKey}`, route);
-        route.component = pageMap['/_core/fallback/not-found.vue'];
+        // 前端没有对应视图（后端菜单指向了已不存在的页面）。
+        // 这里不再替换成 not-found 组件——那样菜单还在、点进去却是 404 页面。
+        // 直接标记丢弃：路由不注册、菜单里也不出现这个死链。
+        console.warn(`route component is invalid, route skipped: ${pageKey}`, {
+          name,
+          path: node.path,
+        });
+        invalidRoutes.add(route);
       }
     }
 
     return route;
   });
+
+  return pruneInvalidRoutes(converted, layoutMap, invalidRoutes);
+}
+
+/**
+ * 丢弃解析不到视图的路由；并去掉因此变空的目录。
+ */
+function pruneInvalidRoutes(
+  routes: RouteRecordRaw[],
+  layoutMap: ComponentRecordType,
+  invalidRoutes: WeakSet<object>,
+): RouteRecordRaw[] {
+  return routes
+    .filter((route) => !invalidRoutes.has(route))
+    .map((route) => {
+      if (!route.children) {
+        return route;
+      }
+      return {
+        ...route,
+        children: pruneInvalidRoutes(route.children, layoutMap, invalidRoutes),
+      };
+    })
+    .filter((route) => {
+      const children = route.children ?? [];
+      if (children.length > 0 || route.redirect) {
+        return true;
+      }
+      const meta = route.meta as Record<string, unknown> | undefined;
+      // 外链菜单（新窗口打开）没有组件是正常的，不能丢
+      if (meta?.openInNewWindow || meta?.link) {
+        return true;
+      }
+      // 只剩布局组件 = 变成了空目录，丢掉
+      const isLayout = Object.values(layoutMap).includes(
+        route.component as never,
+      );
+      if (isLayout) {
+        return false;
+      }
+      return Boolean(route.component);
+    });
 }
 
 function normalizeViewPath(path: string): string {
diff --git a/vue/scripts/deploy/build-local-docker-image.sh b/vue/scripts/deploy/build-local-docker-image.sh
old mode 100644
new mode 100755
diff --git a/vue/scripts/turbo-run/bin/turbo-run.mjs b/vue/scripts/turbo-run/bin/turbo-run.mjs
old mode 100644
new mode 100755
diff --git a/vue/scripts/vsh/bin/vsh.mjs b/vue/scripts/vsh/bin/vsh.mjs
old mode 100644
new mode 100755