-
-
-
-
+
-
-
-
+ {{ t('warehouse.containers') }}: {{ subTotal }} · {{ t('warehouse.items') }}: {{ itemTotal }}
+
-
-
-
-
-
-
-
- | {{ t('warehouse.container_name') }} | -{{ t('warehouse.child_containers') }} | -{{ t('warehouse.items') }} | -{{ t('warehouse.created_at') }} | -{{ t('warehouse.updated_at') }} | -{{ t('warehouse.created_by') }} | -{{ t('warehouse.actions') }} | -
|---|---|---|---|---|---|---|
| - - | -||||||
| - {{ t('warehouse.no_containers') }} - | -||||||
|
-
-
- |
- - - {{ c.ChildCount }} - - | -- - {{ c.ItemCount }} - - | -{{ fmtTs(c.CreatedAt) }} | -{{ fmtTs(c.UpdatedAt) }} | -
-
-
- |
- - - | -
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/frontend/ops_vue_js/src/views/warehouse/WarehouseOverview.vue b/frontend/ops_vue_js/src/views/warehouse/WarehouseOverview.vue
index 60dddfd..a883a49 100644
--- a/frontend/ops_vue_js/src/views/warehouse/WarehouseOverview.vue
+++ b/frontend/ops_vue_js/src/views/warehouse/WarehouseOverview.vue
@@ -15,9 +15,6 @@ import {
IconFolders,
IconPackage,
IconSearch,
- IconTrash,
- IconEdit,
- IconArrowRight,
IconTool,
IconUser,
} from '@tabler/icons-vue'
@@ -38,49 +35,52 @@ const stats = reactive({
})
// ═══════════════════════════════════════════════════════
-// 容器相关
+// 合并列表（容器 + 物品，类似文件管理器）
// ═══════════════════════════════════════════════════════
-const containers = ref([])
-const canModifyContainers = ref([]) // 并行数组：与 containers 下标对应
+//
+// 策略：两个接口分别请求一较大窗口的数据（足以覆盖前端分页），
+// 在前端合并为统一的 entries 列表（容器在前、物品在后），
+// 共用一个搜索框 + 一个分页器。
+
+// 一次性向后端取的最大条数（足够覆盖大多数前端分页场景）
+const FETCH_LIMIT = 500
+
+const containers = ref([]) // 原始容器列表
+const items = ref([]) // 原始物品列表
const containerTotal = ref(0)
-const containerPage = ref(1)
-const containerPageSize = ref(10)
-const containerSearch = ref('')
-const containerLoading = ref(false)
+const itemTotal = ref(0)
-// 新增/编辑弹窗
-const showContainerForm = ref(false)
-const containerFormTitle = ref('')
-const editingContainerId = ref(null)
-const containerForm = reactive({ title: '', remark: '' })
-const submittingContainer = ref(false)
+const search = ref('') // 共用搜索词
+const loading = ref(false)
-// 删除确认
-const showDeleteConfirm = ref(false)
-const deletingId = ref(null)
-const deletingName = ref('')
-const deleting = ref(false)
+const page = ref(1)
+const pageSize = ref(20)
-const containerTotalPages = computed(() => Math.ceil(containerTotal.value / containerPageSize.value) || 1)
+// 合并后的 entries：[{kind:'container', data:c}, {kind:'item', data:i}]
+const entries = computed(() => {
+ const cs = containers.value.map(c => ({ kind: 'container', id: `c-${c.ID}`, data: c }))
+ const is = items.value.map(i => ({ kind: 'item', id: `i-${i.ID}`, data: i }))
+ return [...cs, ...is]
+})
-function containerPageRange() {
- const total = containerTotalPages.value
- const cur = containerPage.value
+const totalEntries = computed(() => entries.value.length)
+const totalPages = computed(() => Math.ceil(totalEntries.value / pageSize.value) || 1)
+
+const pagedEntries = computed(() => {
+ const start = (page.value - 1) * pageSize.value
+ return entries.value.slice(start, start + pageSize.value)
+})
+
+function pageRange() {
+ const total = totalPages.value
+ const cur = page.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)
}
-// ── 权限判断 ──
-function canModifyContainer(index) {
- return canModifyContainers.value[index] === true
-}
-function canModifyItem(index) {
- return canModifyItems.value[index] === true
-}
-
-async function fetchContainerStats() {
+async function fetchStats() {
try {
const { errCode, data } = await warehouseApi.getCount()
if (errCode === 0) {
@@ -91,40 +91,69 @@ async function fetchContainerStats() {
} catch { /* silent */ }
}
-async function fetchContainers() {
- containerLoading.value = true
+async function fetchAll() {
+ loading.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 ?? []
- canModifyContainers.value = data.canModifyContainers ?? []
- containerTotal.value = data.all_count ?? 0
+ const [cRes, iRes] = await Promise.all([
+ warehouseApi.getContainers({
+ search: search.value.trim(),
+ entries: FETCH_LIMIT,
+ page: 1,
+ }),
+ warehouseApi.getItems({
+ search: search.value.trim(),
+ entries: FETCH_LIMIT,
+ page: 1,
+ }),
+ ])
+ if (cRes.errCode === 0) {
+ containers.value = cRes.data.containers ?? []
+ containerTotal.value = cRes.data.all_count ?? 0
} else {
- toast.error(t('message.server_error'))
+ containers.value = []
+ containerTotal.value = 0
}
- } catch { /* interceptor handled */ }
- finally { containerLoading.value = false }
+ if (iRes.errCode === 0) {
+ items.value = iRes.data.items ?? []
+ itemTotal.value = iRes.data.all_count ?? 0
+ } else {
+ items.value = []
+ itemTotal.value = 0
+ }
+ page.value = 1
+ } catch {
+ /* interceptor handled */
+ } finally {
+ loading.value = false
+ }
}
-function goContainerPage(page) {
- if (page < 1 || page > containerTotalPages.value) return
- containerPage.value = page
- fetchContainers()
+let searchTimer = null
+function onSearchInput() {
+ clearTimeout(searchTimer)
+ searchTimer = setTimeout(() => fetchAll(), 400)
}
-function handleContainerPageSize(e) {
- let val = parseInt(e.target.value) || 10
+function goPage(p) {
+ if (p < 1 || p > totalPages.value) return
+ page.value = p
+}
+
+function handlePageSize(e) {
+ let val = parseInt(e.target.value) || 20
if (val > 300) val = 300
if (val < 1) val = 1
- containerPageSize.value = val
- containerPage.value = 1
- fetchContainers()
+ pageSize.value = val
+ page.value = 1
}
+// ── 容器：新增 / 跳转 ──
+const showContainerForm = ref(false)
+const containerFormTitle = ref('')
+const editingContainerId = ref(null)
+const containerForm = reactive({ title: '', remark: '' })
+const submittingContainer = ref(false)
+
function openAddContainer() {
containerFormTitle.value = t('warehouse.add_container')
editingContainerId.value = null
@@ -133,22 +162,6 @@ function openAddContainer() {
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'))
@@ -163,8 +176,8 @@ async function submitContainerForm() {
if (errCode === 0) {
showContainerForm.value = false
toast.success(t('message.save_success'))
- fetchContainers()
- fetchContainerStats()
+ fetchAll()
+ fetchStats()
} else {
toast.error(t('message.server_error'))
}
@@ -172,170 +185,40 @@ async function submitContainerForm() {
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 canModifyItems = ref([]) // 并行数组：与 items 下标对应
-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 || []
- canModifyItems.value = data.canModifyItems || []
- itemTotal.value = data.all_count || 0
- itemStats.total = data.all_count || 0
- itemStats.inContainer = items.value.filter(i => i.ContainerID != null).length
- itemStats.unstored = items.value.filter(i => i.ContainerID == 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 jumpToItem(id) {
+ router.push(`/warehouse/item/${id}`)
}
// ── 工具函数 ──
-function formatDate(dateStr) {
- if (!dateStr) return '—'
- try {
- let d
- if (typeof dateStr === 'string' && /^\d+$/.test(dateStr)) {
- // Unix timestamp string like "1712345678"
- d = new Date(parseInt(dateStr, 10) * 1000)
- } else {
- d = new Date(dateStr)
- }
- if (isNaN(d.getTime())) return '—'
- return d.toLocaleString(isEn.value ? 'en-US' : 'zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', hour12: false })
- } catch { return dateStr }
-}
-
function fmtTs(ts) {
if (!ts) return '—'
let d
if (typeof ts === 'number') {
- // Unix timestamp in seconds (number)
d = new Date(ts * 1000)
} else if (typeof ts === 'string') {
- // Check if it's a Unix timestamp string like "1712345678"
if (/^\d+$/.test(ts)) {
d = new Date(parseInt(ts, 10) * 1000)
} else {
- // ISO 8601 or other string format
d = new Date(ts)
}
} else {
d = new Date(ts)
}
if (isNaN(d.getTime())) return '—'
- return d.toLocaleString()
+ return d.toLocaleString(isEn.value ? 'en-US' : 'zh-CN', {
+ year: 'numeric', month: '2-digit', day: '2-digit',
+ hour: '2-digit', minute: '2-digit', hour12: false
+ })
}
// ── 初始化 ──
onMounted(() => {
- fetchContainerStats()
- fetchContainers()
- fetchItems()
+ fetchStats()
+ fetchAll()
})
@@ -367,166 +250,36 @@ onMounted(() => {
+
+ {{ t('warehouse.total_items', { count: totalEntries }) }}
+ {{ t('warehouse.containers') }}: {{ subContainers.length }}
+ ·
+ {{ t('warehouse.items') }}: {{ items.length }}
+
+
+
+
+
+