From 5406b14b5c2203e9b60574b070d5921f5907c0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A0=E9=97=BB=E9=A3=8E?= <wuwenfengmi@gmail.com>
Date: Wed, 24 Jun 2026 13:09:29 +0800
Subject: [PATCH] up

---
 .gitignore                                    | Bin 94 -> 214 bytes
 frontend/ops_vue_js/.gitignore                |  67 +++++++++---
 frontend/ops_vue_js/src/i18n/en.json          |   2 +
 frontend/ops_vue_js/src/i18n/zh-CN.json       |   2 +
 .../warehouse/WarehouseContainerList.vue      | 100 ++++++++++++++----
 5 files changed, 133 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3bc1785debb43cdb33670b3dd69d52fb2bd47848..23d8f0f39f53ee8856e842d61e40a24b8319d049 100644
GIT binary patch
literal 214
zcmYLDK?=e!5WMdz0^R~{>kGW-O;AYjTH0jWL|Zl_siha+ZYokQ!_4dqvpaEBqH_a9
zz>}&~;y@r}@fRCA0@e~xc}|1tZQ9=tWeHe?CfZylo9r~U5lsu##$YFIfghxkh@Q0T
zoCcgZJln~b1@if9Tpk5{Ma_l^Kxe2aKw_Nz7a8Px4PLm9*%-KARYjxc(1hjpy~H%G
I`ILS501FjDT>t<8

literal 94
zcmezWPmiITA)ld$A)6tIp_Cy72rC(Q8Mqj<fKZ=7kHLi@m?0jBOTem9!E$Lp_4y2W
MK(SOHnSxUt0D1WkzyJUM

diff --git a/frontend/ops_vue_js/.gitignore b/frontend/ops_vue_js/.gitignore
index 32258b0..b6c2e4b 100644
--- a/frontend/ops_vue_js/.gitignore
+++ b/frontend/ops_vue_js/.gitignore
@@ -7,32 +7,65 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
+# Dependencies
 node_modules
-.DS_Store
+.pnp
+.pnp.js
+
+# Build output
 dist
 dist-ssr
-coverage
 *.local
 
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-
-*.tsbuildinfo
-
-.eslintcache
+# Testing
+coverage
+.nyc_output
+__screenshots__/
 
 # Cypress
 /cypress/videos/
 /cypress/screenshots/
 
-# Vitest
-__screenshots__/
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+*.swp
+*.swo
+*~
 
+# TypeScript
+*.tsbuildinfo
+
+# ESLint
+.eslintcache
+
+# Environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Temporary files
+*.tmp
+*.temp
+.cache
+.parcel-cache
+
+# OS files
+Thumbs.db
+Desktop.ini
+
+# Documentation (temporary/generated)
+*_SUMMARY.md
+SEARCH_FIX_SUMMARY.md
+
+# Project specific
 .workbuddy
diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json
index d1f1d6f..cf80f6f 100644
--- a/frontend/ops_vue_js/src/i18n/en.json
+++ b/frontend/ops_vue_js/src/i18n/en.json
@@ -356,6 +356,8 @@
     "no_contents": "No contents",
     "type_container": "Container",
     "type_item": "Item",
+    "item": "Item",
+    "view_detail": "View Detail",
     "linked_customers": "Linked Customers",
     "linked_customer_placeholder": "Search customer by name or phone...",
     "linked_customer_not_found": "No matching customers found",
diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json
index b30d9d7..a0a5ada 100644
--- a/frontend/ops_vue_js/src/i18n/zh-CN.json
+++ b/frontend/ops_vue_js/src/i18n/zh-CN.json
@@ -356,6 +356,8 @@
     "no_contents": "暂无内容",
     "type_container": "容器",
     "type_item": "物品",
+    "item": "物品",
+    "view_detail": "查看详情",
     "linked_customers": "关联客户",
     "linked_customer_placeholder": "搜索客户姓名或电话...",
     "linked_customer_not_found": "未找到匹配的客户",
diff --git a/frontend/ops_vue_js/src/views/warehouse/WarehouseContainerList.vue b/frontend/ops_vue_js/src/views/warehouse/WarehouseContainerList.vue
index c244c16..69c87a5 100644
--- a/frontend/ops_vue_js/src/views/warehouse/WarehouseContainerList.vue
+++ b/frontend/ops_vue_js/src/views/warehouse/WarehouseContainerList.vue
@@ -68,16 +68,53 @@ const pageRange = computed(() => {
 async function fetchContainers() {
   loading.value = true
   try {
-    const { errCode, data } = await warehouseApi.getContainers({
-      search: search.value,
-      entries: pageSize.value,
-      page: currentPage.value,
-    })
-    if (errCode === 0) {
-      containers.value = data.containers ?? []
-      totalCount.value = data.all_count ?? 0
+    // 如果有搜索词，同时搜索容器和物品
+    if (search.value.trim()) {
+      const [containersRes, itemsRes] = await Promise.all([
+        warehouseApi.getContainers({
+          search: search.value,
+          entries: pageSize.value,
+          page: currentPage.value,
+        }),
+        warehouseApi.getItems({
+          search: search.value,
+          entries: pageSize.value,
+          page: currentPage.value,
+        })
+      ])
+
+      if (containersRes.errCode === 0 && itemsRes.errCode === 0) {
+        // 合并容器和物品结果，添加类型标识
+        const containerList = (containersRes.data.containers ?? []).map(c => ({
+          ...c,
+          _type: 'container'
+        }))
+        const itemList = (itemsRes.data.items ?? []).map(i => ({
+          ...i,
+          _type: 'item'
+        }))
+
+        containers.value = [...containerList, ...itemList]
+        totalCount.value = (containersRes.data.all_count ?? 0) + (itemsRes.data.all_count ?? 0)
+      } else {
+        toast.error(t('message.server_error'))
+      }
     } else {
-      toast.error(t('message.server_error'))
+      // 没有搜索词时，只显示容器
+      const { errCode, data } = await warehouseApi.getContainers({
+        search: search.value,
+        entries: pageSize.value,
+        page: currentPage.value,
+      })
+      if (errCode === 0) {
+        containers.value = (data.containers ?? []).map(c => ({
+          ...c,
+          _type: 'container'
+        }))
+        totalCount.value = data.all_count ?? 0
+      } else {
+        toast.error(t('message.server_error'))
+      }
     }
   } catch {
     // 拦截器已处理
@@ -121,9 +158,13 @@ function handleSearch() {
   fetchContainers()
 }
 
-// ── 跳转到子容器 ──
-function jumpToContainer(id) {
-  router.push(`/warehouse/container/${id}`)
+// ── 跳转到容器或物品详情 ──
+function jumpToDetail(item) {
+  if (item._type === 'item') {
+    router.push(`/warehouse/item/${item.ID}`)
+  } else {
+    router.push(`/warehouse/container/${item.ID}`)
+  }
 }
 
 // ── 打开新增 ──
@@ -323,41 +364,49 @@ onMounted(() => {
             <tr
               v-else
               v-for="c in containers"
-              :key="c.ID"
+              :key="`${c._type}-${c.ID}`"
               class="border-b border-gray-100 cursor-pointer transition-colors hover:bg-gray-50 dark:border-dk-muted dark:hover:bg-dk-base"
-              @click="jumpToContainer(c.ID)"
+              @click="jumpToDetail(c)"
             >
               <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="text-blue-500 flex-shrink-0" :size="18" />
-                  <span class="font-medium text-gray-900 dark:text-white max-w-[10rem] truncate">{{ c.Title }}</span>
+                  <IconFolder v-if="c._type === 'container'" class="text-blue-500 flex-shrink-0" :size="18" />
+                  <IconPackage v-else class="text-green-500 flex-shrink-0" :size="18" />
+                  <div class="flex flex-col">
+                    <span class="font-medium text-gray-900 dark:text-white max-w-[10rem] truncate">{{ c.Title }}</span>
+                    <span v-if="c._type === 'item'" class="text-xs text-gray-500 dark:text-gray-400">{{ t('warehouse.item') }}</span>
+                  </div>
                 </div>
               </td>
               <td class="px-6 py-3 text-gray-500 dark:text-gray-400 max-w-xs truncate">{{ c.Remark || '—' }}</td>
               <td class="px-6 py-3 text-center">
-                <span
+                <span v-if="c._type === 'container'"
                   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>
+                <span v-else class="text-gray-400">—</span>
               </td>
               <td class="px-6 py-3 text-center">
-                <span
+                <span v-if="c._type === 'container'"
                   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>
+                <span v-else-if="c.Quantity !== undefined" class="text-gray-500 dark:text-gray-400">x{{ c.Quantity }}</span>
+                <span v-else class="text-gray-400">—</span>
               </td>
               <td class="px-6 py-3 text-center">
-                <span
+                <span v-if="c.WorkOrderCount !== undefined"
                   class="inline-flex items-center gap-1 rounded-full bg-orange-100 px-2 py-0.5 text-xs font-medium text-orange-700 dark:bg-orange-900/40 dark:text-orange-400"
                 >
                   <IconTool :size="12" />
                   {{ c.WorkOrderCount }}
                 </span>
+                <span v-else class="text-gray-400">—</span>
               </td>
               <td class="px-6 py-3">
                 <div v-if="c.Customers && c.Customers.length > 0" class="flex flex-wrap gap-1">
@@ -376,7 +425,7 @@ onMounted(() => {
                 <span v-else class="text-gray-400">—</span>
               </td>
               <td class="px-6 py-3 text-right" @click.stop>
-                <div class="flex items-center justify-end gap-1">
+                <div v-if="c._type === 'container'" 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"
@@ -395,7 +444,16 @@ onMounted(() => {
                   <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)"
+                    @click="jumpToDetail(c)"
+                  >
+                    <IconChevronRight :size="15" />
+                  </button>
+                </div>
+                <div v-else class="flex items-center justify-end gap-1">
+                  <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_detail')"
+                    @click="jumpToDetail(c)"
                   >
                     <IconChevronRight :size="15" />
                   </button>