增加分组库存与客服

apps/frontend/src/services/admin.ts

@@ -58,6 +58,10 @@ export function updateAdminUserStatus(userId: number | string, payload: { status
   return apiPost<{ user: AdminUserListItem }>(`/api/v1/admin/users/${userId}/status`, payload)
 }
 
+export function updateAdminUserInventoryGroups(userId: number | string, payload: { inventoryGroupCodes: string[] }) {
+  return apiPost<{ user: AdminUserListItem }>(`/api/v1/admin/users/${userId}/inventory-groups`, payload)
+}
+
 export function resetAdminUserPassword(userId: number | string, payload: { password: string }) {
   return apiPost<{ user: AdminUserListItem }>(`/api/v1/admin/users/${userId}/reset-password`, payload)
 }

apps/frontend/src/types/admin.ts

@@ -16,6 +16,7 @@ export interface AdminLoginResponse {
     userId: number
     username: string
     role: AdminRole
+    inventoryGroupCodes?: string[]
   }
 }
 
@@ -26,6 +27,7 @@ export interface AdminSessionSummary {
     userId: number
     username: string
     role: AdminRole
+    inventoryGroupCodes?: string[]
   }
 }
 
@@ -34,6 +36,7 @@ export interface AdminUserListItem {
   username: string
   role: AdminRole
   status: AdminUserStatus
+  inventoryGroupCodes: string[]
   createdAt: string
   updatedAt: string
 }
@@ -436,6 +439,7 @@ export interface AdminTaskDetail {
 export interface AdminInventorySkuSuggestion {
   skuCode: string
   credentialType: string
+  inventoryGroupCode: string
   totalCount: number
   availableCount: number
   latestUpdatedAt: string | null
@@ -446,6 +450,7 @@ export interface AdminInventoryItemListItem {
   skuCode: string
   batchNo: string
   credentialType: string
+  inventoryGroupCode: string
   displayValue: string
   status: string
   reservedByTaskId: number | null

apps/frontend/src/utils/admin-options.ts

@@ -78,6 +78,7 @@ export const adminAuditActionOptions = [
   { label: '创建后台用户', value: 'admin_user_created' },
   { label: '修改用户角色', value: 'admin_user_role_updated' },
   { label: '修改用户状态', value: 'admin_user_status_updated' },
+  { label: '修改用户库存组', value: 'admin_user_inventory_groups_updated' },
   { label: '重置用户密码', value: 'admin_user_password_reset' },
   { label: '释放任务库存', value: 'task_release_inventory' },
   { label: '重发领取链接', value: 'task_regenerate_claim_link' },

apps/frontend/src/views/admin/AdminInventoryView.vue

@@ -24,6 +24,7 @@ type InventoryImportRow = {
   skuCode: string
   credentialType: string
   batchNo: string
+  inventoryGroupCode: string
   displayValue: string
 }
 
@@ -31,6 +32,7 @@ type InventoryPoolGroup = {
   key: string
   skuCode: string
   credentialType: string
+  inventoryGroupCode: string
   totalCount: number
   availableCount: number
   reservedCount: number
@@ -50,10 +52,12 @@ const filterSkuCode = ref('')
 const filterCredentialType = ref('')
 const filterStatus = ref('')
 const filterBatchNo = ref('')
+const filterInventoryGroupCode = ref('')
 
 const entrySkuCode = ref('')
 const entryCredentialType = ref('tencent_code')
 const entryBatchNo = ref('')
+const entryInventoryGroupCode = ref('')
 const singleDisplayValue = ref('')
 const bulkText = ref('')
 const skuSuggestionsLoading = ref(false)
@@ -84,6 +88,7 @@ const inventoryGroups = computed<InventoryPoolGroup[]>(() => {
   const groupMap = new Map<string, {
     skuCode: string
     credentialType: string
+    inventoryGroupCode: string
     totalCount: number
     availableCount: number
     reservedCount: number
@@ -94,10 +99,11 @@ const inventoryGroups = computed<InventoryPoolGroup[]>(() => {
   }>()
 
   for (const item of items.value) {
-    const key = `${item.skuCode}::${item.credentialType || 'tencent_code'}`
+    const key = `${item.skuCode}::${item.credentialType || 'tencent_code'}::${item.inventoryGroupCode || ''}`
     const current = groupMap.get(key) || {
       skuCode: item.skuCode,
       credentialType: item.credentialType || 'tencent_code',
+      inventoryGroupCode: item.inventoryGroupCode || '',
       totalCount: 0,
       availableCount: 0,
       reservedCount: 0,
@@ -135,6 +141,7 @@ const inventoryGroups = computed<InventoryPoolGroup[]>(() => {
       key,
       skuCode: value.skuCode,
       credentialType: value.credentialType,
+      inventoryGroupCode: value.inventoryGroupCode,
       totalCount: value.totalCount,
       availableCount: value.availableCount,
       reservedCount: value.reservedCount,
@@ -253,16 +260,18 @@ function getGroupSuggestion(group: InventoryPoolGroup) {
 function useGroupAsFilter(group: InventoryPoolGroup) {
   filterSkuCode.value = group.skuCode
   filterCredentialType.value = group.credentialType
+  filterInventoryGroupCode.value = group.inventoryGroupCode
   void loadInventoryItems(1)
 }
 
 function useGroupAsEntry(group: InventoryPoolGroup) {
   entrySkuCode.value = group.skuCode
   entryCredentialType.value = group.credentialType
+  entryInventoryGroupCode.value = group.inventoryGroupCode
   if (group.batchSummary !== '未分批' && !group.batchSummary.includes(' / ')) {
     entryBatchNo.value = group.batchSummary
   }
-  showSuccess(`已把 ${group.skuCode} / ${group.credentialType} 填入入库表单`)
+  showSuccess(`已把 ${group.skuCode} / ${group.credentialType} / ${group.inventoryGroupCode || '未分组'} 填入入库表单`)
 }
 
 function applySkuSuggestion(skuCode: string) {
@@ -285,11 +294,13 @@ function buildImportRows() {
     if (line.includes('|')) {
       const parts = line.split('|').map((part) => part.trim())
 
-      if (parts.length !== 4) {
-        throw new Error(`第 ${index + 1} 行格式不正确，请使用 内部SKU|凭据类型|批次号|凭据内容`)
+      if (parts.length !== 4 && parts.length !== 5) {
+        throw new Error(`第 ${index + 1} 行格式不正确，请使用 内部SKU|凭据类型|批次号|库存组|凭据内容`)
       }
 
-      const [skuCode, credentialType, batchNo, displayValue] = parts
+      const [skuCode, credentialType, batchNo, inventoryGroupCode, displayValue] = parts.length === 5
+        ? parts
+        : [parts[0], parts[1], parts[2], '', parts[3]]
       if (!skuCode || !displayValue) {
         throw new Error(`第 ${index + 1} 行缺少内部 SKU 或凭据内容`)
       }
@@ -298,6 +309,7 @@ function buildImportRows() {
         skuCode,
         credentialType: credentialType || defaultCredentialType,
         batchNo,
+        inventoryGroupCode: inventoryGroupCode || entryInventoryGroupCode.value.trim(),
         displayValue,
       })
       continue
@@ -311,6 +323,7 @@ function buildImportRows() {
       skuCode: defaultSkuCode,
       credentialType: defaultCredentialType,
       batchNo: defaultBatchNo,
+      inventoryGroupCode: entryInventoryGroupCode.value.trim(),
       displayValue: line,
     })
   }
@@ -330,6 +343,7 @@ async function loadInventoryItems(page = pagination.value.page) {
       credentialType: filterCredentialType.value.trim(),
       status: filterStatus.value.trim(),
       batchNo: filterBatchNo.value.trim(),
+      inventoryGroupCode: filterInventoryGroupCode.value.trim(),
     })
     items.value = response.data.items
     pagination.value = response.data.pagination
@@ -346,6 +360,7 @@ async function loadInventorySkuSuggestions() {
   try {
     const response = await fetchAdminInventorySkuSuggestions({
       credentialType: entryCredentialType.value.trim() || 'tencent_code',
+      inventoryGroupCode: entryInventoryGroupCode.value.trim(),
       limit: 50,
     })
     inventorySkuSuggestions.value = response.data.items
@@ -361,6 +376,7 @@ function resetFilters() {
   filterCredentialType.value = ''
   filterStatus.value = ''
   filterBatchNo.value = ''
+  filterInventoryGroupCode.value = ''
   void loadInventoryItems(1)
 }
 
@@ -377,6 +393,7 @@ async function submitCreate() {
       skuCode: entrySkuCode.value.trim(),
       credentialType: entryCredentialType.value.trim() || 'tencent_code',
       batchNo: entryBatchNo.value.trim(),
+      inventoryGroupCode: entryInventoryGroupCode.value.trim(),
       displayValue: singleDisplayValue.value.trim(),
     })
 
@@ -450,6 +467,10 @@ watch(entryCredentialType, () => {
   void loadInventorySkuSuggestions()
 })
 
+watch(entryInventoryGroupCode, () => {
+  void loadInventorySkuSuggestions()
+})
+
 onMounted(async () => {
   await Promise.all([
     loadInventoryItems(),
@@ -492,6 +513,7 @@ onMounted(async () => {
           </option>
         </select>
         <input v-model="filterBatchNo" class="text-input" placeholder="批次号" />
+        <input v-model="filterInventoryGroupCode" class="text-input" placeholder="库存组，例如 A组" />
       </div>
       <div class="action-row">
         <el-button round type="primary" @click="() => loadInventoryItems(1)">查询列表</el-button>
@@ -518,9 +540,9 @@ onMounted(async () => {
           <datalist id="inventory-sku-suggestions">
             <option
               v-for="suggestion in entrySkuSuggestions"
-              :key="`${suggestion.credentialType}-${suggestion.skuCode}`"
+              :key="`${suggestion.credentialType}-${suggestion.inventoryGroupCode}-${suggestion.skuCode}`"
               :value="suggestion.skuCode"
-              :label="`${suggestion.skuCode} · 可用 ${suggestion.availableCount} / 共 ${suggestion.totalCount}`"
+              :label="`${suggestion.skuCode} · ${suggestion.inventoryGroupCode || '未分组'} · 可用 ${suggestion.availableCount} / 共 ${suggestion.totalCount}`"
             />
           </datalist>
         </div>
@@ -534,6 +556,7 @@ onMounted(async () => {
           </option>
         </select>
         <input v-model="entryBatchNo" class="text-input" placeholder="批次号，可选" />
+        <input v-model="entryInventoryGroupCode" class="text-input" placeholder="库存组，例如 A组 / B组" />
       </div>
 
       <div class="sku-helper-bar">
@@ -544,13 +567,13 @@ onMounted(async () => {
       <div v-if="entrySkuSuggestions.length > 0" class="sku-chip-row">
         <button
           v-for="suggestion in entrySkuSuggestions"
-          :key="`${suggestion.credentialType}-${suggestion.skuCode}-chip`"
+          :key="`${suggestion.credentialType}-${suggestion.inventoryGroupCode}-${suggestion.skuCode}-chip`"
           type="button"
           class="sku-chip"
           @click="applySkuSuggestion(suggestion.skuCode)"
         >
           <span class="sku-chip-title">{{ suggestion.skuCode }}</span>
-          <span class="sku-chip-meta">可用 {{ suggestion.availableCount }} / 共 {{ suggestion.totalCount }}</span>
+          <span class="sku-chip-meta">{{ suggestion.inventoryGroupCode || '未分组' }} · 可用 {{ suggestion.availableCount }} / 共 {{ suggestion.totalCount }}</span>
         </button>
       </div>
 
@@ -559,6 +582,10 @@ onMounted(async () => {
           <span class="helper-title">当前默认匹配</span>
           <span class="helper-copy">{{ getCredentialTypeLabel(entryCredentialType) }}</span>
         </div>
+        <div class="helper-item">
+          <span class="helper-title">库存组</span>
+          <span class="helper-copy">{{ entryInventoryGroupCode || '未分组，默认全局可用' }}</span>
+        </div>
         <div class="helper-item helper-item-wide">
           <span class="helper-title">说明</span>
           <span class="helper-copy">{{ getCredentialTypeHint(entryCredentialType) }}</span>
@@ -573,9 +600,9 @@ onMounted(async () => {
       <textarea
         v-model="bulkText"
         class="text-area"
-        placeholder="批量导入支持两种格式：&#10;1. 每行一个凭据内容（使用上方默认内部 SKU / 凭据类型 / 批次）&#10;2. 每行一条：内部SKU|凭据类型|批次号|凭据内容"
+        placeholder="批量导入支持两种格式：&#10;1. 每行一个凭据内容（使用上方默认内部 SKU / 凭据类型 / 批次 / 库存组）&#10;2. 每行一条：内部SKU|凭据类型|批次号|库存组|凭据内容"
       />
-      <p class="section-tip">示例：`sjz_hdl_test01|tencent_code|sjz-20260412|DJQFf7HgXXXXXXXXXX`</p>
+      <p class="section-tip">示例：`sjz_hdl_test01|tencent_code|sjz-20260412|A组|DJQFf7HgXXXXXXXXXX`</p>
 
       <div class="action-row">
         <el-button :loading="importing" round type="primary" @click="submitImport">批量导入</el-button>
@@ -625,7 +652,9 @@ onMounted(async () => {
             <div class="pool-topline">
               <div class="pool-title-block">
                 <h3 class="pool-title">{{ group.skuCode }}</h3>
-                <span class="pool-subtitle">{{ getCredentialTypeLabel(group.credentialType) }} · {{ group.credentialType }}</span>
+                <span class="pool-subtitle">
+                  {{ getCredentialTypeLabel(group.credentialType) }} · {{ group.credentialType }} · {{ group.inventoryGroupCode || '未分组' }}
+                </span>
               </div>
               <span class="pool-total">共 {{ group.totalCount }} 条</span>
             </div>
@@ -684,12 +713,14 @@ onMounted(async () => {
                 <span class="item-title">#{{ item.inventoryItemId }}</span>
                 <code class="item-value">{{ item.displayValue }}</code>
                 <span class="item-subline">批次 {{ item.batchNo || '未分批' }}</span>
+                <span class="item-subline">库存组 {{ item.inventoryGroupCode || '未分组' }}</span>
               </div>
             </td>
             <td>
               <div class="sku-cell">
                 <span class="sku-title">{{ item.skuCode }}</span>
                 <span class="sku-subline">{{ getCredentialTypeLabel(item.credentialType) }}</span>
+                <span class="sku-subline">库存组 {{ item.inventoryGroupCode || '未分组' }}</span>
                 <span class="sku-subline sku-raw">{{ item.credentialType || '-' }}</span>
               </div>
             </td>
@@ -828,7 +859,7 @@ onMounted(async () => {
 
 .form-grid {
   display: grid;
-  grid-template-columns: repeat(4, minmax(0, 1fr));
+  grid-template-columns: repeat(5, minmax(0, 1fr));
   gap: 12px;
 }
 

apps/frontend/src/views/admin/AdminManualRedeemView.vue

@@ -135,9 +135,9 @@ const taskDetailLink = computed(() => (task.value?.taskId ? `/admin/tasks/${task
           <datalist id="manual-redeem-sku-suggestions">
             <option
               v-for="item in suggestions"
-              :key="`${item.credentialType}-${item.skuCode}`"
+              :key="`${item.credentialType}-${item.inventoryGroupCode}-${item.skuCode}`"
               :value="item.skuCode"
-              :label="`${item.skuCode} · 可用 ${item.availableCount} / 共 ${item.totalCount}`"
+              :label="`${item.skuCode} · ${item.inventoryGroupCode || '未分组'} · 可用 ${item.availableCount} / 共 ${item.totalCount}`"
             />
           </datalist>
         </div>

apps/frontend/src/views/admin/AdminUsersView.vue

@@ -8,6 +8,7 @@ import {
   createAdminUser,
   fetchAdminUsers,
   resetAdminUserPassword,
+  updateAdminUserInventoryGroups,
   updateAdminUserRole,
   updateAdminUserStatus,
 } from '@/services/admin'
@@ -49,6 +50,18 @@ function formatRoleLabel(role: AdminRole) {
   return '普通运营'
 }
 
+function formatInventoryGroups(item: AdminUserListItem) {
+  if (item.role !== 'support') {
+    return ['不限库存组']
+  }
+
+  if (item.inventoryGroupCodes.length === 0) {
+    return ['未绑定']
+  }
+
+  return item.inventoryGroupCodes
+}
+
 async function loadUsers(page = pagination.value.page) {
   if (!hasAdminRole('admin')) {
     loading.value = false
@@ -180,6 +193,46 @@ async function promptResetPassword(item: AdminUserListItem) {
   }
 }
 
+async function promptUpdateInventoryGroups(item: AdminUserListItem) {
+  if (item.role !== 'support') {
+    showError('仅客服账号需要绑定库存组')
+    return
+  }
+
+  try {
+    const result = await showPrompt(
+      `请输入 ${item.username} 可用的库存组，多个组用英文逗号分隔`,
+      '配置库存组',
+      {
+        inputType: 'text',
+        inputValue: item.inventoryGroupCodes.join(','),
+        inputPlaceholder: '例如 A组,B组,售后组',
+        confirmButtonText: '保存',
+        cancelButtonText: '取消',
+      },
+    )
+
+    const inventoryGroupCodes = String(result.value || '')
+      .split(',')
+      .map((value) => value.trim())
+      .filter(Boolean)
+
+    actionLoadingId.value = item.userId
+    await updateAdminUserInventoryGroups(item.userId, {
+      inventoryGroupCodes,
+    })
+    showSuccess('用户库存组已更新')
+    await loadUsers()
+  } catch (error) {
+    if (isFeedbackDismissed(error)) {
+      return
+    }
+    showError(error instanceof Error ? error.message : '更新库存组失败')
+  } finally {
+    actionLoadingId.value = null
+  }
+}
+
 onMounted(loadUsers)
 </script>
 
@@ -233,6 +286,7 @@ onMounted(loadUsers)
               <th>ID</th>
               <th>账号</th>
               <th>角色</th>
+              <th>库存组</th>
               <th>状态</th>
               <th>创建时间</th>
               <th>更新时间</th>
@@ -244,6 +298,17 @@ onMounted(loadUsers)
               <td>{{ item.userId }}</td>
               <td>{{ item.username }}</td>
               <td>{{ formatRoleLabel(item.role) }}</td>
+              <td>
+                <div class="group-chip-row">
+                  <span
+                    v-for="groupCode in formatInventoryGroups(item)"
+                    :key="`${item.userId}-${groupCode}`"
+                    :class="['group-chip', { 'group-chip--muted': groupCode === '未绑定' || groupCode === '不限库存组' }]"
+                  >
+                    {{ groupCode }}
+                  </span>
+                </div>
+              </td>
               <td><AdminStatusTag :status="item.status" /></td>
               <td>{{ formatAdminDateTime(item.createdAt) }}</td>
               <td>{{ formatAdminDateTime(item.updatedAt) }}</td>
@@ -281,6 +346,14 @@ onMounted(loadUsers)
                   >
                     {{ item.status === 'active' ? '停用' : '启用' }}
                   </el-button>
+                  <el-button
+                    :loading="actionLoadingId === item.userId"
+                    link
+                    :disabled="item.role !== 'support'"
+                    @click="promptUpdateInventoryGroups(item)"
+                  >
+                    配库存组
+                  </el-button>
                   <el-button
                     :loading="actionLoadingId === item.userId"
                     link
@@ -385,6 +458,31 @@ onMounted(loadUsers)
   gap: 6px;
 }
 
+.group-chip-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+}
+
+.group-chip {
+  display: inline-flex;
+  align-items: center;
+  min-height: 28px;
+  padding: 0 10px;
+  border-radius: 999px;
+  background: rgba(37, 89, 167, 0.08);
+  border: 1px solid rgba(37, 89, 167, 0.12);
+  color: #2559a7;
+  font-size: 12px;
+  font-weight: 700;
+}
+
+.group-chip--muted {
+  background: rgba(148, 163, 184, 0.12);
+  border-color: rgba(148, 163, 184, 0.18);
+  color: #64748b;
+}
+
 .self-copy {
   color: #64748b;
   font-size: 12px;