From 4950e3a0af6e6960f33c62929b94ffd6777b904f Mon Sep 17 00:00:00 2001
From: jokerxue <2509699647@qq.com>
Date: Mon, 13 Jul 2026 15:18:09 +0800
Subject: [PATCH] 前端最新修改

---
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development                                                |   2 +-
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts                                             |   2 ++
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts                            |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts                                       |  63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts                                               |  30 +++++++++++++++---------------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue                        |  20 +++++++++++---------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/api.ts                 | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts                |  47 +++++++++++++++--------------------------------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue              | 136 +++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-admin-modal.vue |  22 ++++------------------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-menu-drawer.vue |   9 ++-------
 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue       | 171 ++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------
 美国版/Food Labeling Management App UniApp/.env.development                                                                      |   2 +-
 美国版/Food Labeling Management Platform/.env.local                                                                              |   4 ++--
 美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx                                         |  14 +++++++++++---
 15 files changed, 365 insertions(+), 330 deletions(-)
 create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts
 create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts
 create mode 100644 泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/api.ts

diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development
index 42479eb..35f86ef 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/.env.development
@@ -13,7 +13,7 @@ VITE_INJECT_APP_LOADING=true
 
 # 本地开发：直连线上 API（不走 Vite 代理；VITE_GLOB_API_URL 为绝对地址时 proxy 不启用）
 # 线上：http://saas-test.3ffoodsafety.com/api/app
-VITE_GLOB_API_URL=http://saas-test.3ffoodsafety.com/api/app
+VITE_GLOB_API_URL=http://192.168.31.87:19002/api/app
 
 # 全局加密开关(即开启了加解密功能才会生效 不是全部接口加密 需要和后端对应)
 VITE_GLOB_ENABLE_ENCRYPT=false
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts
index 0afe409..8b939a8 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/index.ts
@@ -1,2 +1,4 @@
 export * from './th-app-auth';
 export * from './th-multi-tenancy';
+export * from './th-tenant-provisioning';
+export * from './th-web-auth';
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts
new file mode 100644
index 0000000..5bf5df0
--- /dev/null
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-tenant-provisioning.ts
@@ -0,0 +1,52 @@
+import { requestClient } from '#/api/request';
+
+export interface ThProvisionTenantInput {
+  name: string;
+  tenantConnectionString?: string;
+  dbType?: number;
+  initializeDatabase?: boolean;
+}
+
+export interface ThProvisionTenantOutputDto {
+  tenantId: string;
+  name: string;
+  databaseName: string;
+  tenantConnectionString: string;
+  databaseInitialized: boolean;
+}
+
+function normalizeProvisionTenantOutput(
+  raw: unknown,
+): ThProvisionTenantOutputDto {
+  const o =
+    raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  return {
+    tenantId: String(o.tenantId ?? o.TenantId ?? ''),
+    name: String(o.name ?? o.Name ?? ''),
+    databaseName: String(o.databaseName ?? o.DatabaseName ?? ''),
+    tenantConnectionString: String(
+      o.tenantConnectionString ?? o.TenantConnectionString ?? '',
+    ),
+    databaseInitialized:
+      o.databaseInitialized === true || o.DatabaseInitialized === true,
+  };
+}
+
+export async function thProvisionTenant(
+  input: ThProvisionTenantInput,
+): Promise<ThProvisionTenantOutputDto> {
+  const raw = await requestClient.post<unknown>(
+    'th-tenant-provisioning/provision',
+    {
+      dbType: input.dbType ?? 0,
+      initializeDatabase: input.initializeDatabase ?? true,
+      name: input.name.trim(),
+      tenantConnectionString:
+        input.tenantConnectionString?.trim() || undefined,
+    },
+    {
+      successMessageMode: 'message',
+    },
+  );
+  return normalizeProvisionTenantOutput(raw);
+}
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts
new file mode 100644
index 0000000..49169f8
--- /dev/null
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/api/th/th-web-auth.ts
@@ -0,0 +1,63 @@
+export interface ThWebLoginInput {
+  tenantId: string;
+  userName: string;
+  password: string;
+  uuid?: string;
+  code?: string;
+}
+
+export interface ThWebLoginOutputDto {
+  token: string;
+  refreshToken: string;
+  tenantId: string;
+  tenantName: string;
+}
+
+let loginInFlight: Promise<ThWebLoginOutputDto> | null = null;
+
+function normalizeWebLoginOutput(raw: unknown): ThWebLoginOutputDto {
+  const o =
+    raw && typeof raw === 'object' ? (raw as Record<string, unknown>) : {};
+  return {
+    token: String(o.token ?? o.Token ?? ''),
+    refreshToken: String(o.refreshToken ?? o.RefreshToken ?? ''),
+    tenantId: String(o.tenantId ?? o.TenantId ?? ''),
+    tenantName: String(o.tenantName ?? o.TenantName ?? ''),
+  };
+}
+
+export async function thWebLogin(
+  input: ThWebLoginInput,
+): Promise<ThWebLoginOutputDto> {
+  if (loginInFlight) {
+    return loginInFlight;
+  }
+
+  loginInFlight = (async () => {
+    const { requestClient } = await import('#/api/request');
+    const raw = await requestClient.post<unknown>(
+      'th-web-auth/login',
+      {
+        tenantId: input.tenantId,
+        userName: input.userName.trim(),
+        password: input.password,
+        ...(input.uuid ? { uuid: input.uuid } : {}),
+        ...(input.code != null && input.code !== ''
+          ? { code: input.code }
+          : {}),
+      },
+      {
+        errorMessageMode: 'none',
+        headers: {
+          __tenant: input.tenantId,
+        },
+        successMessageMode: 'none',
+      },
+    );
+    return normalizeWebLoginOutput(raw);
+  })().finally(() => {
+    loginInFlight = null;
+  });
+
+  return loginInFlight;
+}
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts
index 18b301b..6d14ed5 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/store/auth.ts
@@ -10,16 +10,16 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
 import { notification } from 'ant-design-vue';
 import { defineStore } from 'pinia';
 
-import { thAppLogin } from '#/api/th';
+import { thWebLogin } from '#/api/th';
 import { $t } from '#/locales';
 
 import { useDictStore } from './dict';
 import { useThTenantStore } from './th-tenant';
 
-/** 泰额多租户登录入参（POST /api/app/th-app-auth/login） */
+/** 泰额 Web 多租户登录入参（POST /api/app/th-web-auth/login） */
 export interface ThAuthLoginParams {
   tenantId: string;
-  email: string;
+  userName: string;
   password: string;
   uuid?: string;
   code?: string;
@@ -33,16 +33,16 @@ export const useAuthStore = defineStore('auth', () => {
 
   const loginLoading = ref(false);
 
-  function buildUserInfoFromLogin(email: string, tenantName: string): UserInfo {
-    const normalizedEmail = email.trim();
+  function buildUserInfoFromLogin(userName: string, tenantName: string): UserInfo {
+    const normalizedUserName = userName.trim();
     return {
       avatar: '',
-      email: normalizedEmail,
+      email: normalizedUserName.includes('@') ? normalizedUserName : '',
       permissions: [],
-      realName: tenantName || normalizedEmail,
+      realName: tenantName || normalizedUserName,
       roles: [],
-      userId: normalizedEmail,
-      username: normalizedEmail,
+      userId: normalizedUserName,
+      username: normalizedUserName,
       homePath: preferences.app.defaultHomePath,
     };
   }
@@ -58,9 +58,9 @@ export const useAuthStore = defineStore('auth', () => {
     try {
       loginLoading.value = true;
 
-      const result = await thAppLogin({
+      const result = await thWebLogin({
         tenantId: params.tenantId,
-        email: params.email,
+        userName: params.userName,
         password: params.password,
         uuid: params.uuid,
         code: params.code,
@@ -78,10 +78,10 @@ export const useAuthStore = defineStore('auth', () => {
       thTenantStore.setTenantContext({
         tenantId: result.tenantId,
         tenantName: result.tenantName,
-        locations: result.locations,
+        locations: [],
       });
 
-      userInfo = buildUserInfoFromLogin(params.email, result.tenantName);
+      userInfo = buildUserInfoFromLogin(params.userName, result.tenantName);
       userStore.setUserInfo(userInfo);
 
       if (accessStore.loginExpired) {
@@ -138,10 +138,10 @@ export const useAuthStore = defineStore('auth', () => {
       return cached;
     }
 
-    // 泰额 SAAS：用户信息来自 th-app-auth/login，不走 Yi 框架 /account
+    // 泰额 SAAS：用户信息来自 th-web-auth/login，不走 Yi 框架 /account
     if (thTenantStore.tenantId && accessStore.accessToken) {
       const fallback = buildUserInfoFromLogin(
-        cached?.email || cached?.username || 'user',
+        cached?.username || cached?.email || 'user',
         thTenantStore.tenantName || '',
       );
       userStore.setUserInfo(fallback);
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue
index 8e534ac..9d187b7 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/authentication/login.vue
@@ -1,5 +1,8 @@
 <script lang="ts" setup>
-import type { VbenFormSchema } from '@vben/common-ui';
+import type {
+  LoginAndRegisterParams,
+  VbenFormSchema,
+} from '@vben/common-ui';
 
 import type { CaptchaResponse } from '#/api/core/captcha';
 import type { ThTenantSelectDto } from '#/api/th';
@@ -98,12 +101,11 @@ const formSchema = computed((): VbenFormSchema[] => {
         class: 'focus:border-primary',
         placeholder: 'admin@example.com',
       },
-      fieldName: 'email',
+      fieldName: 'username',
       label: 'Email',
       rules: z
         .string()
-        .min(1, { message: 'Email is required.' })
-        .email({ message: 'Invalid email format.' }),
+        .min(1, { message: 'Email is required.' }),
     },
     {
       component: 'VbenInputPassword',
@@ -137,18 +139,18 @@ const formSchema = computed((): VbenFormSchema[] => {
   ];
 });
 
-async function handleAccountLogin(values: Record<string, string>) {
+async function handleAccountLogin(values: LoginAndRegisterParams) {
   if (loginSubmitting.value || authStore.loginLoading) {
     return;
   }
   loginSubmitting.value = true;
   try {
     await authStore.authLogin({
-      tenantId: values.tenantId,
-      email: values.email,
-      password: values.password,
+      tenantId: String(values.tenantId ?? ''),
+      userName: String(values.username ?? ''),
+      password: String(values.password ?? ''),
       ...(captchaInfo.value.isEnableCaptcha
-        ? { code: values.code, uuid: captchaInfo.value.uuid }
+        ? { code: String(values.code ?? ''), uuid: captchaInfo.value.uuid }
         : {}),
     });
   } catch (error) {
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/api.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/api.ts
new file mode 100644
index 0000000..47a2ef4
--- /dev/null
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/api.ts
@@ -0,0 +1,121 @@
+import type { PageResult } from '#/api/common';
+import type { Tenant } from '#/api/system/tenant/model';
+
+import type { SaasTenantDto } from '../../shared/saas-types';
+
+import { thTenantSelectList } from '#/api/th';
+import { tenantInfo, tenantList, tenantRemove, tenantUpdate } from '#/api/system/tenant';
+
+export interface SaasTenantQuery {
+  Keyword?: string;
+  MaxResultCount?: number;
+  SkipCount?: number;
+  State?: boolean;
+}
+
+export interface SaasTenantUpdateInput {
+  id: string;
+  name: string;
+  tenantConnectionString?: string;
+  dbType?: number;
+  entityVersion?: number;
+}
+
+function normalizeTenant(raw: Tenant): SaasTenantDto {
+  const name = raw.name || raw.companyName || raw.tenantId || raw.id;
+  return {
+    id: raw.id,
+    companyName: name,
+    companyCode: raw.id,
+    logoUrl: null,
+    contactName: null,
+    contactEmail: null,
+    contactPhone: null,
+    address: null,
+    remark: raw.tenantConnectionString || null,
+    state: raw.status === false || raw.status === 'false' ? false : true,
+    menuPermissionKeys: [],
+    adminUserId: null,
+    adminUserName: null,
+    adminFullName: null,
+    adminEmail: null,
+    creationTime: raw.creationTime ?? null,
+  };
+}
+
+export async function saasTenantList(
+  query: SaasTenantQuery,
+): Promise<PageResult<SaasTenantDto>> {
+  if (query.State === false) {
+    return { items: [], totalCount: 0 };
+  }
+
+  const resp = (await tenantList({
+    MaxResultCount: query.MaxResultCount,
+    Name: query.Keyword,
+    SkipCount: query.SkipCount,
+  })) as unknown as PageResult<Tenant>;
+
+  return {
+    items: (resp.items ?? []).map(normalizeTenant),
+    totalCount: resp.totalCount ?? 0,
+  };
+}
+
+export async function saasTenantSelectList(
+  query: SaasTenantQuery,
+): Promise<PageResult<SaasTenantDto>> {
+  if (query.State === false) {
+    return { items: [], totalCount: 0 };
+  }
+
+  const keyword = query.Keyword?.trim().toLowerCase();
+  let rows = (await thTenantSelectList()).map((item) =>
+    normalizeTenant({
+      id: item.id,
+      name: item.name,
+      tenantConnectionString: '',
+      dbType: 0,
+      entityVersion: 0,
+      isDeleted: false,
+      creationTime: '',
+      creatorId: null,
+      lastModifierId: null,
+      lastModificationTime: null,
+    }),
+  );
+
+  if (keyword) {
+    rows = rows.filter(
+      (row) =>
+        row.companyName.toLowerCase().includes(keyword) ||
+        row.id.toLowerCase().includes(keyword),
+    );
+  }
+
+  const page = Math.max(query.SkipCount ?? 1, 1);
+  const size = Math.max(query.MaxResultCount ?? 10, 1);
+  const start = (page - 1) * size;
+  return {
+    items: rows.slice(start, start + size),
+    totalCount: rows.length,
+  };
+}
+
+export async function saasTenantInfo(id: string): Promise<Tenant> {
+  return tenantInfo(id);
+}
+
+export async function saasTenantUpdate(input: SaasTenantUpdateInput) {
+  return tenantUpdate({
+    dbType: input.dbType ?? 0,
+    entityVersion: input.entityVersion,
+    id: input.id,
+    name: input.name,
+    tenantConnectionString: input.tenantConnectionString ?? '',
+  });
+}
+
+export async function saasTenantRemove(id: string) {
+  return tenantRemove([id]);
+}
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts
index 19a6395..779bc21 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/data.ts
@@ -1,52 +1,35 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { $t } from '@vben/locales';
-
 import { foodLabelingActionColumn } from '../../management/shared/management-grid';
-import { keywordFilterSchema, stateFilterSchema } from '../../shared/form-schema';
+import { keywordFilterSchema } from '../../shared/form-schema';
 
-export const querySchema: FormSchemaGetter = () => [
-  ...keywordFilterSchema(),
-  ...stateFilterSchema(),
-];
+export const querySchema: FormSchemaGetter = () => [...keywordFilterSchema()];
 
 export const columns: VxeGridProps['columns'] = [
   {
     field: 'companyName',
-    title: $t('foodLabeling.platform.companyName'),
-    minWidth: 160,
+    title: '租户名称',
+    minWidth: 180,
     slots: { default: 'companyName' },
   },
   {
     field: 'companyCode',
-    title: $t('foodLabeling.platform.companyCode'),
-    minWidth: 120,
-    slots: { default: 'companyCode' },
+    title: '租户 ID',
+    minWidth: 260,
+    slots: { default: 'tenantId' },
   },
   {
-    field: 'adminUserName',
-    title: $t('foodLabeling.platform.tenantAdmin'),
-    minWidth: 130,
-    slots: { default: 'adminUserName' },
+    field: 'remark',
+    title: '连接串 / 数据库',
+    minWidth: 240,
+    slots: { default: 'connectionString' },
   },
   {
-    field: 'menuPermissionKeys',
-    title: $t('foodLabeling.platform.menuPermissions'),
-    minWidth: 100,
-    slots: { default: 'menuCount' },
-  },
-  {
-    field: 'contactEmail',
-    title: $t('foodLabeling.accountManagement.contactEmail'),
+    field: 'creationTime',
+    title: '创建时间',
     minWidth: 160,
-    slots: { default: 'contactEmail' },
-  },
-  {
-    field: 'state',
-    title: $t('foodLabeling.common.status'),
-    width: 90,
-    slots: { default: 'state' },
+    slots: { default: 'creationTime' },
   },
-  foodLabelingActionColumn({ minWidth: 160 }),
+  foodLabelingActionColumn({ minWidth: 120 }),
 ];
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue
index 8723804..9257c8e 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/index.vue
@@ -1,20 +1,17 @@
 <script lang="ts" setup>
 import type { VbenFormProps } from '@vben/common-ui';
-import type { Recordable } from '@vben/types';
 
 import type { SaasTenantDto } from '../../shared/saas-types';
 
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
+import { Page, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
-import { Alert, Avatar, Button, Dropdown, Menu, Modal, Space, Tag } from 'ant-design-vue';
+import { Alert, Avatar, Button, Modal, Space, Tooltip } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
-import { matchKeyword, slicePage } from '../../shared/static-mode';
-import { MOCK_SAAS_TENANTS } from '../../shared/mock-platform-data';
 import {
   buildManagementTabFormOptions,
   managementTabGridBase,
@@ -22,9 +19,8 @@ import {
   managementTabTableClass,
   managementTabVxeGridClass,
 } from '../../management/shared/management-grid';
+import { saasTenantRemove, saasTenantSelectList } from './api';
 import { columns, querySchema } from './data';
-import TenantAdminModal from './tenant-admin-modal.vue';
-import TenantMenuDrawer from './tenant-menu-drawer.vue';
 import TenantModal from './tenant-modal.vue';
 
 defineOptions({ name: 'FoodLabelingPlatformTenants' });
@@ -44,23 +40,11 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({ page }, formValues = {}) => {
-        let rows = [...MOCK_SAAS_TENANTS];
-        const kw = String(formValues.Keyword ?? '');
-        if (kw) {
-          rows = rows.filter((r) =>
-            matchKeyword(r as Recordable, kw, [
-              'companyName',
-              'companyCode',
-              'adminUserName',
-              'contactEmail',
-              'contactName',
-            ]),
-          );
-        }
-        if (formValues.State === true || formValues.State === false) {
-          rows = rows.filter((r) => r.state === formValues.State);
-        }
-        return slicePage(rows, page.currentPage, page.pageSize);
+        return saasTenantSelectList({
+          Keyword: String(formValues.Keyword ?? '').trim() || undefined,
+          MaxResultCount: page.pageSize,
+          SkipCount: page.currentPage,
+        });
       },
     },
   },
@@ -82,14 +66,6 @@ const [TenantModalHost, tenantModalApi] = useVbenModal({
   connectedComponent: TenantModal,
 });
 
-const [TenantMenuDrawerHost, tenantMenuDrawerApi] = useVbenDrawer({
-  connectedComponent: TenantMenuDrawer,
-});
-
-const [TenantAdminModalHost, tenantAdminModalApi] = useVbenModal({
-  connectedComponent: TenantAdminModal,
-});
-
 function handleAdd() {
   tenantModalApi.setData({});
   tenantModalApi.open();
@@ -100,26 +76,9 @@ function handleEdit(row: SaasTenantDto) {
   tenantModalApi.open();
 }
 
-function handleMenus(row: SaasTenantDto) {
-  tenantMenuDrawerApi.setData({ id: row.id });
-  tenantMenuDrawerApi.open();
-}
-
-function handleAdmin(row: SaasTenantDto) {
-  tenantAdminModalApi.setData({ id: row.id });
-  tenantAdminModalApi.open();
-}
-
-function handleDelete(row: SaasTenantDto) {
-  const idx = MOCK_SAAS_TENANTS.findIndex((x) => x.id === row.id);
-  if (idx >= 0) {
-    MOCK_SAAS_TENANTS.splice(idx, 1);
-  }
-  tableApi.reload();
-}
-
-function menuCount(row: SaasTenantDto) {
-  return row.menuPermissionKeys?.length ?? 0;
+async function handleDelete(row: SaasTenantDto) {
+  await saasTenantRemove(row.id);
+  await tableApi.reload();
 }
 
 function confirmDelete(row: SaasTenantDto) {
@@ -129,27 +88,13 @@ function confirmDelete(row: SaasTenantDto) {
     onOk: () => handleDelete(row),
   });
 }
-
-function onActionMenu(key: string, row: SaasTenantDto) {
-  if (key === 'menus') {
-    handleMenus(row);
-    return;
-  }
-  if (key === 'admin') {
-    handleAdmin(row);
-    return;
-  }
-  if (key === 'delete') {
-    confirmDelete(row);
-  }
-}
 </script>
 
 <template>
   <Page :auto-content-height="true" :content-class="managementTabPageContentClass">
     <Alert
       class="mb-3 shrink-0"
-      :message="$t('foodLabeling.platform.saasBanner')"
+      message="平台管理员：此处通过 tenant-select 查看租户，通过 provision 开通独立库租户；业务接口会依赖登录 Token 或 __tenant 请求头识别租户上下文。"
       show-icon
       type="info"
     />
@@ -169,33 +114,20 @@ function onActionMenu(key: string, row: SaasTenantDto) {
         </div>
       </template>
 
-      <template #companyCode="{ row }">
-        {{ displayText(row.companyCode) }}
+      <template #tenantId="{ row }">
+        <span class="font-mono text-xs">{{ displayText(row.id) }}</span>
       </template>
 
-      <template #adminUserName="{ row }">
-        <div class="truncate">
-          <div>{{ displayText(row.adminFullName) }}</div>
-          <div class="text-xs text-gray-500">{{ displayText(row.adminUserName) }}</div>
-        </div>
+      <template #connectionString="{ row }">
+        <Tooltip :title="row.remark || 'tenant-select 不返回连接串，编辑时读取 /tenant/{id}'">
+          <span class="block max-w-[320px] truncate">
+            {{ displayText(row.remark) }}
+          </span>
+        </Tooltip>
       </template>
 
-      <template #menuCount="{ row }">
-        <Tag color="blue">{{ menuCount(row) }}</Tag>
-      </template>
-
-      <template #contactEmail="{ row }">
-        {{ displayText(row.contactEmail) }}
-      </template>
-
-      <template #state="{ row }">
-        <Tag :color="row.state !== false ? 'green' : 'default'">
-          {{
-            row.state !== false
-              ? $t('foodLabeling.common.enabled')
-              : $t('foodLabeling.common.disabled')
-          }}
-        </Tag>
+      <template #creationTime="{ row }">
+        {{ displayText(row.creationTime) }}
       </template>
 
       <template #action="{ row }">
@@ -204,33 +136,15 @@ function onActionMenu(key: string, row: SaasTenantDto) {
             <ghost-button size="small" @click="handleEdit(row)">
               {{ $t('pages.common.edit') }}
             </ghost-button>
-            <Dropdown :trigger="['click']">
-              <ghost-button size="small">
-                {{ $t('pages.common.more') }}
-              </ghost-button>
-              <template #overlay>
-                <Menu @click="({ key }) => onActionMenu(String(key), row)">
-                  <Menu.Item key="menus">
-                    {{ $t('foodLabeling.platform.menuPermissions') }}
-                  </Menu.Item>
-                  <Menu.Item key="admin">
-                    {{ $t('foodLabeling.platform.tenantAdmin') }}
-                  </Menu.Item>
-                  <Menu.Divider />
-                  <Menu.Item key="delete" danger>
-                    {{ $t('pages.common.delete') }}
-                  </Menu.Item>
-                </Menu>
-              </template>
-            </Dropdown>
+            <ghost-button danger size="small" @click="confirmDelete(row)">
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
           </Space>
         </div>
       </template>
     </BasicTable>
 
     <TenantModalHost @reload="tableApi.reload()" />
-    <TenantMenuDrawerHost @reload="tableApi.reload()" />
-    <TenantAdminModalHost @reload="tableApi.reload()" />
   </Page>
 </template>
 
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-admin-modal.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-admin-modal.vue
index 62d1dce..7f50fb0 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-admin-modal.vue
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-admin-modal.vue
@@ -5,14 +5,11 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 
-import { MOCK_SAAS_TENANTS } from '../../shared/mock-platform-data';
-
 const emit = defineEmits<{ reload: [] }>();
 
 const tenantId = ref('');
@@ -73,9 +70,9 @@ const [BasicModal, modalApi] = useVbenModal({
     if (!isOpen) {
       return null;
     }
-    const data = modalApi.getData() as { id?: string };
-    tenantId.value = data?.id ?? '';
-    const record = MOCK_SAAS_TENANTS.find((x) => x.id === tenantId.value);
+    const data = modalApi.getData() as { row?: SaasTenantDto };
+    const record = data.row ?? null;
+    tenantId.value = record?.id ?? '';
     tenantName.value = record?.companyName ?? '';
     await formApi.setValues({
       adminUserName: record?.adminUserName ?? '',
@@ -91,18 +88,7 @@ async function handleConfirm() {
   if (!valid || !tenantId.value) {
     return;
   }
-  const values = cloneDeep(await formApi.getValues()) as Record<string, unknown>;
-  const idx = MOCK_SAAS_TENANTS.findIndex((x) => x.id === tenantId.value);
-  if (idx >= 0) {
-    const row = MOCK_SAAS_TENANTS[idx]!;
-    row.adminUserName = String(values.adminUserName ?? '').trim();
-    row.adminFullName = String(values.adminFullName ?? '').trim();
-    row.adminEmail = String(values.adminEmail ?? '').trim() || null;
-    if (!row.adminUserId) {
-      row.adminUserId = `admin-${tenantId.value.slice(0, 8)}`;
-    }
-  }
-  message.success($t('foodLabeling.common.staticDemoAction'));
+  message.warning('后端暂未提供公司管理员保存接口，当前仅展示真实租户信息。');
   emit('reload');
   await handleCancel();
 }
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-menu-drawer.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-menu-drawer.vue
index 1c7bb42..d082fff 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-menu-drawer.vue
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-menu-drawer.vue
@@ -8,7 +8,6 @@ import { $t } from '@vben/locales';
 
 import { message } from 'ant-design-vue';
 
-import { MOCK_SAAS_TENANTS } from '../../shared/mock-platform-data';
 import MenuPermissionTree from '../../shared/menu-permission-tree.vue';
 
 const emit = defineEmits<{ reload: [] }>();
@@ -24,8 +23,8 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({
       record.value = null;
       return;
     }
-    const data = drawerApi.getData() as { id?: string };
-    const found = MOCK_SAAS_TENANTS.find((x) => x.id === data?.id) ?? null;
+    const data = drawerApi.getData() as { row?: SaasTenantDto };
+    const found = data.row ?? null;
     record.value = found;
     menuKeys.value = found ? [...found.menuPermissionKeys] : [];
   },
@@ -35,10 +34,6 @@ async function handleSave() {
   if (!record.value) {
     return;
   }
-  const idx = MOCK_SAAS_TENANTS.findIndex((x) => x.id === record.value!.id);
-  if (idx >= 0) {
-    MOCK_SAAS_TENANTS[idx]!.menuPermissionKeys = [...menuKeys.value];
-  }
   message.success($t('foodLabeling.platform.menuSaved'));
   emit('reload');
   drawerApi.close();
diff --git a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue
index 4ed076f..294b056 100644
--- a/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue
+++ b/泰额版/Food Labeling Management Code/Yi.Vben5.Vue3/apps/web-antd/src/views/food-labeling/platform/tenants/tenant-modal.vue
@@ -1,7 +1,5 @@
 <script lang="ts" setup>
-import type { SaasTenantDto } from '../../shared/saas-types';
-
-import { computed, markRaw, ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
@@ -10,16 +8,16 @@ import { cloneDeep } from '@vben/utils';
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
+import { thProvisionTenant } from '#/api/th';
 
-import { MOCK_SAAS_TENANTS } from '../../shared/mock-platform-data';
-import { stateModalSchema } from '../../shared/form-schema';
-import { ALL_SAAS_MENU_KEYS } from '../../shared/saas-menu-tree';
-import TenantLogoUploadField from './tenant-logo-upload-field.vue';
+import { saasTenantInfo, saasTenantUpdate } from './api';
 
 const emit = defineEmits<{ reload: [] }>();
 
 const isUpdate = ref(false);
 const recordId = ref('');
+const entityVersion = ref<number | undefined>();
+const dbType = ref<number | undefined>();
 
 const title = computed(() =>
   isUpdate.value
@@ -37,96 +35,29 @@ const [BasicForm, formApi] = useVbenForm({
     {
       component: 'Input',
       fieldName: 'companyName',
-      label: $t('foodLabeling.platform.companyName'),
-      rules: 'required',
-    },
-    {
-      component: 'Input',
-      fieldName: 'companyCode',
-      label: $t('foodLabeling.platform.companyCode'),
+      label: '租户名称',
       rules: 'required',
-      componentProps: { placeholder: 'SIAM_FRESH' },
-    },
-    {
-      component: markRaw(TenantLogoUploadField),
-      fieldName: 'logoUrl',
-      label: $t('foodLabeling.platform.logo'),
-      formItemClass: 'col-span-2 items-start',
-      componentProps: { class: 'w-auto' },
-    },
-    {
-      component: 'Input',
-      fieldName: 'contactName',
-      label: $t('foodLabeling.platform.contactName'),
     },
     {
       component: 'Input',
-      fieldName: 'contactEmail',
-      label: $t('foodLabeling.accountManagement.contactEmail'),
-    },
-    {
-      component: 'Input',
-      fieldName: 'contactPhone',
-      label: $t('foodLabeling.accountManagement.phoneNumber'),
-    },
-    {
-      component: 'Textarea',
-      fieldName: 'address',
-      label: $t('foodLabeling.platform.address'),
-      formItemClass: 'col-span-2',
-    },
-    {
-      component: 'Textarea',
-      fieldName: 'remark',
-      label: $t('foodLabeling.accountManagement.remark'),
+      fieldName: 'tenantConnectionString',
+      label: '自定义连接串',
       formItemClass: 'col-span-2',
-    },
-    {
-      component: 'Input',
-      fieldName: 'adminUserName',
-      label: $t('foodLabeling.accountManagement.userName'),
-      rules: 'required',
-      dependencies: {
-        if: () => !isUpdate.value,
-        triggerFields: ['companyName'],
-      },
-    },
-    {
-      component: 'InputPassword',
-      fieldName: 'adminPassword',
-      label: $t('foodLabeling.accountManagement.password'),
-      rules: 'required',
-      dependencies: {
-        if: () => !isUpdate.value,
-        triggerFields: ['companyName'],
-      },
-    },
-    {
-      component: 'Input',
-      fieldName: 'adminFullName',
-      label: $t('foodLabeling.accountManagement.fullName'),
-      rules: 'required',
-      dependencies: {
-        if: () => !isUpdate.value,
-        triggerFields: ['companyName'],
+      componentProps: {
+        placeholder: '可选；为空时后端按租户名称自动生成业务库连接串',
       },
     },
     {
-      component: 'Input',
-      fieldName: 'adminEmail',
-      label: $t('foodLabeling.accountManagement.contactEmail'),
+      component: 'Switch',
+      fieldName: 'initializeDatabase',
+      label: '初始化数据库',
+      defaultValue: true,
+      componentProps: { class: 'w-fit' },
       dependencies: {
         if: () => !isUpdate.value,
         triggerFields: ['companyName'],
       },
     },
-    ...stateModalSchema().map((item) => ({
-      ...item,
-      componentProps: {
-        ...(item.componentProps as Record<string, unknown>),
-        class: 'w-fit',
-      },
-    })),
   ],
   showDefaultActions: false,
   wrapperClass: 'grid-cols-2',
@@ -147,22 +78,18 @@ const [BasicModal, modalApi] = useVbenModal({
     recordId.value = data?.id ?? '';
 
     if (isUpdate.value && recordId.value) {
-      const record =
-        MOCK_SAAS_TENANTS.find((x) => x.id === recordId.value) ?? ({} as SaasTenantDto);
+      const record = await saasTenantInfo(recordId.value);
+      entityVersion.value = record.entityVersion;
+      dbType.value = record.dbType;
       await formApi.setValues({
-        companyName: record.companyName,
-        companyCode: record.companyCode,
-        logoUrl: record.logoUrl ?? '',
-        contactName: record.contactName ?? '',
-        contactEmail: record.contactEmail ?? '',
-        contactPhone: record.contactPhone ?? '',
-        address: record.address ?? '',
-        remark: record.remark ?? '',
-        state: record.state !== false,
+        companyName: record.name,
+        tenantConnectionString: record.tenantConnectionString ?? '',
       });
     } else {
+      entityVersion.value = undefined;
+      dbType.value = undefined;
       await formApi.resetForm();
-      await formApi.setValues({ state: true });
+      await formApi.setValues({ initializeDatabase: true });
     }
     modalApi.modalLoading(false);
   },
@@ -177,44 +104,26 @@ async function handleConfirm() {
     }
     const values = cloneDeep(await formApi.getValues()) as Record<string, unknown>;
     if (isUpdate.value && recordId.value) {
-      const idx = MOCK_SAAS_TENANTS.findIndex((x) => x.id === recordId.value);
-      if (idx >= 0) {
-        const prev = MOCK_SAAS_TENANTS[idx]!;
-        MOCK_SAAS_TENANTS[idx] = {
-          ...prev,
-          companyName: String(values.companyName ?? '').trim(),
-          companyCode: String(values.companyCode ?? '').trim(),
-          logoUrl: String(values.logoUrl ?? '').trim() || null,
-          contactName: String(values.contactName ?? '').trim() || null,
-          contactEmail: String(values.contactEmail ?? '').trim() || null,
-          contactPhone: String(values.contactPhone ?? '').trim() || null,
-          address: String(values.address ?? '').trim() || null,
-          remark: String(values.remark ?? '').trim() || null,
-          state: values.state !== false,
-        };
-      }
+      await saasTenantUpdate({
+        dbType: dbType.value,
+        entityVersion: entityVersion.value,
+        id: recordId.value,
+        name: String(values.companyName ?? '').trim(),
+        tenantConnectionString: String(
+          values.tenantConnectionString ?? '',
+        ).trim(),
+      });
     } else {
-      const id = crypto.randomUUID();
-      MOCK_SAAS_TENANTS.push({
-        id,
-        companyName: String(values.companyName ?? '').trim(),
-        companyCode: String(values.companyCode ?? '').trim(),
-        logoUrl: String(values.logoUrl ?? '').trim() || null,
-        contactName: String(values.contactName ?? '').trim() || null,
-        contactEmail: String(values.contactEmail ?? '').trim() || null,
-        contactPhone: String(values.contactPhone ?? '').trim() || null,
-        address: String(values.address ?? '').trim() || null,
-        remark: String(values.remark ?? '').trim() || null,
-        state: values.state !== false,
-        menuPermissionKeys: [...ALL_SAAS_MENU_KEYS],
-        adminUserId: `admin-${id.slice(0, 8)}`,
-        adminUserName: String(values.adminUserName ?? '').trim(),
-        adminFullName: String(values.adminFullName ?? '').trim(),
-        adminEmail: String(values.adminEmail ?? '').trim() || null,
-        creationTime: new Date().toISOString().slice(0, 16).replace('T', ' '),
+      await thProvisionTenant({
+        dbType: 0,
+        initializeDatabase: values.initializeDatabase !== false,
+        name: String(values.companyName ?? '').trim(),
+        tenantConnectionString: String(
+          values.tenantConnectionString ?? '',
+        ).trim(),
       });
     }
-    message.success($t('foodLabeling.common.staticDemoAction'));
+    message.success($t('http.operationSuccess'));
     emit('reload');
     await handleCancel();
   } finally {
diff --git a/美国版/Food Labeling Management App UniApp/.env.development b/美国版/Food Labeling Management App UniApp/.env.development
index 03e1a64..5f54d6a 100644
--- a/美国版/Food Labeling Management App UniApp/.env.development
+++ b/美国版/Food Labeling Management App UniApp/.env.development
@@ -1,2 +1,2 @@
 # H5 / App 开发：直连本地后端（按本机 IP 与端口修改）
-VITE_US_API_BASE=http://192.168.31.89:19001
+VITE_US_API_BASE=http://192.168.31.87:19001
diff --git a/美国版/Food Labeling Management Platform/.env.local b/美国版/Food Labeling Management Platform/.env.local
index fb04084..235f6af 100644
--- a/美国版/Food Labeling Management Platform/.env.local
+++ b/美国版/Food Labeling Management Platform/.env.local
@@ -1,2 +1,2 @@
-# VITE_API_BASE_URL=http://192.168.31.89:19001
- VITE_API_BASE_URL=http://flus-test.3ffoodsafety.com
+ VITE_API_BASE_URL=http://192.168.31.87:19001
+# VITE_API_BASE_URL=http://flus-test.3ffoodsafety.com
diff --git a/美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx b/美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx
index 0e153df..7958cc8 100644
--- a/美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx
+++ b/美国版/Food Labeling Management Platform/src/components/shared/category-scope-fields.tsx
@@ -9,6 +9,7 @@ import {
   regionOptionsForPartner,
   filterScopeIdsForPartners,
   partnerIdsScopeKey,
+  regionNamesToGroupIds,
   regionOptionsForPartners,
   regionSelectionToGroupNames,
 } from "../../lib/categoryScopeForm";
@@ -120,6 +121,13 @@ export function CategoryScopeFields({
     return regionOptionsForPartner(groups, effectivePartnerId);
   }, [templateScopeMode, groups, effectivePartnerIds, effectivePartnerId]);
 
+  const selectedRegionPickerValues = useMemo(() => {
+    if (templateScopeMode) return selectedRegionIds;
+    const ids = regionNamesToGroupIds(selectedRegionNames, groups, effectivePartnerId);
+    if (ids.length > 0) return ids;
+    return selectedRegionNames.map((x) => x.trim()).filter(Boolean);
+  }, [templateScopeMode, selectedRegionIds, selectedRegionNames, groups, effectivePartnerId]);
+
   const scopedLocations = useMemo(() => {
     if (templateScopeMode) {
       return locationsScopedForTemplateScope(
@@ -332,7 +340,7 @@ export function CategoryScopeFields({
         ) : null}
         <TemplateFieldGroup label="Region:" className="min-w-[10rem] flex-[1_1_10rem]">
           <SearchableMultiSelect
-            values={templateScopeMode ? selectedRegionIds : selectedRegionNames}
+            values={selectedRegionPickerValues}
             onValuesChange={templateScopeMode ? onRegionIdsMultiChange : onRegionMultiChange}
             options={regionOptions}
             placeholder={regionPh}
@@ -401,7 +409,7 @@ export function CategoryScopeFields({
         <div className={scopeCellClass}>
           <Label className={labelClass}>Region *</Label>
           <SearchableMultiSelect
-            values={selectedRegionNames}
+            values={selectedRegionPickerValues}
             onValuesChange={onRegionMultiChange}
             options={regionOptions}
             placeholder={regionPh}
@@ -466,7 +474,7 @@ export function CategoryScopeFields({
         <div className="space-y-2">
           <Label>Region *</Label>
           <SearchableMultiSelect
-            values={templateScopeMode ? selectedRegionIds : selectedRegionNames}
+            values={selectedRegionPickerValues}
             onValuesChange={templateScopeMode ? onRegionIdsMultiChange : onRegionMultiChange}
             options={regionOptions}
             placeholder={regionPlaceholder}
--
libgit2 0.21.4