up

.workbuddy/memory/2026-04-23.md

@@ -13,10 +13,13 @@
   - 物品 Tab 按钮从弹窗改为跳转独立页面
   - 使用 `useDropzone` 组件上传图片
 - 物品详情页 (`WarehouseItemDetail.vue`) — 物品信息 + 移动历史/关联工单 Tab
-- 物品列表总览 (`WarehouseItemList.vue`)
+- **合并页面 (`WarehouseOverview.vue`)** — 容器+物品合并到一个页面
-  - 路由: `/warehouse/items`，侧边栏入口「物品总览」
+  - 路由 `/warehouse/container` 直接渲染此页面
-  - 统计卡片（总数/已入库/未入库）
+  - 顶部 3 格统计卡片（容器数/物品数/未入库）
-  - 表格：名称/序列号/数量/位置/创建时间 + 跳转详情/删除
+  - Tab 切换「容器」/「物品」
+  - 容器 Tab：搜索+表格+分页+新增/编辑弹窗+删除确认
+  - 物品 Tab：搜索（400ms防抖）+表格+分页+删除确认
+  - 删除了 `/warehouse/item` 独立路由和侧边栏「物品总览」入口
 - 补充 i18n key（中/英双语）
 
 ### 踩坑
@@ -28,4 +31,5 @@
   - 不用 `btn`、`tabs`、`tab`、`input-bordered`、`table`、`modal`、`join`、`form-control`、`badge`、`card` 等 daisyUI 类
   - 用 Tailwind 自定义样式：`rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card`
   - 加载动画用自定义 SVG spinner，不用 `loading loading-spinner`
-  - 弹窗用 `<dialog>` + Tailwind 固定定位，不用 daisyUI `modal`
+  - **弹窗用 `<Transition name="fade">` + `v-if` + `@click.self` 关闭，不用 `<dialog :open>`**，`<dialog>` 的 `:open` 属性在某些场景不会正确响应 false
+- **批量修改 Vue 模板后务必检查缩进**：逐块替换时外层 div 的闭合标签容易被吞，造成 "Element is missing end tag" 错误

frontend/ops_vue_js/src/components/AppHeader.vue

@@ -52,7 +52,6 @@ const navItems = computed(() => [
   { label: t("appname.purchase"), to: "/purchase" },
   { label: t("appname.work_order"), to: "/work_order" },
   { label: t("appname.warehouse"), to: "/warehouse/container" },
-  { label: t("appname.warehouse_items"), to: "/warehouse/item" },
 ]);
 </script>
 

frontend/ops_vue_js/src/i18n/en.json

@@ -155,6 +155,8 @@
   "warehouse": {
     "container_list": "Container List",
     "container_detail": "Container Detail",
+    "overview": "Warehouse Overview",
+    "containers": "Containers",
     "item_list": "Item List",
     "add_container": "Add Container",
     "edit_container": "Edit Container",

frontend/ops_vue_js/src/i18n/zh-CN.json

@@ -155,6 +155,8 @@
   "warehouse": {
     "container_list": "容器列表",
     "container_detail": "容器详情",
+    "overview": "仓库总览",
+    "containers": "容器",
     "item_list": "物品列表",
     "add_container": "新增容器",
     "edit_container": "编辑容器",

frontend/ops_vue_js/src/router/index.js

@@ -77,7 +77,7 @@ const router = createRouter({
         {
           path: 'warehouse/container',
           name: 'warehouse',
-          component: () => import('@/views/warehouse/WarehouseContainerList.vue'),
+          component: () => import('@/views/warehouse/WarehouseOverview.vue'),
         },
         {
           path: 'warehouse/container/:id',
@@ -89,11 +89,6 @@ const router = createRouter({
           name: 'warehouse-add-item',
           component: () => import('@/views/warehouse/WarehouseAddItem.vue'),
         },
-        {
-          path: 'warehouse/item',
-          name: 'warehouse-item-list',
-          component: () => import('@/views/warehouse/WarehouseItemList.vue'),
-        },
         {
           path: 'warehouse/item/:id',
           name: 'warehouse-item-detail',
@@ -160,7 +155,7 @@ router.beforeEach((to) => {
   const userStore = useUserStore()
 
   // 不需要登录的页面
-  const publicPages = ['/', '/login', '/register', '/forgot_password', '/schedule', '/warehouse/container', '/warehouse/item', '/404']
+  const publicPages = ['/', '/login', '/register', '/forgot_password', '/schedule', '/404']
   if (publicPages.includes(to.path)) return true
 
   // 未登录 → 跳转登录

frontend/ops_vue_js/src/views/warehouse/WarehouseContainerDetail.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, computed, onMounted, watch } from 'vue'
+import { ref, reactive, computed, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useToastStore } from '@/stores/toast'
@@ -71,9 +71,6 @@ function itemPageRange() {
   return Array.from({ length: end - start + 1 }, (_, i) => start + i)
 }
 
-// ── Tab ──
-const activeTab = ref('sub_containers')
-
 // ── 新增子容器弹窗 ──
 const showAddSub = ref(false)
 const addSubForm = reactive({ title: '', remark: '' })
@@ -157,12 +154,6 @@ async function fetchItems() {
   }
 }
 
-// ── 切 tab 时加载对应数据 ──
-watch(activeTab, (tab) => {
-  if (tab === 'sub_containers') fetchSubContainers()
-  else fetchItems()
-})
-
 // ── 新增子容器 ──
 async function submitAddSub() {
   if (!addSubForm.title.trim()) {
@@ -256,9 +247,8 @@ async function doDelete() {
 // ── 初始化 ──
 onMounted(async () => {
   await fetchContainer()
-  if (activeTab.value === 'sub_containers') {
   fetchSubContainers()
-  }
+  fetchItems()
 })
 </script>
 
@@ -354,30 +344,8 @@ onMounted(async () => {
         </div>
       </div>
 
-      <!-- Tab 切换 -->
-      <div class="flex gap-1 rounded-lg border border-gray-200 bg-gray-50 p-1 dark:border-dk-muted dark:bg-dk-base w-fit">
-        <button
-          class="px-4 py-1.5 text-sm rounded-md font-medium transition-colors"
-          :class="activeTab === 'sub_containers'
-            ? 'bg-white text-gray-900 shadow-sm dark:bg-dk-card dark:text-white'
-            : 'text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'"
-          @click="activeTab = 'sub_containers'"
-        >
-          {{ t('warehouse.child_containers') }} ({{ container.ChildCount }})
-        </button>
-        <button
-          class="px-4 py-1.5 text-sm rounded-md font-medium transition-colors"
-          :class="activeTab === 'items'
-            ? 'bg-white text-gray-900 shadow-sm dark:bg-dk-card dark:text-white'
-            : 'text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'"
-          @click="activeTab = 'items'"
-        >
-          {{ t('warehouse.items') }} ({{ container.ItemCount }})
-        </button>
-      </div>
-
       <!-- 子容器列表 -->
-      <div v-if="activeTab === 'sub_containers'" class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
+      <div class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
         <!-- 工具栏 -->
         <div class="flex items-center gap-2 px-5 py-3 border-b border-gray-100 dark:border-dk-muted">
           <div class="relative flex-1 max-w-xs">
@@ -493,7 +461,7 @@ onMounted(async () => {
       </div>
 
       <!-- 物品列表 -->
-      <div v-if="activeTab === 'items'" class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
+      <div class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
         <!-- 工具栏 -->
         <div class="flex items-center gap-2 px-5 py-3 border-b border-gray-100 dark:border-dk-muted">
           <div class="relative flex-1 max-w-xs">

frontend/ops_vue_js/src/views/warehouse/WarehouseOverview.vue

@@ -0,0 +1,692 @@
+<script setup>
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { useI18n } from 'vue-i18n'
+import { useToastStore } from '@/stores/toast'
+import { usePageTitle } from '@/composables/usePageTitle'
+import { warehouseApi } from '@/api/warehouse'
+import ConfirmDialog from '@/components/ConfirmDialog.vue'
+import {
+  IconPlus,
+  IconChevronLeft,
+  IconChevronRight,
+  IconFolder,
+  IconFolders,
+  IconPackage,
+  IconSearch,
+  IconTrash,
+  IconEdit,
+  IconArrowRight,
+} from '@tabler/icons-vue'
+
+usePageTitle('warehouse.overview')
+const { t, locale } = useI18n()
+const router = useRouter()
+const toast = useToastStore()
+
+const isEn = computed(() => locale.value === 'en')
+
+// ── 统计 ──
+const stats = reactive({
+  container_total: 0,
+  item_total: 0,
+  unstored_items: 0,
+})
+
+// ═══════════════════════════════════════════════════════
+//  容器相关
+// ═══════════════════════════════════════════════════════
+const containers = ref([])
+const containerTotal = ref(0)
+const containerPage = ref(1)
+const containerPageSize = ref(10)
+const containerSearch = ref('')
+const containerLoading = ref(false)
+const containerMap = ref({}) // id -> title
+
+// 新增/编辑弹窗
+const showContainerForm = ref(false)
+const containerFormTitle = ref('')
+const editingContainerId = ref(null)
+const containerForm = reactive({ title: '', remark: '' })
+const submittingContainer = ref(false)
+
+// 删除确认
+const showDeleteConfirm = ref(false)
+const deletingId = ref(null)
+const deletingName = ref('')
+const deleting = ref(false)
+
+const containerTotalPages = computed(() => Math.ceil(containerTotal.value / containerPageSize.value) || 1)
+
+function containerPageRange() {
+  const total = containerTotalPages.value
+  const cur = containerPage.value
+  let start = Math.max(1, cur - 2)
+  let end = Math.min(cur + 4, total)
+  if (end - start < 4) start = Math.max(1, end - 4)
+  return Array.from({ length: end - start + 1 }, (_, i) => start + i)
+}
+
+async function fetchContainerStats() {
+  try {
+    const { errCode, data } = await warehouseApi.getCount()
+    if (errCode === 0) {
+      stats.container_total = data.container_total ?? 0
+      stats.item_total = data.item_total ?? 0
+      stats.unstored_items = data.unstored_items ?? 0
+    }
+  } catch { /* silent */ }
+}
+
+async function fetchContainers() {
+  containerLoading.value = true
+  try {
+    const { errCode, data } = await warehouseApi.getContainers({
+      search: containerSearch.value,
+      entries: containerPageSize.value,
+      page: containerPage.value,
+    })
+    if (errCode === 0) {
+      containers.value = data.containers ?? []
+      containerTotal.value = data.all_count ?? 0
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch { /* interceptor handled */ }
+  finally { containerLoading.value = false }
+}
+
+async function fetchAllContainerMap() {
+  try {
+    const { errCode, data } = await warehouseApi.getContainers({ entries: 500, page: 1 })
+    if (errCode === 0 && data) {
+      const map = {}
+      for (const c of (data.containers || [])) map[c.id] = c.title
+      containerMap.value = map
+    }
+  } catch { /* ignore */ }
+}
+
+function goContainerPage(page) {
+  if (page < 1 || page > containerTotalPages.value) return
+  containerPage.value = page
+  fetchContainers()
+}
+
+function handleContainerPageSize(e) {
+  let val = parseInt(e.target.value) || 10
+  if (val > 300) val = 300
+  if (val < 1) val = 1
+  containerPageSize.value = val
+  containerPage.value = 1
+  fetchContainers()
+}
+
+function openAddContainer() {
+  containerFormTitle.value = t('warehouse.add_container')
+  editingContainerId.value = null
+  containerForm.title = ''
+  containerForm.remark = ''
+  showContainerForm.value = true
+}
+
+async function openEditContainer(id, e) {
+  e.stopPropagation()
+  try {
+    const { errCode, data } = await warehouseApi.getContainer(id)
+    if (errCode === 0) {
+      containerFormTitle.value = t('warehouse.edit_container')
+      editingContainerId.value = id
+      containerForm.title = data.container.title ?? ''
+      containerForm.remark = data.container.remark ?? ''
+      showContainerForm.value = true
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch { /* interceptor handled */ }
+}
+
+async function submitContainerForm() {
+  if (!containerForm.title.trim()) {
+    toast.warning(t('warehouse.title_required'))
+    return
+  }
+  submittingContainer.value = true
+  try {
+    const payload = { title: containerForm.title.trim(), remark: containerForm.remark.trim() }
+    const { errCode } = editingContainerId.value
+      ? await warehouseApi.updateContainer({ id: editingContainerId.value, ...payload })
+      : await warehouseApi.addContainer(payload)
+    if (errCode === 0) {
+      showContainerForm.value = false
+      toast.success(t('message.save_success'))
+      fetchContainers()
+      fetchContainerStats()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch { /* interceptor handled */ }
+  finally { submittingContainer.value = false }
+}
+
+function confirmDeleteContainer(id, title, e) {
+  e.stopPropagation()
+  deletingId.value = id
+  deletingName.value = title
+  showDeleteConfirm.value = true
+}
+
+async function doDeleteContainer() {
+  deleting.value = true
+  try {
+    const { errCode } = await warehouseApi.deleteContainer(deletingId.value)
+    if (errCode === 0) {
+      toast.success(t('message.delete_ok'))
+      showDeleteConfirm.value = false
+      fetchContainers()
+      fetchContainerStats()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch { /* silent */ }
+  finally { deleting.value = false }
+}
+
+function jumpToContainer(id) {
+  router.push(`/warehouse/container/${id}`)
+}
+
+// ═══════════════════════════════════════════════════════
+//  物品相关
+// ═══════════════════════════════════════════════════════
+const items = ref([])
+const itemTotal = ref(0)
+const itemPage = ref(1)
+const itemPageSize = ref(10)
+const itemSearch = ref('')
+const itemLoading = ref(false)
+const itemTotalPages = computed(() => Math.ceil(itemTotal.value / itemPageSize.value) || 1)
+
+const itemStats = reactive({ total: 0, inContainer: 0, unstored: 0 })
+
+async function fetchItems() {
+  itemLoading.value = true
+  try {
+    const { errCode, data } = await warehouseApi.getItems({
+      search: itemSearch.value.trim(),
+      entries: itemPageSize.value,
+      page: itemPage.value,
+    })
+    if (errCode === 0 && data) {
+      items.value = data.items || []
+      itemTotal.value = data.all_count || 0
+      itemStats.total = data.all_count || 0
+      itemStats.inContainer = items.value.filter(i => i.container_id != null).length
+      itemStats.unstored = items.value.filter(i => i.container_id == null).length
+    }
+  } catch { toast.error(t('message.server_error')) }
+  finally { itemLoading.value = false }
+}
+
+let searchTimer = null
+function onItemSearchInput() {
+  clearTimeout(searchTimer)
+  searchTimer = setTimeout(() => {
+    itemPage.value = 1
+    fetchItems()
+  }, 400)
+}
+
+function prevItemPage() {
+  if (itemPage.value > 1) { itemPage.value--; fetchItems() }
+}
+function nextItemPage() {
+  if (itemPage.value < itemTotalPages.value) { itemPage.value++; fetchItems() }
+}
+function goItemPage(p) {
+  if (p >= 1 && p <= itemTotalPages.value && p !== itemPage.value) { itemPage.value = p; fetchItems() }
+}
+
+const itemPageNumbers = computed(() => {
+  const total = itemTotalPages.value
+  const cur = itemPage.value
+  if (total <= 5) return Array.from({ length: total }, (_, i) => i + 1)
+  const pages = []
+  if (cur <= 3) pages.push(1, 2, 3, 4, '...', total)
+  else if (cur >= total - 2) pages.push(1, '...', total - 3, total - 2, total - 1, total)
+  else pages.push(1, '...', cur - 1, cur, cur + 1, '...', total)
+  return pages
+})
+
+function goToItemDetail(item) {
+  router.push(`/warehouse/item/${item.id}`)
+}
+
+const deleteItemTarget = ref(null)
+const showDeleteItemConfirm = ref(false)
+const deletingItem = ref(false)
+
+function askDeleteItem(item) {
+  deleteItemTarget.value = item
+  showDeleteItemConfirm.value = true
+}
+
+async function doDeleteItem() {
+  if (!deleteItemTarget.value) return
+  deletingItem.value = true
+  try {
+    const { errCode } = await warehouseApi.deleteItem(deleteItemTarget.value.id)
+    if (errCode === 0) {
+      toast.success(t('message.delete_success'))
+      showDeleteItemConfirm.value = false
+      deleteItemTarget.value = null
+      fetchItems()
+      fetchContainerStats()
+    } else {
+      toast.error(t('message.server_error'))
+    }
+  } catch { toast.error(t('message.server_error')) }
+  finally { deletingItem.value = false }
+}
+
+function getContainerTitle(cid) {
+  return containerMap.value[cid] || `#${cid}`
+}
+
+// ── 工具函数 ──
+function formatDate(dateStr) {
+  if (!dateStr) return '—'
+  try {
+    const d = new Date(dateStr)
+    return d.toLocaleDateString(isEn.value ? 'en-US' : 'zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit' })
+  } catch { return dateStr }
+}
+
+function fmtTs(ts) {
+  if (!ts) return '—'
+  const d = new Date(parseInt(ts) * 1000)
+  return d.toLocaleString()
+}
+
+// ── 初始化 ──
+onMounted(() => {
+  fetchContainerStats()
+  fetchContainers()
+  fetchAllContainerMap().then(() => fetchItems())
+})
+</script>
+
+<template>
+  <div class="mx-auto max-w-6xl px-6 py-6 space-y-4">
+
+    <!-- 统计卡片 -->
+    <div class="grid grid-cols-3 gap-4">
+      <div class="rounded-xl border border-gray-200 bg-white px-5 py-4 shadow dark:border-dk-muted dark:bg-dk-card">
+        <div class="flex items-center gap-2 text-gray-500 dark:text-gray-400">
+          <IconFolders :size="18" />
+          <span class="text-sm">{{ t('warehouse.container_count') }}</span>
+        </div>
+        <div class="mt-1 text-2xl font-bold text-gray-900 dark:text-white">{{ stats.container_total }}</div>
+      </div>
+      <div class="rounded-xl border border-gray-200 bg-white px-5 py-4 shadow dark:border-dk-muted dark:bg-dk-card">
+        <div class="flex items-center gap-2 text-gray-500 dark:text-gray-400">
+          <IconPackage :size="18" />
+          <span class="text-sm">{{ t('warehouse.item_count') }}</span>
+        </div>
+        <div class="mt-1 text-2xl font-bold text-gray-900 dark:text-white">{{ stats.item_total }}</div>
+      </div>
+      <div class="rounded-xl border border-gray-200 bg-white px-5 py-4 shadow dark:border-dk-muted dark:bg-dk-card">
+        <div class="flex items-center gap-2 text-gray-500 dark:text-gray-400">
+          <IconPackage :size="18" />
+          <span class="text-sm">{{ t('warehouse.unstored_items') }}</span>
+        </div>
+        <div class="mt-1 text-2xl font-bold text-orange-600 dark:text-orange-400">{{ stats.unstored_items }}</div>
+      </div>
+    </div>
+
+    <!-- 主卡片：容器 -->
+    <div class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
+        <!-- Header -->
+        <div class="flex items-center justify-between border-b border-gray-100 px-6 py-4 dark:border-dk-muted">
+          <h3 class="text-lg font-semibold text-gray-900 dark:text-white">{{ t('warehouse.container_list') }}</h3>
+          <button
+            @click="openAddContainer"
+            class="inline-flex items-center gap-1.5 rounded-lg bg-blue-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-blue-700"
+          >
+            <IconPlus :size="16" />
+            {{ t('warehouse.add_container') }}
+          </button>
+        </div>
+
+        <!-- 搜索栏 -->
+        <div class="flex items-center gap-3 border-b border-gray-100 px-6 py-3 dark:border-dk-muted">
+          <div class="relative flex-1 max-w-xs">
+            <IconSearch class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" :size="16" />
+            <input
+              v-model="containerSearch"
+              type="text"
+              :placeholder="t('warehouse.search_placeholder')"
+              class="w-full rounded-lg border border-gray-300 bg-white py-1.5 pl-9 pr-3 text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white"
+              @keyup.enter="containerPage = 1; fetchContainers()"
+            />
+          </div>
+          <button
+            @click="containerPage = 1; fetchContainers()"
+            class="rounded-lg border border-gray-300 bg-white px-3 py-1.5 text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white hover:bg-gray-50 dark:hover:bg-dk-muted"
+          >
+            {{ t('purchase.search') }}
+          </button>
+        </div>
+
+        <!-- 表格 -->
+        <div class="overflow-x-auto">
+          <table class="w-full text-left text-sm text-gray-900">
+            <thead>
+              <tr class="border-b border-gray-200 bg-gray-50 text-gray-500 dark:border-dk-muted dark:bg-dk-base dark:text-gray-400">
+                <th class="px-6 py-3 font-medium w-16">ID</th>
+                <th class="px-6 py-3 font-medium">{{ t('warehouse.container_name') }}</th>
+                <th class="px-6 py-3 font-medium">{{ t('warehouse.remark') }}</th>
+                <th class="px-6 py-3 font-medium w-24 text-center">{{ t('warehouse.child_containers') }}</th>
+                <th class="px-6 py-3 font-medium w-24 text-center">{{ t('warehouse.items') }}</th>
+                <th class="px-6 py-3 font-medium whitespace-nowrap w-44">{{ t('warehouse.created_at') }}</th>
+                <th class="px-6 py-3 font-medium w-28 text-right">{{ t('warehouse.actions') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="containerLoading">
+                <td colspan="7" class="px-6 py-8 text-center text-gray-400">
+                  <svg class="mx-auto mb-2 h-5 w-5 animate-spin text-gray-400" viewBox="0 0 24 24" fill="none">
+                    <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
+                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8v8H4z" />
+                  </svg>
+                  {{ t('message.loading') }}
+                </td>
+              </tr>
+              <tr v-else-if="containers.length === 0">
+                <td colspan="7" class="px-6 py-8 text-center text-gray-400 dark:text-gray-500">
+                  {{ t('warehouse.no_containers') }}
+                </td>
+              </tr>
+              <tr
+                v-else
+                v-for="c in containers"
+                :key="c.ID"
+                class="cursor-pointer border-b border-gray-100 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:hover:bg-dk-base"
+                @click="jumpToContainer(c.ID)"
+              >
+                <td class="px-6 py-3 text-gray-500 dark:text-gray-400">{{ c.ID }}</td>
+                <td class="px-6 py-3">
+                  <div class="flex items-center gap-2">
+                    <IconFolder class="flex-shrink-0 text-blue-500" :size="18" />
+                    <span class="max-w-xs truncate font-medium text-gray-900 dark:text-white">{{ c.Title }}</span>
+                  </div>
+                </td>
+                <td class="px-6 py-3 max-w-xs truncate text-gray-500 dark:text-gray-400">{{ c.Remark || '—' }}</td>
+                <td class="px-6 py-3 text-center">
+                  <span class="inline-flex items-center gap-1 rounded-full bg-purple-100 px-2 py-0.5 text-xs font-medium text-purple-700 dark:bg-purple-900/40 dark:text-purple-400">
+                    <IconFolders :size="12" />
+                    {{ c.ChildCount }}
+                  </span>
+                </td>
+                <td class="px-6 py-3 text-center">
+                  <span class="inline-flex items-center gap-1 rounded-full bg-green-100 px-2 py-0.5 text-xs font-medium text-green-700 dark:bg-green-900/40 dark:text-green-400">
+                    <IconPackage :size="12" />
+                    {{ c.ItemCount }}
+                  </span>
+                </td>
+                <td class="px-6 py-3 whitespace-nowrap text-gray-500 dark:text-gray-400">{{ fmtTs(c.CreatedAt) }}</td>
+                <td class="px-6 py-3 text-right" @click.stop>
+                  <div class="flex items-center justify-end gap-1">
+                    <button
+                      v-if="c.ChildCount === 0 && c.ItemCount === 0"
+                      class="rounded p-1.5 text-gray-400 hover:bg-gray-100 hover:text-red-500 dark:hover:bg-dk-muted"
+                      :title="t('warehouse.delete')"
+                      @click="confirmDeleteContainer(c.ID, c.Title, $event)"
+                    >
+                      <IconTrash :size="15" />
+                    </button>
+                    <button
+                      class="rounded p-1.5 text-gray-400 hover:bg-gray-100 hover:text-blue-500 dark:hover:bg-dk-muted"
+                      :title="t('warehouse.edit')"
+                      @click="openEditContainer(c.ID, $event)"
+                    >
+                      <IconEdit :size="15" />
+                    </button>
+                    <button
+                      class="rounded p-1.5 text-gray-400 hover:bg-gray-100 hover:text-blue-500 dark:hover:bg-dk-muted"
+                      :title="t('warehouse.view_items')"
+                      @click="jumpToContainer(c.ID)"
+                    >
+                      <IconChevronRight :size="15" />
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+
+        <!-- 分页 -->
+        <div class="flex flex-col items-center gap-3 border-t border-gray-100 px-6 py-4 sm:flex-row sm:justify-between dark:border-dk-muted">
+          <div class="flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400">
+            <span>共 {{ containerTotal }} 条</span>
+            <span>每页</span>
+            <input
+              type="number"
+              :value="containerPageSize"
+              min="1"
+              max="300"
+              class="w-14 rounded border border-gray-300 px-1.5 py-0.5 text-center text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white"
+              @change="handleContainerPageSize"
+            />
+            <span>条</span>
+          </div>
+          <div class="flex items-center gap-1">
+            <button @click="goContainerPage(1)" :disabled="containerPage === 1" class="rounded p-1.5 text-gray-500 hover:bg-gray-100 disabled:opacity-30 dark:hover:bg-dk-muted">
+              <svg class="h-4 w-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M11 17l-5-5 5-5M18 17l-5-5 5-5"/></svg>
+            </button>
+            <button @click="goContainerPage(containerPage - 1)" :disabled="containerPage === 1" class="rounded p-1.5 text-gray-500 hover:bg-gray-100 disabled:opacity-30 dark:hover:bg-dk-muted">
+              <IconChevronLeft :size="16" />
+            </button>
+            <button
+              v-for="p in containerPageRange()" :key="p"
+              @click="goContainerPage(p)"
+              :class="['rounded px-2.5 py-1 text-sm', p === containerPage ? 'bg-blue-600 text-white' : 'text-gray-600 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-dk-muted']"
+            >{{ p }}</button>
+            <button @click="goContainerPage(containerPage + 1)" :disabled="containerPage === containerTotalPages" class="rounded p-1.5 text-gray-500 hover:bg-gray-100 disabled:opacity-30 dark:hover:bg-dk-muted">
+              <IconChevronRight :size="16" />
+            </button>
+            <button @click="goContainerPage(containerTotalPages)" :disabled="containerPage === containerTotalPages" class="rounded p-1.5 text-gray-500 hover:bg-gray-100 disabled:opacity-30 dark:hover:bg-dk-muted">
+              <svg class="h-4 w-4" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M13 17l5-5-5-5M6 17l5-5-5-5"/></svg>
+            </button>
+          </div>
+        </div>
+      </div>
+
+    <!-- 主卡片：物品 -->
+    <div class="rounded-xl border border-gray-200 bg-white shadow dark:border-dk-muted dark:bg-dk-card">
+      <!-- Header -->
+      <div class="flex items-center justify-between border-b border-gray-100 px-6 py-4 dark:border-dk-muted">
+        <h3 class="text-lg font-semibold text-gray-900 dark:text-white">{{ t('warehouse.item_list') }}</h3>
+      </div>
+
+      <!-- 搜索栏 -->
+      <div class="flex items-center gap-3 border-b border-gray-100 px-6 py-3 dark:border-dk-muted">
+        <IconSearch class="flex-shrink-0 text-gray-400" :size="18" />
+        <input
+          v-model="itemSearch"
+          class="flex-1 bg-transparent text-sm text-gray-900 outline-none dark:text-white"
+          :placeholder="t('warehouse.search_item_placeholder')"
+          @input="onItemSearchInput"
+        />
+      </div>
+
+      <!-- 表格 -->
+      <div class="overflow-x-auto">
+        <table class="w-full text-left text-sm text-gray-900 dark:text-white">
+          <thead>
+            <tr class="border-b border-gray-200 bg-gray-50 text-gray-500 dark:border-dk-muted dark:bg-dk-base dark:text-gray-400">
+              <th class="px-6 py-3 font-medium">{{ t('warehouse.item_name') }}</th>
+              <th class="px-6 py-3 font-medium">{{ t('warehouse.serial_number') }}</th>
+              <th class="px-6 py-3 font-medium w-20 text-center">{{ t('warehouse.quantity') }}</th>
+              <th class="px-6 py-3 font-medium">{{ t('warehouse.location') }}</th>
+              <th class="px-6 py-3 font-medium whitespace-nowrap">{{ t('warehouse.created_at') }}</th>
+              <th class="px-6 py-3 font-medium w-16 text-right">{{ t('warehouse.actions') }}</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-if="itemLoading">
+              <td colspan="6" class="px-6 py-8 text-center text-gray-400">
+                <svg class="mx-auto mb-2 h-5 w-5 animate-spin text-gray-400" viewBox="0 0 24 24" fill="none">
+                  <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
+                  <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8v8H4z" />
+                </svg>
+                {{ t('message.loading') }}
+              </td>
+            </tr>
+            <tr v-else-if="items.length === 0">
+              <td colspan="6" class="px-6 py-8 text-center text-gray-400 dark:text-gray-500">
+                {{ t('warehouse.no_items') }}
+              </td>
+            </tr>
+            <tr
+              v-else
+              v-for="item in items" :key="item.id"
+              class="cursor-pointer border-b border-gray-100 transition-colors hover:bg-gray-50 dark:border-dk-muted dark:hover:bg-dk-base"
+              @click="goToItemDetail(item)"
+            >
+              <td class="px-6 py-3 font-medium max-w-[200px] truncate">{{ item.name }}</td>
+              <td class="px-6 py-3 max-w-[160px] truncate text-xs text-gray-500 dark:text-gray-400">{{ item.serial_number || '—' }}</td>
+              <td class="px-6 py-3 text-center text-sm">{{ item.quantity }}</td>
+              <td class="px-6 py-3">
+                <span v-if="item.container_id != null" class="inline-flex items-center gap-1 text-sm text-blue-600">
+                  <IconArrowRight :size="13" />
+                  <span class="max-w-[140px] truncate">{{ getContainerTitle(item.container_id) }}</span>
+                </span>
+                <span v-else class="inline-flex items-center gap-1 text-xs text-orange-500">
+                  {{ t('warehouse.unstored_items') }}
+                </span>
+              </td>
+              <td class="px-6 py-3 whitespace-nowrap text-xs text-gray-400 dark:text-gray-500">{{ formatDate(item.created_at) }}</td>
+              <td class="px-6 py-3 text-right" @click.stop>
+                <button
+                  class="flex h-7 w-7 items-center justify-center rounded text-red-500 hover:bg-red-50 dark:hover:bg-red-900/20"
+                  @click="askDeleteItem(item)"
+                >
+                  <IconTrash :size="14" />
+                </button>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <!-- 分页 -->
+      <div v-if="itemTotalPages > 1" class="flex items-center justify-between border-t border-gray-100 px-6 py-3 dark:border-dk-muted">
+        <div class="text-xs text-gray-400 dark:text-gray-500">
+          {{ t('warehouse.total_items', { count: itemTotal }) }}
+        </div>
+        <div class="flex items-center gap-1">
+          <button
+            class="flex h-7 w-7 items-center justify-center rounded text-sm text-gray-500 hover:bg-gray-100 disabled:cursor-not-allowed disabled:opacity-30 dark:text-gray-400 dark:hover:bg-dk-muted"
+            :disabled="itemPage === 1"
+            @click="prevItemPage"
+          >
+            <IconChevronLeft :size="15" />
+          </button>
+          <template v-for="p in itemPageNumbers" :key="p">
+            <span v-if="p === '...'" class="px-1 text-sm text-gray-400">…</span>
+            <button
+              v-else
+              class="flex h-7 w-7 items-center justify-center rounded text-sm"
+              :class="p === itemPage
+                ? 'bg-blue-600 font-medium text-white'
+                : 'text-gray-500 hover:bg-gray-100 dark:text-gray-400 dark:hover:bg-dk-muted'"
+              @click="goItemPage(p)"
+            >{{ p }}</button>
+          </template>
+          <button
+            class="flex h-7 w-7 items-center justify-center rounded text-sm text-gray-500 hover:bg-gray-100 disabled:cursor-not-allowed disabled:opacity-30 dark:text-gray-400 dark:hover:bg-dk-muted"
+            :disabled="itemPage === itemTotalPages"
+            @click="nextItemPage"
+          >
+            <IconChevronRight :size="15" />
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- 容器 新增/编辑弹窗 -->
+  <Transition name="fade">
+    <div
+      v-if="showContainerForm"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/40"
+      @click.self="showContainerForm = false"
+    >
+      <div class="w-full max-w-md rounded-xl border border-gray-200 bg-white p-5 shadow-xl dark:border-dk-muted dark:bg-dk-card">
+        <h3 class="mb-4 text-base font-semibold text-gray-900 dark:text-white">{{ containerFormTitle }}</h3>
+        <div class="space-y-3">
+          <div>
+            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">
+              {{ t('warehouse.container_name') }} <span class="text-red-500">*</span>
+            </label>
+            <input
+              v-model="containerForm.title"
+              type="text"
+              :placeholder="t('warehouse.title_placeholder')"
+              class="w-full rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white"
+              @keyup.enter="submitContainerForm"
+            />
+          </div>
+          <div>
+            <label class="mb-1 block text-sm font-medium text-gray-700 dark:text-gray-300">{{ t('warehouse.remark') }}</label>
+            <textarea
+              v-model="containerForm.remark"
+              rows="3"
+              :placeholder="t('warehouse.remark_placeholder')"
+              class="w-full resize-none rounded-lg border border-gray-300 bg-white px-3 py-2 text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white"
+            ></textarea>
+          </div>
+        </div>
+        <div class="mt-4 flex justify-end gap-2">
+          <button
+            @click="showContainerForm = false"
+            class="rounded-lg border border-gray-300 bg-white px-4 py-2 text-sm dark:border-dk-muted dark:bg-dk-base dark:text-white hover:bg-gray-50 dark:hover:bg-dk-muted"
+          >
+            {{ t('message.cancel') }}
+          </button>
+          <button
+            @click="submitContainerForm"
+            :disabled="submittingContainer"
+            class="rounded-lg bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-60"
+          >
+            {{ submittingContainer ? t('message.submitting') : t('message.submit') }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </Transition>
+
+  <!-- 容器 删除确认 -->
+  <ConfirmDialog
+    v-model="showDeleteConfirm"
+    :title="t('warehouse.delete_confirm_title')"
+    :message="t('warehouse.delete_confirm_msg', { name: deletingName })"
+    :confirm-text="t('warehouse.delete')"
+    :cancel-text="t('message.cancel')"
+    :confirm-loading="deleting"
+    danger
+    @confirm="doDeleteContainer"
+  />
+
+  <!-- 物品 删除确认 -->
+  <ConfirmDialog
+    v-model="showDeleteItemConfirm"
+    :title="t('warehouse.delete_item_title')"
+    :message="t('warehouse.delete_item_msg', { name: deleteItemTarget?.name })"
+    :confirm-loading="deletingItem"
+    @confirm="doDeleteItem"
+  />
+</template>