From 452634fba96b23c390e95a9f049bb5540ccf50a7 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 16 May 2026 02:45:24 +0800 Subject: [PATCH] 1 --- src/api/storage.report/report.ts | 69 ++++- src/components/ScanBox/index.vue | 13 + src/views/storage/report/index.vue | 358 +++++++++++++++++++--- src/views/storage/report/report-config.ts | 158 +++++++--- 4 files changed, 501 insertions(+), 97 deletions(-) diff --git a/src/api/storage.report/report.ts b/src/api/storage.report/report.ts index 7c049289..447b7c0f 100644 --- a/src/api/storage.report/report.ts +++ b/src/api/storage.report/report.ts @@ -25,9 +25,44 @@ export interface StorageReportSearchBody { where?: { start_time?: string | Date end_time?: string | Date - by_space?: boolean store_ids?: number[] } + sort?: { + sortField?: 'begin_total' | 'inbound_total' | 'outbound_total' | 'end_total' + sort_field?: 'begin_total' | 'inbound_total' | 'outbound_total' | 'end_total' + sortOrder?: 'ASC' | 'DESC' | 'asc' | 'desc' + sort_order?: 'ASC' | 'DESC' | 'asc' | 'desc' + } +} + +export interface StorageReportExportBody extends StorageReportSearchBody {} + +export interface StorageReportExportTaskResponse { + task_id: string + status: 'submitted' | 'running' | 'success' | 'failed' + progress: number + message: string + error: string + result: Record | null + update_time: number + code?: number +} + +export interface StorageReportExportTaskProgressParams { + task_id?: string + taskId?: string +} + +export interface StorageReportExportTaskProgressResponse { + task_id: string + status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' + progress: number + message: string + error: string + download_url: string + result: Record | null + update_time: number + code?: number } /** 与网关返回一致:成功时 data 内含 list */ @@ -57,3 +92,35 @@ export function searchInventoryReport( isSystemApi: true } as any) } + +export function exportInventoryReport( + data?: StorageReportExportBody +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.report.export', + v, + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) +} + +export function getExportTaskProgress( + data: StorageReportExportTaskProgressParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.report.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index b6f33b81..e422c307 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -681,6 +681,15 @@ function normalizeTextValue(field: any) { } } +function cloneConditionDefaultValue(value: any) { + if (value === undefined) return undefined + if (value === null) return null + if (Array.isArray(value) || typeof value === 'object') { + return JSON.parse(JSON.stringify(value)) + } + return value +} + function initCustomConditions(fields: any[], isSilent = false) { fields.forEach(field => { let defaultValue: any = undefined @@ -714,6 +723,10 @@ function initCustomConditions(fields: any[], isSilent = false) { } } + if (Object.prototype.hasOwnProperty.call(field, 'defaultValue')) { + defaultValue = cloneConditionDefaultValue(field.defaultValue) + } + if (!customConditions[field.value]) { customConditions[field.value] = { value: defaultValue, diff --git a/src/views/storage/report/index.vue b/src/views/storage/report/index.vue index a6f67d34..b0552aa8 100644 --- a/src/views/storage/report/index.vue +++ b/src/views/storage/report/index.vue @@ -16,7 +16,7 @@
刷新 - 导出 CSV + 导出库存明细 库存报表 共 {{ pagination.total }} 条 +