From e7d7e731baece6a56622b2b0a02989dba8698157 Mon Sep 17 00:00:00 2001
From: zlwu <704541015@qq.com>
Date: Tue, 28 Jul 2026 09:35:42 +0800
Subject: [PATCH] feat(web-admin): show brand on inventory ledger and
 transactions

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 web-admin/src/api/pl/index.ts               | 15 +++++++++++++--
 web-admin/src/views/pl/inventory/ledger.vue | 11 +++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/web-admin/src/api/pl/index.ts b/web-admin/src/api/pl/index.ts
index f75b1a7f1..b886ae423 100644
--- a/web-admin/src/api/pl/index.ts
+++ b/web-admin/src/api/pl/index.ts
@@ -1086,6 +1086,8 @@ export const freightApi = {
 export interface InventoryRecord {
   id: string
   productId: string
+  brandId?: string
+  brandName?: string
   productNo: string
   productName: string
   model?: string
@@ -1100,6 +1102,8 @@ export interface InventoryRecord {
 export interface InventoryTransaction {
   id: string
   productId: string
+  brandId?: string
+  brandName?: string
   productName: string
   transactionType: string
   planId?: string
@@ -1114,6 +1118,8 @@ export interface InventoryTransaction {
 export interface InventoryWarning {
   id: string
   productId: string
+  brandId?: string
+  brandName?: string
   productName: string
   warningType: string
   currentQty: number
@@ -1167,8 +1173,13 @@ export const inventoryApi = {
     request.get<InventoryWarning[]>('/transport/inventory/warnings', { params: { status } }),
   updateWarning: (id: string, data: { status: string; resolveRemark?: string }) =>
     request.put<InventoryWarning>(`/transport/inventory/warnings/${id}`, data),
-  setWarningThreshold: (data: { productId: string; lowStockWarning?: number; highStockWarning?: number }) =>
-    request.post('/transport/inventory/warning-threshold', data),
+  setWarningThreshold: (data: {
+    productId: string
+    brandId?: string
+    brandName?: string
+    lowStockWarning?: number
+    highStockWarning?: number
+  }) => request.post('/transport/inventory/warning-threshold', data),
   documentReminders: (status?: string) =>
     request.get<DocumentReminder[]>('/transport/inventory/document-reminders', { params: { status } }),
   documentReminderStats: () =>
diff --git a/web-admin/src/views/pl/inventory/ledger.vue b/web-admin/src/views/pl/inventory/ledger.vue
index dd66c5f6c..1be6983f1 100644
--- a/web-admin/src/views/pl/inventory/ledger.vue
+++ b/web-admin/src/views/pl/inventory/ledger.vue
@@ -73,6 +73,16 @@
             :index="(index) => (pagination.page - 1) * pagination.pageSize + index + 1"
           />
           <el-table-column prop="productName" label="产品名称" min-width="180" show-overflow-tooltip />
+          <el-table-column
+            v-if="isColumnVisible('brandName')"
+            label="品牌"
+            min-width="110"
+            show-overflow-tooltip
+          >
+            <template #default="{ row }">
+              {{ row.brandName || '—' }}
+            </template>
+          </el-table-column>
           <el-table-column
             v-if="isColumnVisible('productNo')"
             prop="productNo"
@@ -167,6 +177,7 @@ import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
 import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
 
 const listColumnDefs = [
+  { prop: 'brandName', label: '品牌' },
   { prop: 'productNo', label: '产品编号' },
   { prop: 'model', label: '规格型号' },
   { prop: 'unit', label: '单位' },