更新bug

杨鑫
1 parent 1aa1dca9
Showing 51 changed files with 3431 additions and 436 deletions
5-18接口优化.md
泰额版/Food Labeling Management Platform/src/components/ui/select.tsx
美国版/Food Labeling Management App UniApp/src/App.vue
美国版/Food Labeling Management App UniApp/src/locales/en.ts
美国版/Food Labeling Management App UniApp/src/locales/zh.ts
美国版/Food Labeling Management App UniApp/src/pages/labels/labels.vue
美国版/Food Labeling Management App UniApp/src/pages/labels/preview.vue
美国版/Food Labeling Management App UniApp/src/pages/login/login.vue
美国版/Food Labeling Management App UniApp/src/services/locationSupport.ts
美国版/Food Labeling Management App UniApp/src/services/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/types/usAppLabeling.ts
美国版/Food Labeling Management App UniApp/src/utils/barcodeFormat.ts
美国版/Food Labeling Management App UniApp/src/utils/labelPreview/normalizePreviewTemplate.ts
美国版/Food Labeling Management App UniApp/src/utils/offlineSyncManager.ts
美国版/Food Labeling Management App UniApp/src/utils/print/protocols/escPosBuilder.ts
美国版/Food Labeling Management App UniApp/src/utils/print/systemTemplateAdapter.ts
美国版/Food Labeling Management App UniApp/src/utils/print/tscLabelBuilder.ts
美国版/Food Labeling Management App UniApp/src/utils/sqliteSync.ts
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Product/ProductCreateInputVo.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/Product/ProductGetListOutputDto.cs
+# 5-18 接口优化
+
+本文档说明 **2026-05-18** 对美国版接口修复与约定，包括：
+
+1. **`/api/app/rbac-role`**：`accessPermissions` 读写（见下文 rbac-role 章节）。
+2. **`/api/app/team-member`**：成员 **平台端无法登录**（已修复）；列表支持 **Company / Region / Location** 筛选（见 [team-member-list](#team-member-列表-companyregionlocation-筛选)）。
+3. **`/api/app/label-type`**：列表 **No. of Labels / Region / Location**；新增/编辑 **Region·Location 多选**（见 [label-type](#label-type-标签类型)）。
+4. **`/api/app/label-multiple-option`**：列表 **Region / Location** 筛选与出参；新增/编辑 **Region·Location 多选**（见 [label-multiple-option](#label-multiple-option-多选项)）。
+5. **`/api/app/reports/print-log-list`**：Print Log **Label ID** 当日门店序号 + **Expiry Date** 从打印快照解析（见 [reports-print-log](#reports-print-log-打印日志)）。
+6. **`/api/app/reports/label-report`**：按 Token **门店绑定**统计（管理员全量；见 [reports-label-report](#reports-label-report-标签报表)）。
+7. **`/api/app/us-app-auth/location-detail/{locationId}`**：出参增加 **经营时间** `operatingHours`（见 [us-app-auth-location-detail](#us-app-auth-location-detail-门店详情)）。
+8. **App `POST /api/app/us-app-labeling/get-print-log-list`**、**`get-label-report`**：管理员 / Partner 角色可查看**当前门店全部**打印记录与统计（见 [us-app-print-log](#us-app-print-log-app-打印日志与报表)）。
+9. **`GET /api/app/us-app-labeling/labeling-tree`**：修复产品分类 `SPECIFIED` 未配门店关联导致全店空树（见 [us-app-labeling-tree](#us-app-labeling-tree-四级列表)）。
+10. **`GET /api/app/location`**：门店列表按 Token **Region** 数据范围过滤（见 [location-list](#location-门店列表)）。
+11. **`GET /api/app/reports/template-print-stat-list`**：按模板统计打印标签数量（见 [reports-template-print-stat](#reports-template-print-stat-模板打印统计)）。
+
+---
+
+## reports-print-log 打印日志
+
+**应用服务**：`ReportsAppService`  
+**接口**：`GET /api/app/reports/print-log-list`（及同源导出 `export-print-log-pdf` / `export-print-log-excel`）  
+**辅助类**：`ReportsPrintLogDailyLabelIdHelper`、`ReportsPrintLogExpiryHelper`
+
+### Label ID 变更说明
+
+| 项 | 说明 |
+|----|------|
+| **Label ID 含义** | 由 **`fl_label.LabelCode`**（如 `079`）改为 **门店当日打印序号** |
+| **展示格式** | `{yyyyMMdd}-{n}`，例如 `20260513-1`、`20260513-2` |
+| **排序规则** | 按 **`LocationId`（门店）** + **自然日**（`PrintedAt`，无则 `CreationTime`）分组；组内按打印时间 **升序**，同秒按任务 `Id` 升序，`n` 从 **1** 递增 |
+| **跨页一致** | 分页列表与导出使用同一套序号（按门店全日任务计算，非仅当前页内排序） |
+| **API 字段名** | 仍为 **`labelCode`**（兼容前端列绑定），内容为当日序号，**不是**标签主数据编码 |
+
+### 列表出参（节选）
+
+| 字段 | 说明 |
+|------|------|
+| taskId | 打印任务 Id（`fl_label_print_task.Id`，重打用） |
+| **labelCode** | **Label ID 列**：`20260515-1` 这种当日门店序号 |
+| productName / categoryName / templateText | 不变 |
+| printedAt | 打印时间 |
+| locationText / locationId | 门店 |
+| **expiryDateText** | **Expiry Date 列**：从 `PrintInputJson` 解析的保质期展示文案；无则「无」 |
+
+**示例**
+
+```json
+{
+  "taskId": "task-guid-001",
+  "labelCode": "20260515-3",
+  "productName": "Tuna & Bacon Sub",
+  "printedAt": "2026-05-15T15:00:40",
+  "locationText": "UNCC store (LOC001)",
+  "expiryDateText": "05/17"
+}
+```
+
+### Expiry Date（到期时间）变更说明
+
+| 项 | 说明 |
+|----|------|
+| **数据来源** | `fl_label_print_task.PrintInputJson`（App 打印接口落库，多为**整份模板快照** JSON，含 `elements[]`） |
+| **解析方式** | `ReportsPrintLogExpiryHelper.ExtractExpiryText`：先读根级 `expiryDate` / `expiry` / `expirationDate` 等；若无，在 `elements` 中匹配 **duration date / expiry** 类元素，取 `config.text`（或 `config.format`） |
+| **匹配规则** | 与 Web `isDateTimeDataEntryField` 对齐：`elementName` / `inputKey` 含 `durationdate`、`expirydate` 等；`typeAdd` 含 `duration date`；排除 `currentdate`、`currenttime`、`prepped` 等制备日期字段 |
+| **展示格式** | **与标签出纸一致**（如 `05/17`、`2026-05-17`），不做二次换算 |
+| **适用范围** | 分页列表、`export-print-log-pdf`、`export-print-log-excel` 共用同一解析逻辑 |
+
+**库内样例（节选）**
+
+`PrintInputJson.elements` 中 `elementName: "durationdate1"` → `config.text: "05/17"`，接口应返回 `expiryDateText: "05/17"`（此前仅查根级字段，列恒为「无」）。
+
+### Label ID 计算逻辑（与代码一致）
+
+同一门店、同一天内：
+
+1. 查询 `fl_label_print_task` 中 `LocationId` 相同且 `DATE(COALESCE(PrintedAt, CreationTime))` 相同的全部任务；
+2. 按打印时间升序编号 `1, 2, 3…`；
+3. 格式化为 `yyyyMMdd-n`。
+
+> **注意**：序号统计范围为该门店**当日全部打印任务**（不限于当前列表筛选关键字），以保证同一天内序号全局唯一、连续。列表/导出的日期、门店筛选只决定**哪些行展示**，不改变已展示行的序号。
+
+### 库内核对 SQL
+
+```sql
+SELECT
+  t.Id AS task_id,
+  t.LocationId,
+  DATE(COALESCE(t.PrintedAt, t.CreationTime)) AS print_day,
+  ROW_NUMBER() OVER (
+    PARTITION BY t.LocationId, DATE(COALESCE(t.PrintedAt, t.CreationTime))
+    ORDER BY COALESCE(t.PrintedAt, t.CreationTime), t.Id
+  ) AS daily_seq,
+  CONCAT(
+    DATE_FORMAT(COALESCE(t.PrintedAt, t.CreationTime), '%Y%m%d'),
+    '-',
+    ROW_NUMBER() OVER (
+      PARTITION BY t.LocationId, DATE(COALESCE(t.PrintedAt, t.CreationTime))
+      ORDER BY COALESCE(t.PrintedAt, t.CreationTime), t.Id
+    )
+  ) AS label_id_display
+FROM fl_label_print_task t
+WHERE t.LocationId = :locationId
+  AND COALESCE(t.PrintedAt, t.CreationTime) >= :dayStart
+  AND COALESCE(t.PrintedAt, t.CreationTime) < :dayEnd
+ORDER BY print_day, daily_seq;
+```
+
+### 联调注意
+
+| 现象 | 可能原因 |
+|------|----------|
+| 仍显示 `079` 等 | 后端未部署；或前端绑错字段（应绑 `labelCode`） |
+| 同一天序号不连续 | 存在无 `LocationId` 的任务，显示「无」 |
+| 与 App 端打印记录不一致 | App 接口为另一套（`us-app-labeling` 打印历史），本规则仅 **Reports Print Log** |
+
+---
+
+## location 门店列表
+
+**应用服务**：`LocationAppService`  
+**接口**：`GET /api/app/location`（分页；同源 Excel 导出 `export-locations-excel` 使用相同筛选）  
+**辅助类**：`LocationRegionScopeHelper`、`ReportsRoleHelper`
+
+### 数据范围（按 Token）
+
+| 角色 | 可见门店 |
+|------|----------|
+| **管理员** | **全部**未删除门店（`ReportsRoleHelper.IsAdminRole`） |
+| **非管理员** | 仅 **`userlocation` 绑定门店所属 Region** 下的全部门店 |
+
+**Region 判定**：与 `fl_group` / `group` 列表一致——取绑定门店的 `location.Partner`（公司名称）+ `location.GroupName`（Region 名称）去重后，列表返回 **同一 Partner + GroupName** 的所有 `location` 行（不限于本人绑定的那几家店）。
+
+未绑定门店、或绑定门店缺少 `Partner`/`GroupName` 时，列表为空。
+
+### 请求示例
+
+```http
+GET /api/app/location?SkipCount=1&MaxResultCount=10
+Authorization: Bearer {token}
+```
+
+可选 Query：`Keyword`、`Partner`、`GroupName`、`State`、`Sorting`（在数据范围之上再收窄）。
+
+### 与 group 列表的关系
+
+| 接口 | 非管理员范围 |
+|------|----------------|
+| `GET /api/app/group` | 可见的 **fl_group** 记录 |
+| `GET /api/app/location` | 上述 Region 对应的 **location** 门店 |
+
+### 库内核对（非管理员）
+
+```sql
+-- 当前用户绑定门店所属的 Region（Partner + GroupName）
+SELECT DISTINCT loc.Partner, loc.GroupName
+FROM userlocation ul
+INNER JOIN location loc ON ul.LocationId = loc.Id AND loc.IsDeleted = 0
+WHERE ul.IsDeleted = 0 AND ul.UserId = :currentUserId
+  AND loc.Partner IS NOT NULL AND loc.Partner != ''
+  AND loc.GroupName IS NOT NULL AND loc.GroupName != '';
+
+-- 列表应返回的同 Region 全部门店
+SELECT loc.*
+FROM location loc
+WHERE loc.IsDeleted = 0
+  AND (loc.Partner, loc.GroupName) IN (
+    SELECT DISTINCT l2.Partner, l2.GroupName
+    FROM userlocation ul
+    INNER JOIN location l2 ON ul.LocationId = l2.Id AND l2.IsDeleted = 0
+    WHERE ul.IsDeleted = 0 AND ul.UserId = :currentUserId
+  );
+```
+
+### 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| 非管理员列表为空 | 检查 `userlocation` 是否有绑定；门店 `Partner`、`GroupName` 是否已填 |
+| 只能看到部分 Region | 正常：仅能看到绑定门店所在 Region；换绑门店可扩大范围 |
+| 入参 `GroupName` 越权筛选 | 仅能筛 **已有权限范围内** 的数据，不会扩大范围 |
+
+---
+
+## us-app-labeling-tree 四级列表
+
+**应用服务**：`UsAppLabelingAppService.GetLabelingTreeAsync`  
+**接口**：`GET /api/app/us-app-labeling/labeling-tree?locationId={guid}`
+
+### 问题与修复（2026-05-18）
+
+| 现象 | 原因 | 处理 |
+|------|------|------|
+| App 各门店 Labeling 页 **No products found** | 产品已写入 `fl_location_product`，但 `fl_product_category.AvailabilityType=SPECIFIED` 且 **未**在 `fl_product_category_location` 配置当前门店时，旧逻辑在 Join 条件中整行过滤 | **已修复**：四级树的产品范围仅由 **`fl_location_product` + `fl_label.LocationId`** 决定；产品分类、标签分类仅校验未删除且启用，不再用 SPECIFIED 子查询拦截 |
+| 某门店仍为空 | 该门店 **无** `fl_label`（`LocationId` 匹配且 `State=1`） | 属数据：需在 Web **Labels** 为该门店创建/复制标签，或把已有标签的 `LocationId` 指到该门店 |
+
+### 数据范围（与代码一致）
+
+1. **门店产品**：`fl_location_product.LocationId = locationId`  
+2. **门店标签**：`fl_label.LocationId = locationId` 且未删除、启用  
+3. **关联**：`fl_label_product` 连接标签与产品  
+4. **登录**：须绑定该门店（`userlocation`），否则返回业务错误  
+
+### 请求示例
+
+```http
+GET /api/app/us-app-labeling/labeling-tree?locationId=3a212211-3b01-d66f-a804-125c0cee3bf0
+Authorization: Bearer {token}
+```
+
+### 出参
+
+`UsAppLabelCategoryTreeNodeDto[]`（L1 标签分类 → L2 产品分类 → L3 产品+模板卡片 → L4 标签类型）。
+
+### 库内核对 SQL
+
+```sql
+-- 门店是否有可展示产品（绑定产品数）
+SELECT COUNT(*) FROM fl_location_product WHERE LocationId = :locationId;
+
+-- 门店是否有可用标签（决定树是否非空）
+SELECT COUNT(*) FROM fl_label
+WHERE LocationId = :locationId AND IsDeleted = 0 AND State = 1;
+
+-- 修复后应能查到的树行数（与接口一致）
+SELECT COUNT(*) AS tree_rows
+FROM fl_label_product lp
+INNER JOIN fl_label l ON lp.LabelId = l.Id
+INNER JOIN fl_product p ON lp.ProductId = p.Id
+INNER JOIN fl_label_category c ON l.LabelCategoryId = c.Id
+INNER JOIN fl_label_type t ON l.LabelTypeId = t.Id
+INNER JOIN fl_label_template tpl ON l.TemplateId = tpl.Id
+LEFT JOIN fl_product_category pc ON p.CategoryId = pc.Id
+WHERE l.LocationId = :locationId
+  AND p.Id IN (SELECT ProductId FROM fl_location_product WHERE LocationId = :locationId)
+  AND l.IsDeleted = 0 AND l.State = 1
+  AND p.IsDeleted = 0 AND p.State = 1
+  AND c.IsDeleted = 0 AND c.State = 1
+  AND t.IsDeleted = 0 AND t.State = 1
+  AND tpl.IsDeleted = 0
+  AND (pc.Id IS NULL OR (pc.IsDeleted = 0 AND pc.State = 1));
+```
+
+---
+
+## us-app-print-log App 打印日志与报表
+
+**应用服务**：`UsAppLabelingAppService`  
+**辅助类**：`UsAppPrintLogScopeHelper`、`ReportsRoleHelper`
+
+### 涉及接口
+
+| 接口 | 说明 |
+|------|------|
+| `POST /api/app/us-app-labeling/get-print-log-list` | 打印日志分页 |
+| `POST /api/app/us-app-labeling/get-label-report` | 当前门店 Label Report 统计（出参与 Web `reports/label-report` 同结构） |
+| `POST /api/app/us-app-labeling/reprint` | 重打；权限与日志查看一致 |
+
+### 查看权限（按 Token + 当前门店）
+
+须已登录，且 `userlocation` **绑定** `locationId`。
+
+| 角色 | 打印日志 / Report 数据范围 |
+|------|---------------------------|
+| **管理员** | 当前门店 **全部** 用户的打印任务（`ReportsRoleHelper.IsAdminRole`：用户名为 `admin`、角色码 `admin`、权限 `*:*:*` 等） |
+| **Partner** | 同上；判定为 `UserRole` → `Role` 的 **`RoleCode` 或 `RoleName` 含 `partner`**（忽略大小写，如 Partner Admin） |
+| **其它**（如 Staff、Store Manager） | 仅 **`CreatedBy == 当前用户 Id`** |
+
+### get-print-log-list
+
+**请求示例**
+
+```http
+POST /api/app/us-app-labeling/get-print-log-list
+Authorization: Bearer {token}
+Content-Type: application/json
+
+{
+  "locationId": "3a21220f-db37-3e32-7390-d55f64cd62a8",
+  "skipCount": 1,
+  "maxResultCount": 20
+}
+```
+
+**出参要点**
+
+| 字段 | 说明 |
+|------|------|
+| `items[].operatorName` | 实际打印人姓名（全店可见时为对应 `CreatedBy` 用户，非固定当前登录人） |
+| 其它 | 与既有 `PrintLogItemDto` 一致 |
+
+### get-label-report
+
+**请求示例**
+
+```json
+{
+  "locationId": "3a21220f-db37-3e32-7390-d55f64cd62a8",
+  "startDate": "2026-04-07",
+  "endDate": "2026-05-18",
+  "keyword": ""
+}
+```
+
+**出参**：`ReportsLabelReportOutputDto`（`summary`、`labelsByCategory`、`printVolumeTrend`、`mostUsedProducts`）。
+
+### 与 Web Reports 的差异
+
+| 模块 | 范围 |
+|------|------|
+| **App** `get-print-log-list` / `get-label-report` | 单门店 + 上表角色规则 |
+| **Web** `reports/print-log-list` | 非管理员仍仅本人；见 reports-print-log 章节 |
+| **Web** `reports/label-report` | 非管理员为绑定门店全量；见 reports-label-report 章节 |
+
+### 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| Partner 仍只看本人 | 确认角色 `RoleCode`/`RoleName` 含 `partner`，或是否为管理员 |
+| 列表为空 | 确认 `locationId` 与绑定门店一致；Staff 仅能看到自己打印的记录 |
+
+---
+
+## us-app-auth-location-detail 门店详情
+
+**应用服务**：`UsAppAuthAppService`  
+**接口**：`GET /api/app/us-app-auth/location-detail/{locationId}`  
+**鉴权**：Bearer Token；仅可查当前用户在 **`userlocation`** 中绑定的门店。
+
+### 变更说明
+
+| 项 | 说明 |
+|----|------|
+| **新增出参** | **`operatingHours`**（经营时间） |
+| **数据来源** | `location.OperatingHours`（`varchar(512)` 自由文本） |
+| **空值展示** | 未维护或空白时返回 **`无`**（与 `locationName`、`storePhone` 等字段一致） |
+| **维护入口** | Web 管理端 `POST/PUT /api/app/location` 的 `operatingHours` 字段 |
+
+### 数据库（若列不存在须先执行）
+
+脚本：`美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_location_add_operating_hours_column.sql`
+
+```sql
+ALTER TABLE `location`
+  ADD COLUMN `OperatingHours` varchar(512) DEFAULT NULL COMMENT '经营时间（自由文本）' AFTER `Longitude`;
+```
+
+### 请求示例
+
+```http
+GET /api/app/us-app-auth/location-detail/3a21220f-db37-3e32-7390-d55f64cd62a8
+Authorization: Bearer {token}
+```
+
+### 响应体（UsAppLocationDetailOutputDto）
+
+| 字段（JSON） | 类型 | 说明 |
+|--------------|------|------|
+| `locationId` | string | 门店主键 Guid |
+| `locationName` | string | 门店名称 |
+| `fullAddress` | string | 街道/城市/州/邮编拼接 |
+| `storePhone` | string | `location.Phone` |
+| **`operatingHours`** | string | **经营时间**；示例：`Mon–Fri 9:00 AM – 6:00 PM`；空为 `无` |
+| `managerName` | string | 本店绑定用户中角色含 `manager` 者姓名 |
+| `managerPhone` | string | 同上用户电话 |
+
+### 响应示例
+
+```json
+{
+  "locationId": "3a21220f-db37-3e32-7390-d55f64cd62a8",
+  "locationName": "Central Park Store",
+  "fullAddress": "123 Main St, New York, NY 10001",
+  "storePhone": "(212) 555-0100",
+  "operatingHours": "Mon–Fri 9:00 AM – 6:00 PM",
+  "managerName": "Jane Doe",
+  "managerPhone": "+1 (555) 123-4567"
+}
+```
+
+### 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| `operatingHours` 恒为 `无` | 1）确认已执行 DDL；2）在 Web 门店编辑保存 `operatingHours`；3）重启 API 使实体映射生效 |
+| 403 / 业务异常 | 当前 Token 用户未在 `userlocation` 绑定该 `locationId` |
+
+---
+
+## reports-template-print-stat 模板打印统计
+
+**应用服务**：`ReportsAppService`  
+**接口**：`GET /api/app/reports/template-print-stat-list`  
+**辅助类**：`ReportsLocationScopeHelper`、`ReportsRoleHelper`
+
+### 功能
+
+按 **`fl_label_template`** 汇总 **`fl_label_print_task`** 行数，返回 **模板名称 + 打印标签数量** 分页列表（默认按 `printedCount` 降序）。
+
+### 数据范围（与 label-report 一致）
+
+| 角色 | 统计范围 |
+|------|----------|
+| **管理员** | 全部门店打印任务（可按 Company/Region/Location 入参收窄） |
+| **非管理员** | 仅 **`userlocation` 绑定门店**内全部打印任务（**不按** `CreatedBy` 过滤） |
+
+### 入参
+
+| 参数 | 说明 |
+|------|------|
+| `SkipCount` / `MaxResultCount` | 分页（`SkipCount` 为 **1-based 页码**，第一页传 `1`） |
+| `StartDate` / `EndDate` | 统计区间（含起止日；未传默认近 30 天至今天） |
+| `PartnerId` | Company（`fl_partner.Id`） |
+| `GroupId` | Region（`fl_group.Id`） |
+| `LocationId` | 门店（`location.Id`） |
+| `Keyword` | **模板名称**模糊匹配（`fl_label_template.TemplateName`） |
+| `Sorting` | 可选 `PrintedCount asc`；默认 **`PrintedCount desc`** |
+
+### 请求示例
+
+```http
+GET /api/app/reports/template-print-stat-list?SkipCount=1&MaxResultCount=20&StartDate=2026-04-07&EndDate=2026-05-18
+Authorization: Bearer {token}
+```
+
+### 出参（`items[]`）
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| `templateId` | string? | `fl_label_template.Id` |
+| `templateName` | string | 模板名称；缺失时 **「无」** |
+| `printedCount` | int | 该模板下打印任务条数 |
+
+**分页包装**：`pageIndex`、`pageSize`、`totalCount`、`totalPages`、`items`（与其它列表一致）。
+
+### 响应示例
+
+```json
+{
+  "pageIndex": 1,
+  "pageSize": 20,
+  "totalCount": 3,
+  "totalPages": 1,
+  "items": [
+    { "templateId": "tpl-001", "templateName": "2x3 Price Label", "printedCount": 128 },
+    { "templateId": "tpl-002", "templateName": "Deli Scale Label", "printedCount": 45 }
+  ]
+}
+```
+
+### 库内核对
+
+```sql
+SELECT t.TemplateId,
+       tpl.TemplateName,
+       COUNT(*) AS printed_count
+FROM fl_label_print_task t
+LEFT JOIN fl_label_template tpl ON t.TemplateId = tpl.Id
+INNER JOIN location loc ON t.LocationId = CAST(loc.Id AS CHAR) AND loc.IsDeleted = 0
+WHERE COALESCE(t.PrintedAt, t.CreationTime) >= :start
+  AND COALESCE(t.PrintedAt, t.CreationTime) < :endExcl
+  AND t.LocationId IN (:allowedLocationIds)   -- 非管理员：userlocation 绑定门店
+GROUP BY t.TemplateId, tpl.TemplateName
+ORDER BY printed_count DESC;
+```
+
+### 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| 列表为空 | 检查日期区间、门店绑定、该区间是否有打印任务 |
+| 与 **print-log-list** 数量不一致 | print-log 非管理员仅本人任务；本接口与 **label-report** 同范围 |
+| 模板已删除仍有统计 | 任务仍保留 `TemplateId`；名称来自 Left Join，无名称时显示「无」 |
+
+---
+
+## reports-label-report 标签报表
+
+**应用服务**：`ReportsAppService`  
+**接口**：`GET /api/app/reports/label-report`（及同源 `export-label-report-pdf`）  
+**辅助类**：`ReportsLocationScopeHelper`、`ReportsRoleHelper`
+
+### 数据范围（按 Token）
+
+| 角色 | 统计范围 | 说明 |
+|------|----------|------|
+| **管理员** | 全部门店打印任务 | 识别方式与 Print Log 一致：`admin` 角色 / 用户名为 `admin` / 权限 `*:*:*` |
+| **非管理员** | 仅 **`userlocation` 绑定门店** | `UserLocation.UserId = 当前用户 Id` 的 `LocationId`；统计该门店下**全部**打印任务，**不按** `CreatedBy` 过滤 |
+
+### 入参筛选（与 Print Log 一致）
+
+| 参数 | 说明 |
+|------|------|
+| `StartDate` / `EndDate` | 统计区间（含起日、含止日；未传时默认近 30 天至今天） |
+| `PartnerId` | Company（`fl_partner.Id`） |
+| `GroupId` | Region（`fl_group.Id`） |
+| `LocationId` | 门店（`location.Id`） |
+| `Keyword` | 产品名 / 标签分类 / 产品分类模糊匹配 |
+
+**筛选叠加规则**
+
+- **管理员**：未传 Company/Region/Location → 不限制门店；传入后与对应门店集合取交集。
+- **非管理员**：始终在绑定门店集合内统计；若再传 `PartnerId` / `GroupId` / `LocationId`，与绑定门店 **取交集**（传了未绑定门店 → 空数据）。
+- **无绑定门店**：返回空统计（各指标为 0 / 空列表）。
+
+### 示例
+
+```http
+GET /api/app/reports/label-report?StartDate=2026-04-07&EndDate=2026-05-18
+Authorization: Bearer {token}
+```
+
+### 出参结构（不变）
+
+| 块 | 字段 |
+|----|------|
+| `summary` | `totalLabelsPrinted`、`totalLabelsPrintedPrevPeriod`、`mostPrintedCategoryName`、`topProductName`、`avgDailyPrints` 等 |
+| `labelsByCategory` | 按标签分类汇总 |
+| `printVolumeTrend` | 近 7 日（在查询区间内）每日打印量 |
+| `mostUsedProducts` | Top 20 产品 |
+
+### 与 Print Log 的差异
+
+| 模块 | 非管理员范围 |
+|------|----------------|
+| **label-report** | 绑定门店内**所有**打印记录 |
+| **print-log-list** | 仍仅 **`CreatedBy = 当前用户`**（见 `报表Reports接口对接说明.md`） |
+
+### 库内核对（非管理员）
+
+```sql
+-- 当前用户绑定的门店
+SELECT ul.LocationId
+FROM userlocation ul
+WHERE ul.IsDeleted = 0 AND ul.UserId = :currentUserId;
+
+-- 绑定门店在区间内的打印量（应与接口 summary.totalLabelsPrinted 一致）
+SELECT COUNT(*) AS cnt
+FROM fl_label_print_task t
+WHERE t.LocationId IN (:boundLocationIds)
+  AND COALESCE(t.PrintedAt, t.CreationTime) >= :start
+  AND COALESCE(t.PrintedAt, t.CreationTime) < :endExclusive;
+```
+
+---
+
+## label-multiple-option 多选项
+
+**应用服务**：`LabelMultipleOptionAppService`  
+
+**命名约定**：UI **Region** = 入参 **`regionIds` / `groupIds`**、列表筛选 **`groupId`**（均为 `fl_group.Id`）；UI **Location** = 入参 **`locationIds`**、列表筛选 **`locationId`**（`location.Id`）。存储表 **`fl_label_multiple_option_location`**（与 label-type / label-category 一致）。
+
+### 数据库变更（列表筛选前须执行）
+
+脚本：`美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_multiple_option_scope.sql`
+
+```sql
+ALTER TABLE `fl_label_multiple_option`
+  ADD COLUMN `AvailabilityType` varchar(20) NOT NULL DEFAULT 'ALL' COMMENT '门店可用范围：ALL/SPECIFIED' AFTER `State`;
+
+CREATE TABLE IF NOT EXISTS `fl_label_multiple_option_location` (
+  `Id` varchar(36) NOT NULL,
+  `MultipleOptionId` varchar(36) NOT NULL,
+  `LocationId` varchar(36) NOT NULL,
+  `CreationTime` datetime NOT NULL,
+  `CreatorId` varchar(36) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `idx_fl_lmol_option` (`MultipleOptionId`),
+  KEY `idx_fl_lmol_location` (`LocationId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签多选项适用门店';
+```
+
+> 执行 DDL 后，历史数据默认 **`AvailabilityType = ALL`**，任意 Region/门店筛选下仍可见。
+
+### 新增 `POST /api/app/label-multiple-option`、编辑 `PUT /api/app/label-multiple-option/{id}`
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| optionCode | string | 是 | 多选项编码 |
+| optionName | string | 是 | 多选项名称 |
+| optionValuesJson | string | 否 | 选项值 JSON 字符串 |
+| state | bool | 否 | 默认 `true` |
+| orderNum | int | 否 | 排序 |
+| availabilityType | string | 否 | `ALL` / `SPECIFIED`；传 region/location 数组时自动 **`SPECIFIED`** |
+| **regionIds** | string[] | 否 | **Region 多选**（`fl_group.Id`） |
+| **groupIds** | string[] | 否 | 与 `regionIds` 合并去重 |
+| **locationIds** | string[] | 否 | **Location 多选**（`location.Id`） |
+
+**合并规则**：每个 `regionIds` 展开为该 Region 下全部门店，再与 `locationIds` **取并集** → 写入 `fl_label_multiple_option_location`；`SPECIFIED` 时至少 **1** 个有效门店。
+
+**请求示例**
+
+```json
+POST /api/app/label-multiple-option
+{
+  "optionCode": "OPT_ALLERGENS",
+  "optionName": "Allergens",
+  "optionValuesJson": "[\"Peanuts\",\"Dairy\",\"Gluten\"]",
+  "state": true,
+  "orderNum": 1,
+  "availabilityType": "SPECIFIED",
+  "regionIds": ["fl_group_id_east"],
+  "locationIds": ["11111111-1111-1111-1111-111111111111"]
+}
+```
+
+**详情 `GET /api/app/label-multiple-option/{id}` 出参（范围字段）**
+
+| 字段 | 说明 |
+|------|------|
+| availabilityType | `ALL` / `SPECIFIED` |
+| regionIds | Region Id（`SPECIFIED` 时由门店反推） |
+| groupIds | 与 `regionIds` 相同 |
+| locationIds | 已绑定门店 Id |
+
+**编辑**：Body 与新增相同；会 **先删后插** 重建 `fl_label_multiple_option_location`。
+
+---
+
+### 列表 `GET /api/app/label-multiple-option`
+
+示例：`?SkipCount=1&MaxResultCount=10`
+
+### 列表 Query 筛选
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| skipCount | int | 是 | 跳过条数（第 1 页常为 `1`） |
+| maxResultCount | int | 是 | 每页条数 |
+| sorting | string | 否 | 排序 |
+| keyword | string | 否 | 匹配 `optionCode`、`optionName` |
+| state | bool | 否 | 启用状态 |
+| **groupId** | string | 否 | **Region** 筛选（`fl_group.Id`） |
+| **locationId** | string | 否 | **Location** 筛选；**优先于** `groupId` |
+
+**筛选语义**（与 label-category / label-type 一致）：
+
+- 未传 `groupId`、`locationId`：返回全部未删除多选项。
+- 传入筛选：返回 **`availabilityType = ALL`** 或 **`fl_label_multiple_option_location` 命中该门店** 的记录。
+
+**请求示例**
+
+```bash
+GET /api/app/label-multiple-option?SkipCount=1&MaxResultCount=10
+Authorization: {token}
+```
+
+```bash
+GET /api/app/label-multiple-option?SkipCount=1&MaxResultCount=10&groupId=你的fl_group主键
+Authorization: {token}
+```
+
+```bash
+GET /api/app/label-multiple-option?SkipCount=1&MaxResultCount=10&locationId=11111111-1111-1111-1111-111111111111
+Authorization: {token}
+```
+
+### 列表出参 `items[]`
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | string | 多选项主键 |
+| optionCode / optionName | string | 编码、名称 |
+| optionValuesJson | string | 选项值 JSON |
+| state / orderNum | bool / int | 状态、排序 |
+| availabilityType | string | `ALL` / `SPECIFIED` |
+| **region** | string | 列表列 **Region**：`ALL` → `All Regions`；`SPECIFIED` → 绑定门店 `GroupName` 拼接 |
+| **location** | string | 列表列 **Location**：`ALL` → `All Locations`；`SPECIFIED` → 门店名拼接 |
+| regionIds | string[] | Region Id（`SPECIFIED` 时由门店反推） |
+| locationIds | string[] | 门店 Id |
+| lastEdited | datetime | 最近编辑时间 |
+
+**响应示例**
+
+```json
+{
+  "id": "opt_allergens_001",
+  "optionCode": "OPT_ALLERGENS",
+  "optionName": "Allergens",
+  "optionValuesJson": "[\"Peanuts\",\"Dairy\"]",
+  "state": true,
+  "availabilityType": "SPECIFIED",
+  "orderNum": 1,
+  "region": "East Region",
+  "location": "UNCC store",
+  "regionIds": ["fl_group_id_east"],
+  "locationIds": ["11111111-1111-1111-1111-111111111111"],
+  "lastEdited": "2026-05-18T12:00:00"
+}
+```
+
+### 库内核对 SQL
+
+```sql
+SELECT
+  o.Id,
+  o.OptionName,
+  o.AvailabilityType,
+  ol.LocationId,
+  loc.GroupName AS region_name,
+  COALESCE(NULLIF(TRIM(loc.LocationName), ''), loc.LocationCode) AS location_name
+FROM fl_label_multiple_option o
+LEFT JOIN fl_label_multiple_option_location ol ON ol.MultipleOptionId = o.Id
+LEFT JOIN location loc ON loc.Id = ol.LocationId AND loc.IsDeleted = 0
+WHERE o.IsDeleted = 0
+ORDER BY o.OrderNum DESC;
+```
+
+### 联调注意
+
+| 现象 | 可能原因 |
+|------|----------|
+| region / location 为 `All Regions` / `All Locations` | `availabilityType = ALL`（历史数据默认） |
+| region / location 为「无」 | `SPECIFIED` 但未写入 `fl_label_multiple_option_location` |
+| 筛 Region 后列表为空 | 非 `ALL` 且关联表未覆盖该门店 |
+| 接口报错列不存在 | 未执行 `fl_label_multiple_option_scope.sql` |
+| 保存报「至少需要匹配到一个有效门店」 | Region 下无门店且 `locationIds` 为空 |
+
+---
+
+## label-type 标签类型
+
+**应用服务**：`LabelTypeAppService`  
+**命名约定**：UI **Region** = **`regionIds` / `groupIds`**（`fl_group.Id`）；UI **Location** = **`locationIds`**（`location.Id`）。存储表 **`fl_label_type_location`**（与 label-category 一致）。
+
+### 数据库变更（新增/编辑 Region·Location 前须执行）
+
+脚本：`美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/fl_label_type_scope.sql`
+
+```sql
+ALTER TABLE `fl_label_type`
+  ADD COLUMN `AvailabilityType` varchar(20) NOT NULL DEFAULT 'ALL' COMMENT '门店可用范围：ALL/SPECIFIED' AFTER `State`;
+
+CREATE TABLE IF NOT EXISTS `fl_label_type_location` (
+  `Id` varchar(36) NOT NULL,
+  `LabelTypeId` varchar(36) NOT NULL,
+  `LocationId` varchar(36) NOT NULL,
+  `CreationTime` datetime NOT NULL,
+  `CreatorId` varchar(36) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `idx_fl_ltl_type` (`LabelTypeId`),
+  KEY `idx_fl_ltl_location` (`LocationId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签类型适用门店';
+```
+
+| 表/字段 | 说明 |
+|---------|------|
+| `fl_label_type.AvailabilityType` | `ALL` = 全部门店；`SPECIFIED` = 仅关联表内门店 |
+| `fl_label_type_location` | `LabelTypeId` + `LocationId` 多选落库 |
+
+---
+
+### 新增 `POST /api/app/label-type`、编辑 `PUT /api/app/label-type/{id}`
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| typeCode | string | 是 | 类型编码 |
+| typeName | string | 是 | 类型名称 |
+| state | bool | 否 | 默认 `true` |
+| orderNum | int | 否 | 排序 |
+| availabilityType | string | 否 | `ALL` / `SPECIFIED`；传了 region/location 数组时自动 **`SPECIFIED`** |
+| **regionIds** | string[] | 否 | **Region 多选**（`fl_group.Id`）；推荐字段名 |
+| **groupIds** | string[] | 否 | 与 `regionIds` 合并去重（兼容） |
+| **locationIds** | string[] | 否 | **Location 多选**（`location.Id`） |
+
+**合并规则**：每个 `regionIds` 展开为该 Region 下全部门店，再与 `locationIds` **取并集** → 写入 `fl_label_type_location`；`SPECIFIED` 时至少 **1** 个有效门店，否则报错：`指定适用区域或门店时，至少需要匹配到一个有效门店`。
+
+**请求示例**
+
+```json
+POST /api/app/label-type
+{
+  "typeCode": "PRICE",
+  "typeName": "Price Label",
+  "state": true,
+  "orderNum": 10,
+  "availabilityType": "SPECIFIED",
+  "regionIds": ["fl_group_id_east"],
+  "locationIds": ["11111111-1111-1111-1111-111111111111"]
+}
+```
+
+**详情 `GET /api/app/label-type/{id}` 出参（范围字段）**
+
+| 字段 | 说明 |
+|------|------|
+| availabilityType | `ALL` / `SPECIFIED` |
+| regionIds | Region Id 数组（`SPECIFIED` 时由门店反推） |
+| groupIds | 与 `regionIds` 相同 |
+| locationIds | 已绑定门店 Id |
+
+**编辑**：Body 字段与新增相同；会 **先删后插** 重建 `fl_label_type_location`。
+
+---
+
+### 列表 `GET /api/app/label-type`
+
+示例：`?SkipCount=1&MaxResultCount=10`
+
+### 列表 UI 列与 API 字段对照
+
+| 列表列（UI） | API 字段（camelCase） | 类型 | 说明 |
+|--------------|----------------------|------|------|
+| **No. of Labels** | **noOfLabels** | long | 该 Label Type 下 **未删除** 标签条数（`fl_label.LabelTypeId = fl_label_type.Id` 且 `IsDeleted = 0`） |
+| **Region** | **region** | string | `ALL` → `All Regions`；`SPECIFIED` → 绑定门店 `GroupName` 拼接；未配置为 **`无`** |
+| **Location** | **location** | string | `ALL` → `All Locations`；`SPECIFIED` → 门店名拼接 |
+| （辅助） | regionIds | string[] | Region 主键（`fl_group.Id`，由门店反推） |
+| （辅助） | locationIds | string[] | 门店主键（`location.Id`） |
+| Last Edited | lastEdited | datetime | 类型与下属标签最近编辑时间的较大值 |
+
+### No. of Labels 是否需要库字段？
+
+**不需要** `NoOfLabels` 物理列，由 `fl_label` 实时 `COUNT`。
+
+| 表 | 作用 |
+|----|------|
+| `fl_label_type` | 类型主数据 + **`AvailabilityType`** |
+| `fl_label_type_location` | 新增/编辑时 Region·Location 多选落库 |
+| `fl_label` | 标签实例；**`noOfLabels`** 统计来源 |
+| `location` | 门店；Region 展示用 **`GroupName`** |
+
+**统计逻辑（与代码一致）**：
+
+```sql
+-- 某类型下标签数（No. of Labels）
+SELECT COUNT(*) AS no_of_labels
+FROM fl_label
+WHERE IsDeleted = 0
+  AND LabelTypeId = :labelTypeId;
+```
+
+列表接口在分页查出类型后，对当前页 `Id` 批量 `GROUP BY LabelTypeId` 计数，避免 N+1；**标签增删改后无需改类型表**，下次列表即反映最新数量。
+
+### 变更说明
+
+| 项 | 说明 |
+|----|------|
+| **列表** `GET /api/app/label-type` | 出参增加 **`noOfLabels`**、**`region`**、**`location`**、**`regionIds`**、**`locationIds`**、**`lastEdited`** |
+| **列表筛选** | Query 可选 **`groupId`**（Region）、**`locationId`**（Location）；`locationId` 优先于 `groupId` |
+| **统计一致性** | 传 Region/门店筛选时，**`noOfLabels`**、**`region`/`location`** 仅统计筛选范围内标签 |
+| **筛选语义** | 传 `groupId`/`locationId` 时：返回 **`availabilityType=ALL`** 或 **关联门店命中** 的类型（与 label-category 一致） |
+| **列表 region/location** | 来自 **配置**（`AvailabilityType` + `fl_label_type_location`），非仅标签反推 |
+
+**命名约定**：UI **Region** = Query **`groupId`**（`fl_group.Id`）；UI **Location** = Query **`locationId`**（`location.Id`）。
+
+### 列表 Query
+
+| 字段 | 类型 | 必填 | 说明 |
+|------|------|------|------|
+| skipCount | int | 是 | 跳过条数（项目约定：第 1 页常为 `1`） |
+| maxResultCount | int | 是 | 每页条数 |
+| sorting | string | 否 | 排序，如 `orderNum desc` |
+| keyword | string | 否 | 匹配 `typeCode`、`typeName` |
+| state | bool | 否 | 启用状态 |
+| **groupId** | string | 否 | **Region** 筛选（`fl_group.Id`） |
+| **locationId** | string | 否 | **Location** 筛选（`location.Id`）；**优先于** `groupId` |
+
+**请求示例（默认列表，含三列出参）**
+
+```bash
+GET /api/app/label-type?SkipCount=1&MaxResultCount=10
+Authorization: {token}
+```
+
+**按 Region / Location 筛选**
+
+```bash
+GET /api/app/label-type?SkipCount=1&MaxResultCount=10&groupId=你的fl_group主键
+Authorization: {token}
+```
+
+```bash
+GET /api/app/label-type?SkipCount=1&MaxResultCount=10&locationId=11111111-1111-1111-1111-111111111111
+Authorization: {token}
+```
+
+### 列表出参 `items[]`（节选）
+
+| 字段 | 类型 | 说明 |
+|------|------|------|
+| id | string | 类型主键（`fl_label_type.Id`） |
+| typeCode / typeName | string | 编码、名称 |
+| state / orderNum | bool / int | 状态、排序 |
+| availabilityType | string | `ALL` / `SPECIFIED` |
+| **noOfLabels** | long | 列表列 **No. of Labels** |
+| **region** | string | 列表列 **Region** |
+| **location** | string | 列表列 **Location** |
+| regionIds | string[] | Region Id（`fl_group.Id`） |
+| locationIds | string[] | 门店 Id |
+| lastEdited | datetime | 最近编辑时间 |
+
+**响应 `items[]` 示例**
+
+```json
+{
+  "id": "type_price_001",
+  "typeCode": "PRICE",
+  "typeName": "Price Label",
+  "state": true,
+  "availabilityType": "SPECIFIED",
+  "orderNum": 10,
+  "region": "East Region",
+  "location": "UNCC store, Central Park Store",
+  "regionIds": ["fl_group_id_east"],
+  "locationIds": ["11111111-1111-1111-1111-111111111111"],
+  "noOfLabels": 8,
+  "lastEdited": "2026-05-18T10:00:00"
+}
+```
+
+### 库内核对 SQL（只读，无需执行 DDL）
+
+**1）确认 `fl_label_type` 无 NoOfLabels 列（不应加列）**
+
+```sql
+SELECT COLUMN_NAME
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE()
+  AND TABLE_NAME = 'fl_label_type'
+ORDER BY ORDINAL_POSITION;
+```
+
+**2）按类型统计标签数（与接口 `noOfLabels` 一致）**
+
+```sql
+SELECT
+  t.Id,
+  t.TypeCode,
+  t.TypeName,
+  COUNT(l.Id) AS no_of_labels
+FROM fl_label_type t
+LEFT JOIN fl_label l
+  ON l.LabelTypeId = t.Id AND l.IsDeleted = 0
+WHERE t.IsDeleted = 0
+GROUP BY t.Id, t.TypeCode, t.TypeName
+ORDER BY t.OrderNum DESC, t.CreationTime DESC;
+```
+
+**3）某类型已配置的 Region / Location（与列表 region/location 一致）**
+
+```sql
+SELECT
+  t.Id,
+  t.TypeName,
+  t.AvailabilityType,
+  tl.LocationId,
+  loc.GroupName AS region_name,
+  COALESCE(NULLIF(TRIM(loc.LocationName), ''), loc.LocationCode) AS location_name
+FROM fl_label_type t
+LEFT JOIN fl_label_type_location tl ON tl.LabelTypeId = t.Id
+LEFT JOIN location loc ON loc.Id = tl.LocationId AND loc.IsDeleted = 0
+WHERE t.IsDeleted = 0
+  AND t.Id = :labelTypeId;
+```
+
+### 联调注意（label-type）
+
+| 现象 | 可能原因 |
+|------|----------|
+| **noOfLabels 为 0** | 该类型下尚无标签，或标签均已逻辑删除 |
+| region / location 为「无」 | `SPECIFIED` 但未绑定门店，或门店无 `GroupName`/名称 |
+| 保存报「至少需要匹配到一个有效门店」 | Region 下无门店且 `locationIds` 为空 |
+| 筛 Region 后列表变空 | 非 `ALL` 且 `fl_label_type_location` 未覆盖该门店 |
+| 未执行 DDL | 先跑 `fl_label_type_scope.sql` |
+| noOfLabels 与标签列表不一致 | 对比时 label 列表需传与 label-type 相同的 `groupId`/`locationId` |
+| 前端列空白 | 绑定 **`noOfLabels`**、**`region`**、**`location`**（勿用 `creationTime` 代替 `lastEdited`） |
+
+> 与 **label-category**（见 `5-17接口优化.md`）区别：分类有 `availabilityType=ALL`；**标签类型**无 ALL，三列均由 **`fl_label`** 实时汇总。
+
+> **不提供** `ALTER TABLE fl_label_type ADD NoOfLabels ...`：冗余字段易与 `fl_label` 不一致，且每次标签变更都要维护计数。
+
+---
+
+## team-member 列表 Company·Region·Location 筛选
+
+**应用服务**：`TeamMemberAppService`  
+**接口**：`GET /api/app/team-member`（分页；PDF 导出 `export-team-members-pdf` 使用相同 Query 筛选）  
+**辅助类**：`LocationScopeBindingHelper.ResolveFilteredLocationIdsForListAsync`
+
+### Query 参数（在原有 Keyword / RoleId / State 基础上）
+
+| UI | Query 参数 | 说明 |
+|----|------------|------|
+| Company | `partnerId` | `fl_partner.Id` |
+| Region | `groupId` | `fl_group.Id` |
+| Location | `locationId` | `location.Id`（Guid 字符串） |
+
+**筛选优先级**（与 product 列表一致）：传 `locationId` 时仅按该门店；否则传 `groupId` 按 Region 下全部门店；否则传 `partnerId` 按 Company 下全部门店；均未传则不按组织范围过滤。
+
+**命中规则**：返回在 **`userlocation`** 中至少绑定一家「落在上述门店集合内」的成员；列表行内 `assignedLocations` 在传入范围参数时仅展示该范围内的绑定门店。
+
+### 请求示例
+
+```http
+GET /api/app/team-member?SkipCount=1&MaxResultCount=10&partnerId={fl_partner.Id}
+Authorization: Bearer {token}
+
+GET /api/app/team-member?SkipCount=1&MaxResultCount=10&groupId={fl_group.Id}
+
+GET /api/app/team-member?SkipCount=1&MaxResultCount=10&locationId={location.Id}
+```
+
+可与 `Keyword`、`RoleId`、`State`、`Sorting` 组合使用。
+
+### 库内核对
+
+```sql
+-- 某 Region 下应出现在列表中的成员（userId 去重）
+SELECT DISTINCT ul.UserId
+FROM userlocation ul
+INNER JOIN location loc ON ul.LocationId = CAST(loc.Id AS CHAR) AND loc.IsDeleted = 0
+WHERE ul.IsDeleted = 0
+  AND loc.Partner = :partnerName
+  AND loc.GroupName = :groupName;
+```
+
+### 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| 传了 `groupId` 仍无数据 | 确认成员 `userlocation` 是否绑定该区域下门店 |
+| `partnerId` / `groupId` 无效 | 返回空列表（非 404） |
+| 与 5-17 新增字段关系 | 列表 **筛选** 用 Query；新增/编辑 Body 仍用 `partnerId` / `regionIds` / `locationIds`（见 `5-17接口优化.md`） |
+
+---
+
+## team-member 新增用户无法平台登录
+
+### 问题现象
+
+通过 **`POST /api/app/team-member`** 新增用户（如 `email=123@qq.com`、`userName=1234`）后，在平台登录页用 **邮箱 + 创建时密码** 登录失败（`Sign-in failed: incorrect email or password`）。
+
+### 根因（两处）
+
+**1）新增时双重 `BuildPassword`（已修复）**
+
+- `new UserAggregateRoot(userName, password, …)` 构造函数内已 `BuildPassword()` 一次；
+- 若再调用 `user.BuildPassword()`，会对 **已哈希值再哈希**，明文登录必失败。
+
+**2）改密时 SqlSugar `IsOwnsOne` 只更新了 Salt、未更新 Password（本次主因）**
+
+- `PUT /api/app/team-member/{id}` 传入新明文 → `BuildPassword()` 会生成 **新 Salt + 新 Password 哈希**；
+- `UpdateAsync` 整表更新时 **`Password` 列可能未写入**，库中仍保留旧哈希（例如与 admin 相同的 `ANg9hGZC…`），但 **Salt 已是新值**；
+- 校验 `SHA2Encode(明文, Salt)` 与库中 `Password` 永远对不上（查库可见 `123@qq.com` 与 `admin` 的 `Password` 相同、`Salt` 不同）。
+
+### 代码修复
+
+- 新增：与 `UserDataSeed` 一致，`EncryPassword = new EncryPasswordValueObject(明文)` 后 **只调用一次** `BuildPassword()`。
+- 改密 / 重置密码：改密后调用 `UserPasswordHelper.EnsurePasswordColumnsPersistedAsync`，**显式 SET `Password` 与 `Salt`**（`Yi.Framework.Rbac.Domain/Helpers/UserPasswordHelper.cs`）。
+- 登录校验统一走 `UserPasswordHelper.VerifyPlainPassword` / `UserAggregateRoot.JudgePassword`。
+
+### 平台登录约定
+
+| 项目 | 说明 |
+|------|------|
+| 接口 | `POST /api/app/account/login`（`AccountService.PostLoginAsync`） |
+| 入参 | `userName` 填 **邮箱**（平台 UI 的 Email 框）；`password` 为明文 |
+| 匹配 | `User.Email`（忽略大小写）优先；否则 `User.UserName` 与邮箱相同也可 |
+| 状态 | `State = true` 且未删除才可登录 |
+
+**登录示例**
+
+```json
+POST /api/app/account/login
+{
+  "userName": "123@qq.com",
+  "password": "创建时设置的明文密码"
+}
+```
+
+### 已受影响账号的处理
+
+部署修复后，**已受影响账号**（如 `123@qq.com`，库内 `Password`/`Salt` 不一致）必须 **再保存一次密码**：
+
+```http
+PUT /api/app/team-member/{id}
+Content-Type: application/json
+
+{
+  "fullName": "显示名",
+  "userName": "1234",
+  "email": "123@qq.com",
+  "password": "新的明文密码",
+  "phone": 1234567890,
+  "roleId": "角色Guid",
+  "locationIds": ["门店Id"],
+  "state": true
+}
+```
+
+保存后用 **邮箱 + 新密码** 登录。
+
+**库内核对**
+
+```sql
+SELECT Id, UserName, Email, State, Password, Salt
+FROM User
+WHERE Email = '123@qq.com' AND IsDeleted = 0;
+-- 正常：同一用户的 Password 须与 SHA512(salt+明文) 一致；勿出现与 admin 相同 Password、不同 Salt。
+```
+
+### 新增成员入参提醒
+
+| 字段 | 说明 |
+|------|------|
+| userName | 登录名（可与邮箱不同）；平台登录仍建议用 **email** 字段 |
+| email | 平台登录主键（须为合法邮箱格式） |
+| password | 明文，至少 6 位（`UserManager` 校验） |
+| roleId | 须绑定角色，否则登录后可能无菜单 |
+| locationIds / partnerId / groupIds | 门店范围（见 5-17 team-member 章节） |
+
+---
+
+## rbac-role accessPermissions
+
+以下为 **`/api/app/rbac-role`** 相关说明（原 5-18 内容）。
+
+---
+
+## 问题与根因
+
+| 现象 | 根因 |
+|------|------|
+| `POST`/`PUT` 传了 `accessPermissions` 后仍无菜单绑定 | 库表 **`Menu.PermissionCode` 全为空**，按 Code 解析不到 `MenuId`；或入参 `menuIds: []` 抢先清空绑定 |
+| `GET /api/app/rbac-role/{id}` 的 `accessPermissions` 为 `""` | 无 **`RoleMenu`** 记录，或已绑定菜单的 **`PermissionCode` 为空** |
+| `menuIds` 详情为空（历史问题） | 曾错误查询 `rolemenu` 字符串表；已改为查询 **`RoleMenu`**（Guid） |
+
+**数据链路（正确）**
+
+```text
+accessPermissions（入参/出参字符串）
+    ↔ Menu.PermissionCode（权限码，可为空时按 Router 推导 menu.xxx）
+    ↔ RoleMenu（RoleId + MenuId）
+    ↔ Role
+```
+
+---
+
+## 变更摘要
+
+| 项 | 说明 |
+|----|------|
+| **绑定写入** | `accessPermissions` 解析为 `MenuId` 后 **覆盖写入 `RoleMenu`**；解析不到任何菜单时 **返回明确错误** |
+| **出参汇总** | `GET` 列表/详情从 **`RoleMenu` + `Menu.PermissionCode`** 汇总；`PermissionCode` 为空时按 **`Router`** 推导（与回填 SQL 一致） |
+| **详情 menuIds** | 从 **`RoleMenu`** 读取，不再查错误的 `rolemenu` 映射 |
+| **RoleMenu 主键** | 插入时生成 **`Id`**（`RoleMenu` 表必填） |
+| **数据库脚本** | `scripts/menu_backfill_permission_code.sql` 批量回填 `PermissionCode` |
+
+---
+
+## 公共约定
+
+- **宿主**：`Yi.Abp.Web`；路由前缀 `api/app`。
+- **应用服务**：`RbacRoleAppService`（模块 `food-labeling-us`）。
+- **鉴权**：`Authorization: {token}`。
+
+---
+
+## accessPermissions 规则
+
+### 出参（只读）
+
+- 查询 **`RoleMenu`** 中该角色绑定的菜单，取 **`Menu.PermissionCode`**（非空优先）。
+- 若 `PermissionCode` 为空，按 **`Router`** 推导：`/labels` → `menu.labels`。
+- 去重后按字母序用 **`, `** 拼接；无绑定为 `""`。
+
+### 入参（写入）
+
+| 场景 | menuIds | accessPermissions | 行为 |
+|------|---------|-------------------|------|
+| 新增/编辑 | 非空数组 | 任意 | **以 menuIds 为准**（覆盖 `RoleMenu`） |
+| 新增/编辑 | 不传 / null | 非空字符串 | 按 PermissionCode 解析菜单并 **覆盖绑定** |
+| 新增/编辑 | 不传 / null | `""` | **清空** `RoleMenu` |
+| 新增/编辑 | `[]` | 不传 | **清空** `RoleMenu` |
+| 编辑 | 不传 | 不传 / null | **不修改** 已有菜单绑定 |
+
+- 解析 **忽略大小写**；支持英文逗号、分号分隔。
+- 若传了非空 `accessPermissions` 但 **0 条菜单匹配**，接口返回业务错误（提示检查 `PermissionCode` 或执行回填脚本）。
+
+---
+
+## 1 角色详情
+
+| 项目 | 说明 |
+|------|------|
+| HTTP | `GET` |
+| 路径 | `/api/app/rbac-role/{id}` |
+| 示例 | `/api/app/rbac-role/3a1f077b-3665-63f2-5fea-0fd7e7044b88` |
+
+**响应 `data` 字段（节选）**
+
+| 字段 | 说明 |
+|------|------|
+| menuIds | 已绑定菜单 Guid 字符串数组（来自 `RoleMenu`） |
+| accessPermissions | 已绑定菜单权限码汇总，如 `menu.account-management, menu.labels` |
+
+---
+
+## 2 新增角色
+
+| 项目 | 说明 |
+|------|------|
+| HTTP | `POST` |
+| 路径 | `/api/app/rbac-role` |
+
+**请求示例（accessPermissions）**
+
+```json
+{
+  "roleName": "Partner Admin",
+  "roleCode": "admin",
+  "state": true,
+  "accessPermissions": "menu.labels, menu.label-categories, menu.account-management"
+}
+```
+
+> 须先保证 `Menu` 表存在对应 **`PermissionCode`**（或执行回填脚本后使用 `menu.{router-segment}` 形式）。
+
+---
+
+## 3 编辑角色
+
+| 项目 | 说明 |
+|------|------|
+| HTTP | `PUT` |
+| 路径 | `/api/app/rbac-role/{id}` |
+| Body | 与新增相同（`RbacRoleUpdateInputVo`） |
+
+---
+
+## 数据库准备（必做）
+
+执行（按环境选择库）：
+
+`美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/scripts/menu_backfill_permission_code.sql`
+
+回填后示例：
+
+| MenuName | Router | PermissionCode |
+|----------|--------|----------------|
+| Labels | /labels | menu.labels |
+| Account Management | /account-management | menu.account-management |
+
+**验证 SQL**
+
+```sql
+SELECT r.RoleName, m.MenuName, m.PermissionCode
+FROM Role r
+INNER JOIN RoleMenu rm ON rm.RoleId = r.Id
+INNER JOIN Menu m ON m.Id = rm.MenuId AND m.IsDeleted = 0
+WHERE r.Id = '3a1f077b-3665-63f2-5fea-0fd7e7044b88';
+```
+
+---
+
+## 关联接口
+
+| 接口 | 说明 |
+|------|------|
+| `POST /api/app/rbac-role-menu/set` | 仅维护 `RoleMenu`（`menuIds` 覆盖式），不直接写 `accessPermissions` 列 |
+| `GET /api/app/rbac-role-menu/menu-ids/{roleId}` | 查询已绑定菜单 Id |
+
+保存菜单权限后，再调 **`GET /api/app/rbac-role/{id}`** 应能看到非空 **`accessPermissions`**（在 `PermissionCode` 已配置前提下）。
+
+---
+
+## 联调注意
+
+| 现象 | 处理 |
+|------|------|
+| accessPermissions 仍为空 | 1）查 `RoleMenu` 是否有记录；2）查 `Menu.PermissionCode` 是否已回填 |
+| 保存报未匹配到菜单 | `accessPermissions` 与库中 Code 不一致；先执行回填脚本或改用 `menuIds` |
+| 同时传 `menuIds: []` 与 accessPermissions | **menuIds 优先**，空数组会清空绑定，accessPermissions 被忽略 |
+
+---
+
+## 修订记录
+
+| 日期 | 说明 |
+|------|------|
+| 2026-05-18 | 修复 rbac-role accessPermissions 读写；RoleMenu 绑定；Menu.PermissionCode 回填脚本 |
+| 2026-05-18 | 修复 team-member 登录：去掉双重 BuildPassword；改密显式落库 Password+Salt；已建账号需 PUT 重置密码 |
+| 2026-05-18 | label-type 列表 noOfLabels/region/location；新增编辑 regionIds+locationIds 多选；DDL `fl_label_type_scope.sql` |
+| 2026-05-18 | label-multiple-option 列表筛选与出参；新增/编辑 regionIds+locationIds 多选；DDL `fl_label_multiple_option_scope.sql` |
+| 2026-05-18 | reports print-log-list：Label ID 改为门店当日序号 yyyyMMdd-n（labelCode 字段） |
+| 2026-05-18 | reports print-log-list：Expiry Date 从 PrintInputJson 模板快照 elements 解析（expiryDateText） |
+| 2026-05-18 | reports label-report：管理员全量；非管理员按 userlocation 绑定门店统计（不按 CreatedBy） |
+| 2026-05-18 | us-app-auth location-detail：出参 operatingHours 读 location.OperatingHours |
+| 2026-05-18 | us-app get-print-log-list / get-label-report：管理员与 Partner 可看当前门店全部打印；reprint 同权 |
+| 2026-05-18 | us-app labeling-tree：产品已绑门店时不再因产品分类 SPECIFIED 无 location 关联而空树 |
+| 2026-05-18 | location 列表：管理员全部门店；非管理员仅绑定门店所属 Region（Partner+GroupName） |
+| 2026-05-18 | team-member 列表：Query 增加 partnerId / groupId / locationId（Company·Region·Location）筛选 |
+| 2026-05-18 | reports template-print-stat-list：按模板汇总打印标签数量（templateName + printedCount） |
@@ -41,7 +41,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-full items-center justify-between gap-2 rounded-md border bg-input-background px-3 py-2 text-sm whitespace-nowrap transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-full items-center justify-between gap-2 overflow-hidden rounded-md border bg-input-background px-3 py-2 text-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:min-w-0 *:data-[slot=select-value]:flex-1 *:data-[slot=select-value]:truncate [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className,
       )}
       {...props}
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
+import { initOfflineSqlite } from "./utils/sqliteSync";
+import { syncNowAndRefreshCaches } from "./utils/offlineSyncManager";
+import { isLoggedIn } from "./utils/authSession";
+
+let networkSyncInFlight = false;
  
 onLaunch(() => {
-  // 静态页面模式，不做登录校验
+  void initOfflineSqlite();
+  uni.onNetworkStatusChange((res) => {
+    if (!res.isConnected || !isLoggedIn() || networkSyncInFlight) return;
+    networkSyncInFlight = true;
+    void syncNowAndRefreshCaches()
+      .catch(() => {})
+      .finally(() => {
+        networkSyncInFlight = false;
+      });
+  });
 });
  
 onShow(() => {
@@ -39,6 +39,8 @@ export default {
     signingIn: 'Signing In...',
     loginSuccess: 'Login successful',
     loginFailed: 'Login failed',
+    offlineLoginFailed: 'Offline sign-in failed. Sign in online and tap Sync first.',
+    offlineLoginSuccess: 'Signed in offline',
     fillRequired: 'Please enter email and password',
     noStoresBound: 'No stores are linked to this account',
     refreshStoresFail: 'Could not refresh store list',
@@ -39,6 +39,8 @@ export default {
     signingIn: '登录中...',
     loginSuccess: '登录成功',
     loginFailed: '登录失败',
+    offlineLoginFailed: '离线登录失败，请先联网登录并点击同步后再断网使用',
+    offlineLoginSuccess: '已离线登录',
     fillRequired: '请输入邮箱和密码',
     noStoresBound: '当前账号未绑定门店',
     refreshStoresFail: '门店列表刷新失败',
@@ -107,31 +107,39 @@
               >
                 <view class="cat-header" @click="toggleCategory(productCategoryRowKey(pCat, pIdx))">
                   <view class="cat-header-left">
-                    <view class="cat-header-thumb" :style="productCategoryThumbStyle(pCat)">
+                    <view
+                      class="cat-icon cat-header-thumb"
+                      :class="
+                        productCategoryVisual(pCat).mode === 'image'
+                          ? 'cat-icon--photo'
+                          : 'cat-icon--fallback'
+                      "
+                      :style="productCategoryThumbStyle(pCat)"
+                    >
                       <image
                         v-if="productCategoryVisual(pCat).mode === 'image'"
                         :src="resolveMediaUrlForApp(productCategoryVisual(pCat).imageUrl) || ''"
-                        class="cat-header-img"
+                        class="cat-photo"
                         mode="aspectFill"
                       />
-                      <view
+                      <text
                         v-else-if="productCategoryVisual(pCat).mode === 'colorText'"
-                        class="cat-header-text cat-header-text--fill"
+                        class="cat-icon-text cat-icon-text--on-color"
                         :style="{ color: productCategoryVisual(pCat).textColor || '#ffffff' }"
                       >
-                        <text class="cat-header-text-inner">{{ productCategoryVisual(pCat).text }}</text>
-                      </view>
+                        {{ productCategoryVisual(pCat).text }}
+                      </text>
                       <view
                         v-else-if="productCategoryVisual(pCat).mode === 'color'"
                         class="cat-header-color-fill"
                         :style="{ backgroundColor: productCategoryVisual(pCat).bg }"
                       />
-                      <view
+                      <text
                         v-else-if="productCategoryVisual(pCat).mode === 'text'"
-                        class="cat-header-text"
+                        class="cat-icon-text"
                       >
-                        <text class="cat-header-text-inner">{{ productCategoryVisual(pCat).text }}</text>
-                      </view>
+                        {{ productCategoryVisual(pCat).text }}
+                      </text>
                       <view v-else class="cat-header-fallback" :class="colorClassForName(pCat.name)">
                         <AppIcon name="food" size="sm" color="white" />
                       </view>
@@ -163,15 +171,47 @@
                       class="food-card"
                       @click="handleProductClick(product, pCat.name)"
                     >
-                      <view class="food-img-wrap">
+                      <view
+                        class="food-img-wrap"
+                        :class="
+                          productVisual(product).mode === 'image'
+                            ? 'food-img-wrap--photo'
+                            : 'food-img-wrap--fallback'
+                        "
+                        :style="productThumbWrapStyle(product)"
+                      >
                         <image
-                          v-if="productPhotoSrc(product)"
-                          :src="productPhotoSrc(product)"
+                          v-if="productVisual(product).mode === 'image'"
+                          :src="resolveMediaUrlForApp(productVisual(product).imageUrl) || ''"
                           class="food-img"
                           mode="aspectFill"
                         />
-                        <view v-else class="food-thumb-placeholder">
-                          <AppIcon name="layers" size="md" color="gray" />
+                        <text
+                          v-else-if="productVisual(product).mode === 'colorText'"
+                          class="food-thumb-text food-thumb-text--on-color"
+                          :style="{ color: productVisual(product).textColor || '#ffffff' }"
+                        >
+                          {{ productVisual(product).text }}
+                        </text>
+                        <text
+                          v-else-if="productVisual(product).mode === 'text'"
+                          class="food-thumb-text"
+                        >
+                          {{ productVisual(product).text }}
+                        </text>
+                        <view
+                          v-else-if="productVisual(product).mode === 'color'"
+                          class="food-thumb-color-fill"
+                          :style="{ backgroundColor: productVisual(product).bg }"
+                        />
+                        <view
+                          v-else
+                          class="food-thumb-fallback"
+                          :class="colorClassForName(product.productName)"
+                        >
+                          <text class="food-thumb-text food-thumb-text--on-color">
+                            {{ productThumbFallbackText(product) }}
+                          </text>
                         </view>
                         <view class="size-badge">
                           <text class="size-badge-text">{{ primaryLabelSizeText(product) }}</text>
@@ -404,8 +444,40 @@ function colorClassForName(name: string): string {
   return COLOR_CLASSES[Math.abs(h) % COLOR_CLASSES.length]
 }
  
-function productPhotoSrc(p: UsAppLabelingProductNodeDto): string {
-  return resolveMediaUrlForApp(p.productImageUrl)
+function productVisual(p: UsAppLabelingProductNodeDto): CategoryVisualRender {
+  const v = resolveCategoryButtonVisualFromDto({
+    buttonStyleJson: p.buttonStyleJson,
+    buttonAppearance: p.buttonAppearance,
+    displayText: p.displayText,
+    buttonBgColor: p.buttonBgColor,
+    buttonImageUrl: p.buttonImageUrl,
+    buttonTextColor: p.buttonTextColor,
+    categoryPhotoUrl: p.categoryPhotoUrl,
+    categoryName: p.productName,
+    name: p.productName,
+  })
+  if (v.mode !== 'none') return v
+  const legacyImg = (p.productImageUrl ?? '').trim()
+  if (legacyImg) return { mode: 'image', imageUrl: legacyImg }
+  return { mode: 'none' }
+}
+
+function productThumbWrapStyle(p: UsAppLabelingProductNodeDto): Record<string, string> {
+  const v = productVisual(p)
+  if (v.mode === 'colorText' || v.mode === 'color') {
+    return { backgroundColor: v.bg }
+  }
+  return {}
+}
+
+function productThumbFallbackText(p: UsAppLabelingProductNodeDto): string {
+  const name = (p.productName ?? '').trim()
+  if (!name) return '?'
+  const parts = name.split(/\s+/).filter(Boolean)
+  if (parts.length >= 2) {
+    return (parts[0].slice(0, 1) + parts[1].slice(0, 1)).toUpperCase()
+  }
+  return name.slice(0, 4)
 }
  
 /** 无商品图时由标签类型尺寸文案拼接展示（接口无单独预览图字段） */
@@ -779,22 +851,13 @@ const goBluetoothPage = () =&gt; {
   min-width: 0;
 }
  
+/* 与侧栏 .cat-icon 同尺寸，仅去掉侧栏下边距 */
 .cat-header-thumb {
-  width: 56rpx;
-  height: 56rpx;
-  border-radius: 14rpx;
-  overflow: hidden;
+  width: 64rpx;
+  height: 64rpx;
+  margin-bottom: 0;
   flex-shrink: 0;
   background: #f3f4f6;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.cat-header-img {
-  width: 100%;
-  height: 100%;
-  display: block;
 }
  
 .cat-header-color-fill {
@@ -802,36 +865,6 @@ const goBluetoothPage = () =&gt; {
   height: 100%;
 }
  
-.cat-header-text {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 6rpx;
-}
-
-.cat-header-text-inner {
-  max-width: 100%;
-  font-size: 22rpx;
-  font-weight: 700;
-  color: #111827;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.cat-header-text--fill .cat-header-text-inner {
-  color: inherit;
-  white-space: normal;
-  text-align: center;
-  line-height: 1.15;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-
 .cat-header-fallback {
   width: 100%;
   height: 100%;
@@ -909,6 +942,12 @@ const goBluetoothPage = () =&gt; {
   overflow: hidden;
 }
  
+.food-img-wrap--fallback {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .food-img {
   position: absolute;
   left: 0;
@@ -917,7 +956,39 @@ const goBluetoothPage = () =&gt; {
   height: 100%;
 }
  
-.food-thumb-placeholder {
+.food-thumb-text {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 12rpx;
+  box-sizing: border-box;
+  font-size: 32rpx;
+  font-weight: 700;
+  color: #111827;
+  line-height: 1.15;
+  text-align: center;
+  word-break: break-word;
+}
+
+.food-thumb-text--on-color {
+  font-size: 30rpx;
+  color: #ffffff;
+}
+
+.food-thumb-color-fill {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.food-thumb-fallback {
   position: absolute;
   left: 0;
   top: 0;
@@ -926,7 +997,24 @@ const goBluetoothPage = () =&gt; {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: linear-gradient(165deg, #f3f4f6 0%, #e5e7eb 45%, #d1d5db 100%);
+  padding: 12rpx;
+  box-sizing: border-box;
+}
+
+.food-thumb-fallback.bg-red {
+  background: #ef4444;
+}
+.food-thumb-fallback.bg-blue {
+  background: #3b82f6;
+}
+.food-thumb-fallback.bg-green {
+  background: #22c55e;
+}
+.food-thumb-fallback.bg-orange {
+  background: #f97316;
+}
+.food-thumb-fallback.bg-purple {
+  background: #a855f7;
 }
  
 .size-badge {
@@ -285,6 +285,8 @@ import {
 } from '../../services/usAppLabeling'
 import {
   applyTemplateProductDefaultValuesToTemplate,
+  applyProductCodeValueToTemplateScanElements,
+  extractProductCodeValueFromPreviewPayload,
   extractTemplateProductDefaultValuesFromPreviewPayload,
   normalizeLabelTemplateFromPreviewApi,
   overlayProductNameOnPreviewTemplate,
@@ -1343,10 +1345,17 @@ async function loadPreview() {
       templateSize.value = labelSizeTextFromApi.trim()
     }
     const productDefaults = extractTemplateProductDefaultValuesFromPreviewPayload(raw)
-    const tmplWithDefaults =
+    let tmplWithDefaults =
       Object.keys(productDefaults).length > 0
         ? applyTemplateProductDefaultValuesToTemplate(tmplRaw, productDefaults)
         : tmplRaw
+    const productCodeValue = extractProductCodeValueFromPreviewPayload(raw)
+    if (productCodeValue) {
+      tmplWithDefaults = applyProductCodeValueToTemplateScanElements(
+        tmplWithDefaults,
+        productCodeValue,
+      )
+    }
     /** 画布像素仅按接口 template 的 width / height / unit 换算（与 renderLabelPreviewCanvas.toCanvasPx 一致），不用 labelSizeText 覆盖以免单位被误判 */
     const base = overlayProductNameOnPreviewTemplate(tmplWithDefaults, displayProductName.value)
     basePreviewTemplate.value = base
@@ -143,6 +143,12 @@ import {
   isLoggedIn,
 } from '../../utils/authSession'
 import { performInitialOfflineSync } from '../../utils/offlineSyncManager'
+import {
+  findOfflineAuthAccount,
+  initOfflineSqlite,
+  isNetworkOnline,
+  saveOfflineAuthAccount,
+} from '../../utils/sqliteSync'
 import AppIcon from '../../components/AppIcon.vue'
  
 const { t } = useI18n()
@@ -325,6 +331,30 @@ const handleLogin = async () =&gt; {
   }
   isLoading.value = true
   try {
+    await initOfflineSqlite()
+    const online = await isNetworkOnline()
+
+    if (!online) {
+      const offline = await findOfflineAuthAccount(em, pw)
+      if (!offline?.token) {
+        uni.showToast({ title: t('login.offlineLoginFailed'), icon: 'none', duration: 2800 })
+        return
+      }
+      saveRememberPreference(rememberMe.value, em, pw)
+      saveAuthSession({
+        token: offline.token,
+        refreshToken: offline.refreshToken || '',
+        locations: offline.locations ?? [],
+        displayName: offline.displayName || displayNameFromEmail(em),
+        email: em,
+      })
+      uni.showToast({ title: t('login.offlineLoginSuccess'), icon: 'success' })
+      setTimeout(() => {
+        uni.redirectTo({ url: '/pages/store-select/store-select' })
+      }, 400)
+      return
+    }
+
     const res = await usAppLogin({ email: em, password: pw })
     if (!res.token) {
       uni.showToast({ title: t('login.loginFailed'), icon: 'none' })
@@ -338,6 +368,14 @@ const handleLogin = async () =&gt; {
       displayName: displayNameFromEmail(em),
       email: em,
     })
+    await saveOfflineAuthAccount({
+      email: em,
+      password: pw,
+      token: res.token,
+      refreshToken: res.refreshToken || '',
+      locations: res.locations ?? [],
+      displayName: displayNameFromEmail(em),
+    })
     try {
       await performInitialOfflineSync()
     } catch {
@@ -3,6 +3,7 @@
  * App 只读；需登录。
  */
 import { usAppApiRequest } from '../utils/usAppApiRequest'
+import { fetchWithOfflineCache } from '../utils/sqliteSync'
  
 export type LocationSupportGetOutputDto = {
   id?: string | null
@@ -10,20 +11,28 @@ export type LocationSupportGetOutputDto = {
   supportEmail?: string | null
 }
  
-export async function fetchGlobalSupportContact(): Promise<LocationSupportGetOutputDto | null> {
-  const raw = await usAppApiRequest<LocationSupportGetOutputDto | null>({
-    path: '/api/app/location-support/support',
-    method: 'GET',
-    auth: true,
-  })
+function normalizeSupportContact(raw: unknown): LocationSupportGetOutputDto | null {
   if (raw === null || raw === undefined) return null
   if (typeof raw !== 'object' || Array.isArray(raw)) return null
-  const phone = String(raw.supportPhone ?? '').trim()
-  const email = String(raw.supportEmail ?? '').trim()
+  const o = raw as LocationSupportGetOutputDto
+  const phone = String(o.supportPhone ?? '').trim()
+  const email = String(o.supportEmail ?? '').trim()
   if (!phone && !email) return null
   return {
-    id: raw.id != null ? String(raw.id) : null,
+    id: o.id != null ? String(o.id) : null,
     supportPhone: phone || null,
     supportEmail: email || null,
   }
 }
+
+/** 在线缓存至 SQLite，离线可读 */
+export async function fetchGlobalSupportContact(): Promise<LocationSupportGetOutputDto | null> {
+  return fetchWithOfflineCache('support', 'global-contact', async () => {
+    const raw = await usAppApiRequest<LocationSupportGetOutputDto | null>({
+      path: '/api/app/location-support/support',
+      method: 'GET',
+      auth: true,
+    })
+    return normalizeSupportContact(raw)
+  })
+}
@@ -114,16 +114,61 @@ export async function fetchUsAppLabelingTree(input: {
   })
 }
  
-/** 接口 8.2 */
+export function buildLabelPreviewCacheKey(body: UsAppLabelPreviewInputVo): string {
+  const loc = String(body.locationId || '').trim()
+  const code = String(body.labelCode || '').trim()
+  const pid = String(body.productId || '').trim()
+  return `preview:${loc}:${code}:${pid}`
+}
+
+/** 接口 8.2（在线写入 SQLite，离线读缓存） */
 export async function postUsAppLabelPreview(body: UsAppLabelPreviewInputVo): Promise<unknown> {
-  return usAppApiRequest<unknown>({
-    path: '/api/app/us-app-labeling/preview',
-    method: 'POST',
-    auth: true,
-    data: body,
+  const key = buildLabelPreviewCacheKey(body)
+  return fetchWithOfflineCache('labeling', key, async () => {
+    return usAppApiRequest<unknown>({
+      path: '/api/app/us-app-labeling/preview',
+      method: 'POST',
+      auth: true,
+      data: body,
+    })
   })
 }
  
+const PREVIEW_PREFETCH_MAX_PER_LOCATION = 80
+
+/** 同步时预拉标签预览，供断网进入预览页 */
+export async function prefetchUsAppLabelPreviewsForLocation(
+  locationId: string,
+  tree: UsAppLabelCategoryTreeNodeDto[]
+): Promise<void> {
+  const loc = String(locationId || '').trim()
+  if (!loc) return
+  const jobs: UsAppLabelPreviewInputVo[] = []
+  outer: for (const cat of tree) {
+    for (const pc of cat.productCategories ?? []) {
+      for (const prod of pc.products ?? []) {
+        for (const lt of prod.labelTypes ?? []) {
+          const labelCode = String(lt.labelCode || '').trim()
+          if (!labelCode) continue
+          jobs.push({
+            locationId: loc,
+            labelCode,
+            productId: String(prod.productId || '').trim() || undefined,
+          })
+          if (jobs.length >= PREVIEW_PREFETCH_MAX_PER_LOCATION) break outer
+        }
+      }
+    }
+  }
+  for (const body of jobs) {
+    try {
+      await postUsAppLabelPreview(body)
+    } catch {
+      // 单条失败不阻断整店同步
+    }
+  }
+}
+
 /**
  * 接口 9.1 原始请求。
  * 注意：仅供业务落库场景调用；打印机设置页「测试打印」、蓝牙页 Test Print 等 **不得** 使用（避免脏数据）。
@@ -14,9 +14,19 @@ export interface UsAppLabelingProductNodeDto {
   productName: string
   productCode: string
   productImageUrl: string | null
+  displayText?: string | null
+  categoryPhotoUrl?: string | null
+  buttonAppearance?: 'TEXT' | 'COLOR' | 'IMAGE' | string | string[] | null
+  buttonBgColor?: string | null
+  buttonImageUrl?: string | null
+  buttonTextColor?: string | null
+  buttonStyleJson?: string | null
   subtitle: string
   labelTypeCount: number
   labelTypes: UsAppLabelTypeNodeDto[]
+  templateId?: string
+  templateCode?: string | null
+  templateLabelSizeText?: string | null
 }
  
 export interface UsAppProductCategoryNodeDto {
+/** 与 Web 端 `barcodeFormat.ts` 选项顺序与取值一致 */
+
+export const BARCODE_FORMAT_OPTIONS = [
+  { label: 'Codabar', value: 'CODABAR' },
+  { label: 'Code39', value: 'CODE39' },
+  { label: 'Code128', value: 'CODE128' },
+  { label: 'EAN-2', value: 'EAN2' },
+  { label: 'EAN-5', value: 'EAN5' },
+  { label: 'EAN-8', value: 'EAN8' },
+  { label: 'EAN-13', value: 'EAN13' },
+  { label: 'ITF-14', value: 'ITF14' },
+  { label: 'MSI', value: 'MSI' },
+  { label: 'MSI10', value: 'MSI10' },
+  { label: 'MSI11', value: 'MSI11' },
+  { label: 'MSI1010', value: 'MSI1010' },
+  { label: 'MSI1110', value: 'MSI1110' },
+  { label: 'Pharmacode', value: 'PHARMACODE' },
+  { label: 'UPC(A)', value: 'UPCA' },
+] as const
+
+export type BarcodeFormatValue = (typeof BARCODE_FORMAT_OPTIONS)[number]['value']
+
+export const DEFAULT_BARCODE_FORMAT: BarcodeFormatValue = BARCODE_FORMAT_OPTIONS[0].value
+
+export function normalizeBarcodeType (raw: unknown): BarcodeFormatValue {
+  const key = String(raw ?? '')
+    .trim()
+    .toUpperCase()
+    .replace(/[^A-Z0-9]/g, '')
+  const allowed = new Set(BARCODE_FORMAT_OPTIONS.map((o) => o.value))
+  if (allowed.has(key as BarcodeFormatValue)) return key as BarcodeFormatValue
+  if (key === 'UPC' || key === 'UPCA') return 'UPCA'
+  if (key === 'ITF') return 'ITF14'
+  return DEFAULT_BARCODE_FORMAT
+}
+
+export function toTscBarcodeSymbology (barcodeType: unknown): string {
+  const key = normalizeBarcodeType(barcodeType)
+  const map: Record<BarcodeFormatValue, string> = {
+    CODABAR: 'CODA',
+    CODE39: '39',
+    CODE128: '128',
+    EAN2: '128',
+    EAN5: '128',
+    EAN8: 'EAN8',
+    EAN13: 'EAN13',
+    ITF14: 'ITF14',
+    MSI: 'MSI',
+    MSI10: 'MSI',
+    MSI11: 'MSI',
+    MSI1010: 'MSI',
+    MSI1110: 'MSI',
+    PHARMACODE: '128',
+    UPCA: 'UPCA',
+  }
+  return map[key] ?? 'CODA'
+}
+
+export function toEscBarcodeTypeCode (barcodeType: unknown): number {
+  const key = normalizeBarcodeType(barcodeType)
+  const map: Record<BarcodeFormatValue, number> = {
+    CODABAR: 71,
+    CODE39: 69,
+    CODE128: 73,
+    EAN2: 73,
+    EAN5: 73,
+    EAN8: 68,
+    EAN13: 67,
+    ITF14: 70,
+    MSI: 73,
+    MSI10: 73,
+    MSI11: 73,
+    MSI1010: 73,
+    MSI1110: 73,
+    PHARMACODE: 73,
+    UPCA: 65,
+  }
+  return map[key] ?? 71
+}
@@ -234,6 +234,79 @@ export function extractTemplateProductDefaultValuesFromPreviewPayload(payload: u
   )
 }
  
+function isTemplateSectionScanElement(el: SystemTemplateElementBase): boolean {
+  const cfg = el.config || {}
+  const typeAdd = String(
+    (el as { typeAdd?: string }).typeAdd ??
+    cfg.typeAdd ??
+    cfg.TypeAdd ??
+    el.type ??
+    '',
+  )
+    .trim()
+    .toLowerCase()
+  if (!typeAdd.startsWith('template_')) return false
+  const t = String(el.type || '').toUpperCase()
+  return t === 'BARCODE' || t === 'QRCODE'
+}
+
+/** 预览/打印接口响应中的产品 codeValue（兼容 PascalCase / data 嵌套） */
+export function extractProductCodeValueFromPreviewPayload(payload: unknown): string {
+  const readLayer = (layer: Record<string, unknown> | null | undefined): string => {
+    if (!layer) return ''
+    const cv =
+      layer.codeValue ??
+      layer.CodeValue ??
+      layer.productCodeValue ??
+      layer.ProductCodeValue
+    if (cv != null && String(cv).trim()) return String(cv).trim()
+    const prod = layer.product ?? layer.Product
+    if (prod != null && typeof prod === 'object' && !Array.isArray(prod)) {
+      const p = prod as Record<string, unknown>
+      const nested = p.codeValue ?? p.CodeValue
+      if (nested != null && String(nested).trim()) return String(nested).trim()
+    }
+    return ''
+  }
+  if (payload == null || typeof payload !== 'object') return ''
+  const r = payload as Record<string, unknown>
+  const nested = r.data ?? r.Data
+  const inner =
+    nested != null && typeof nested === 'object' && !Array.isArray(nested)
+      ? (nested as Record<string, unknown>)
+      : null
+  return (
+    readLayer(inner) ||
+    readLayer(r) ||
+    ''
+  )
+}
+
+/** 将产品 codeValue 写入 Template 分组下的 BARCODE / QRCODE（覆盖模板内静态 data） */
+export function applyProductCodeValueToTemplateScanElements(
+  template: SystemLabelTemplate,
+  codeValue: string | null | undefined,
+): SystemLabelTemplate {
+  const cv = String(codeValue ?? '').trim()
+  if (!cv) return template
+  const elements = (template.elements || []).map((el) => {
+    if (!isTemplateSectionScanElement(el)) return el
+    const cfg = { ...(el.config || {}) } as Record<string, unknown>
+    cfg.data = cv
+    cfg.Data = cv
+    if (String(el.type || '').toUpperCase() === 'BARCODE') {
+      cfg.barcodeData = cv
+      cfg.BarcodeData = cv
+      cfg.value = cv
+      cfg.Value = cv
+      cfg.content = cv
+      cfg.Content = cv
+    }
+    return { ...el, config: cfg }
+  })
+  return { ...template, elements }
+}
+
 /**
  * 将平台录入的默认值合并进模板元素 config，供画布预览（键与 elements[].id 一致）。
  */
 import { fetchLabelCategoryPage } from '../services/labelCategory'
 import { fetchProductCategoryPage } from '../services/productCategory'
 import { usAppFetchLocationDetail, usAppFetchMyLocations, usAppFetchMyProfile } from '../services/usAppAuth'
-import { fetchUsAppLabelingTree, fetchUsAppPrintLogList } from '../services/usAppLabeling'
-import { setBoundLocations } from './authSession'
+import {
+  fetchUsAppLabelingTree,
+  fetchUsAppPrintLogList,
+  prefetchUsAppLabelPreviewsForLocation,
+} from '../services/usAppLabeling'
+import { fetchGlobalSupportContact } from '../services/locationSupport'
+import {
+  getAccessToken,
+  getBoundLocations,
+  isLoggedIn,
+  setBoundLocations,
+} from './authSession'
 import { getCurrentStoreId } from './stores'
 import {
   clearFailedOfflineMutations,
@@ -15,6 +25,7 @@ import {
   markOfflineMutationDone,
   markOfflineMutationFailed,
   removeOfflineMutationById,
+  refreshOfflineAuthAccountSession,
 } from './sqliteSync'
 import type { MutationRow } from './sqliteSync'
 import { usAppApiRequest } from './usAppApiRequest'
@@ -93,16 +104,34 @@ export async function performInitialOfflineSync(): Promise&lt;void&gt; {
   )
   for (const locId of targetLocationIds) {
     // 每个门店一组缓存，确保离线切店后仍有可读数据
-    await Promise.allSettled([
+    const [, treeResult] = await Promise.allSettled([
       usAppFetchLocationDetail(locId),
       fetchUsAppLabelingTree({ locationId: locId }),
       fetchUsAppPrintLogList({ locationId: locId, skipCount: 1, maxResultCount: 20 }),
     ])
+    if (treeResult.status === 'fulfilled' && Array.isArray(treeResult.value)) {
+      await prefetchUsAppLabelPreviewsForLocation(locId, treeResult.value)
+    }
   }
   await Promise.allSettled([
     fetchLabelCategoryPage({ skipCount: 1, maxResultCount: 100, state: true }),
     fetchProductCategoryPage({ skipCount: 1, maxResultCount: 100, state: true }),
+    fetchGlobalSupportContact(),
   ])
+
+  if (isLoggedIn()) {
+    const email = String(uni.getStorageSync('user_email') || '').trim()
+    if (email) {
+      await refreshOfflineAuthAccountSession({
+        email,
+        token: getAccessToken(),
+        refreshToken: String(uni.getStorageSync('refresh_token') || ''),
+        locations: getBoundLocations(),
+        displayName: String(uni.getStorageSync('userName') || email),
+      })
+    }
+  }
+
   setLastSyncAt(Date.now())
 }
  
@@ -7,6 +7,7 @@ import type {
 } from '../types/printer'
 import { resolveEscTemplate } from '../templateRenderer'
 import { createTestPrintTemplate } from '../templates/testPrintTemplate'
+import { toEscBarcodeTypeCode } from '../../barcodeFormat'
  
 function normalizePrinterText (str: string): string {
   return String(str || '')
@@ -99,19 +100,7 @@ function clamp (value: number, min: number, max: number): number {
 }
  
 function normalizeEscBarcodeType (value?: string): number {
-  const key = String(value || 'CODE128').trim().toUpperCase()
-  const map: Record<string, number> = {
-    UPCA: 65,
-    UPCE: 66,
-    EAN13: 67,
-    EAN8: 68,
-    CODE39: 69,
-    ITF: 70,
-    CODABAR: 71,
-    CODE93: 72,
-    CODE128: 73,
-  }
-  return map[key] || 73
+  return toEscBarcodeTypeCode(value)
 }
  
 function normalizeEscQrLevel (value?: string): number {
+import { normalizeBarcodeType } from '../barcodeFormat'
 import { storedValueLooksLikeImagePath } from '../resolveMediaUrl'
 import {
   createImageBitmapPatch,
@@ -333,6 +334,25 @@ function sanitizeTextForTscBuiltinFont (text: string): string {
 }
  
 /** 估算 TSC 项底部点坐标，用于避免 SIZE 高度略小于内容时裁掉最后一行（常见于底部价格） */
+function pushElementBorderBoxIfNeeded (
+  items: TscTemplateItem[],
+  element: SystemTemplateElementBase,
+  dpi: number
+) {
+  const type = String(element.type || '').toUpperCase()
+  if (type === 'BLANK') return
+  const border = String(element.border || '').toLowerCase()
+  if (border !== 'line' && border !== 'dotted') return
+  items.push({
+    type: 'box',
+    x: pxToDots(element.x, dpi),
+    y: pxToDots(element.y, dpi),
+    width: Math.max(1, pxToDots(element.width, dpi)),
+    height: Math.max(1, pxToDots(element.height, dpi)),
+    lineWidth: border === 'dotted' ? 1 : 2,
+  })
+}
+
 function estimateTscItemBottomDots (item: TscTemplateItem): number {
   switch (item.type) {
     case 'bitmap':
@@ -375,6 +395,7 @@ function buildTscTemplate (
   sortElements(template.elements).forEach((element) => {
     const config = element.config || {}
     const type = String(element.type || '').toUpperCase()
+    pushElementBorderBoxIfNeeded(items, element, dpi)
  
     const renderAsTextBlock =
       type.startsWith('TEXT_') ||
@@ -467,15 +488,19 @@ function buildTscTemplate (
     if (type === 'BARCODE') {
       const value = resolveElementDataValue(element, data)
       if (!value) return
+      const symbology = normalizeBarcodeType(getConfigString(config, ['barcodeType'], ''))
+      const rotation = resolveRotation(
+        element.rotation || getConfigString(config, ['orientation'], 'horizontal')
+      )
       items.push({
         type: 'barcode',
         x: pxToDots(element.x, dpi),
         y: pxToDots(element.y, dpi),
         value,
-        symbology: getConfigString(config, ['barcodeType'], 'CODE128'),
+        symbology,
         height: Math.max(20, pxToDots(element.height, dpi)),
         readable: config.showText !== false,
-        rotation: resolveRotation(getConfigString(config, ['orientation'], element.rotation || 'horizontal')),
+        rotation,
         narrow: clamp(element.width / Math.max(40, value.length * 6), 1, 4),
         wide: clamp(element.width / Math.max(24, value.length * 3), 2, 6),
       })
@@ -593,7 +618,7 @@ function buildEscTemplate (
         type: 'barcode',
         value,
         align,
-        symbology: getConfigString(config, ['barcodeType'], 'CODE128'),
+        symbology: normalizeBarcodeType(getConfigString(config, ['barcodeType'], '')),
         height: clamp(element.height * 2, 48, 180),
         width: clamp(element.width / Math.max(48, value.length * 4), 2, 6),
         showText: config.showText !== false,
@@ -4,6 +4,7 @@
  * 若需中文等非 ASCII，可考虑运行时动态加载 tsc.js（仅 APP 端）。
  */
 import type { MonochromeImageData, PrintImageOptions, StructuredTscTemplate } from './types/printer'
+import { toTscBarcodeSymbology } from '../barcodeFormat'
  
 function normalizePrinterText (str: string): string {
   return String(str || '')
@@ -81,19 +82,7 @@ function escapeTscString (s: string): string {
 }
  
 function normalizeTscBarcodeType (value?: string): string {
-  const key = String(value || 'CODE128').trim().toUpperCase()
-  const map: Record<string, string> = {
-    CODE128: '128',
-    CODE39: '39',
-    EAN13: 'EAN13',
-    EAN8: 'EAN8',
-    UPCA: 'UPCA',
-    UPCE: 'UPCE',
-    CODABAR: 'CODA',
-    ITF14: 'ITF14',
-    ITF: 'ITF',
-  }
-  return map[key] || '128'
+  return toTscBarcodeSymbology(value)
 }
  
 /**
@@ -15,9 +15,21 @@ export type MutationRow = {
 const DB_NAME = 'us_app_offline.db'
 const CACHE_TABLE = 'offline_cache'
 const MUTATION_TABLE = 'offline_mutation_queue'
+const AUTH_TABLE = 'offline_auth_account'
  
 const FALLBACK_CACHE_KEY = '__offline_cache_json__'
 const FALLBACK_MUTATION_KEY = '__offline_mutation_queue_json__'
+const FALLBACK_AUTH_KEY = '__offline_auth_accounts_json__'
+
+export type OfflineAuthAccountRow = {
+  email: string
+  password: string
+  token: string
+  refreshToken: string
+  locations: import('../types/usAppBound').UsAppBoundLocationDto[]
+  displayName: string
+  updatedAt: number
+}
  
 let initialized = false
  
@@ -151,6 +163,17 @@ export async function initOfflineSqlite(): Promise&lt;void&gt; {
       last_error TEXT
     )`
   )
+  await sqliteExecute(
+    `CREATE TABLE IF NOT EXISTS ${AUTH_TABLE} (
+      email TEXT PRIMARY KEY,
+      password TEXT NOT NULL,
+      token TEXT NOT NULL,
+      refresh_token TEXT,
+      locations_json TEXT NOT NULL,
+      display_name TEXT,
+      updated_at INTEGER NOT NULL
+    )`
+  )
   initialized = true
 }
  
@@ -171,6 +194,19 @@ export async function setOfflineCache(module: string, name: string, payload: Jso
   await sqliteExecute(sql)
 }
  
+export async function hasOfflineCache(module: string, name: string): Promise<boolean> {
+  const key = cachePk(module, name)
+  if (!isAppSqliteAvailable()) {
+    const map = getStorageMap<{ payloadJson: string }>(FALLBACK_CACHE_KEY)
+    return Object.prototype.hasOwnProperty.call(map, key)
+  }
+  await initOfflineSqlite()
+  const rows = await sqliteSelect(
+    `SELECT 1 FROM ${CACHE_TABLE} WHERE cache_key='${esc(key)}' LIMIT 1`
+  )
+  return rows.length > 0
+}
+
 export async function getOfflineCache<T = unknown>(module: string, name: string): Promise<T | null> {
   const key = cachePk(module, name)
   if (!isAppSqliteAvailable()) {
@@ -360,8 +396,145 @@ export async function fetchWithOfflineCache&lt;T&gt;(
     await setOfflineCache(module, name, data)
     return data
   }
-  const cached = await getOfflineCache<T>(module, name)
-  if (cached != null) return cached
+  if (await hasOfflineCache(module, name)) {
+    return (await getOfflineCache<T>(module, name)) as T
+  }
   throw new Error('No offline cache available')
 }
  
+function getFallbackAuthAccounts(): OfflineAuthAccountRow[] {
+  try {
+    const raw = String(uni.getStorageSync(FALLBACK_AUTH_KEY) || '').trim()
+    if (!raw) return []
+    const parsed = JSON.parse(raw) as unknown
+    return Array.isArray(parsed) ? (parsed as OfflineAuthAccountRow[]) : []
+  } catch {
+    return []
+  }
+}
+
+function setFallbackAuthAccounts(rows: OfflineAuthAccountRow[]): void {
+  uni.setStorageSync(FALLBACK_AUTH_KEY, JSON.stringify(rows))
+}
+
+function authRowFromDb(r: Record<string, unknown>): OfflineAuthAccountRow {
+  let locations: OfflineAuthAccountRow['locations'] = []
+  try {
+    locations = JSON.parse(String(r.locations_json || '[]')) as OfflineAuthAccountRow['locations']
+  } catch {
+    locations = []
+  }
+  return {
+    email: String(r.email || ''),
+    password: String(r.password || ''),
+    token: String(r.token || ''),
+    refreshToken: String(r.refresh_token || ''),
+    locations,
+    displayName: String(r.display_name || ''),
+    updatedAt: Number(r.updated_at || 0),
+  }
+}
+
+/** 在线登录成功后保存，供断网时用同一账号密码登录 */
+export async function saveOfflineAuthAccount(input: {
+  email: string
+  password: string
+  token: string
+  refreshToken: string
+  locations: OfflineAuthAccountRow['locations']
+  displayName: string
+}): Promise<void> {
+  const email = input.email.trim().toLowerCase()
+  if (!email || !input.password || !input.token) return
+  const row: OfflineAuthAccountRow = {
+    email,
+    password: input.password,
+    token: input.token,
+    refreshToken: input.refreshToken || '',
+    locations: input.locations ?? [],
+    displayName: input.displayName || email,
+    updatedAt: Date.now(),
+  }
+  if (!isAppSqliteAvailable()) {
+    const list = getFallbackAuthAccounts().filter((x) => x.email !== email)
+    list.push(row)
+    setFallbackAuthAccounts(list)
+    return
+  }
+  await initOfflineSqlite()
+  const locationsJson = esc(JSON.stringify(row.locations))
+  await sqliteExecute(
+    `INSERT OR REPLACE INTO ${AUTH_TABLE}
+      (email, password, token, refresh_token, locations_json, display_name, updated_at)
+      VALUES (
+        '${esc(email)}',
+        '${esc(row.password)}',
+        '${esc(row.token)}',
+        '${esc(row.refreshToken)}',
+        '${locationsJson}',
+        '${esc(row.displayName)}',
+        ${row.updatedAt}
+      )`
+  )
+}
+
+/** 断网登录：匹配 SQLite 中已同步过的账号 */
+export async function findOfflineAuthAccount(
+  email: string,
+  password: string
+): Promise<OfflineAuthAccountRow | null> {
+  const em = email.trim().toLowerCase()
+  const pw = password
+  if (!em || !pw) return null
+  if (!isAppSqliteAvailable()) {
+    return getFallbackAuthAccounts().find((x) => x.email === em && x.password === pw) ?? null
+  }
+  await initOfflineSqlite()
+  const rows = await sqliteSelect(
+    `SELECT email, password, token, refresh_token, locations_json, display_name, updated_at
+     FROM ${AUTH_TABLE}
+     WHERE email='${esc(em)}' AND password='${esc(pw)}'
+     LIMIT 1`
+  )
+  if (!rows.length) return null
+  return authRowFromDb(rows[0] as Record<string, unknown>)
+}
+
+/** 同步后刷新已存离线账号的 token / 门店，无需再次输入密码 */
+export async function refreshOfflineAuthAccountSession(input: {
+  email: string
+  token: string
+  refreshToken: string
+  locations: OfflineAuthAccountRow['locations']
+  displayName: string
+}): Promise<void> {
+  const email = input.email.trim().toLowerCase()
+  if (!email || !input.token) return
+  if (!isAppSqliteAvailable()) {
+    const list = getFallbackAuthAccounts()
+    const idx = list.findIndex((x) => x.email === email)
+    if (idx < 0) return
+    list[idx] = {
+      ...list[idx],
+      token: input.token,
+      refreshToken: input.refreshToken || '',
+      locations: input.locations ?? [],
+      displayName: input.displayName || list[idx].displayName,
+      updatedAt: Date.now(),
+    }
+    setFallbackAuthAccounts(list)
+    return
+  }
+  await initOfflineSqlite()
+  const locationsJson = esc(JSON.stringify(input.locations ?? []))
+  await sqliteExecute(
+    `UPDATE ${AUTH_TABLE}
+     SET token='${esc(input.token)}',
+         refresh_token='${esc(input.refreshToken || '')}',
+         locations_json='${locationsJson}',
+         display_name='${esc(input.displayName || email)}',
+         updated_at=${Date.now()}
+     WHERE email='${esc(email)}'`
+  )
+}
+
@@ -15,6 +15,14 @@ public class ProductCreateInputVo
  
     public string? ProductImageUrl { get; set; }
  
+    public string? DisplayText { get; set; }
+
+    public string? CategoryPhotoUrl { get; set; }
+
+    public string? ButtonAppearance { get; set; }
+
+    public string? CodeValue { get; set; }
+
     public bool State { get; set; } = true;
  
     /// <summary>
@@ -14,6 +14,14 @@ public class ProductGetListOutputDto
  
     public string? ProductImageUrl { get; set; }
  
+    public string? DisplayText { get; set; }
+
+    public string? CategoryPhotoUrl { get; set; }
+
+    public string ButtonAppearance { get; set; } = "TEXT";
+
+    public string? CodeValue { get; set; }
+
     public bool State { get; set; }
  
     /// <summary>
@@ -16,6 +16,14 @@ public class ProductGetOutputDto
  
     public string? ProductImageUrl { get; set; }
  
+    public string? DisplayText { get; set; }
+
+    public string? CategoryPhotoUrl { get; set; }
+
+    public string ButtonAppearance { get; set; } = "TEXT";
+
+    public string? CodeValue { get; set; }
+
     public bool State { get; set; }
  
     /// <summary>适用 Company Id（<c>fl_partner.Id</c>，由关联门店反推；多公司时取第一个）</summary>
@@ -22,6 +22,13 @@ public class UsAppLabelingProductNodeDto
  
     public string? ProductImageUrl { get; set; }
  
+    /// <summary>按钮展示配置（与平台端产品 Button Appearance、fl_product 扩展字段对齐）</summary>
+    public string? DisplayText { get; set; }
+
+    public string? CategoryPhotoUrl { get; set; }
+
+    public string? ButtonAppearance { get; set; }
+
     /// <summary>副标题（无独立业务字段时：有编码显示编码，否则「无」）</summary>
     public string Subtitle { get; set; } = string.Empty;
  
@@ -18,6 +18,18 @@ public class FlProductDbEntity
  
     public string? ProductImageUrl { get; set; }
  
+    /// <summary>按钮展示文案（为空则默认使用 ProductName）</summary>
+    public string? DisplayText { get; set; }
+
+    /// <summary>与 fl_product_category 一致：TEXT/COLOR/IMAGE 展示值 JSON 数组（与 ButtonAppearance 配合）</summary>
+    public string? CategoryPhotoUrl { get; set; }
+
+    /// <summary>按钮外观 JSON，如 ["TEXT","COLOR"] 或 ["IMAGE"]</summary>
+    public string ButtonAppearance { get; set; } = "TEXT";
+
+    /// <summary>条码/编码值（打印模板条形码、二维码数据源）</summary>
+    public string? CodeValue { get; set; }
+
     public bool State { get; set; }
 }
  
@@ -100,6 +100,10 @@ public class ProductAppService : ApplicationService, IProductAppService
                 CategoryId = x.CategoryId,
                 CategoryName = categoryName,
                 ProductImageUrl = x.ProductImageUrl,
+                DisplayText = x.DisplayText,
+                CategoryPhotoUrl = x.CategoryPhotoUrl,
+                ButtonAppearance = x.ButtonAppearance,
+                CodeValue = x.CodeValue,
                 State = x.State,
                 NoOfLabels = countMap.TryGetValue(x.Id, out var count) ? count : 0
             };
@@ -153,6 +157,10 @@ public class ProductAppService : ApplicationService, IProductAppService
             CategoryId = entity.CategoryId,
             CategoryName = categoryName,
             ProductImageUrl = entity.ProductImageUrl,
+            DisplayText = entity.DisplayText,
+            CategoryPhotoUrl = entity.CategoryPhotoUrl,
+            ButtonAppearance = entity.ButtonAppearance,
+            CodeValue = entity.CodeValue,
             State = entity.State,
             PartnerId = partnerIds.Count > 0 ? partnerIds[0] : null,
             PartnerIds = partnerIds,
@@ -185,6 +193,8 @@ public class ProductAppService : ApplicationService, IProductAppService
             }
         }
  
+        var displayText = input.DisplayText?.Trim();
+        var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
         var entity = new FlProductDbEntity
         {
             Id = _guidGenerator.Create().ToString(),
@@ -193,6 +203,10 @@ public class ProductAppService : ApplicationService, IProductAppService
             ProductName = name,
             CategoryId = input.CategoryId?.Trim(),
             ProductImageUrl = input.ProductImageUrl?.Trim(),
+            DisplayText = string.IsNullOrWhiteSpace(displayText) ? null : displayText,
+            CategoryPhotoUrl = CategoryAppearanceStorageHelper.NormalizeCategoryPhotoUrlForStorage(input.CategoryPhotoUrl),
+            ButtonAppearance = appearance,
+            CodeValue = string.IsNullOrWhiteSpace(input.CodeValue?.Trim()) ? null : input.CodeValue!.Trim(),
             State = input.State
         };
  
@@ -246,10 +260,16 @@ public class ProductAppService : ApplicationService, IProductAppService
             }
         }
  
+        var displayText = input.DisplayText?.Trim();
+        var appearance = CategoryAppearanceStorageHelper.NormalizeButtonAppearanceForStorage(input.ButtonAppearance);
         entity.ProductCode = code;
         entity.ProductName = name;
         entity.CategoryId = input.CategoryId?.Trim();
         entity.ProductImageUrl = input.ProductImageUrl?.Trim();
+        entity.DisplayText = string.IsNullOrWhiteSpace(displayText) ? null : displayText;
+        entity.CategoryPhotoUrl = CategoryAppearanceStorageHelper.NormalizeCategoryPhotoUrlForStorage(input.CategoryPhotoUrl);
+        entity.ButtonAppearance = appearance;
+        entity.CodeValue = string.IsNullOrWhiteSpace(input.CodeValue?.Trim()) ? null : input.CodeValue!.Trim();
         entity.State = input.State;
  
         await _dbContext.SqlSugarClient.Updateable(entity).ExecuteCommandAsync();
@@ -99,6 +99,9 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
                 ProductName = p.ProductName,
                 ProductCode = p.ProductCode,
                 ProductImageUrl = p.ProductImageUrl,
+                ProductDisplayText = p.DisplayText,
+                ProductCategoryPhotoUrl = p.CategoryPhotoUrl,
+                ProductButtonAppearance = p.ButtonAppearance,
                 LabelTypeId = t.Id,
                 TypeName = t.TypeName,
                 TypeOrderNum = t.OrderNum,
@@ -217,6 +220,9 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
                         first.TemplateHeight,
                         first.TemplateUnit);
  
+                    var productAppearance = string.IsNullOrWhiteSpace(first.ProductButtonAppearance)
+                        ? "TEXT"
+                        : first.ProductButtonAppearance.Trim();
                     l2.Products.Add(new UsAppLabelingProductNodeDto
                     {
                         ProductId = first.ProductId,
@@ -226,6 +232,9 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
                         ProductName = first.ProductName ?? string.Empty,
                         ProductCode = first.ProductCode ?? string.Empty,
                         ProductImageUrl = first.ProductImageUrl,
+                        DisplayText = first.ProductDisplayText,
+                        CategoryPhotoUrl = first.ProductCategoryPhotoUrl,
+                        ButtonAppearance = productAppearance,
                         Subtitle = subtitle,
                         LabelTypeCount = typeNodes.Count,
                         LabelTypes = typeNodes
@@ -960,6 +969,12 @@ public class UsAppLabelingAppService : ApplicationService, IUsAppLabelingAppServ
  
         public string? ProductImageUrl { get; set; }
  
+        public string? ProductDisplayText { get; set; }
+
+        public string? ProductCategoryPhotoUrl { get; set; }
+
+        public string? ProductButtonAppearance { get; set; }
+
         public string LabelTypeId { get; set; } = string.Empty;
  
         public string? TypeName { get; set; }
@@ -29,7 +29,9 @@ import {
   YAxis,
 } from 'recharts';
 import { getDashboardOverview } from '../../services/dashboardService';
+import { getTemplatePrintStatList } from '../../services/reportsService';
 import type { DashboardMetricCardDto, DashboardOverviewDto, DashboardRecentLabelItemDto } from '../../types/dashboardOverview';
+import type { TemplatePrintStatListItem } from '../../types/reports';
 import { useAuth } from '../auth/AuthProvider';
 import { displayNameFromUser } from '../../lib/currentUserDisplay';
 import { formatRelativeSince } from '../../lib/relativeSince';
@@ -48,6 +50,19 @@ function isRecentLabelExpired(item: DashboardRecentLabelItemDto): boolean {
   return (item.status || '').toLowerCase() === 'expired';
 }
  
+/** 与 reports template-print-stat 默认区间一致：近 30 天（含今天） */
+function last30DaysIsoRange(): { startDate: string; endDate: string } {
+  const end = new Date();
+  const start = new Date();
+  start.setHours(12, 0, 0, 0);
+  end.setHours(12, 0, 0, 0);
+  start.setDate(start.getDate() - 29);
+  return {
+    startDate: start.toISOString().slice(0, 10),
+    endDate: end.toISOString().slice(0, 10),
+  };
+}
+
 function formatHeaderDate(iso: string | null | undefined): string {
   const d = iso ? new Date(iso) : new Date();
   if (!Number.isFinite(d.getTime())) return new Date().toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' });
@@ -125,18 +140,37 @@ export function Dashboard({ onViewReports, onViewAllRecentLabels }: DashboardPro
   const welcomeName = auth.roleDisplay ?? displayNameFromUser(auth.user);
   const [overview, setOverview] = React.useState<DashboardOverviewDto | null>(null);
   const [loading, setLoading] = React.useState(true);
+  const [templateStats, setTemplateStats] = React.useState<TemplatePrintStatListItem[]>([]);
+  const [templateStatsLoading, setTemplateStatsLoading] = React.useState(true);
  
   const load = React.useCallback(async () => {
     setLoading(true);
+    setTemplateStatsLoading(true);
+    const { startDate, endDate } = last30DaysIsoRange();
     try {
-      const data = await getDashboardOverview();
+      const [data, statRes] = await Promise.all([
+        getDashboardOverview(),
+        getTemplatePrintStatList({
+          skipCount: 1,
+          maxResultCount: 12,
+          startDate,
+          endDate,
+          sorting: 'PrintedCount desc',
+        }).catch((e) => {
+          console.error(e);
+          return { items: [], totalCount: 0 };
+        }),
+      ]);
       setOverview(data);
+      setTemplateStats(statRes.items ?? []);
     } catch (e) {
       console.error(e);
       toast.error(e instanceof Error ? e.message : 'Failed to load dashboard');
       setOverview(null);
+      setTemplateStats([]);
     } finally {
       setLoading(false);
+      setTemplateStatsLoading(false);
     }
   }, []);
  
@@ -453,6 +487,52 @@ export function Dashboard({ onViewReports, onViewAllRecentLabels }: DashboardPro
               )}
             </CardContent>
           </Card>
+
+          <Card className="shadow-sm border-gray-200">
+            <CardHeader>
+              <CardTitle className="text-base font-bold text-gray-800 flex items-center gap-2">
+                <FileText className="w-5 h-5 text-gray-500" />
+                Template Print Statistics
+              </CardTitle>
+              <CardDescription>By template — labels printed in the last 30 days</CardDescription>
+            </CardHeader>
+            <CardContent>
+              {loading || templateStatsLoading ? (
+                <div className="space-y-3">
+                  {Array.from({ length: 6 }).map((_, i) => (
+                    <div key={i} className="flex items-center justify-between gap-3">
+                      <Skeleton className="h-4 flex-1 max-w-[200px]" />
+                      <Skeleton className="h-4 w-12 shrink-0" />
+                    </div>
+                  ))}
+                </div>
+              ) : templateStats.length === 0 ? (
+                <div className="py-10 text-center text-sm text-gray-500">
+                  No template print data in the last 30 days.
+                </div>
+              ) : (
+                <div className="space-y-2 max-h-[320px] overflow-y-auto pr-1">
+                  {templateStats.map((row, i) => {
+                    const name = (row.templateName ?? '').trim() || 'None';
+                    const key = row.templateId ? `${row.templateId}-${i}` : `row-${i}-${name}`;
+                    return (
+                      <div
+                        key={key}
+                        className="flex items-center justify-between gap-3 py-2.5 px-3 rounded-lg border border-gray-100 bg-gray-50 hover:bg-gray-100 transition-colors"
+                      >
+                        <p className="text-sm font-medium text-gray-900 truncate min-w-0 flex-1" title={name}>
+                          {name}
+                        </p>
+                        <span className="text-sm font-semibold text-gray-900 tabular-nums shrink-0">
+                          {row.printedCount.toLocaleString()}
+                        </span>
+                      </div>
+                    );
+                  })}
+                </div>
+              )}
+            </CardContent>
+          </Card>
         </div>
       </div>
     </div>
@@ -66,6 +66,15 @@ import { getLocations } from &quot;../../services/locationService&quot;;
 import { getGroups } from "../../services/groupService";
 import { resolvePictureUrlForDisplay } from "../../services/imageUploadService";
 import type { LabelCategoryDto, LabelCategoryCreateInput, LabelCategoryUpdateInput } from "../../types/labelCategory";
+import {
+  FORM_DIALOG_CONTENT_CLASS,
+  FORM_DIALOG_CONTENT_STYLE,
+  FORM_DIALOG_FOOTER_CLASS,
+  FORM_DIALOG_HEADER_CLASS,
+  FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS,
+  FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX,
+  FORM_DIALOG_SCROLL_BODY_CLASS,
+} from "../../lib/formDialogLayout";
 import type { LocationDto } from "../../types/location";
 import type { GroupListItem } from "../../types/group";
 import { SearchableMultiSelect } from "../ui/searchable-multi-select";
@@ -933,15 +942,15 @@ function CreateLabelCategoryDialog({
  
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex h-[min(85vh,720px)] max-h-[90vh] w-[min(50%,calc(100vw-2rem))] max-w-none flex-col gap-0 overflow-hidden p-0 sm:max-w-none">
-        <DialogHeader className="shrink-0 space-y-2 px-6 pt-6 pr-14 pb-2 text-center sm:text-left">
+      <DialogContent className={FORM_DIALOG_CONTENT_CLASS} style={FORM_DIALOG_CONTENT_STYLE}>
+        <DialogHeader className={FORM_DIALOG_HEADER_CLASS}>
           <DialogTitle>Add New Label Category</DialogTitle>
           <DialogDescription>
             Enter the details for the new label category.
           </DialogDescription>
         </DialogHeader>
  
-        <div className="flex min-h-0 flex-1 flex-col overflow-y-auto overscroll-contain px-6 pb-4">
+        <div className={FORM_DIALOG_SCROLL_BODY_CLASS}>
           <div className="grid gap-4 py-2">
           <div className="grid grid-cols-2 gap-4">
             <div className="space-y-2">
@@ -1125,7 +1134,9 @@ function CreateLabelCategoryDialog({
                 onChange={(url) => setForm((p) => ({ ...p, categoryPhotoUrl: url || null }))}
                 uploadSubDir="category"
                 oneImageOnly
-                hint="One image only. Replace or clear to change. JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
+                boxClassName={FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS}
+                boxSizePx={FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX}
+                hint="JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
               />
             </div>
           ) : null}
@@ -1147,7 +1158,7 @@ function CreateLabelCategoryDialog({
           </div>
         </div>
  
-        <DialogFooter className="shrink-0 gap-2 border-t border-gray-100 bg-background px-6 py-4 sm:flex-row sm:justify-end">
+        <DialogFooter className={FORM_DIALOG_FOOTER_CLASS}>
           <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
@@ -1446,15 +1457,15 @@ function EditLabelCategoryDialog({
  
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex h-[min(85vh,720px)] max-h-[90vh] w-[min(50%,calc(100vw-2rem))] max-w-none flex-col gap-0 overflow-hidden p-0 sm:max-w-none">
-        <DialogHeader className="shrink-0 space-y-2 px-6 pt-6 pr-14 pb-2 text-center sm:text-left">
+      <DialogContent className={FORM_DIALOG_CONTENT_CLASS} style={FORM_DIALOG_CONTENT_STYLE}>
+        <DialogHeader className={FORM_DIALOG_HEADER_CLASS}>
           <DialogTitle>Edit Label Category</DialogTitle>
           <DialogDescription>
             Update the label category details.
           </DialogDescription>
         </DialogHeader>
  
-        <div className="flex min-h-0 flex-1 flex-col overflow-y-auto overscroll-contain px-6 pb-4">
+        <div className={FORM_DIALOG_SCROLL_BODY_CLASS}>
           <div className="grid gap-4 py-2">
           <div className="grid grid-cols-2 gap-4">
             <div className="space-y-2">
@@ -1638,7 +1649,9 @@ function EditLabelCategoryDialog({
                 onChange={(url) => setForm((p) => ({ ...p, categoryPhotoUrl: url || null }))}
                 uploadSubDir="category"
                 oneImageOnly
-                hint="One image only. Replace or clear to change. JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
+                boxClassName={FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS}
+                boxSizePx={FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX}
+                hint="JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
               />
             </div>
           ) : null}
@@ -1660,7 +1673,7 @@ function EditLabelCategoryDialog({
           </div>
         </div>
  
-        <DialogFooter className="shrink-0 gap-2 border-t border-gray-100 bg-background px-6 py-4 sm:flex-row sm:justify-end">
+        <DialogFooter className={FORM_DIALOG_FOOTER_CLASS}>
           <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
@@ -49,6 +49,7 @@ import {
 } from '../../lib/nutritionManualEntry';
 import type { ProductDto } from '../../types/product';
 import type { LabelTypeDto } from '../../types/labelType';
+import { buildTemplateBarcodeQrDefaultsFromCodeValue } from '../../lib/productCodeValueTemplate';
  
 export type TemplateDataEntryRow = {
   id: string;
@@ -303,6 +304,29 @@ export function LabelTemplateDataEntryView({
     );
   }, []);
  
+  const applyProductCodeValueToRow = useCallback(
+    (rowId: string, productId: string) => {
+      const pid = productId.trim();
+      const product = products.find((p) => p.id === pid);
+      const cv = (product?.codeValue ?? '').trim();
+      const scanDefaults = buildTemplateBarcodeQrDefaultsFromCodeValue(
+        (templateDto?.elements ?? []) as LabelElement[],
+        cv,
+      );
+      setRows((prev) =>
+        prev.map((r) => {
+          if (r.id !== rowId) return r;
+          return {
+            ...r,
+            productId: pid,
+            fieldValues: { ...r.fieldValues, ...scanDefaults },
+          };
+        }),
+      );
+    },
+    [products, templateDto],
+  );
+
   const setFieldValue = useCallback(
     (rowId: string, elementId: string, value: string) => {
       setRows((prev) =>
@@ -488,7 +512,7 @@ export function LabelTemplateDataEntryView({
                   <TableCell className="align-top py-2">
                     <SearchableSelect
                       value={row.productId}
-                      onValueChange={(v) => updateRow(row.id, { productId: v })}
+                      onValueChange={(v) => applyProductCodeValueToRow(row.id, v)}
                       options={productOptions}
                       placeholder="Select product"
                       searchPlaceholder="Search product…"
@@ -18,41 +18,53 @@ import {
   SelectTrigger,
   SelectValue,
 } from '../../ui/select';
+import { normalizeBarcodeType, toJsBarcodeFormat } from '../../../lib/barcodeFormat';
  
-/** 真实条形码渲染（JsBarcode），支持水平/竖排 */
+/** 真实条形码渲染（JsBarcode），支持水平/竖排与制式 */
 function BarcodeBlock({
   data,
   width,
   height,
   showText,
   orientation = 'horizontal',
+  barcodeType,
+  fontSize = 14,
+  textAlign = 'center',
 }: {
   data: string;
   width: number;
   height: number;
   showText?: boolean;
   orientation?: 'horizontal' | 'vertical';
+  barcodeType?: unknown;
+  fontSize?: number;
+  textAlign?: 'left' | 'center' | 'right' | string;
 }) {
   const svgRef = useRef<SVGSVGElement>(null);
   const isVertical = orientation === 'vertical';
-  const barHeight = Math.max(20, (isVertical ? width : height) - (showText ? 14 : 4));
+  const labelReserve = showText !== false ? Math.max(12, Math.round(fontSize) + 4) : 4;
+  const barHeight = Math.max(20, (isVertical ? width : height) - labelReserve);
+  const jsFormat = toJsBarcodeFormat(barcodeType);
+  const align =
+    textAlign === 'right' ? 'flex-end' : textAlign === 'center' ? 'center' : 'flex-start';
   useEffect(() => {
     if (svgRef.current && data) {
       try {
         JsBarcode(svgRef.current, data, {
-          format: 'CODE128',
+          format: jsFormat,
           width: 1,
           height: barHeight,
           displayValue: showText !== false,
           margin: 2,
           fontOptions: '',
-          fontSize: 10,
+          fontSize: Math.max(8, Math.round(fontSize)),
+          textAlign: textAlign === 'right' ? 'right' : textAlign === 'center' ? 'center' : 'left',
         });
       } catch {
         // invalid data, ignore
       }
     }
-  }, [data, barHeight, showText]);
+  }, [data, barHeight, showText, jsFormat, fontSize, textAlign]);
   const svg = <svg ref={svgRef} className="w-full h-full min-h-0" style={{ maxHeight: isVertical ? width : height }} />;
   if (isVertical) {
     return (
@@ -68,12 +80,16 @@ function BarcodeBlock({
             justifyContent: 'center',
           }}
         >
-          {svg}
+          <div className="w-full min-h-0 flex flex-col" style={{ alignItems: align }}>{svg}</div>
         </div>
       </div>
     );
   }
-  return svg;
+  return (
+    <div className="w-full h-full flex flex-col justify-center" style={{ alignItems: align }}>
+      <div className="w-full min-h-0 flex flex-col" style={{ alignItems: align }}>{svg}</div>
+    </div>
+  );
 }
  
 /** 画布网格步长（px），控件吸附到该步长 */
@@ -606,13 +622,19 @@ function ElementContent({ el, isAppPrintField }: { el: LabelElement; isAppPrintF
     );
   }
  
-  // 条码（支持水平/竖排）
+  // 条码（支持水平/竖排、制式、字号与对齐）
   if (type === 'BARCODE') {
     const data = (cfg?.data as string) ?? '123456789';
     const showText = (cfg?.showText as boolean) !== false;
-    const orientation = ((cfg?.orientation as string) === 'vertical' ? 'vertical' : 'horizontal') as 'horizontal' | 'vertical';
+    const orientation = (
+      el.rotation === 'vertical' || (cfg?.orientation as string) === 'vertical'
+        ? 'vertical'
+        : 'horizontal'
+    ) as 'horizontal' | 'vertical';
+    const textAlign = (cfg?.textAlign as string) ?? 'center';
+    const fontSize = (cfg?.fontSize as number) ?? 14;
     return (
-      <div className="flex flex-col items-center justify-center w-full h-full overflow-hidden p-0.5">
+      <div className="flex flex-col w-full h-full overflow-hidden p-0.5">
         <div className="flex-1 w-full min-h-0 flex items-center justify-center">
           <BarcodeBlock
             data={data}
@@ -620,6 +642,9 @@ function ElementContent({ el, isAppPrintField }: { el: LabelElement; isAppPrintF
             height={el.height}
             showText={showText}
             orientation={orientation}
+            barcodeType={normalizeBarcodeType(cfg?.barcodeType)}
+            fontSize={fontSize}
+            textAlign={textAlign}
           />
         </div>
       </div>
@@ -29,6 +29,11 @@ import type { LabelMultipleOptionDto } from &#39;../../../types/labelMultipleOption&#39;
 import { getLabelMultipleOptions } from '../../../services/labelMultipleOptionService';
 import { Checkbox } from '../../ui/checkbox';
 import { Trash2 } from 'lucide-react';
+import {
+  BARCODE_FORMAT_OPTIONS,
+  DEFAULT_BARCODE_FORMAT,
+  normalizeBarcodeType,
+} from '../../../lib/barcodeFormat';
  
 const DATE_FORMAT_OPTIONS = [
   'DD/MM/YYYY',
@@ -525,28 +530,63 @@ function ElementConfigFields({
       return (
         <>
           <div>
-            <Label className="text-xs">Data</Label>
-            <Input
-              value={(cfg.data as string) ?? '123456789'}
-              onChange={(e) => update('data', e.target.value)}
-              className="h-8 text-sm mt-1"
-            />
-          </div>
-          <div>
-            <Label className="text-xs">Orientation</Label>
+            <Label className="text-xs">Barcode Format</Label>
             <Select
-              value={(cfg.orientation as string) ?? 'horizontal'}
-              onValueChange={(v) => update('orientation', v)}
+              value={normalizeBarcodeType(cfg.barcodeType ?? DEFAULT_BARCODE_FORMAT)}
+              onValueChange={(v) => update('barcodeType', v)}
             >
               <SelectTrigger className="h-8 text-sm mt-1">
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value="horizontal">Horizontal</SelectItem>
-                <SelectItem value="vertical">Vertical</SelectItem>
+                {BARCODE_FORMAT_OPTIONS.map((opt) => (
+                  <SelectItem key={opt.value} value={opt.value}>
+                    {opt.label}
+                  </SelectItem>
+                ))}
               </SelectContent>
             </Select>
           </div>
+          <div>
+            <Label className="text-xs">Data</Label>
+            <Input
+              value={(cfg.data as string) ?? '123456789'}
+              onChange={(e) => update('data', e.target.value)}
+              className="h-8 text-sm mt-1"
+            />
+          </div>
+          <div className="grid grid-cols-2 gap-2">
+            <div>
+              <Label className="text-xs">Font size</Label>
+              <Input
+                type="number"
+                min={8}
+                max={72}
+                value={(cfg.fontSize as number) ?? 14}
+                onChange={(e) => update('fontSize', Number(e.target.value) || 14)}
+                className="h-8 text-sm mt-1"
+              />
+            </div>
+            <div>
+              <Label className="text-xs">Text align</Label>
+              <Select
+                value={(cfg.textAlign as string) ?? 'center'}
+                onValueChange={(v) => update('textAlign', v)}
+              >
+                <SelectTrigger className="h-8 text-sm mt-1">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="left">Left</SelectItem>
+                  <SelectItem value="center">Center</SelectItem>
+                  <SelectItem value="right">Right</SelectItem>
+                </SelectContent>
+              </Select>
+            </div>
+          </div>
+          <p className="text-[10px] text-gray-400 -mt-1">
+            Rotation and border use the common fields above.
+          </p>
           <div className="flex items-center gap-2">
             <Switch
               checked={(cfg.showText as boolean) !== false}
@@ -129,13 +129,41 @@ function hydrateScopeFromLocationIds(
   return { regionNames, locationIds: lids };
 }
  
+function normalizeIdList(ids: string[] | null | undefined): string[] {
+  return [...new Set((ids ?? []).map((x) => String(x).trim()).filter(Boolean))];
+}
+
+function formatLocationLine(l: LocationDto): string {
+  const code = (l.locationCode ?? "").trim();
+  const name = (l.locationName ?? "").trim();
+  return code && name ? `${code} - ${name}` : name || code || l.id;
+}
+
+/** 按 locationIds 顺序解析门店；目录未命中时回退显示 Id */
+function linesFromLocationIds(locationIds: string[], catalog: LocationDto[]): string[] {
+  const ids = normalizeIdList(locationIds);
+  if (!ids.length) return [];
+  const byId = new Map(catalog.map((l) => [l.id, l]));
+  return ids.map((id) => {
+    const loc = byId.get(id);
+    return loc ? formatLocationLine(loc) : id;
+  });
+}
+
 function locationsForTypeScope(item: LabelTypeDto, catalog: LocationDto[]): LocationDto[] {
-  const idSet = new Set((item.locationIds ?? []).map((x) => String(x).trim()).filter(Boolean));
-  if (!idSet.size) return [];
-  return catalog.filter((l) => idSet.has(l.id));
+  const ids = normalizeIdList(item.locationIds);
+  if (!ids.length) return [];
+  const byId = new Map(catalog.map((l) => [l.id, l]));
+  return ids.map((id) => byId.get(id)).filter((l): l is LocationDto => !!l);
 }
  
 function typeRegionSummary(item: LabelTypeDto, catalog: LocationDto[]): string {
+  const ids = normalizeIdList(item.locationIds);
+  if (ids.length > 0) {
+    const matched = locationsForTypeScope(item, catalog);
+    const regions = [...new Set(matched.map((l) => (l.groupName ?? "").trim()).filter(Boolean))];
+    if (regions.length) return regions.join(", ");
+  }
   const apiRegion = (item.region ?? "").trim();
   if (apiRegion) return apiRegion;
   const matched = locationsForTypeScope(item, catalog);
@@ -145,15 +173,13 @@ function typeRegionSummary(item: LabelTypeDto, catalog: LocationDto[]): string {
 }
  
 function typeLocationLines(item: LabelTypeDto, catalog: LocationDto[]): string[] {
+  const fromIds = linesFromLocationIds(item.locationIds ?? [], catalog);
+  if (fromIds.length > 0) return fromIds;
   const apiLoc = (item.location ?? "").trim();
   if (apiLoc) return apiLoc.split(/\s*;\s*/).map((x) => x.trim()).filter(Boolean);
   const matched = locationsForTypeScope(item, catalog);
   if (!matched.length) return ["—"];
-  return matched.map((l) => {
-    const code = (l.locationCode ?? "").trim();
-    const name = (l.locationName ?? "").trim();
-    return code && name ? `${code} - ${name}` : name || code || l.id;
-  });
+  return matched.map(formatLocationLine);
 }
  
 async function enrichTypesWithLocationIds(
@@ -284,85 +310,6 @@ function LabelTypeScopeFields({
   );
 }
  
-async function fetchAllLabelTypesMatching(
-  keyword: string | undefined,
-  state: boolean | undefined,
-  signal: AbortSignal,
-): Promise<LabelTypeDto[]> {
-  const out: LabelTypeDto[] = [];
-  let page = 1;
-  const size = 500;
-  for (;;) {
-    const res = await getLabelTypes(
-      {
-        skipCount: skipCountForPage(page),
-        maxResultCount: size,
-        keyword,
-        state,
-      },
-      signal,
-    );
-    const items = res.items ?? [];
-    out.push(...items);
-    if (items.length < size) break;
-    page += 1;
-    if (page > 200) break;
-  }
-  return out;
-}
-
-/** 解析 Region / Location 筛选对应的门店 Id 列表；未筛选时返回 null */
-function resolveScopedLocationIds(
-  regionFilter: string,
-  locationFilter: string,
-  locationCatalog: LocationDto[],
-  filterGroups: GroupListItem[],
-): string[] | null {
-  if (regionFilter === "all" && locationFilter === "all") return null;
-  if (locationFilter !== "all") {
-    const lid = locationFilter.trim();
-    return lid ? [lid] : [];
-  }
-  const g = filterGroups.find((x) => x.id === regionFilter);
-  if (!g) return [];
-  const gn = (g.groupName ?? "").trim();
-  const pn = (g.partnerName ?? "").trim();
-  return locationCatalog
-    .filter((l) => (l.groupName ?? "").trim() === gn && (l.partner ?? "").trim() === pn)
-    .map((l) => l.id)
-    .filter(Boolean);
-}
-
-/** 在指定门店范围内，收集被标签引用的 LabelTypeId */
-async function fetchLabelTypeIdsInLocations(
-  locationIds: string[],
-  signal: AbortSignal,
-): Promise<Set<string>> {
-  const typeIds = new Set<string>();
-  for (const lid of locationIds) {
-    let page = 1;
-    for (;;) {
-      const res = await getLabels(
-        {
-          skipCount: skipCountForPage(page),
-          maxResultCount: 500,
-          locationId: lid,
-        },
-        signal,
-      );
-      for (const lbl of res.items ?? []) {
-        const tid = (lbl.labelTypeId ?? "").trim();
-        if (tid) typeIds.add(tid);
-      }
-      if ((res.items?.length ?? 0) < 500) break;
-      page += 1;
-      if (page > 50) break;
-    }
-    if (signal.aborted) break;
-  }
-  return typeIds;
-}
-
 export function LabelTypesView() {
   const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
   const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
@@ -480,43 +427,21 @@ export function LabelTypesView() {
         const skipCount = skipCountForPage(pageIndex);
         const stateBool = stateFilter === "all" ? undefined : stateFilter === "true";
         const kw = debouncedKeyword || undefined;
-        const needsClientFilter = regionFilter !== "all" || locationFilter !== "all";
-        const scopeLocationIds = resolveScopedLocationIds(
-          regionFilter,
-          locationFilter,
-          locationCatalog,
-          filterGroups,
+        const res = await getLabelTypes(
+          {
+            skipCount,
+            maxResultCount: pageSize,
+            keyword: kw,
+            state: stateBool,
+            groupId: regionFilter !== "all" ? regionFilter : undefined,
+            locationId: locationFilter !== "all" ? locationFilter : undefined,
+          },
+          ac.signal,
         );
-
-        if (!needsClientFilter) {
-          const res = await getLabelTypes(
-            {
-              skipCount,
-              maxResultCount: pageSize,
-              keyword: kw,
-              state: stateBool,
-              groupId: regionFilter !== "all" ? regionFilter : undefined,
-              locationId: locationFilter !== "all" ? locationFilter : undefined,
-            },
-            ac.signal,
-          );
-          const enriched = await enrichTypesWithLocationIds(res.items ?? [], ac.signal);
-          if (ac.signal.aborted) return;
-          setTypes(enriched);
-          setTotal(res.totalCount ?? 0);
-        } else {
-          const scopedTypeIds = scopeLocationIds?.length
-            ? await fetchLabelTypeIdsInLocations(scopeLocationIds, ac.signal)
-            : new Set<string>();
-          const all = await fetchAllLabelTypesMatching(kw, stateBool, ac.signal);
-          const filtered = all.filter((t) => scopedTypeIds.has(t.id));
-          setTotal(filtered.length);
-          const start = (pageIndex - 1) * pageSize;
-          const pageItems = filtered.slice(start, start + pageSize);
-          const enriched = await enrichTypesWithLocationIds(pageItems, ac.signal);
-          if (ac.signal.aborted) return;
-          setTypes(enriched);
-        }
+        const enriched = await enrichTypesWithLocationIds(res.items ?? [], ac.signal);
+        if (ac.signal.aborted) return;
+        setTypes(enriched);
+        setTotal(res.totalCount ?? 0);
       } catch (e: any) {
         if (e?.name === "AbortError") return;
         toast.error("Failed to load label types.", {
@@ -659,6 +584,7 @@ export function LabelTypesView() {
                 types.map((item) => {
                   const regionText = typeRegionSummary(item, locationCatalog);
                   const locLines = typeLocationLines(item, locationCatalog);
+                  const locText = locLines.join(", ");
                   return (
                   <TableRow key={item.id} className="hover:bg-gray-50">
                     <TableCell className="text-sm font-normal text-gray-900 whitespace-nowrap">
@@ -670,14 +596,11 @@ export function LabelTypesView() {
                     >
                       {regionText}
                     </TableCell>
-                    <TableCell className="text-sm font-normal text-gray-900 max-w-[260px]">
-                      <div className="flex flex-col gap-1">
-                        {locLines.map((line, idx) => (
-                          <div key={idx} className="truncate whitespace-nowrap" title={line}>
-                            {line}
-                          </div>
-                        ))}
-                      </div>
+                    <TableCell
+                      className="text-sm font-normal text-gray-900 max-w-[260px] truncate whitespace-nowrap"
+                      title={locText}
+                    >
+                      {locText}
                     </TableCell>
                     <TableCell className="text-sm font-normal text-gray-900 tabular-nums whitespace-nowrap">
                       {typeof item.noOfLabels === "number" && Number.isFinite(item.noOfLabels)
@@ -71,6 +71,7 @@ import {
   dataEntryColumnLabel,
   isDataEntryTableColumnElement,
   isDateTimeDataEntryField,
+  isTemplateSectionPersistedType,
   labelElementsToApiPayload,
   sortTemplateElementsForDisplay,
 } from "../../types/labelTemplate";
@@ -89,6 +90,10 @@ import {
   nutritionManualValuesFromTemplateConfig,
   type NutritionManualFieldSpec,
 } from "../../lib/nutritionManualEntry";
+import {
+  applyProductCodeValueToLabelElements,
+  buildTemplateBarcodeQrDefaultsFromCodeValue,
+} from "../../lib/productCodeValueTemplate";
  
 function toDisplay(v: string | null | undefined): string {
   const s = (v ?? "").trim();
@@ -195,6 +200,7 @@ function buildCreateLabelPreviewTemplate(
   textValues: Record<string, string>,
   dateOffsets: Record<string, { unit: string; value: string }>,
   nutritionByElementId: Record<string, Record<string, string>>,
+  productCodeValue?: string | null,
 ): LabelTemplate | null {
   if (!apiTpl) return null;
   const tmpl = dtoToEditorTemplate(apiTpl);
@@ -246,6 +252,7 @@ function buildCreateLabelPreviewTemplate(
     const merged = mergeNutritionManualIntoConfig({ ...(el.config as Record<string, unknown>) }, manual);
     el.config = merged as LabelElement["config"];
   }
+  tmpl.elements = applyProductCodeValueToLabelElements(tmpl.elements, productCodeValue);
   return tmpl;
 }
  
@@ -254,6 +261,7 @@ function collectTemplateDefaultValuesForSave(
   textValues: Record<string, string>,
   dateOffsets: Record<string, { unit: string; value: string }>,
   nutritionByElementId: Record<string, Record<string, string>>,
+  productCodeValue?: string | null,
 ): Record<string, string> {
   const out: Record<string, string> = {};
   for (const el of getDataEntryElements(latest)) {
@@ -279,6 +287,13 @@ function collectTemplateDefaultValuesForSave(
     const j = nutritionDefaultValuesJsonForSave(manual);
     if (j) out[nel.id] = j;
   }
+  Object.assign(
+    out,
+    buildTemplateBarcodeQrDefaultsFromCodeValue(
+      (latest.elements ?? []) as LabelElement[],
+      productCodeValue,
+    ),
+  );
   return out;
 }
  
@@ -1506,11 +1521,18 @@ function CreateLabelDialog({
         listNutritionElements((latest.elements ?? []) as LabelElement[]).length > 0;
       if (dataEls.length === 0 && !hasNutritionRows) return;
  
+      const productCodeValue = (() => {
+        const pid = form.productIds[0]?.trim();
+        if (!pid) return "";
+        const p = productsScoped.find((x) => x.id === pid);
+        return (p?.codeValue ?? "").trim();
+      })();
       const inputDefaultValues = collectTemplateDefaultValuesForSave(
         latest,
         templateDataValues,
         templateDateOffsets,
         nutritionByElementId,
+        productCodeValue,
       );
       const defaultsMap = buildTemplateDefaultsMap(latest);
       for (const productId of form.productIds) {
@@ -1657,6 +1679,32 @@ function CreateLabelDialog({
   const showTemplateInputColumn =
     dataEntryElements.length > 0 || nutritionFieldBlocks.length > 0;
  
+  const selectedProductCodeValue = useMemo(() => {
+    const pid = (form.productIds[0] ?? "").trim();
+    if (!pid) return "";
+    const p = productsScoped.find((x) => x.id === pid);
+    return (p?.codeValue ?? "").trim();
+  }, [form.productIds, productsScoped]);
+
+  useEffect(() => {
+    if (!open || !selectedTemplate) return;
+    const cv = selectedProductCodeValue;
+    if (!cv) return;
+    setTemplateDataValues((prev) => {
+      let changed = false;
+      const next = { ...prev };
+      for (const el of getDataEntryElements(selectedTemplate)) {
+        const t = canonicalElementType(el.type);
+        if (t !== "BARCODE" && t !== "QRCODE") continue;
+        if (isTemplateSectionPersistedType(el)) continue;
+        if (next[el.id] === cv) continue;
+        next[el.id] = cv;
+        changed = true;
+      }
+      return changed ? next : prev;
+    });
+  }, [open, selectedTemplate, selectedProductCodeValue]);
+
   const previewTemplate = useMemo(
     () =>
       buildCreateLabelPreviewTemplate(
@@ -1664,8 +1712,15 @@ function CreateLabelDialog({
         templateDataValues,
         templateDateOffsets,
         nutritionByElementId,
+        selectedProductCodeValue,
       ),
-    [selectedTemplate, templateDataValues, templateDateOffsets, nutritionByElementId],
+    [
+      selectedTemplate,
+      templateDataValues,
+      templateDateOffsets,
+      nutritionByElementId,
+      selectedProductCodeValue,
+    ],
   );
   const hasTemplateSelected = form.templateCode.trim().length > 0;
  
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { 
   Search, 
   Plus, 
@@ -55,6 +55,7 @@ import { Switch } from &quot;../ui/switch&quot;;
 import { Badge } from "../ui/badge";
 import { Checkbox } from "../ui/checkbox";
 import { ScrollArea } from "../ui/scroll-area";
+import { SearchableMultiSelect } from "../ui/searchable-multi-select";
 import { cn } from "../ui/utils";
 import { toast } from "sonner";
  
@@ -97,6 +98,7 @@ import { BatchImportDialog } from &quot;../bulk/batch-import-dialog&quot;;
 import { TeamMemberBulkEditPage } from "./team-member-bulk-edit-page";
 import { useAuth } from "../auth/AuthProvider";
 import { canMutateAccountManagementStructure } from "../../lib/accountManagementAccess";
+import { skipCountForPage } from "../../lib/paginationQuery";
  
 function listStateFromFilter(v: "all" | "active" | "inactive"): boolean | undefined {
   if (v === "all") return undefined;
@@ -169,6 +171,11 @@ async function loadAllLocationsForMemberFilter(signal?: AbortSignal): Promise&lt;Lo
 }
  
 /** 成员是否至少绑定在 scope 允许的门店之一（仅前端 company/region 筛选用） */
+/** 门店 Id 比较（忽略大小写与首尾空格） */
+function normLocationId(id: string | null | undefined): string {
+  return String(id ?? "").trim().toLowerCase();
+}
+
 function memberMatchesLocationScope(m: TeamMemberDto, allowedLocationIds: Set<string> | null): boolean {
   if (allowedLocationIds === null) return true;
   if (allowedLocationIds.size === 0) return false;
@@ -2719,21 +2726,26 @@ function MemberDialog({
   const [roleId, setRoleId] = useState("");
   const [state, setState] = useState(true);
   const [selectedLocationIds, setSelectedLocationIds] = useState<Set<string>>(new Set());
-  /** 绑定公司 / 区域（单选；接口对接前仅前端状态与门店范围联动） */
+  const [selectedRegionIds, setSelectedRegionIds] = useState<Set<string>>(new Set());
+  /** 绑定公司（单选）/ Region（多选，fl_group.Id） */
   const [companyId, setCompanyId] = useState("");
-  const [regionId, setRegionId] = useState("");
  
   const [roleOptions, setRoleOptions] = useState<RoleDto[]>([]);
   const [loadingRoles, setLoadingRoles] = useState(false);
  
   const [locationOptions, setLocationOptions] = useState<LocationDto[]>([]);
+  const [scopedLocationOptions, setScopedLocationOptions] = useState<LocationDto[]>([]);
   const [loadingLocations, setLoadingLocations] = useState(false);
+  const [loadingScopedLocations, setLoadingScopedLocations] = useState(false);
   const [partnerOptions, setPartnerOptions] = useState<PartnerListItem[]>([]);
   const [groupOptionsAll, setGroupOptionsAll] = useState<GroupListItem[]>([]);
   const [loadingPartnersGroups, setLoadingPartnersGroups] = useState(false);
   const [locationKeyword, setLocationKeyword] = useState("");
  
   const abortRef = useRef<AbortController | null>(null);
+  /** 编辑详情里的已分配 Region / 门店 Id，scoped 列表加载完成后用于恢复勾选 */
+  const assignedRegionIdsRef = useRef<string[]>([]);
+  const assignedLocationIdsRef = useRef<string[]>([]);
  
   const resetForm = () => {
     setFullName("");
@@ -2744,8 +2756,11 @@ function MemberDialog({
     setRoleId("");
     setState(true);
     setSelectedLocationIds(new Set());
+    setSelectedRegionIds(new Set());
     setCompanyId("");
-    setRegionId("");
+    setScopedLocationOptions([]);
+    assignedRegionIdsRef.current = [];
+    assignedLocationIdsRef.current = [];
   };
  
   const loadAllRolesForSelect = async (signal: AbortSignal) => {
@@ -2767,20 +2782,89 @@ function MemberDialog({
  
   const loadAllLocationsForSelect = async (signal: AbortSignal) => {
     const out: LocationDto[] = [];
-    let skip = 0;
+    let page = 1;
     const size = 200;
     for (;;) {
-      const res = await getLocations({ skipCount: skip, maxResultCount: size }, signal);
+      const res = await getLocations({ skipCount: skipCountForPage(page), maxResultCount: size }, signal);
       out.push(...(res.items ?? []));
       if (!res.items || res.items.length < size) break;
-      skip += size;
-      if (skip > 40000) break;
+      page += 1;
+      if (page > 200) break;
+    }
+    const m = new Map<string, LocationDto>();
+    for (const l of out) if (l.id && !m.has(l.id)) m.set(l.id, l);
+    return Array.from(m.values());
+  };
+
+  /** 按 Company + Region 调门店列表接口（与列表页筛选一致），保证该区域下全部门店都出现在勾选项 */
+  const fetchLocationsPaged = async (
+    query: { partner?: string; groupName?: string },
+    signal: AbortSignal,
+  ): Promise<LocationDto[]> => {
+    const out: LocationDto[] = [];
+    let page = 1;
+    const size = 500;
+    for (;;) {
+      const res = await getLocations(
+        {
+          skipCount: skipCountForPage(page),
+          maxResultCount: size,
+          partner: query.partner,
+          groupName: query.groupName,
+        },
+        signal,
+      );
+      out.push(...(res.items ?? []));
+      if (!res.items || res.items.length < size) break;
+      page += 1;
+      if (page > 200) break;
     }
     const m = new Map<string, LocationDto>();
     for (const l of out) if (l.id && !m.has(l.id)) m.set(l.id, l);
     return Array.from(m.values());
   };
  
+  /** 按 Company + Region 拉门店；partner 名不一致时仅用 groupName 兜底 */
+  const loadScopedLocationsForPicker = async (
+    partnerName: string,
+    groupName: string,
+    signal: AbortSignal,
+  ): Promise<LocationDto[]> => {
+    const withPartner = await fetchLocationsPaged(
+      { partner: partnerName || undefined, groupName: groupName || undefined },
+      signal,
+    );
+    if (!groupName.trim()) return withPartner;
+    if (withPartner.length > 1 || !partnerName.trim()) return withPartner;
+    const byGroupOnly = await fetchLocationsPaged({ groupName }, signal);
+    if (byGroupOnly.length <= withPartner.length) return withPartner;
+    const merged = new Map<string, LocationDto>();
+    for (const l of [...withPartner, ...byGroupOnly]) {
+      if (l.id) merged.set(l.id, l);
+    }
+    return Array.from(merged.values());
+  };
+
+  /** 多选 Region：合并各 Region 下门店列表 */
+  const loadScopedLocationsForRegions = async (
+    partnerName: string,
+    regions: GroupListItem[],
+    signal: AbortSignal,
+  ): Promise<LocationDto[]> => {
+    const merged = new Map<string, LocationDto>();
+    for (const g of regions) {
+      const gn = (g.groupName ?? "").trim();
+      if (!gn) continue;
+      const scoped = await loadScopedLocationsForPicker(partnerName, gn, signal);
+      for (const l of scoped) {
+        const id = String(l.id ?? "").trim();
+        if (id) merged.set(id, l);
+      }
+      if (signal.aborted) break;
+    }
+    return Array.from(merged.values());
+  };
+
   useEffect(() => {
     if (!open) return;
     abortRef.current?.abort();
@@ -2827,20 +2911,25 @@ function MemberDialog({
           setRoleId(nextRoleId);
           setState(!!detail.state);
  
-          const optionIds = new Set(
-            locationsRes.map((l) => String(l.id ?? "").trim()).filter(Boolean),
-          );
+          const catalogIdByNorm = new Map<string, string>();
+          for (const l of locationsRes) {
+            const id = String(l.id ?? "").trim();
+            if (!id) continue;
+            catalogIdByNorm.set(normLocationId(id), id);
+          }
           const rawIds = (detail.locationIds ?? [])
             .map((x) => String(x).trim())
             .filter(Boolean);
-          const matchedFromIds = new Set<string>();
+          assignedLocationIdsRef.current = rawIds;
+          const resolvedIds = new Set<string>();
           for (const id of rawIds) {
-            if (optionIds.has(id)) matchedFromIds.add(id);
+            const hit = catalogIdByNorm.get(normLocationId(id));
+            resolvedIds.add(hit ?? id);
           }
           let assignedIds = new Set<string>();
-          if (matchedFromIds.size > 0) {
-            setSelectedLocationIds(matchedFromIds);
-            assignedIds = matchedFromIds;
+          if (resolvedIds.size > 0) {
+            setSelectedLocationIds(resolvedIds);
+            assignedIds = resolvedIds;
           } else if (detail.locations?.length) {
             // 如果后端只返回 locations（名字），则尽力映射回 id
             const labels = new Set(detail.locations);
@@ -2851,32 +2940,45 @@ function MemberDialog({
               const label3 = (l.locationCode ?? "").trim();
               if (labels.has(label1) || labels.has(label2) || labels.has(label3)) inferred.add(l.id);
             }
+            assignedLocationIdsRef.current = [...inferred];
             setSelectedLocationIds(inferred);
             assignedIds = inferred;
+          } else {
+            assignedLocationIdsRef.current = [];
           }
  
-          let nextCompany = String(detail.partnerId ?? "").trim();
-          let nextRegion = String(detail.groupId ?? "").trim();
-          if ((!nextCompany || !nextRegion) && assignedIds.size > 0) {
+          const rawRegionIds = [
+            ...(detail.regionIds ?? []),
+            ...(detail.groupIds ?? []),
+          ]
+            .map((x) => String(x).trim())
+            .filter(Boolean);
+          if (detail.groupId?.trim() && !rawRegionIds.includes(detail.groupId.trim())) {
+            rawRegionIds.push(detail.groupId.trim());
+          }
+          const regionIdSet = new Set(rawRegionIds);
+          assignedRegionIdsRef.current = [...regionIdSet];
+          setSelectedRegionIds(regionIdSet);
+
+          let nextCompany = String(
+            detail.partnerId ?? detail.partnerIds?.[0] ?? "",
+          ).trim();
+          if (!nextCompany && assignedIds.size > 0) {
             const firstId = [...assignedIds][0];
             const loc0 = locationsRes.find((l) => l.id === firstId);
             if (loc0) {
               const pn = (loc0.partner ?? "").trim();
-              const gn = (loc0.groupName ?? "").trim();
-              if (!nextCompany && pn) {
+              if (pn) {
                 const p = partnersRes.find((x) => (x.partnerName ?? "").trim() === pn);
                 if (p) nextCompany = p.id;
               }
-              if (!nextRegion && gn && nextCompany) {
-                const g = groupsRes.find(
-                  (x) => (x.groupName ?? "").trim() === gn && x.partnerId === nextCompany,
-                );
-                if (g) nextRegion = g.id;
-              }
             }
           }
+          if (!nextCompany && regionIdSet.size > 0) {
+            const g0 = groupsRes.find((g) => regionIdSet.has(g.id));
+            if (g0?.partnerId) nextCompany = g0.partnerId;
+          }
           setCompanyId(nextCompany);
-          setRegionId(nextRegion);
         }
       } catch (e: any) {
         if (e?.name !== "AbortError") {
@@ -2901,45 +3003,164 @@ function MemberDialog({
     [partnerOptions, companyId],
   );
  
-  const selectedGroupForScope = useMemo(
-    () => groupOptionsAll.find((g) => g.id === regionId) ?? null,
-    [groupOptionsAll, regionId],
-  );
-
   const regionSelectOptions = useMemo(
     () => groupOptionsAll.filter((g) => g.partnerId === companyId),
     [groupOptionsAll, companyId],
   );
  
+  const regionMultiSelectOptions = useMemo(
+    () =>
+      regionSelectOptions.map((g) => ({
+        value: g.id,
+        label: (g.groupName ?? "").trim() || g.id,
+      })),
+    [regionSelectOptions],
+  );
+
+  const selectedRegionsForScope = useMemo(
+    () => regionSelectOptions.filter((g) => selectedRegionIds.has(g.id)),
+    [regionSelectOptions, selectedRegionIds],
+  );
+
   const locationsForMemberPicker = useMemo(() => {
-    if (!companyId.trim() || !regionId.trim()) return [];
+    if (!companyId.trim() || selectedRegionIds.size === 0) return [];
+    return scopedLocationOptions;
+  }, [companyId, selectedRegionIds, scopedLocationOptions]);
+
+  useEffect(() => {
+    if (!open) return;
+    if (!companyId.trim() || selectedRegionIds.size === 0) {
+      setScopedLocationOptions([]);
+      return;
+    }
     const p = selectedPartnerForScope;
-    const g = selectedGroupForScope;
-    if (!p || !g || g.partnerId !== companyId) return [];
+    if (!p) {
+      setScopedLocationOptions([]);
+      return;
+    }
     const pn = (p.partnerName ?? "").trim();
-    const gn = (g.groupName ?? "").trim();
-    return locationOptions.filter(
-      (l) => (l.partner ?? "").trim() === pn && (l.groupName ?? "").trim() === gn,
-    );
-  }, [companyId, regionId, locationOptions, selectedPartnerForScope, selectedGroupForScope]);
+    if (!pn || selectedRegionsForScope.length === 0) {
+      setScopedLocationOptions([]);
+      return;
+    }
+
+    const ac = new AbortController();
+    setLoadingScopedLocations(true);
+    (async () => {
+      try {
+        const scoped = await loadScopedLocationsForRegions(pn, selectedRegionsForScope, ac.signal);
+        const merged = new Map<string, LocationDto>();
+        for (const l of scoped) {
+          const id = String(l.id ?? "").trim();
+          if (id) merged.set(id, l);
+        }
+        const catalogByNorm = new Map(
+          locationOptions.map((l) => [normLocationId(l.id), l] as const),
+        );
+        const idsToEnsure = [
+          ...assignedLocationIdsRef.current,
+          ...Array.from(selectedLocationIds),
+        ];
+        for (const rawId of idsToEnsure) {
+          const hit = catalogByNorm.get(normLocationId(rawId));
+          if (!hit) continue;
+          const id = String(hit.id ?? "").trim();
+          if (id && !merged.has(id)) merged.set(id, hit);
+        }
+        setScopedLocationOptions(Array.from(merged.values()));
+
+        if (assignedRegionIdsRef.current.length > 0) {
+          const nextRegions = new Set<string>();
+          for (const rawId of assignedRegionIdsRef.current) {
+            const hit = regionSelectOptions.find((g) => g.id === rawId);
+            if (hit) nextRegions.add(hit.id);
+          }
+          setSelectedRegionIds(nextRegions);
+          assignedRegionIdsRef.current = [];
+        }
+
+        if (assignedLocationIdsRef.current.length > 0) {
+          const nextSelected = new Set<string>();
+          for (const rawId of assignedLocationIdsRef.current) {
+            const hit = catalogByNorm.get(normLocationId(rawId));
+            nextSelected.add(hit?.id ?? rawId);
+          }
+          setSelectedLocationIds(nextSelected);
+          assignedLocationIdsRef.current = [];
+        }
+      } catch (e: unknown) {
+        if ((e as { name?: string })?.name !== "AbortError") {
+          setScopedLocationOptions([]);
+        }
+      } finally {
+        if (!ac.signal.aborted) setLoadingScopedLocations(false);
+      }
+    })();
+
+    return () => ac.abort();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open, companyId, selectedRegionIds, selectedPartnerForScope, selectedRegionsForScope, locationOptions]);
  
   useEffect(() => {
     if (!open) return;
-    const allowed = new Set(locationsForMemberPicker.map((l) => String(l.id ?? "").trim()).filter(Boolean));
+    if (loadingLocations || loadingScopedLocations) return;
+    if (!companyId.trim() || selectedRegionIds.size === 0) return;
+    const allowedRegionIds = new Set(regionSelectOptions.map((g) => g.id));
+    setSelectedRegionIds((prev) => {
+      const next = new Set([...prev].filter((id) => allowedRegionIds.has(id)));
+      if (next.size === prev.size && [...next].every((id) => prev.has(id))) return prev;
+      return next;
+    });
+  }, [open, companyId, regionSelectOptions, loadingLocations, loadingScopedLocations]);
+
+  useEffect(() => {
+    if (!open) return;
+    if (loadingLocations || loadingScopedLocations) return;
+    if (!companyId.trim() || selectedRegionIds.size === 0) return;
+    if (locationsForMemberPicker.length === 0) return;
+
+    const allowedNorm = new Set(
+      locationsForMemberPicker.map((l) => normLocationId(l.id)).filter(Boolean),
+    );
     setSelectedLocationIds((prev) => {
-      const next = new Set([...prev].filter((id) => allowed.has(id)));
+      const next = new Set(
+        [...prev].filter((id) => allowedNorm.has(normLocationId(id))),
+      );
       if (next.size === prev.size && [...next].every((id) => prev.has(id))) return prev;
       return next;
     });
-  }, [open, locationsForMemberPicker]);
+  }, [
+    open,
+    companyId,
+    selectedRegionIds,
+    locationsForMemberPicker,
+    loadingLocations,
+    loadingScopedLocations,
+  ]);
+
+  const selectedRegionIdsForSubmit = useMemo(
+    () =>
+      regionSelectOptions
+        .map((g) => g.id)
+        .filter((id) => selectedRegionIds.has(id)),
+    [regionSelectOptions, selectedRegionIds],
+  );
  
   const selectedLocationIdsForSubmit = useMemo(() => {
-    const allowed = new Set(
-      locationsForMemberPicker.map((l) => String(l.id ?? "").trim()).filter(Boolean),
+    const allowedNorm = new Set(
+      locationsForMemberPicker.map((l) => normLocationId(l.id)).filter(Boolean),
     );
-    return Array.from(selectedLocationIds).filter((id) => allowed.has(id));
+    return Array.from(selectedLocationIds).filter((id) => allowedNorm.has(normLocationId(id)));
   }, [locationsForMemberPicker, selectedLocationIds]);
  
+  const isLocationSelected = useCallback(
+    (locId: string) => {
+      const n = normLocationId(locId);
+      return [...selectedLocationIds].some((id) => normLocationId(id) === n);
+    },
+    [selectedLocationIds],
+  );
+
   // Same as create: Save enabled when required fields are filled; empty values show error on submit.
   const canSubmit = useMemo(() => {
     if (!fullName.trim()) return false;
@@ -2948,7 +3169,7 @@ function MemberDialog({
     if (!String(phone ?? "").trim()) return false;
     if (!roleId.trim()) return false;
     if (!companyId.trim()) return false;
-    if (!regionId.trim()) return false;
+    if (selectedRegionIdsForSubmit.length === 0) return false;
     if (selectedLocationIdsForSubmit.length === 0) return false;
     if (!isEdit && !password.trim()) return false;
     return true;
@@ -2959,17 +3180,23 @@ function MemberDialog({
     phone,
     roleId,
     companyId,
-    regionId,
+    selectedRegionIdsForSubmit,
     selectedLocationIdsForSubmit,
     isEdit,
     password,
   ]);
  
   const toggleLocation = (id: string, checked: boolean) => {
+    const n = normLocationId(id);
     setSelectedLocationIds((prev) => {
       const next = new Set(prev);
-      if (checked) next.add(id);
-      else next.delete(id);
+      if (checked) {
+        next.add(id);
+      } else {
+        for (const x of prev) {
+          if (normLocationId(x) === n) next.delete(x);
+        }
+      }
       return next;
     });
   };
@@ -2982,14 +3209,14 @@ function MemberDialog({
   const allLocationsSelected = useMemo(
     () =>
       allLocationIdsForToggle.length > 0 &&
-      allLocationIdsForToggle.every((id) => selectedLocationIds.has(id)),
-    [allLocationIdsForToggle, selectedLocationIds],
+      allLocationIdsForToggle.every((id) => isLocationSelected(id)),
+    [allLocationIdsForToggle, isLocationSelected],
   );
  
   const someLocationsSelected = useMemo(
     () =>
-      allLocationIdsForToggle.some((id) => selectedLocationIds.has(id)) && !allLocationsSelected,
-    [allLocationIdsForToggle, selectedLocationIds, allLocationsSelected],
+      allLocationIdsForToggle.some((id) => isLocationSelected(id)) && !allLocationsSelected,
+    [allLocationIdsForToggle, isLocationSelected, allLocationsSelected],
   );
  
   const toggleAllLocations = (checked: boolean) => {
@@ -3018,7 +3245,7 @@ function MemberDialog({
       if (!String(phone ?? "").trim()) missing.push("Phone");
       if (!roleId.trim()) missing.push("Role");
       if (!companyId.trim()) missing.push("Company");
-      if (!regionId.trim()) missing.push("Region");
+      if (selectedRegionIdsForSubmit.length === 0) missing.push("Region");
       if (selectedLocationIdsForSubmit.length === 0) missing.push("Locations");
       if (!isEdit && !password.trim()) missing.push("Password");
       toast.error("Missing required fields.", {
@@ -3032,7 +3259,9 @@ function MemberDialog({
       setSubmitting(true);
       try {
         const locationIds = selectedLocationIdsForSubmit;
-        console.log("[MemberDialog] Creating user", { fullName, userName, roleId, locationIds });
+        const regionIds = selectedRegionIdsForSubmit;
+        const partnerId = companyId.trim();
+        console.log("[MemberDialog] Creating user", { fullName, userName, roleId, partnerId, regionIds, locationIds });
         await createTeamMember({
           fullName: fullName.trim(),
           userName: userName.trim(),
@@ -3040,6 +3269,8 @@ function MemberDialog({
           email: email.trim(),
           phone: String(phone).trim(),
           roleId: roleId.trim(),
+          partnerId,
+          regionIds,
           locationIds,
           state,
         });
@@ -3059,7 +3290,9 @@ function MemberDialog({
       setSubmitting(true);
       try {
         const locationIds = selectedLocationIdsForSubmit;
-        console.log("[MemberDialog] Updating user", { id: member.id, fullName, userName, roleId, locationIds });
+        const regionIds = selectedRegionIdsForSubmit;
+        const partnerId = companyId.trim();
+        console.log("[MemberDialog] Updating user", { id: member.id, fullName, userName, roleId, partnerId, regionIds, locationIds });
         await updateTeamMember(member.id, {
           fullName: fullName.trim(),
           userName: userName.trim(),
@@ -3067,6 +3300,8 @@ function MemberDialog({
           email: email.trim(),
           phone: String(phone).trim(),
           roleId: roleId.trim(),
+          partnerId,
+          regionIds,
           locationIds,
           state,
         });
@@ -3108,8 +3343,8 @@ function MemberDialog({
         <DialogHeader>
           <DialogTitle>{isEdit ? "Edit User" : "New User"}</DialogTitle>
           <DialogDescription>
-            Company and Region are single-select and scope which locations you can assign; Locations is
-            multi-select.
+            Company is single-select; Region and Locations are multi-select and determine which stores you
+            can assign.
           </DialogDescription>
         </DialogHeader>
  
@@ -3196,7 +3431,9 @@ function MemberDialog({
                 onValueChange={(v) => {
                   const next = (v && v.trim()) ? v.trim() : "";
                   setCompanyId(next);
-                  setRegionId("");
+                  setSelectedRegionIds(new Set());
+                  setSelectedLocationIds(new Set());
+                  setScopedLocationOptions([]);
                 }}
                 disabled={loadingRoles || loadingPartnersGroups}
               >
@@ -3218,30 +3455,23 @@ function MemberDialog({
             </div>
             <div className="space-y-2">
               <Label>Region *</Label>
-              <Select
-                value={regionId ? regionId : ""}
-                onValueChange={(v) => setRegionId((v && v.trim()) ? v.trim() : "")}
+              <SearchableMultiSelect
+                values={selectedRegionIdsForSubmit}
+                onValuesChange={(next) => setSelectedRegionIds(new Set(next))}
+                options={regionMultiSelectOptions}
+                placeholder={
+                  !companyId.trim()
+                    ? "Select company first"
+                    : loadingPartnersGroups
+                      ? "Loading regions..."
+                      : "Select region(s)…"
+                }
+                searchPlaceholder="Search regions…"
+                emptyText="No regions for this company."
+                selectAllRowLabel="ALL"
                 disabled={loadingRoles || loadingPartnersGroups || !companyId.trim()}
-              >
-                <SelectTrigger className="h-10 rounded-md border border-gray-200 bg-white">
-                  <SelectValue
-                    placeholder={
-                      !companyId.trim()
-                        ? "Select company first"
-                        : loadingPartnersGroups
-                          ? "Loading regions..."
-                          : "Select region"
-                    }
-                  />
-                </SelectTrigger>
-                <SelectContent>
-                  {regionSelectOptions.map((g) => (
-                    <SelectItem key={g.id} value={g.id}>
-                      {(g.groupName ?? "").trim() || g.id}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
+                className="h-10 rounded-md border border-gray-200 bg-white"
+              />
             </div>
           </div>
  
@@ -3260,11 +3490,11 @@ function MemberDialog({
             </div>
             <ScrollArea className="h-[180px] w-full border rounded-md p-2">
               <div className="space-y-2">
-                {loadingLocations ? (
+                {loadingLocations || loadingScopedLocations ? (
                   <div className="text-sm text-gray-500 py-2">Loading...</div>
-                ) : !companyId.trim() || !regionId.trim() ? (
+                ) : !companyId.trim() || selectedRegionIds.size === 0 ? (
                   <div className="text-sm text-gray-500 py-2">
-                    Please select company and region to see locations for assignment.
+                    Please select company and at least one region to see locations for assignment.
                   </div>
                 ) : (
                   <>
@@ -3298,7 +3528,7 @@ function MemberDialog({
                       <div key={l.id} className="flex items-center space-x-2">
                         <Checkbox
                           id={`loc-${l.id}`}
-                          checked={selectedLocationIds.has(l.id)}
+                          checked={isLocationSelected(l.id)}
                           onCheckedChange={(v) => toggleLocation(l.id, !!v)}
                         />
                         <label htmlFor={`loc-${l.id}`} className="text-sm cursor-pointer w-full hover:bg-gray-50 p-1 rounded">
@@ -8,6 +8,7 @@ import {
   MoreHorizontal,
   Package,
   Trash2,
+  Barcode,
 } from "lucide-react";
 import { Button } from "../ui/button";
 import { Checkbox } from "../ui/checkbox";
@@ -56,6 +57,15 @@ import {
   tokensFromSelection,
   visualInputFromAppearanceAndValueArray,
 } from "../../lib/categoryButtonAppearance";
+import {
+  FORM_DIALOG_CONTENT_CLASS,
+  FORM_DIALOG_CONTENT_STYLE,
+  FORM_DIALOG_FOOTER_CLASS,
+  FORM_DIALOG_HEADER_CLASS,
+  FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS,
+  FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX,
+  FORM_DIALOG_SCROLL_BODY_CLASS,
+} from "../../lib/formDialogLayout";
 import { getLocations } from "../../services/locationService";
 import { getPartners } from "../../services/partnerService";
 import { getGroups } from "../../services/groupService";
@@ -1324,6 +1334,9 @@ function ProductFormDialog({
   locationMap: Map<string, string[]>;
   onSaved: () => void;
 }) {
+  const DISPLAY_TEXT_MAX = 7;
+  const clampDisplayText = (s: string) => String(s ?? "").slice(0, DISPLAY_TEXT_MAX);
+
   const [submitting, setSubmitting] = useState(false);
   const [initLoading, setInitLoading] = useState(false);
   const [scopeLoading, setScopeLoading] = useState(false);
@@ -1332,12 +1345,88 @@ function ProductFormDialog({
   const [partnerId, setPartnerId] = useState("");
   const [groupId, setGroupId] = useState("");
   const [categoryId, setCategoryId] = useState("");
-  const [productImageUrl, setProductImageUrl] = useState("");
+  const [displayText, setDisplayText] = useState("");
+  const [apSel, setApSel] = useState({ text: true, color: false, image: false });
+  const [buttonBgColor, setButtonBgColor] = useState("");
+  const [buttonImageUrl, setButtonImageUrl] = useState("");
+  const [codeValue, setCodeValue] = useState("");
   const [state, setState] = useState(true);
   const [locationIds, setLocationIds] = useState<string[]>([]);
   const [scopedCategoryOptions, setScopedCategoryOptions] = useState<{ value: string; label: string }[]>([]);
   const [scopedLocationOptions, setScopedLocationOptions] = useState<{ value: string; label: string }[]>([]);
  
+  const textColorToggleValue = useMemo(() => {
+    const v: string[] = [];
+    if (apSel.text) v.push("TEXT");
+    if (apSel.color) v.push("COLOR");
+    return v;
+  }, [apSel.text, apSel.color]);
+
+  const colorPresets = useMemo(
+    () => [
+      "#111827",
+      "#374151",
+      "#6B7280",
+      "#EF4444",
+      "#F59E0B",
+      "#10B981",
+      "#3B82F6",
+      "#8B5CF6",
+      "#EC4899",
+    ],
+    [],
+  );
+
+  const applyAppearanceFromProduct = (detail: ProductDto) => {
+    const parsed = parseCategoryButtonStyleV1(detail.buttonStyleJson);
+    if (parsed) {
+      setApSel(appearanceSelectionFromTokens(parsed.appearances));
+      setDisplayText(clampDisplayText(parsed.displayText ?? ""));
+      setButtonBgColor(parsed.buttonBgColor ?? "");
+      setButtonImageUrl(parsed.buttonImageUrl ?? "");
+      return;
+    }
+    const appearances = parseAppearanceTokens(detail.buttonAppearance);
+    const valArr = parseCategoryPhotoUrlValueArray(detail.categoryPhotoUrl);
+    if (valArr && appearances.length > 0 && appearances.length === valArr.length) {
+      const merged = visualInputFromAppearanceAndValueArray(appearances, valArr, {
+        categoryName: detail.productName,
+        name: undefined,
+        buttonTextColor: null,
+      });
+      setApSel(appearanceSelectionFromTokens(appearances));
+      setDisplayText(clampDisplayText(merged.displayText ?? ""));
+      setButtonBgColor(merged.buttonBgColor ?? "");
+      setButtonImageUrl(merged.buttonImageUrl ?? "");
+      return;
+    }
+    const img = (detail.buttonImageUrl ?? detail.productImageUrl ?? "").trim();
+    if (img) {
+      setApSel({ text: false, color: false, image: true });
+      setDisplayText("");
+      setButtonBgColor("");
+      setButtonImageUrl(img);
+      return;
+    }
+    setDisplayText(clampDisplayText(detail.displayText ?? ""));
+    const tokens = parseAppearanceTokens(detail.buttonAppearance);
+    if (tokens.length === 0) {
+      setApSel({ text: true, color: false, image: false });
+    } else {
+      setApSel(appearanceSelectionFromTokens(tokens));
+    }
+    setButtonBgColor(detail.buttonBgColor ?? "");
+    setButtonImageUrl(detail.buttonImageUrl ?? "");
+  };
+
+  const resetAppearance = () => {
+    setDisplayText("");
+    setApSel({ text: true, color: false, image: false });
+    setButtonBgColor("");
+    setButtonImageUrl("");
+    setCodeValue("");
+  };
+
   const regionOptionsForForm = useMemo(() => {
     let list = groups;
     if (partnerId) list = list.filter((g) => g.partnerId === partnerId);
@@ -1381,7 +1470,8 @@ function ProductFormDialog({
           setProductCode(detail.productCode ?? editing.productCode ?? "");
           setProductName(detail.productName ?? editing.productName ?? "");
           setCategoryId((detail.categoryId ?? editing.categoryId ?? "").trim());
-          setProductImageUrl(detail.productImageUrl ?? editing.productImageUrl ?? "");
+          applyAppearanceFromProduct(detail);
+          setCodeValue((detail.codeValue ?? "").trim());
           setState(detail.state !== false && editing.state !== false);
           setPartnerId(pid);
           setGroupId(gid);
@@ -1392,7 +1482,7 @@ function ProductFormDialog({
           setPartnerId("");
           setGroupId("");
           setCategoryId("");
-          setProductImageUrl("");
+          resetAppearance();
           setState(true);
           setLocationIds([]);
         }
@@ -1490,11 +1580,54 @@ function ProductFormDialog({
       return;
     }
  
+    const tokens = tokensFromSelection(apSel);
+    if (tokens.length === 0) {
+      toast.error("Validation", { description: "Select at least one button appearance (Text, Color, or Image)." });
+      return;
+    }
+    if (tokens[0] === "IMAGE") {
+      if (!buttonImageUrl.trim()) {
+        toast.error("Validation", { description: "Please upload an image for Image appearance." });
+        return;
+      }
+    } else {
+      if (apSel.text && !clampDisplayText(displayText.trim())) {
+        toast.error("Validation", { description: "Please enter display text for Text appearance." });
+        return;
+      }
+      if (apSel.color && !buttonBgColor.trim()) {
+        toast.error("Validation", { description: "Please select a background color for Color appearance." });
+        return;
+      }
+    }
+
+    const displayTextForSave = clampDisplayText(displayText.trim()) || null;
+    const categoryPhotoUrl = serializeCategoryPhotoUrlValueArray(tokens, {
+      displayText: displayTextForSave ?? "",
+      buttonBgColor: buttonBgColor.trim(),
+      buttonImageUrl: buttonImageUrl.trim(),
+    });
+    const buttonStyleJson = serializeCategoryButtonStyleV1({
+      appearances: tokens,
+      displayText: displayTextForSave,
+      buttonBgColor: apSel.image ? null : buttonBgColor.trim() || null,
+      buttonTextColor: null,
+      buttonImageUrl: apSel.image ? buttonImageUrl.trim() || null : null,
+    });
+    const imageUrlForLegacy = apSel.image ? buttonImageUrl.trim() || null : null;
+
     const body: ProductCreateInput = {
       productCode: productCode.trim() || null,
       productName: productName.trim(),
       categoryId: categoryId.trim() || null,
-      productImageUrl: productImageUrl.trim() || null,
+      productImageUrl: imageUrlForLegacy,
+      categoryPhotoUrl,
+      displayText: displayTextForSave,
+      buttonAppearance: tokens,
+      buttonBgColor: buttonBgColor.trim() || null,
+      buttonImageUrl: buttonImageUrl.trim() || null,
+      buttonStyleJson,
+      codeValue: codeValue.trim() || null,
       state,
       partnerId,
       groupIds: [groupId],
@@ -1521,8 +1654,8 @@ function ProductFormDialog({
  
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="w-[min(50%,calc(100vw-2rem))] max-w-none sm:max-w-none max-h-[90vh] overflow-y-auto">
-        <DialogHeader>
+      <DialogContent className={FORM_DIALOG_CONTENT_CLASS} style={FORM_DIALOG_CONTENT_STYLE}>
+        <DialogHeader className={FORM_DIALOG_HEADER_CLASS}>
           <DialogTitle>{editing ? "Edit Product" : "Add New Product"}</DialogTitle>
           <DialogDescription>
             {editing
@@ -1531,7 +1664,8 @@ function ProductFormDialog({
           </DialogDescription>
         </DialogHeader>
  
-        <div className="grid gap-4 py-4">
+        <div className={FORM_DIALOG_SCROLL_BODY_CLASS}>
+        <div className="grid gap-4 py-2">
           <div className="grid grid-cols-2 gap-4">
             <div className="space-y-2">
               <Label>Product code</Label>
@@ -1612,15 +1746,158 @@ function ProductFormDialog({
             />
           </div>
           <div className="space-y-2">
-            <Label>Product image</Label>
-            <ImageUrlUpload
-              value={productImageUrl}
-              onChange={setProductImageUrl}
-              uploadSubDir="product"
-              oneImageOnly
-              hint="POST /api/app/picture/category/upload (subDir: product). JPG/PNG/WebP/GIF, max 5 MB."
+            <Label>Button Appearance</Label>
+            <div className="category-appearance-toggles rounded-2xl border border-gray-200 bg-gray-100 p-3 space-y-3">
+              <div className="space-y-1">
+                <div className="text-xs text-gray-600">Text &amp; Color — can combine</div>
+                <ToggleGroup
+                  type="multiple"
+                  value={textColorToggleValue}
+                  onValueChange={(v) => {
+                    const arr = (v ?? []) as string[];
+                    setApSel((s) => ({
+                      ...s,
+                      text: arr.includes("TEXT"),
+                      color: arr.includes("COLOR"),
+                      image: false,
+                    }));
+                  }}
+                  variant="outline"
+                  size="sm"
+                  className="w-full bg-transparent gap-1 flex-wrap justify-stretch"
+                >
+                  <ToggleGroupItem
+                    value="TEXT"
+                    className="flex-1 min-w-[100px] gap-2 h-10 rounded-full transition-colors border border-gray-200 bg-white text-gray-700 shadow-sm hover:bg-gray-50"
+                  >
+                    <span className="font-medium flex items-center gap-2">
+                      <span className="text-lg leading-none">T</span>
+                      Text
+                    </span>
+                  </ToggleGroupItem>
+                  <ToggleGroupItem
+                    value="COLOR"
+                    className="flex-1 min-w-[100px] gap-2 h-10 rounded-full transition-colors border border-gray-200 bg-white text-gray-700 shadow-sm hover:bg-gray-50"
+                  >
+                    <span className="font-medium flex items-center gap-2">
+                      <span className="text-lg leading-none">🎨</span>
+                      Color
+                    </span>
+                  </ToggleGroupItem>
+                </ToggleGroup>
+              </div>
+              <div className="space-y-1">
+                <div className="text-xs text-gray-600">Image — exclusive (clears Text &amp; Color)</div>
+                <ToggleGroup
+                  type="single"
+                  value={apSel.image ? "IMAGE" : ""}
+                  onValueChange={(v) => {
+                    const up = String(v || "").toUpperCase();
+                    if (up === "IMAGE") setApSel({ text: false, color: false, image: true });
+                    else setApSel((s) => ({ ...s, image: false }));
+                  }}
+                  variant="outline"
+                  size="sm"
+                  className="w-full bg-transparent"
+                >
+                  <ToggleGroupItem
+                    value="IMAGE"
+                    className="w-full gap-2 h-10 rounded-full transition-colors border border-gray-200 bg-white text-gray-700 shadow-sm hover:bg-gray-50"
+                  >
+                    <span className="font-medium flex items-center justify-center gap-2">
+                      <span className="text-lg leading-none">🖼</span>
+                      Image
+                    </span>
+                  </ToggleGroupItem>
+                </ToggleGroup>
+              </div>
+            </div>
+          </div>
+
+          {apSel.text && !apSel.image ? (
+            <div className="space-y-2">
+              <Label>Display Text</Label>
+              <Input
+                className="h-10"
+                value={displayText}
+                onChange={(e) => setDisplayText(clampDisplayText(e.target.value))}
+                placeholder="Category Name"
+                maxLength={DISPLAY_TEXT_MAX}
+              />
+              <div className="text-xs text-gray-500">
+                Max {DISPLAY_TEXT_MAX} characters. Saved to <span className="font-mono">photo</span> as this text.
+              </div>
+            </div>
+          ) : null}
+
+          {apSel.color && !apSel.image ? (
+            <div className="space-y-2">
+              <Label>Select Color</Label>
+              <div className="flex flex-wrap items-center gap-3">
+                {colorPresets.map((c) => (
+                  <button
+                    key={c}
+                    type="button"
+                    className={[
+                      "h-10 w-10 rounded-full border border-gray-200 shadow-sm",
+                      buttonBgColor.toLowerCase() === c.toLowerCase() ? "ring-2 ring-blue-500 ring-offset-2" : "",
+                    ].join(" ")}
+                    style={{ backgroundColor: c }}
+                    onClick={() => setButtonBgColor(c)}
+                    aria-label={`Select ${c}`}
+                  />
+                ))}
+                <button
+                  type="button"
+                  className="h-10 w-10 rounded-full border border-dashed border-gray-300 bg-white text-gray-500 hover:text-gray-700 hover:border-gray-400 flex items-center justify-center"
+                  onClick={() => {
+                    const el = document.getElementById("product-form-custom-color") as HTMLInputElement | null;
+                    el?.click();
+                  }}
+                  aria-label="Custom color"
+                >
+                  +
+                </button>
+                <input
+                  id="product-form-custom-color"
+                  type="color"
+                  value={buttonBgColor || "#3B82F6"}
+                  onChange={(e) => setButtonBgColor(e.target.value)}
+                  className="h-0 w-0 opacity-0 pointer-events-none"
+                  aria-label="Custom color picker"
+                />
+              </div>
+            </div>
+          ) : null}
+
+          {apSel.image ? (
+            <div className="space-y-2">
+              <Label>Button Image</Label>
+              <ImageUrlUpload
+                value={buttonImageUrl}
+                onChange={setButtonImageUrl}
+                uploadSubDir="product"
+                oneImageOnly
+                boxClassName={FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS}
+                boxSizePx={FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX}
+                hint="JPG, PNG, WebP, or GIF — max 5 MB."
+              />
+            </div>
+          ) : null}
+
+          <div className="space-y-3 rounded-md border border-gray-100 bg-gray-50 p-4">
+            <Label className="flex items-center gap-2">
+              <Barcode className="h-4 w-4 shrink-0" />
+              CodeValue Setting
+            </Label>
+            <Input
+              className="h-10"
+              value={codeValue}
+              onChange={(e) => setCodeValue(e.target.value)}
+              placeholder="Barcode Value"
             />
           </div>
+
           <div className="space-y-2">
             <Label>Bind to stores *</Label>
             <SearchableMultiSelect
@@ -1640,8 +1917,9 @@ function ProductFormDialog({
             <Switch checked={state} onCheckedChange={setState} />
           </div>
         </div>
+        </div>
  
-        <DialogFooter>
+        <DialogFooter className={FORM_DIALOG_FOOTER_CLASS}>
           <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
@@ -2032,15 +2310,15 @@ function ProductCategoryFormDialog({
  
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex h-[min(85vh,720px)] max-h-[90vh] w-[min(50%,calc(100vw-2rem))] max-w-none flex-col gap-0 overflow-hidden p-0 sm:max-w-none">
-        <DialogHeader className="shrink-0 space-y-2 px-6 pt-6 pr-14 pb-2 text-center sm:text-left">
+      <DialogContent className={FORM_DIALOG_CONTENT_CLASS} style={FORM_DIALOG_CONTENT_STYLE}>
+        <DialogHeader className={FORM_DIALOG_HEADER_CLASS}>
           <DialogTitle>{isEdit ? "Edit Category" : "New Category"}</DialogTitle>
           <DialogDescription>
             {isEdit ? "Update product category (API: /api/app/product-category)." : "Create a product category."}
           </DialogDescription>
         </DialogHeader>
  
-        <div className="flex min-h-0 flex-1 flex-col overflow-y-auto overscroll-contain px-6 pb-4">
+        <div className={FORM_DIALOG_SCROLL_BODY_CLASS}>
           <div className="grid gap-4 py-2">
           <div className="grid grid-cols-2 gap-4">
             <div className="space-y-2">
@@ -2226,7 +2504,9 @@ function ProductCategoryFormDialog({
                 onChange={setButtonImageUrl}
                 uploadSubDir="category"
                 oneImageOnly
-                hint="One image only. Replace or clear to change. JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
+                boxClassName={FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS}
+                boxSizePx={FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX}
+                hint="JPG, PNG, WebP, or GIF — max 5 MB. Saved as CategoryPhotoUrl."
               />
             </div>
           ) : null}
@@ -2248,7 +2528,7 @@ function ProductCategoryFormDialog({
           </div>
         </div>
  
-        <DialogFooter className="shrink-0 gap-2 border-t border-gray-100 bg-background px-6 py-4 sm:flex-row sm:justify-end">
+        <DialogFooter className={FORM_DIALOG_FOOTER_CLASS}>
           <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
@@ -18,6 +18,8 @@ export type ImageUrlUploadProps = {
   className?: string;
   /** 上传区域宽度（tailwind），默认 max-w-[200px] */
   boxClassName?: string;
+  /** 固定上传区边长（px）；优先于仅依赖 Tailwind 的 boxClassName，避免预构建 CSS 缺类名时撑满整行 */
+  boxSizePx?: number;
   /** 传给后端的 multipart `subDir`（如 category、product） */
   uploadSubDir?: string;
   /** 明确单图：隐藏多选、提示文案 */
@@ -34,6 +36,7 @@ export function ImageUrlUpload({
   maxSizeMb = PICTURE_UPLOAD_MAX_BYTES / (1024 * 1024),
   className,
   boxClassName,
+  boxSizePx,
   uploadSubDir,
   oneImageOnly,
 }: ImageUrlUploadProps) {
@@ -72,14 +75,26 @@ export function ImageUrlUpload({
     if (!busy) inputRef.current?.click();
   };
  
-  /** 未传 boxClassName 时用默认「自适应宽度 + 正方形」；传入 boxClassName 时不再附带 w-full/aspect，避免与固定宽高冲突 */
-  const hasCustomBox = Boolean(boxClassName?.trim());
+  const fixedSize = typeof boxSizePx === "number" && boxSizePx > 0 ? Math.round(boxSizePx) : 0;
+  const hasCustomBox = fixedSize > 0 || Boolean(boxClassName?.trim());
+  const boxSizeStyle: React.CSSProperties | undefined =
+    fixedSize > 0
+      ? {
+          width: fixedSize,
+          height: fixedSize,
+          minWidth: fixedSize,
+          minHeight: fixedSize,
+          maxWidth: fixedSize,
+          maxHeight: fixedSize,
+          boxSizing: "border-box",
+        }
+      : undefined;
   const boxShell = hasCustomBox
-    ? "rounded-md transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
+    ? "box-border shrink-0 rounded-md transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2"
     : "w-full max-w-[200px] aspect-square rounded-md transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2";
  
   return (
-    <div className={cn("space-y-2", className)}>
+    <div className={cn("space-y-2", hasCustomBox && "w-fit max-w-full", className)}>
       <input
         ref={inputRef}
         type="file"
@@ -96,6 +111,7 @@ export function ImageUrlUpload({
           disabled={busy}
           onClick={openPicker}
           aria-label={emptyLabel || "Upload image"}
+          style={boxSizeStyle}
           className={cn(
             boxShell,
             hasCustomBox ? boxClassName : null,
@@ -111,7 +127,13 @@ export function ImageUrlUpload({
             <span className="px-3 text-center text-sm font-normal text-gray-500">Uploading…</span>
           ) : (
             <>
-              <Plus className="h-10 w-10 shrink-0 stroke-[1.25]" aria-hidden />
+              <Plus
+                className={cn(
+                  "shrink-0 stroke-[1.25]",
+                  fixedSize > 0 && fixedSize <= 120 ? "h-8 w-8" : "h-10 w-10",
+                )}
+                aria-hidden
+              />
               {emptyLabel ? (
                 <span className="px-3 text-center text-sm font-normal leading-tight text-gray-400">
                   {emptyLabel}
@@ -122,6 +144,7 @@ export function ImageUrlUpload({
         </button>
       ) : (
         <div
+          style={boxSizeStyle}
           className={cn(
             "group relative overflow-hidden border-2 border-dashed border-gray-300 bg-gray-50/80",
             boxShell,
@@ -117,15 +117,16 @@ export function SearchableMultiSelect({
           aria-expanded={open}
           disabled={disabled}
           className={cn(
-            "h-auto min-h-10 w-full justify-between px-3 py-2 font-normal border border-gray-300 bg-white",
+            "h-auto min-h-10 w-full justify-between overflow-hidden px-3 py-2 font-normal border border-gray-300 bg-white",
             className,
           )}
         >
           <span
             className={cn(
-              "line-clamp-2 text-left text-sm",
+              "min-w-0 flex-1 truncate text-left text-sm",
               !summary && "text-gray-500",
             )}
+            title={summary ?? undefined}
           >
             {summary ?? placeholder}
           </span>
@@ -54,15 +54,16 @@ export function SearchableSelect({
           aria-expanded={open}
           disabled={disabled}
           className={cn(
-            "w-full justify-between h-10 px-3 font-normal border border-gray-300 bg-white",
+            "h-10 w-full justify-between overflow-hidden px-3 font-normal border border-gray-300 bg-white",
             className,
           )}
         >
           <span
             className={cn(
-              "truncate text-left text-sm",
+              "min-w-0 flex-1 truncate text-left text-sm",
               !selectedLabel && "text-gray-500",
             )}
+            title={selectedLabel ?? undefined}
           >
             {selectedLabel ?? placeholder}
           </span>
@@ -41,7 +41,7 @@ function SelectTrigger({
       data-slot="select-trigger"
       data-size={size}
       className={cn(
-        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-full items-center justify-between gap-2 rounded-md border bg-input-background px-3 py-2 text-sm whitespace-nowrap transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        "border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-full items-center justify-between gap-2 overflow-hidden rounded-md border bg-input-background px-3 py-2 text-sm transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:min-w-0 *:data-[slot=select-value]:flex-1 *:data-[slot=select-value]:truncate [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
         className,
       )}
       {...props}
+/** 模板编辑器 / 预览 / 打印共用的条形码制式选项（与需求文档顺序一致） */
+
+export const BARCODE_FORMAT_OPTIONS = [
+  { label: "Codabar", value: "CODABAR" },
+  { label: "Code39", value: "CODE39" },
+  { label: "Code128", value: "CODE128" },
+  { label: "EAN-2", value: "EAN2" },
+  { label: "EAN-5", value: "EAN5" },
+  { label: "EAN-8", value: "EAN8" },
+  { label: "EAN-13", value: "EAN13" },
+  { label: "ITF-14", value: "ITF14" },
+  { label: "MSI", value: "MSI" },
+  { label: "MSI10", value: "MSI10" },
+  { label: "MSI11", value: "MSI11" },
+  { label: "MSI1010", value: "MSI1010" },
+  { label: "MSI1110", value: "MSI1110" },
+  { label: "Pharmacode", value: "PHARMACODE" },
+  { label: "UPC(A)", value: "UPCA" },
+] as const;
+
+export type BarcodeFormatValue = (typeof BARCODE_FORMAT_OPTIONS)[number]["value"];
+
+export const DEFAULT_BARCODE_FORMAT: BarcodeFormatValue = BARCODE_FORMAT_OPTIONS[0].value;
+
+/** 规范化模板 config.barcodeType（兼容旧值、带连字符写法） */
+export function normalizeBarcodeType(raw: unknown): BarcodeFormatValue {
+  const key = String(raw ?? "")
+    .trim()
+    .toUpperCase()
+    .replace(/[^A-Z0-9]/g, "");
+  const allowed = new Set(BARCODE_FORMAT_OPTIONS.map((o) => o.value));
+  if (allowed.has(key as BarcodeFormatValue)) return key as BarcodeFormatValue;
+  if (key === "UPC" || key === "UPCA") return "UPCA";
+  if (key === "ITF") return "ITF14";
+  return DEFAULT_BARCODE_FORMAT;
+}
+
+/** JsBarcode `format` 参数 */
+export function toJsBarcodeFormat(barcodeType: unknown): string {
+  const key = normalizeBarcodeType(barcodeType);
+  const map: Record<BarcodeFormatValue, string> = {
+    CODABAR: "codabar",
+    CODE39: "CODE39",
+    CODE128: "CODE128",
+    EAN2: "ean2",
+    EAN5: "ean5",
+    EAN8: "EAN8",
+    EAN13: "EAN13",
+    ITF14: "ITF14",
+    MSI: "MSI",
+    MSI10: "MSI10",
+    MSI11: "MSI11",
+    MSI1010: "MSI1010",
+    MSI1110: "MSI1110",
+    PHARMACODE: "pharmacode",
+    UPCA: "upc",
+  };
+  return map[key] ?? "codabar";
+}
+
+/** TSC 打印机 BARCODE 指令制式名 */
+export function toTscBarcodeSymbology(barcodeType: unknown): string {
+  const key = normalizeBarcodeType(barcodeType);
+  const map: Record<BarcodeFormatValue, string> = {
+    CODABAR: "CODA",
+    CODE39: "39",
+    CODE128: "128",
+    EAN2: "128",
+    EAN5: "128",
+    EAN8: "EAN8",
+    EAN13: "EAN13",
+    ITF14: "ITF14",
+    MSI: "MSI",
+    MSI10: "MSI",
+    MSI11: "MSI",
+    MSI1010: "MSI",
+    MSI1110: "MSI",
+    PHARMACODE: "128",
+    UPCA: "UPCA",
+  };
+  return map[key] ?? "CODA";
+}
+
+/** ESC/POS GS k 条码类型码 */
+export function toEscBarcodeTypeCode(barcodeType: unknown): number {
+  const key = normalizeBarcodeType(barcodeType);
+  const map: Record<BarcodeFormatValue, number> = {
+    CODABAR: 71,
+    CODE39: 69,
+    CODE128: 73,
+    EAN2: 73,
+    EAN5: 73,
+    EAN8: 68,
+    EAN13: 67,
+    ITF14: 70,
+    MSI: 73,
+    MSI10: 73,
+    MSI11: 73,
+    MSI1010: 73,
+    MSI1110: 73,
+    PHARMACODE: 73,
+    UPCA: 65,
+  };
+  return map[key] ?? 71;
+}
+import type { CSSProperties } from "react";
+
+/**
+ * 新增/编辑弹框：50% 宽、70vh 高；中间区域滚动。
+ * 使用 grid 三行（与 DialogContent 默认 display:grid 一致），避免 flex 被覆盖后高度失效。
+ */
+export const FORM_DIALOG_CONTENT_CLASS =
+  "form-dialog-shell sm:max-w-none w-[min(50%,calc(100vw-2rem))] max-w-[min(50%,calc(100vw-2rem))] gap-0 overflow-hidden p-0 grid-rows-[auto_minmax(0,1fr)_auto]";
+
+export const FORM_DIALOG_CONTENT_STYLE: CSSProperties = {
+  display: "grid",
+  height: "70vh",
+  maxHeight: "70vh",
+  minHeight: 0,
+  width: "50%",
+  maxWidth: "min(50%, calc(100vw - 2rem))",
+  overflow: "hidden",
+  padding: 0,
+  boxSizing: "border-box",
+};
+
+export const FORM_DIALOG_HEADER_CLASS =
+  "shrink-0 space-y-2 px-6 pt-6 pr-14 pb-2 text-center sm:text-left min-h-0";
+
+export const FORM_DIALOG_SCROLL_BODY_CLASS =
+  "form-dialog-scroll-body min-h-0 overflow-y-auto overflow-x-hidden overscroll-contain px-6 pb-4";
+
+export const FORM_DIALOG_FOOTER_CLASS =
+  "shrink-0 gap-2 border-t border-gray-100 bg-background px-6 py-4 sm:flex-row sm:justify-end min-h-0";
+
+/** 弹框内 Button Image 上传区边长（px） */
+export const FORM_DIALOG_IMAGE_UPLOAD_SIZE_PX = 120;
+
+/** 弹框内 Button Image 上传区 class（配合 boxSizePx 使用） */
+export const FORM_DIALOG_IMAGE_UPLOAD_BOX_CLASS = "shrink-0";
+import type { LabelElement } from "../types/labelTemplate";
+import { canonicalElementType, isTemplateSectionPersistedType } from "../types/labelTemplate";
+
+/** Template 面板中的条形码 / 二维码（typeAdd 以 template_ 开头） */
+export function isTemplateSectionBarcodeOrQrElement(el: LabelElement): boolean {
+  if (!isTemplateSectionPersistedType(el)) return false;
+  const t = canonicalElementType(el.type);
+  return t === "BARCODE" || t === "QRCODE";
+}
+
+/** 将产品 codeValue 写入 elementId → 字符串，供 templateProductDefaults / 预览合并 */
+export function buildTemplateBarcodeQrDefaultsFromCodeValue(
+  elements: LabelElement[],
+  codeValue: string | null | undefined,
+): Record<string, string> {
+  const cv = String(codeValue ?? "").trim();
+  if (!cv) return {};
+  const out: Record<string, string> = {};
+  for (const el of elements) {
+    if (!isTemplateSectionBarcodeOrQrElement(el)) continue;
+    out[el.id] = cv;
+  }
+  return out;
+}
+
+/** 合并 codeValue 到元素 config.data（用于画布预览） */
+export function applyProductCodeValueToLabelElements(
+  elements: LabelElement[],
+  codeValue: string | null | undefined,
+): LabelElement[] {
+  const cv = String(codeValue ?? "").trim();
+  if (!cv) return elements;
+  return elements.map((el) => {
+    if (!isTemplateSectionBarcodeOrQrElement(el)) return el;
+    const cfg = { ...(el.config as Record<string, unknown>) };
+    cfg.data = cv;
+    return { ...el, config: cfg };
+  });
+}
@@ -4,6 +4,7 @@
   import "react-day-picker/dist/style.css";
   import "./index.css";
   import "./styles/category-appearance-toggle.css";
+  import "./styles/form-dialog.css";
   import "./styles/fonts.css";
  
   createRoot(document.getElementById("root")!).render(<App />);
@@ -20,6 +20,33 @@ const api = createApiClient({
  
 const PATH = "/product";
  
+function buildProductWriteBody(input: ProductCreateInput): Record<string, unknown> {
+  const body: Record<string, unknown> = {
+    productCode: String(input.productCode ?? "").trim() || null,
+    productName: input.productName,
+    categoryId: input.categoryId?.trim() ? input.categoryId.trim() : null,
+    productImageUrl: input.productImageUrl ?? null,
+    categoryPhotoUrl: input.categoryPhotoUrl ?? null,
+    displayText: input.displayText ?? null,
+    buttonAppearance: input.buttonAppearance ?? null,
+    buttonBgColor: input.buttonBgColor ?? null,
+    buttonImageUrl: input.buttonImageUrl ?? null,
+    buttonStyleJson: input.buttonStyleJson ?? null,
+    codeValue: (input.codeValue ?? "").trim() || null,
+    state: input.state ?? true,
+  };
+  if (input.locationIds !== undefined) {
+    body.locationIds = input.locationIds;
+  }
+  if (input.partnerId?.trim()) {
+    body.partnerId = input.partnerId.trim();
+  }
+  if (input.groupIds?.length) {
+    body.groupIds = input.groupIds;
+  }
+  return body;
+}
+
 function normalizeProductDto(raw: unknown): ProductDto {
   const r = raw as Record<string, unknown>;
   const id = String(r?.id ?? r?.Id ?? "").trim();
@@ -35,6 +62,13 @@ function normalizeProductDto(raw: unknown): ProductDto {
     categoryId: (r?.categoryId ?? r?.CategoryId) as string | null | undefined,
     categoryName: (r?.categoryName ?? r?.CategoryName) as string | null | undefined,
     productImageUrl: (r?.productImageUrl ?? r?.ProductImageUrl) as string | null | undefined,
+    categoryPhotoUrl: (r?.categoryPhotoUrl ?? r?.CategoryPhotoUrl) as string | null | undefined,
+    displayText: (r?.displayText ?? r?.DisplayText) as string | null | undefined,
+    buttonAppearance: (r?.buttonAppearance ?? r?.ButtonAppearance ?? "TEXT") as ProductDto["buttonAppearance"],
+    buttonBgColor: (r?.buttonBgColor ?? r?.ButtonBgColor) as string | null | undefined,
+    buttonImageUrl: (r?.buttonImageUrl ?? r?.ButtonImageUrl) as string | null | undefined,
+    buttonStyleJson: (r?.buttonStyleJson ?? r?.ButtonStyleJson) as string | null | undefined,
+    codeValue: (r?.codeValue ?? r?.CodeValue) as string | null | undefined,
     state:
       typeof r?.state === "boolean"
         ? r.state
@@ -84,22 +118,7 @@ export async function getProduct(id: string, signal?: AbortSignal): Promise&lt;Prod
 }
  
 export async function createProduct(input: ProductCreateInput): Promise<ProductDto> {
-  const body: Record<string, unknown> = {
-    productCode: String(input.productCode ?? "").trim() || null,
-    productName: input.productName,
-    categoryId: input.categoryId?.trim() ? input.categoryId.trim() : null,
-    productImageUrl: input.productImageUrl ?? null,
-    state: input.state ?? true,
-  };
-  if (input.locationIds !== undefined) {
-    body.locationIds = input.locationIds;
-  }
-  if (input.partnerId?.trim()) {
-    body.partnerId = input.partnerId.trim();
-  }
-  if (input.groupIds?.length) {
-    body.groupIds = input.groupIds;
-  }
+  const body = buildProductWriteBody(input);
   const raw = await api.requestJson<ProductDto>({
     path: PATH,
     method: "POST",
@@ -109,22 +128,7 @@ export async function createProduct(input: ProductCreateInput): Promise&lt;ProductD
 }
  
 export async function updateProduct(id: string, input: ProductUpdateInput): Promise<ProductDto> {
-  const body: Record<string, unknown> = {
-    productCode: String(input.productCode ?? "").trim() || null,
-    productName: input.productName,
-    categoryId: input.categoryId?.trim() ? input.categoryId.trim() : null,
-    productImageUrl: input.productImageUrl ?? null,
-    state: input.state ?? true,
-  };
-  if (input.locationIds !== undefined) {
-    body.locationIds = input.locationIds;
-  }
-  if (input.partnerId?.trim()) {
-    body.partnerId = input.partnerId.trim();
-  }
-  if (input.groupIds?.length) {
-    body.groupIds = input.groupIds;
-  }
+  const body = buildProductWriteBody(input);
   const raw = await api.requestJson<ProductDto>({
     path: `${PATH}/${encodeURIComponent(id)}`,
     method: "PUT",
@@ -6,6 +6,9 @@ import type {
   ReportsPrintLogListItem,
   ReportsPrintLogListResult,
   ReportsPrintLogQueryInput,
+  TemplatePrintStatListItem,
+  TemplatePrintStatListResult,
+  TemplatePrintStatQueryInput,
 } from "../types/reports";
  
 const api = createApiClient({
@@ -296,6 +299,57 @@ export async function getLabelReport(
   return normLabelReport(raw);
 }
  
+function normTemplatePrintStatItem(raw: unknown): TemplatePrintStatListItem {
+  if (!raw || typeof raw !== "object") {
+    return { templateId: null, templateName: "None", printedCount: 0 };
+  }
+  const o = raw as Record<string, unknown>;
+  const tid = str(o, "templateId", "TemplateId", "");
+  return {
+    templateId: tid.trim() ? tid : null,
+    templateName: str(o, "templateName", "TemplateName", "None") || "None",
+    printedCount: num(o, "printedCount", "PrintedCount", 0),
+  };
+}
+
+function buildTemplatePrintStatQuery(input: TemplatePrintStatQueryInput) {
+  return {
+    SkipCount: input.skipCount,
+    MaxResultCount: input.maxResultCount,
+    Sorting: input.sorting ?? "PrintedCount desc",
+    PartnerId: input.partnerId,
+    GroupId: input.groupId,
+    LocationId: input.locationId,
+    StartDate: input.startDate,
+    EndDate: input.endDate,
+    Keyword: input.keyword,
+  };
+}
+
+/** 按模板汇总打印数量（`GET /api/app/reports/template-print-stat-list`） */
+export async function getTemplatePrintStatList(
+  input: TemplatePrintStatQueryInput,
+  signal?: AbortSignal,
+): Promise<TemplatePrintStatListResult> {
+  const raw = await api.requestJson<unknown>({
+    path: `${REPORTS_PREFIX}/template-print-stat-list`,
+    method: "GET",
+    query: buildTemplatePrintStatQuery(input),
+    signal,
+  });
+  const o = (raw && typeof raw === "object" ? raw : {}) as Record<string, unknown>;
+  const itemsRaw = o.items ?? o.Items;
+  const list = Array.isArray(itemsRaw) ? itemsRaw.map(normTemplatePrintStatItem) : [];
+  const total = num(o, "totalCount", "TotalCount", list.length);
+  return {
+    items: list,
+    totalCount: total,
+    pageIndex: num(o, "pageIndex", "PageIndex", input.skipCount),
+    pageSize: num(o, "pageSize", "PageSize", input.maxResultCount),
+    totalPages: num(o, "totalPages", "TotalPages", 0),
+  };
+}
+
 // --- 下载、重打：不走 JSON 解包，单独 fetch ---
  
 function joinUrl(baseUrl: string, path: string): string {
@@ -127,6 +127,15 @@ function normalizeTeamMemberDto(row: unknown): TeamMemberDto {
     if (inferredIds.length) locationIds = inferredIds;
   }
  
+  const partnerIds = toIdArray(r.partnerIds ?? r.PartnerIds);
+  const regionIds = toIdArray(
+    r.regionIds ?? r.RegionIds ?? r.groupIds ?? r.GroupIds,
+  );
+  const partnerId =
+    (r.partnerId ?? r.PartnerId ?? partnerIds[0] ?? null) as string | null | undefined;
+  const groupId =
+    (r.groupId ?? r.GroupId ?? regionIds[0] ?? null) as string | null | undefined;
+
   // 有些接口可能只返回一个 locations，但我们仍尽量填充
   return {
     id,
@@ -138,6 +147,11 @@ function normalizeTeamMemberDto(row: unknown): TeamMemberDto {
     roleName,
     locationIds,
     locations,
+    partnerId: partnerId != null ? String(partnerId) : null,
+    groupId: groupId != null ? String(groupId) : null,
+    partnerIds,
+    regionIds,
+    groupIds: regionIds,
     state: state ?? (r.status ? (String(r.status).toLowerCase() === "active") : undefined),
   };
 }
@@ -186,8 +200,15 @@ function toPhoneNumber(v: string | number | null | undefined): number | null {
   return num;
 }
  
+function scopeIdsForApi(ids: string[] | undefined): string[] | undefined {
+  const list = [...new Set((ids ?? []).map((x) => String(x).trim()).filter(Boolean))];
+  return list.length ? list : undefined;
+}
+
 function buildCreatePayload(input: TeamMemberCreateInput): Record<string, unknown> {
   const phoneVal = input.phone != null && input.phone !== "" ? toPhoneNumber(String(input.phone)) : null;
+  const partnerId = (input.partnerId ?? "").trim() || undefined;
+  const regionIds = scopeIdsForApi(input.regionIds);
   return {
     fullName: input.fullName,
     userName: input.userName,
@@ -195,7 +216,10 @@ function buildCreatePayload(input: TeamMemberCreateInput): Record&lt;string, unknow
     email: input.email ?? null,
     phone: phoneVal,
     roleId: input.roleId,
-    // 兼容：后端可能叫 locationIds 或 locations
+    partnerId,
+    partnerIds: partnerId ? [partnerId] : undefined,
+    regionIds,
+    groupIds: regionIds,
     locationIds: input.locationIds,
     locations: input.locationIds,
     state: input.state,
@@ -204,12 +228,18 @@ function buildCreatePayload(input: TeamMemberCreateInput): Record&lt;string, unknow
  
 function buildUpdatePayload(input: TeamMemberUpdateInput): Record<string, unknown> {
   const phoneVal = input.phone != null && input.phone !== "" ? toPhoneNumber(String(input.phone)) : null;
+  const partnerId = (input.partnerId ?? "").trim() || undefined;
+  const regionIds = scopeIdsForApi(input.regionIds);
   const payload: Record<string, unknown> = {
     fullName: input.fullName,
     userName: input.userName,
     email: input.email ?? null,
     phone: phoneVal,
     roleId: input.roleId,
+    partnerId,
+    partnerIds: partnerId ? [partnerId] : undefined,
+    regionIds,
+    groupIds: regionIds,
     locationIds: input.locationIds,
     locations: input.locationIds,
     state: input.state,
+/* 固定尺寸弹框外壳（覆盖 DialogContent 默认 grid + 随内容增高） */
+[data-slot="dialog-content"].form-dialog-shell {
+  display: grid !important;
+  height: 70vh !important;
+  max-height: 70vh !important;
+  min-height: 0 !important;
+  width: min(50%, calc(100vw - 2rem)) !important;
+  max-width: min(50%, calc(100vw - 2rem)) !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  box-sizing: border-box !important;
+}
+
+[data-slot="dialog-content"].form-dialog-shell > .form-dialog-scroll-body {
+  min-height: 0 !important;
+  max-height: 100% !important;
+  overflow-y: auto !important;
+  overflow-x: hidden !important;
+}
+
+/* 滚动区内图片预览不撑宽 */
+.form-dialog-scroll-body img {
+  max-width: 100%;
+  max-height: 120px;
+  object-fit: contain;
+}
+
+.form-dialog-scroll-body .group.relative {
+  max-width: 100%;
+}
@@ -320,7 +320,17 @@ export function createDefaultElement(type: ElementType, x = 20, y = 20): LabelEl
     TEXT_STATIC: { width: 120, height: 24, config: { text: 'Text', fontFamily: 'Arial', fontSize: 14, fontWeight: 'normal', textAlign: 'left' } },
     TEXT_PRODUCT: { width: 120, height: 24, config: { text: 'Product name', fontFamily: 'Arial', fontSize: 14, fontWeight: 'normal', textAlign: 'left' } },
     TEXT_PRICE: { width: 80, height: 24, config: { text: '0.00', decimal: 2, fontFamily: 'Arial', fontSize: 14, fontWeight: 'bold', textAlign: 'right' } },
-    BARCODE: { width: 160, height: 48, config: { barcodeType: 'CODE128', data: '123456789', showText: true, orientation: 'horizontal' } },
+    BARCODE: {
+      width: 160,
+      height: 48,
+      config: {
+        barcodeType: 'CODABAR',
+        data: '123456789',
+        showText: true,
+        fontSize: 14,
+        textAlign: 'center',
+      },
+    },
     QRCODE: { width: 80, height: 80, config: { data: 'https://example.com', errorLevel: 'M' } },
     IMAGE: { width: 60, height: 60, config: { src: '', scaleMode: 'contain' } },
     DATE: {
@@ -31,9 +31,9 @@ export type LabelTypeGetListInput = {
   sorting?: string;
   keyword?: string;
   state?: boolean;
-  /** Region 筛选：`fl_group.Id`（后端就绪后生效；否则前端按标签门店关联过滤） */
+  /** Region 筛选：`fl_group.Id` */
   groupId?: string;
-  /** 门店筛选：`location.Id` */
+  /** 门店筛选：`location.Id`（`GET /label-type` Query） */
   locationId?: string;
   partnerId?: string;
 };
@@ -5,6 +5,14 @@ export type ProductDto = {
   categoryId?: string | null;
   categoryName?: string | null;
   productImageUrl?: string | null;
+  categoryPhotoUrl?: string | null;
+  displayText?: string | null;
+  buttonAppearance?: "TEXT" | "COLOR" | "IMAGE" | string | string[] | null;
+  buttonBgColor?: string | null;
+  buttonImageUrl?: string | null;
+  buttonStyleJson?: string | null;
+  /** 条码/编码值 */
+  codeValue?: string | null;
   state?: boolean | null;
   creationTime?: string | null;
   /** 列表/详情可能返回：该产品绑定的门店 Id（`fl_location_product`） */
@@ -39,6 +47,13 @@ export type ProductCreateInput = {
   productName: string;
   categoryId?: string | null;
   productImageUrl?: string | null;
+  categoryPhotoUrl?: string | null;
+  displayText?: string | null;
+  buttonAppearance?: "TEXT" | "COLOR" | "IMAGE" | string | string[] | null;
+  buttonBgColor?: string | null;
+  buttonImageUrl?: string | null;
+  buttonStyleJson?: string | null;
+  codeValue?: string | null;
   state?: boolean;
   /**
    * 门店 Id 列表；写入 `fl_location_product`（§6.3）。
@@ -81,3 +81,28 @@ export type LabelReportQueryInput = {
   endDate?: string;
   keyword?: string;
 };
+
+/** `GET /reports/template-print-stat-list` 列表行 */
+export type TemplatePrintStatListItem = {
+  templateId: string | null;
+  templateName: string;
+  printedCount: number;
+};
+
+export type TemplatePrintStatListResult = PagedResultDto<TemplatePrintStatListItem> & {
+  pageIndex?: number;
+  pageSize?: number;
+  totalPages?: number;
+};
+
+export type TemplatePrintStatQueryInput = {
+  skipCount: number;
+  maxResultCount: number;
+  sorting?: string;
+  partnerId?: string;
+  groupId?: string;
+  locationId?: string;
+  startDate?: string;
+  endDate?: string;
+  keyword?: string;
+};
@@ -15,9 +15,12 @@ export type TeamMemberDto = {
   locationIds?: string[];
   locations?: string[];
  
-  // 绑定公司与区域（后端字段就绪后对接；前端先做单选与门店范围联动）
+  // 绑定公司与区域（详情接口返回 partnerIds / regionIds 多选；表单单选取首项）
   partnerId?: string | null;
   groupId?: string | null;
+  partnerIds?: string[];
+  regionIds?: string[];
+  groupIds?: string[];
  
   state?: boolean | null;
 };
@@ -44,6 +47,8 @@ export type TeamMemberCreateInput = {
   email?: string | null;
   phone?: string | null;
   roleId: string;
+  partnerId?: string;
+  regionIds?: string[];
   locationIds: string[];
   state: boolean;
 };
@@ -55,6 +60,8 @@ export type TeamMemberUpdateInput = {
   email?: string | null;
   phone?: string | null;
   roleId: string;
+  partnerId?: string;
+  regionIds?: string[];
   locationIds: string[];
   state: boolean;
 };