From daebceebd6b8920fab4220633ced2adda03f0c15 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 22 Jul 2026 18:18:30 +0800 Subject: [PATCH] 1 --- .env.development | 3 + .env.production | 3 + .env.staging | 3 + src/api/stock/stock.ts | 19 + src/api/storage.entry/entry.ts | 47 + src/api/storage.receiving/receiving.ts | 47 + src/api/storage_receiving/receiving.ts | 44 +- .../storeWarehouse.store/storeWarehouse.ts | 56 ++ src/components/ScanBox/index.vue | 54 +- src/router/map.ts | 4 +- src/utils/asyncExportHelpers.ts | 11 +- .../components/ColumnCellRenderer.vue | 4 +- .../components/OperationCellRenderer.vue | 4 +- .../newpackingflow/components/VideoButton.vue | 34 + .../components/VideoListDialog.vue | 134 +++ .../components/VideoPlayerDialog.vue | 173 ++++ .../config/components/DetailPanel.vue | 21 +- .../config/packingflow-config.ts | 750 +++++++++++++++ src/views/data/newpackingflow/index.vue | 325 ++++--- src/views/material/packageMaterial/index.vue | 5 +- .../package-material-config.ts | 6 + .../components/ColumnCellRenderer.vue | 65 ++ .../components/OperationCellRenderer.vue | 175 ++++ .../packageMaterial2/components/TabArea.vue | 132 +++ .../config/components/DetailPanel.vue | 159 ++++ .../config/components/LogPanel.vue | 227 +++++ .../config/template-config.ts | 0 src/views/material/packageMaterial2/index.vue | 854 ++++++++++++++++++ .../pages/ExampleFormDialog.vue | 107 +++ src/views/material/packageSupplier/index.vue | 3 +- .../package-supplier-config.ts | 7 + src/views/stock/external_stock/index.vue | 240 +++-- src/views/storage/entry_owner/index.vue | 179 ++-- src/views/storage/receiving_owner/index.vue | 181 ++-- src/views/warehouses/index.vue | 149 ++- 35 files changed, 3816 insertions(+), 409 deletions(-) create mode 100644 src/views/data/newpackingflow/components/VideoButton.vue create mode 100644 src/views/data/newpackingflow/components/VideoListDialog.vue create mode 100644 src/views/data/newpackingflow/components/VideoPlayerDialog.vue create mode 100644 src/views/data/newpackingflow/config/packingflow-config.ts create mode 100644 src/views/material/packageMaterial2/components/ColumnCellRenderer.vue create mode 100644 src/views/material/packageMaterial2/components/OperationCellRenderer.vue create mode 100644 src/views/material/packageMaterial2/components/TabArea.vue create mode 100644 src/views/material/packageMaterial2/config/components/DetailPanel.vue create mode 100644 src/views/material/packageMaterial2/config/components/LogPanel.vue rename src/views/{data/newpackingflow => material/packageMaterial2}/config/template-config.ts (100%) create mode 100644 src/views/material/packageMaterial2/index.vue create mode 100644 src/views/material/packageMaterial2/pages/ExampleFormDialog.vue diff --git a/.env.development b/.env.development index 737e1dd9..9dac3a9f 100644 --- a/.env.development +++ b/.env.development @@ -4,5 +4,8 @@ VITE_USER_NODE_ENV = development # base api VITE_APP_BASE_API = 'http://192.168.11.56:6060/' +# file server (export download) +VITE_FILE_SERVER_BASE = 'https://ye4s.file.gzxunren.com' + VITE_APP_IM_WS_URL=wss://your-im-server.com/ws VITE_APP_IM_API_URL=https://your-im-server.com/api diff --git a/.env.production b/.env.production index d3ae3134..c77b0b16 100644 --- a/.env.production +++ b/.env.production @@ -4,5 +4,8 @@ VITE_USER_NODE_ENV = production # base api VITE_APP_BASE_API = 'https://qimen.wms.gztbyc.com/' +# file server (export download) +VITE_FILE_SERVER_BASE = 'https://ye4s.file.gzxunren.com' + VITE_APP_IM_WS_URL=wss://your-im-server.com/ws VITE_APP_IM_API_URL=https://your-im-server.com/api diff --git a/.env.staging b/.env.staging index c1fc1cac..c8411bfa 100644 --- a/.env.staging +++ b/.env.staging @@ -3,3 +3,6 @@ VITE_USER_NODE_ENV = production # base api VITE_APP_BASE_API = '/stage-api' + +# file server (export download) +VITE_FILE_SERVER_BASE = 'https://ye4s.file.gzxunren.com' diff --git a/src/api/stock/stock.ts b/src/api/stock/stock.ts index 60a753eb..8990f550 100644 --- a/src/api/stock/stock.ts +++ b/src/api/stock/stock.ts @@ -55,6 +55,25 @@ export function stockWarehouseExternalList(params: { } as any) } +/** 提交外仓商品导出任务,返回 task_id/status/progress/message/result/error/update_time */ +export function stockWarehouseExternalExport(data: { + warehouse_id?: number + where?: Record + sort?: StockWarehouseListSort +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.warehouse.externalExport', + v, + timestamp: new Date().getTime() + }, + data: data || {}, + isSystemApi: true + } as any) +} + export function getProhibitedType() { return request({ url: '/system', diff --git a/src/api/storage.entry/entry.ts b/src/api/storage.entry/entry.ts index 178286e7..442cc2d0 100644 --- a/src/api/storage.entry/entry.ts +++ b/src/api/storage.entry/entry.ts @@ -748,3 +748,50 @@ export function entryExportTaskProgress(data: EntryExportTaskProgressParams): Pr isSystemApi: true, } as any) } + +/** storage.entry.storeExport 查询参数(货主侧入库单导出) */ +export type EntryStoreExportParams = { + where?: Record + sort?: { + sortField?: string + sort_field?: string + sortOrder?: string + sort_order?: string + } +} + +/** storage.entry.storeExport:货主侧提交入库单导出任务 */ +export function entryStoreExport(data: EntryStoreExportParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.storeExport', + v, + timestamp: new Date().getTime(), + }, + data, + isSystemApi: true, + } as any) +} + +/** storage.entry.storeExportTaskProgress 查询参数 */ +export type EntryStoreExportTaskProgressParams = { + task_id?: string + taskId?: string +} + +/** storage.entry.storeExportTaskProgress:货主侧查询入库单导出任务进度 */ +export function entryStoreExportTaskProgress(data: EntryStoreExportTaskProgressParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.entry.storeExportTaskProgress', + v, + timestamp: new Date().getTime(), + }, + data, + isSystemApi: true, + } as any) +} diff --git a/src/api/storage.receiving/receiving.ts b/src/api/storage.receiving/receiving.ts index c0358ccf..bd0a82c9 100644 --- a/src/api/storage.receiving/receiving.ts +++ b/src/api/storage.receiving/receiving.ts @@ -51,3 +51,50 @@ export function getAvailableInboundQuantity( isSystemApi: true } as any) } + +/** storage.receiving.export 查询参数(货主维度收货单导出) */ +export type ReceivingExportParams = { + where?: Record + sort?: { + sortField?: string + sort_field?: string + sortOrder?: string + sort_order?: string + } +} + +/** storage.receiving.export:货主侧提交收货单导出任务 */ +export function exportReceiving(data: ReceivingExportParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.export', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** storage.receiving.exportTaskProgress 查询参数 */ +export type ReceivingExportTaskProgressParams = { + task_id?: string + taskId?: string +} + +/** storage.receiving.exportTaskProgress:货主侧查询收货单导出任务进度 */ +export function exportReceivingTaskProgress(data: ReceivingExportTaskProgressParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/storage_receiving/receiving.ts b/src/api/storage_receiving/receiving.ts index 3a87f6f5..cc3383fd 100644 --- a/src/api/storage_receiving/receiving.ts +++ b/src/api/storage_receiving/receiving.ts @@ -130,18 +130,38 @@ export function rejectReceiving(data: any): Promise { }) } -// export function exportReceiving(data: any): Promise { -// return request({ -// url: '/system', -// method: 'post', -// params: { -// method: 'storage.receiving.exportReceiving', -// v, -// timestamp: new Date().getTime() -// }, -// data: data -// }) -// } +/** 提交收货单异步导出任务 */ +export function exportReceiving(data: { + where?: Record + sort?: { sortField?: string; sortOrder?: string } +}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.export', + v, + timestamp: new Date().getTime() + }, + data: data || {}, + isSystemApi: true + } as any) +} + +/** 查询收货单导出任务进度 */ +export function exportReceivingTaskProgress(data: { task_id?: string; taskId?: string }): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storage.receiving.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} export function createReceiving(data: any): Promise { return request({ diff --git a/src/api/storeWarehouse.store/storeWarehouse.ts b/src/api/storeWarehouse.store/storeWarehouse.ts index a3cff6c7..4d45c6d7 100644 --- a/src/api/storeWarehouse.store/storeWarehouse.ts +++ b/src/api/storeWarehouse.store/storeWarehouse.ts @@ -397,3 +397,59 @@ export function storeWarehouseExportPrintQuantityLogsTaskProgress(data: { isSystemApi: true } as any) } + +/** 按条件分页查询面单余额变更日志(货主维度,无需 store_id) */ +export function storeWarehouseQueryStorePrintQuantityLogs(data: { + where?: Record + pagination?: { + page?: number + page_size?: number + } +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.store.queryStorePrintQuantityLogs', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 提交面单余额变更日志导出任务(货主维度) */ +export function storeWarehouseExportStorePrintQuantityLogs(data: { + where?: Record +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.store.exportStorePrintQuantityLogs', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 查询面单余额变更日志导出任务进度(货主维度) */ +export function storeWarehouseExportStorePrintQuantityLogsTaskProgress(data: { + task_id?: string + taskId?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.store.exportStorePrintQuantityLogsTaskProgress', + 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 6763e65f..2851ef91 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -27,6 +27,8 @@
+ +
@@ -127,10 +165,12 @@ import { ref, reactive, onMounted, computed } from 'vue' import { useRoute } from 'vue-router' import { ElMessage } from 'element-plus' +import { ArrowDown } from '@element-plus/icons-vue' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import WarehouseSelect from '@/components/WarehouseSelect.vue' -import ExportModeDropdown from '@/components/ExportModeDropdown.vue' +import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue' +import { useAsyncExportTask } from '@/composables/useAsyncExportTask' import * as indexApi from '@/api/index/index' import * as receivingApi from '@/api/storage_receiving/receiving' import { @@ -143,7 +183,6 @@ import { } from '@/views/storage/receiving/receiving-config' import Details from '@/views/storage/receiving/component/Details.vue' import Logs from '@/views/storage/receiving/component/Logs.vue' -import * as XLSX from 'xlsx' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { useSettingsStore } from '@/stores/modules/settings' @@ -192,9 +231,30 @@ const activeTab = ref('details') const list = ref([]) const loading = ref(false) -const exportLoading = ref(false) const queryTime = ref(0) +// ─── 多选 & 导出 ────────────────────────────────────────────────────────── +const selectionIds = ref([]) +const hasSelection = computed(() => selectionIds.value.length > 0) + +function handleSelectionChange(selection: any[]) { + selectionIds.value = selection +} + +const { + exportLoading, + exportDialogVisible, + exportTaskProgress, + exportProgressPercent, + exportProgressStatus, + exportStatusLabel, + submitExportTask +} = useAsyncExportTask({ + storageKey: 'storage:receiving:exportTaskId', + submitExport: (payload) => receivingApi.exportReceiving(payload as any), + queryProgress: (params) => receivingApi.exportReceivingTaskProgress(params) +}) + const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) const tableSize = ref('small') @@ -392,83 +452,52 @@ function handlePageSizeChange(size: number) { loadData() } -async function handleExport(mode: 'waybill' | 'item' = 'waybill') { - const sourceRows = list.value - if (!sourceRows.length) { - ElMessage.warning('当前无数据可导出') - return +function buildExportPayload() { + const where = currentCondition.value || normalizeToWhere(scanBox.value?.getConditions?.() || {}) + if (selectedWarehouseId.value) { + where.warehouse_id = { operator: 'eq', value: selectedWarehouseId.value, type: 'number' } } - exportLoading.value = true - try { - const exportColumns = columns.value.filter((col: any) => col.prop && col.label) - - if (mode === 'waybill') { - const headers = exportColumns.map((col: any) => col.label) - const data = sourceRows.map((row: any) => - exportColumns.map((col: any) => { - const val = row[col.prop] - if (col.prop === 'status') return statusText(val) - if (col.prop === 'storage_status') return storageStatusText(val) - if (col.prop === 'delivery_method') return deliveryMethodText(val) - if (col.prop === 'loading_method') return loadingMethodText(val) - if (col.prop === 'created_at' || col.prop === 'updated_at' || - col.prop === 'receiving_start_time' || col.prop === 'receiving_end_time') { - return formatTime(val) - } - return val === null || val === undefined ? '' : val - }) - ) - const ws = XLSX.utils.aoa_to_sheet([headers, ...data]) - const wb = XLSX.utils.book_new() - XLSX.utils.book_append_sheet(wb, ws, '收货单列表') - XLSX.writeFile(wb, `收货单列表_${new Date().getTime()}.xlsx`) - ElMessage.success('导出成功') - return + const payload: any = { where } + if (currentSort.prop) { + payload.sort = { + sortField: currentSort.prop, + sortOrder: currentSort.order === 'ascending' ? 'ASC' : 'DESC' } - - // 导出明细 - const detailRows: any[] = [] - for (const row of sourceRows) { - try { - const res: any = await receivingApi.getReceivingDetailStore({ id: row.id }) - const payload = res?.data || res - const items = Array.isArray(payload?.items) - ? payload.items - : payload?.receiving?.items || [] - items.forEach((item: any) => { - detailRows.push({ - '收货单号': row.receiving_number || row.id, - '商品名称': item.product_name || item.item_name || '', - '商品编码': item.product_code || item.item_code || '', - '数量': item.quantity ?? '', - '箱数': item.boxes ?? '', - }) - }) - } catch (e) { - console.warn(`获取收货单 ${row.id} 明细失败`, e) - } - } - - if (!detailRows.length) { - ElMessage.warning('未获取到可导出的收货明细') - return - } - - const ws = XLSX.utils.json_to_sheet(detailRows) - const wb = XLSX.utils.book_new() - XLSX.utils.book_append_sheet(wb, ws, '收货明细') - XLSX.writeFile(wb, `收货明细_${new Date().getTime()}.xlsx`) - ElMessage.success('导出成功') - } catch (e) { - console.error('导出 Excel 失败:', e) - ElMessage.error('导出失败') - } finally { - exportLoading.value = false } + return payload } -function handleExportAction(action: string) { - void handleExport(action === 'handleExportItem' ? 'item' : 'waybill') +function buildExportSelectedPayload() { + const ids = selectionIds.value.map((item: any) => item.id) + const payload: any = { + where: { + id: { operator: 'in', value: ids } + } + } + if (selectedWarehouseId.value) { + payload.where.warehouse_id = { operator: 'eq', value: selectedWarehouseId.value, type: 'number' } + } + return payload +} + +async function handleExportAll() { + await submitExportTask(buildExportPayload()) +} + +async function handleExportSelected() { + if (!hasSelection.value) { + ElMessage.warning('请先勾选需要导出的收货单') + return + } + await submitExportTask(buildExportSelectedPayload()) +} + +function handleExportCommand(command: string) { + if (command === 'selected') { + handleExportSelected() + } else if (command === 'all') { + handleExportAll() + } } diff --git a/src/views/warehouses/index.vue b/src/views/warehouses/index.vue index fc739366..5dc452e2 100644 --- a/src/views/warehouses/index.vue +++ b/src/views/warehouses/index.vue @@ -17,6 +17,9 @@ 发起签约 + + 导出日志 + 刷新 @@ -158,7 +161,52 @@
- +
+ +
+ + + + + + + + + + + + + + + + + + + +
@@ -338,24 +386,42 @@ + +