diff --git a/dist.tar.gz b/dist.tar.gz index 87c819e2..45af8eb1 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/storage.report/report.ts b/src/api/stock.report/stock.report.ts similarity index 75% rename from src/api/storage.report/report.ts rename to src/api/stock.report/stock.report.ts index 8ce1d01e..1b0439a7 100644 --- a/src/api/storage.report/report.ts +++ b/src/api/stock.report/stock.report.ts @@ -2,8 +2,7 @@ import request from '@/utils/request' const v = '1.0' -/** 与 apidata/data.json 中 list 单项字段一致 */ -export interface StorageReportListItem { +export type StockReportListItem = { start_time?: string | null end_time?: string | null stock_id: number @@ -21,7 +20,7 @@ export interface StorageReportListItem { [key: string]: unknown } -export interface StorageReportSearchBody { +export interface StockReportSearchBody { where?: { start_time?: string | Date end_time?: string | Date @@ -38,12 +37,12 @@ export interface StorageReportSearchBody { } } -export interface StorageReportExportBody extends StorageReportSearchBody { +export interface StockReportExportBody extends StockReportSearchBody { export_mode?: 'waybill' | 'item' exportMode?: 'waybill' | 'item' } -export interface StorageReportExportTaskResponse { +export interface StockReportExportTaskResponse { task_id: string status: 'submitted' | 'running' | 'success' | 'failed' progress: number @@ -54,12 +53,12 @@ export interface StorageReportExportTaskResponse { code?: number } -export interface StorageReportExportTaskProgressParams { +export interface StockReportExportTaskProgressParams { task_id?: string taskId?: string } -export interface StorageReportExportTaskProgressResponse { +export interface StockReportExportTaskProgressResponse { task_id: string status: 'submitted' | 'running' | 'success' | 'failed' | 'not_found' progress: number @@ -71,21 +70,20 @@ export interface StorageReportExportTaskProgressResponse { code?: number } -/** 与网关返回一致:成功时 data 内含 list */ -export interface StorageReportSearchResult { +export interface StockReportSearchResult { flag?: string code?: number message?: string data?: { - list?: StorageReportListItem[] + list?: StockReportListItem[] } - list?: StorageReportListItem[] + list?: StockReportListItem[] } /** 不传或传 `{}` 表示无业务参数(与页面首次打开一致) */ export function searchInventoryReport( - data?: StorageReportSearchBody -): Promise { + data?: StockReportSearchBody +): Promise { return request({ url: '/system', method: 'post', @@ -101,8 +99,8 @@ export function searchInventoryReport( /** 货主侧库存报表查询 */ export function searchStoreReport( - data?: StorageReportSearchBody -): Promise { + data?: StockReportSearchBody +): Promise { return request({ url: '/system', method: 'post', @@ -117,8 +115,8 @@ export function searchStoreReport( } export function exportInventoryReport( - data?: StorageReportExportBody -): Promise { + data?: StockReportExportBody +): Promise { return request({ url: '/system', method: 'post', @@ -134,8 +132,8 @@ export function exportInventoryReport( /** 货主侧库存报表导出 */ export function exportStoreReport( - data?: StorageReportExportBody -): Promise { + data?: StockReportExportBody +): Promise { return request({ url: '/system', method: 'post', @@ -150,8 +148,8 @@ export function exportStoreReport( } export function getExportTaskProgress( - data: StorageReportExportTaskProgressParams -): Promise { + data: StockReportExportTaskProgressParams +): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/stock.transaction/stock.transaction.ts b/src/api/stock.transaction/stock.transaction.ts new file mode 100644 index 00000000..8723c3b5 --- /dev/null +++ b/src/api/stock.transaction/stock.transaction.ts @@ -0,0 +1,66 @@ +import request from '@/utils/request' + +const v = '1.0' + +export type StockTransactionListSort = { + sortField?: string + sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC' | string + sort_field?: string + sort_order?: string +} + +/** 仓库侧异步导出商品流水 */ +export function transactionExport(data?: { + where?: Record + sort?: StockTransactionListSort + all?: boolean + mode?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.transaction.export', + v, + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) +} + +/** 货主侧异步导出商品流水 */ +export function transactionExportStore(data?: { + store_id: number + where?: Record + sort?: StockTransactionListSort + all?: boolean + mode?: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.transaction.exportStore', + v, + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) +} + +/** 查询商品流水导出任务进度(仓库/货主共用) */ +export function transactionExportTaskProgress(data: { task_id: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.transaction.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/stock/stock.ts b/src/api/stock/stock.ts index 4ec4120d..60a753eb 100644 --- a/src/api/stock/stock.ts +++ b/src/api/stock/stock.ts @@ -567,7 +567,7 @@ export function stockTransactionList(data: StockTransactionListParams) { /** 货主侧商品出入库流水列表查询 */ export function stockTransactionStoreList( - data: StockTransactionListParams & { store_id: number } + data: StockTransactionListParams & { store_id?: number } ) { return request({ url: '/system', @@ -582,60 +582,4 @@ export function stockTransactionStoreList( } as any) } -// ─── 商品流水导出 ────────────────────────────────────────────────────────── -/** 仓库侧异步导出商品流水 */ -export function transactionExport(data?: { - where?: Record - sort?: StockTransactionListSort - all?: boolean - mode?: string -}) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'stock.transaction.export', - v, - timestamp: new Date().getTime() - }, - data: data ?? {}, - isSystemApi: true - } as any) -} - -/** 货主侧异步导出商品流水 */ -export function transactionExportStore(data?: { - store_id: number - where?: Record - sort?: StockTransactionListSort - all?: boolean - mode?: string -}) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'stock.transaction.exportStore', - v, - timestamp: new Date().getTime() - }, - data: data ?? {}, - isSystemApi: true - } as any) -} - -/** 查询商品流水导出任务进度(仓库/货主共用) */ -export function transactionExportTaskProgress(data: { task_id: string }) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'stock.transaction.exportTaskProgress', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} diff --git a/src/router/map.ts b/src/router/map.ts index 823d0bb7..96e56442 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -41,7 +41,7 @@ export const componentMap: Record = { 'storage/productflow/store': () => import('@/views/storage/productflow/store/index.vue'), 'store/index': () => import('@/views/store/stores/index.vue'), 'Externalwarehouse/shipperSigning/index': () => import('@/views/Externalwarehouse/shipperSigning/index.vue'), - 'wave/index': () => import('@/views/order/waveOrder/index.vue'), + 'wave/index': () => import('@/views/order/waveOrder2/index.vue'), /** 与后端菜单 component 字段兼容 */ 'order/waveOrder': () => import('@/views/order/waveOrder/index.vue'), 'orderreview/index': () => import('@/views/order/orderreview/index.vue'), diff --git a/src/views/mode/components/ColumnCellRenderer.vue b/src/views/mode/components/ColumnCellRenderer.vue index 4711251e..8aa6b3a8 100644 --- a/src/views/mode/components/ColumnCellRenderer.vue +++ b/src/views/mode/components/ColumnCellRenderer.vue @@ -2,12 +2,14 @@ ColumnCellRenderer — 通用表格列渲染器 根据传入的 ColumnSlotConfig 决定如何渲染单元格: - - type='tag' → el-tag(可配置颜色映射) - - type='text' → 纯文本(支持 datetime 格式化) + - type='tag' → el-tag(支持 tagResolver / tagType 颜色映射) + - type='text' → 纯文本(支持 datetime 格式化) + - type='default' → 默认插槽渲染 + - type='operation' → 操作列(由 OperationCellRenderer 处理) --> @@ -172,22 +191,24 @@ defineOptions({ name: 'PageTemplate' }) import { ref, computed, onMounted, reactive } from 'vue' -import { Refresh } from '@element-plus/icons-vue' +import { ElMessage } from 'element-plus' import { useSettingsStore } from '@/stores/modules/settings' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import TabArea from './components/TabArea.vue' import ColumnCellRenderer from './components/ColumnCellRenderer.vue' +import OperationCellRenderer from './components/OperationCellRenderer.vue' +import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' +import type { ToolbarButtonConfig as OrderToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' import { PAGE_CONFIG, tabPages, resolveTabConfig, + getTabToolbarButtons, type TabPageConfig, - type ColumnConfig, - type ColumnSlotConfig, - type DetailSectionConfig, - type DetailTabConfig + type DetailTabConfig, + type ToolbarButtonConfig, } from './config/template-config' // ============================================================ @@ -225,17 +246,17 @@ const currentScanBoxFields = computed( ) /** 当前表格列 */ -const currentColumns = computed( +const currentColumns = computed( () => currentTabConfig.value?.upperTable.columns ?? [] ) /** 当前列插槽配置 */ -const currentColumnSlots = computed>( +const currentColumnSlots = computed( () => currentTabConfig.value?.columnSlots ?? {} ) /** 当前明细面板配置 */ -const currentDetailConfig = computed( +const currentDetailConfig = computed( () => currentTabConfig.value?.detailConfig ?? [] ) @@ -252,6 +273,128 @@ const activeDetailTabComponent = computed(() => { return tab?.component ?? null }) +/** 当前激活明细标签页对应的 API 方法 */ +const currentDetailTabApiMethod = computed(() => { + const cfg = currentTabConfig.value + if (!cfg?.api) return undefined + const tab = currentDetailTabs.value.find((t) => t.name === activeDetailTab.value) + if (!tab) return undefined + + let componentCfg: unknown + switch (tab.componentKey) { + case 'DetailPanel': + componentCfg = cfg.api.detail + break + case 'LogPanel': + componentCfg = cfg.api.log + break + default: + return undefined + } + + if (typeof componentCfg === 'function') { + return componentCfg + } + return undefined +}) + +// ============================================================ +// 工具栏按钮系统 +// ============================================================ + +/** 当前标签页的工具栏按钮列表 */ +const currentToolbarButtons = computed(() => { + const btns = getTabToolbarButtons(activeTabName.value) + return btns.map((btn: ToolbarButtonConfig) => ({ + key: btn.key, + label: btn.label, + size: btn.size, + type: btn.type, + plain: btn.plain, + loadingKey: btn.loadingKey, + disabledKey: btn.disabledKey, + action: btn.action, + dynamicLabelKey: btn.dynamicLabelKey, + buttonType: btn.buttonType, + dropdownOptions: btn.dropdownOptions + })) +}) + +const buttonDisabledMap = computed>(() => ({ + noSelection: selectedRows.value.length === 0 +})) + +const buttonLoadingMap = computed>(() => ({ + loading: loading.value, + exportLoading: false +})) + +const buttonLabelMap = computed>(() => ({ + detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情' +})) + +const toolbarLayoutKey = computed(() => + JSON.stringify({ + loading: buttonLoadingMap.value, + disabled: buttonDisabledMap.value, + labels: buttonLabelMap.value + }) +) + +function resolveButtonLoading(loadingKey?: string) { + if (!loadingKey) return false + return Boolean(buttonLoadingMap.value[loadingKey]) +} + +function resolveButtonDisabled(disabledKey?: string) { + if (!disabledKey) return false + return Boolean(buttonDisabledMap.value[disabledKey]) +} + +function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) { + if (!dynamicLabelKey) return defaultLabel + return buttonLabelMap.value[dynamicLabelKey] || defaultLabel +} + +// ============================================================ +// 工具栏动作分发 +// ============================================================ +const toolbarActionMap: Record void> = { + loadData: () => { void loadData() }, + openColumnConfigPanel: () => { upperTableRef.value?.openColumnConfig?.() }, + toggleDetailVisible: () => { detailVisible.value = !detailVisible.value }, + handleExport: () => { console.log('[PageTemplate] 导出(不含明细)', activeTabName.value) }, + handleExportItem: () => { console.log('[PageTemplate] 导出(含明细)', activeTabName.value) } +} + +function handleToolbarButtonClick(action: string) { + const handler = toolbarActionMap[action] + if (handler) { + handler() + return + } + // ★ 在此添加功能按钮分发 + console.warn('[PageTemplate] 未处理的工具栏动作:', action) +} + +// ============================================================ +// 操作列按钮事件处理 +// ============================================================ +async function handleOperationAction(key: string, row: Record) { + // ★ 在此添加操作列按钮回调 + console.log('[PageTemplate] 操作列按钮:', key, row) + switch (key) { + case 'viewDetail': + // 已经通过行点击处理 + break + case 'edit': + ElMessage.info(`编辑「${row.name ?? row.code ?? row.id}」`) + break + default: + console.warn('[PageTemplate] 未处理的操作按钮:', key) + } +} + // ============================================================ // ★★★ 第二步:接入真实接口 ★★★ // ============================================================ @@ -267,24 +410,46 @@ const pagination = reactive({ const currentSort = reactive({ prop: '', order: '' }) -/** 加载列表数据(在此接入真实接口) */ const loadData = async () => { + const cfg = currentTabConfig.value + if (!cfg) return loading.value = true const startTime = performance.now() try { - // ★ TODO: 替换为真实接口调用 - // const res = await yourApi.list({ - // page: pagination.currentPage, - // pageSize: pagination.pageSize - // }) - // listData.value = res.data.list - // pagination.total = res.data.total + if (cfg.api) { + // 使用真实接口 + const conditions = scanBoxRef.value?.getConditions?.() || {} + const params = cfg.api.buildListParams + ? cfg.api.buildListParams({ + pagination: { page: pagination.currentPage, pageSize: pagination.pageSize }, + conditions, + sort: currentSort.prop ? { prop: currentSort.prop, order: currentSort.order } : undefined + }) + : { + pagination: { page: pagination.currentPage, pageSize: pagination.pageSize }, + where: conditions + } - listData.value = [] - pagination.total = 0 + const res = await cfg.api.list(params) + if (res && (res.code === 1 || res.code === 200)) { + const parsed = cfg.api.parseListResponse + ? cfg.api.parseListResponse(res) + : { list: res.data?.list ?? res.list ?? [], total: res.data?.pagination?.total ?? res.total ?? 0 } + listData.value = parsed.list + pagination.total = parsed.total + } else { + throw new Error(res?.message || '接口返回异常') + } + } else { + // ★ 未配置 API 时使用模拟数据(替换为真实接口后删除) + console.log('[PageTemplate] 未配置 API,使用空数据。请在 tabPages 中配置 api 字段。') + listData.value = [] + pagination.total = 0 + } } catch (e: any) { console.error('[PageTemplate] 加载列表失败:', e) + ElMessage.error(e?.message || '获取列表数据失败') listData.value = [] pagination.total = 0 } finally { @@ -349,13 +514,27 @@ const selectedDetail = ref | null>(null) const activeDetailTab = ref('detail') const handleRowClick = async (row: Record) => { + const cfg = currentTabConfig.value + if (!cfg) return selectedRow.value = row - // ★ TODO: 如需调接口获取明细,在这里添加 - // const res = await yourApi.detail(row.id) - // selectedDetail.value = res.data - - selectedDetail.value = { ...row } + // 根据 DetailPanel 的 api 配置决定数据来源 + const detailCfg = cfg.api?.detail + if (typeof detailCfg === 'function') { + try { + const detailRes = await detailCfg({ id: row.id, code: row.code }) + if (detailRes && (detailRes.code === 1 || detailRes.code === 200)) { + selectedDetail.value = detailRes.data ?? detailRes + } else { + selectedDetail.value = { ...row } + } + } catch { + selectedDetail.value = { ...row } + } + } else { + // source='list' 或未配置:直接用行数据 + selectedDetail.value = { ...row } + } } // ============================================================ @@ -501,209 +680,112 @@ onMounted(() => { ================================================================ */ .split-stack { flex: 1; - min-height: 0; display: flex; flex-direction: column; + min-height: 0; overflow: hidden; + + :deep(.el-card__header) { + padding: 2px 12px; + font-size: 13px; + } } .upper-wrapper { - flex: 1; + flex: 1 1 62%; min-height: 0; overflow: hidden; } -.upper-wrapper :deep(.upper-table-container) { - height: 100%; - display: flex; - flex-direction: column; -} - -.upper-wrapper :deep(.table-container) { - height: auto !important; - flex: 1 1 auto; - min-height: 0; - overflow: hidden; -} - -.upper-wrapper :deep(.el-table__body-wrapper) { - overflow: auto; -} - .pane-resizer { - flex: 0 0 6px; - min-height: 6px; - background: #e4e7ed; - cursor: row-resize; flex-shrink: 0; - position: relative; - z-index: 2; + height: 5px; + cursor: row-resize; + background-color: #f0f2f5; + border-top: 1px solid #ebeef5; + border-bottom: 1px solid #ebeef5; + transition: background-color 0.2s; + user-select: none; &:hover { - background: #dcdfe6; + background-color: #d3d9e3; + } +} + +.lower-level { + flex: 1 1 38%; + min-height: 0; + overflow: hidden; + display: flex; + flex-direction: column; + + :deep(.el-card) { + height: 100%; + display: flex; + flex-direction: column; + } +} + +.no-selection { + flex: 1 1 38%; + min-height: 0; + display: flex; + align-items: center; + justify-content: center; + border: 1px solid #ebeef5; + border-radius: 4px; + + .empty-tip p { + font-size: 14px; + color: #909399; } } /* ================================================================ 5. 明细面板 ================================================================ */ -.lower-level { - flex: 0 0 38%; - height: 38%; - display: flex; - flex-direction: column; - border-top: 1px solid #ebeef5; - overflow: hidden; - background-color: #fff; +.detail-header { + flex-shrink: 0; + border-bottom: 1px solid #e8eef7; + background: #fff; + padding: 0 12px; - .detail-header { - background-color: #fafafa; - border-bottom: 1px solid #ebeef5; - padding: 0 12px; - display: flex; - align-items: center; - justify-content: space-between; - gap: 12px; - height: 42px; - min-height: 42px; - box-sizing: border-box; - - .detail-tab { - flex: 1; - min-width: 0; - margin-bottom: -1px; - - :deep(.el-tabs__header) { - margin: 0; - border-bottom: none; - } - - :deep(.el-tabs__nav-wrap::after) { - display: none; - } - - :deep(.el-tabs__active-bar) { - display: none; - } - - :deep(.el-tabs__item) { - height: 40px; - line-height: 40px; - font-size: 13px; - padding: 0 16px; - color: #606266; - border: 1px solid transparent; - border-bottom: none; - border-radius: 4px 4px 0 0; - transition: color 0.2s; - } - - :deep(.el-tabs__item:hover) { - color: var(--el-color-primary); - } - - :deep(.el-tabs__item.is-active) { - color: var(--el-color-primary); - background-color: #fff; - border-color: #ebeef5; - border-bottom-color: #fff; - } + .detail-tab { + :deep(.el-tabs__header) { + margin-bottom: 0; + } + :deep(.el-tabs__nav-wrap::after) { + height: 1px; } } - - .detail-container { - flex: 1; - overflow-y: auto; - padding: 12px; - } } -/* 未选中行占位 */ -.no-selection { - flex: 0 0 38%; - height: 38%; - display: flex; - align-items: center; - justify-content: center; - border-top: 1px solid #ebeef5; - overflow: hidden; - background-color: #fff; +.detail-container { + flex: 1; + overflow: auto; + padding: 12px; + background: #fff; } /* ================================================================ - 6. 通用样式 + 6. 过渡动画 ================================================================ */ -.empty-tip { - text-align: center; - font-size: 13px; - color: #909399; - line-height: 1.5; -} - -/* 标签页切换过渡 */ .tab-fade-enter-active, .tab-fade-leave-active { - transition: opacity 0.2s ease, transform 0.2s ease; -} - -.tab-fade-enter-from { - opacity: 0; - transform: translateY(8px); + transition: opacity 0.2s ease; + opacity: 1; } +.tab-fade-enter-from, .tab-fade-leave-to { opacity: 0; - transform: translateY(-8px); -} - -.tab-fade-leave-active { - position: absolute; - width: 100%; } /* ================================================================ - 7. ScanBox 筛选标签样式微调 + 7. 空状态 ================================================================ */ -.main-container { - :deep(.scan-box-container .scan-tabs) { - flex-shrink: 0; - border-bottom: 1px solid #ebeef5; - background: #fafafa; - } - - :deep(.scan-box-container .scan-tabs .el-tabs__header) { - margin: 0; - } - - :deep(.scan-box-container .scan-tabs .el-tabs__nav-wrap::after) { - display: none; - } - - :deep(.scan-box-container .scan-tabs .el-tabs__active-bar) { - display: none; - } - - :deep(.scan-box-container .scan-tabs .el-tabs__item) { - height: 40px; - line-height: 40px; - font-size: 13px; - padding: 0 12px; - color: #606266; - border: 1px solid transparent; - border-bottom: none; - border-radius: 4px 4px 0 0; - transition: color 0.2s; - } - - :deep(.scan-box-container .scan-tabs .el-tabs__item:hover) { - color: var(--el-color-primary); - } - - :deep(.scan-box-container .scan-tabs .el-tabs__item.is-active) { - color: var(--el-color-primary); - background-color: #fff; - border-color: #ebeef5; - border-bottom-color: #fff; - } +.empty-tip { + font-size: 13px; + color: #909399; } diff --git a/src/views/mode/pages/ExampleFormDialog.vue b/src/views/mode/pages/ExampleFormDialog.vue new file mode 100644 index 00000000..945481b8 --- /dev/null +++ b/src/views/mode/pages/ExampleFormDialog.vue @@ -0,0 +1,107 @@ + + + + + + diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 27f2cb5a..44e72997 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -444,7 +444,8 @@ import type { SelectProductItem } from './SelectProductDialog.vue' import * as indexApi from '@/api/index/index' import { settingPlatformList } from '@/api/setting.platform/platform' import { - lookupProductByKeyword + lookupAndExpandProductByKeyword, + type OrderSelectedProductItem } from '../utils/stock-picker-helpers' import { orderList } from '@/api/order.index/orderindex' import { @@ -839,18 +840,8 @@ function collectGroupOrderItems(rows: ImportPreviewRow[]) { } async function lookupStockItemByCode(storeId: number, itemCode: string) { - return lookupProductByKeyword(storeId, itemCode) -} - -function applyMatchedStockToSelectedItem(item: PreviewSelectedItem, matched: PreviewSelectedItem) { - const displayCode = String(item.item_code || '').trim() - item.item_id = matched.item_id - item.item_name = String(item.item_name || '').trim() || matched.item_name - item.item_code = displayCode || matched.item_code - item.barcode = String(item.barcode || '').trim() || matched.barcode - item.store_id = item.store_id || matched.store_id - item.is_combo = matched.is_combo - item.combo_id = matched.combo_id + // 使用展开版:组合商品自动展开为子 SKU 列表 + return lookupAndExpandProductByKeyword(storeId, itemCode) } async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) { @@ -861,17 +852,39 @@ async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) { if (!Number.isFinite(storeId) || storeId <= 0) return false for (const row of rows) { + const newItems: PreviewSelectedItem[] = [] for (const item of row.selected_items) { - if (hasValidSelectedItemId(item)) continue + if (hasValidSelectedItemId(item)) { + newItems.push(item) + continue + } const itemCode = String(item.item_code || '').trim() - if (!itemCode) continue - const matched = await lookupStockItemByCode(storeId, itemCode) - if (!matched?.item_id) { + if (!itemCode) { + newItems.push(item) + continue + } + // 使用展开版查询:组合商品返回子 SKU 数组,普通商品返回 [单品] + const matchedItems = await lookupStockItemByCode(storeId, itemCode) + if (!matchedItems.length) { ElMessage.warning(`订单「${orderLabel}」:商品「${itemCode}」未匹配到有效商品,请在右侧重新选择`) return false } - applyMatchedStockToSelectedItem(item, matched) + // 统一展开:无论普通商品还是组合商品,均使用匹配结果中的编码和名称 + const planQty = String(item.plan_qty || '1').trim() + matchedItems.forEach((subItem) => { + newItems.push({ + item_id: subItem.item_id, + item_code: subItem.item_code, + item_name: subItem.item_name, + barcode: subItem.barcode, + plan_qty: planQty, + store_id: subItem.store_id, + is_combo: false, + combo_id: undefined + }) + }) } + row.selected_items = newItems } return true } @@ -1650,23 +1663,46 @@ async function parseImportPreviewFromFile(file: File) { } } - // 自动匹配商品(按 item_code 查询并填充 item_id) + // 自动匹配商品(按 item_code 查询并填充 item_id,组合商品自动展开) for (const row of mergedRows) { const storeId = Number(row.store_id) if (!Number.isFinite(storeId) || storeId <= 0) continue + const newItems: PreviewSelectedItem[] = [] for (const item of row.selected_items) { - if (hasValidSelectedItemId(item)) continue + if (hasValidSelectedItemId(item)) { + newItems.push(item) + continue + } const itemCode = String(item.item_code || '').trim() - if (!itemCode) continue + if (!itemCode) { + newItems.push(item) + continue + } try { - const matched = await lookupStockItemByCode(storeId, itemCode) - if (matched?.item_id) { - applyMatchedStockToSelectedItem(item, matched) + const matchedItems = await lookupStockItemByCode(storeId, itemCode) + if (!matchedItems.length) { + newItems.push(item) + continue } + // 统一展开:使用匹配结果中的编码和名称 + const planQty = String(item.plan_qty || '1').trim() + matchedItems.forEach((subItem) => { + newItems.push({ + item_id: subItem.item_id, + item_code: subItem.item_code, + item_name: subItem.item_name, + barcode: subItem.barcode, + plan_qty: planQty, + store_id: subItem.store_id, + is_combo: false, + combo_id: undefined + }) + }) } catch { - // 匹配失败不影响导入 + newItems.push(item) } } + row.selected_items = newItems } const firstRow = mergedRows[0] diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue index c4e22007..0b1bb2fb 100644 --- a/src/views/order/orderManagement/component/SelectProductDialog.vue +++ b/src/views/order/orderManagement/component/SelectProductDialog.vue @@ -105,6 +105,7 @@ import { findStockRowForSelectedItem, getStockItemId, indexStockRowsByLookupKeys, + isComboStockRow, isStockApiSuccess, mapStockPickerItem, queryStockProducts, @@ -304,9 +305,25 @@ async function loadList() { ElMessage.warning('组合商品未包含有效子商品') } } else { - allRows.value = rawList - .map((row) => mapStockPickerItem(row)) - .filter((item) => getPickerRowItemId(item)) + // stock 模式也需要展开组合商品为子 SKU + const stockRows: any[] = [] + const comboRows: any[] = [] + for (const row of rawList) { + if (isComboStockRow(row)) { + comboRows.push(row) + } else { + stockRows.push(row) + } + } + const expandedCombos = comboRows.length + ? await expandComboSearchResults(comboRows, { storeId: props.storeId }) + : [] + allRows.value = [ + ...stockRows + .map((row) => mapStockPickerItem(row)) + .filter((item) => getPickerRowItemId(item)), + ...expandedCombos + ] } pagination.total = allRows.value.length const maxPage = Math.max(1, Math.ceil(pagination.total / pagination.pageSize)) @@ -427,6 +444,23 @@ function handleSearch() { pagination.currentPage = 1 syncingSelection.value = true void loadList() + .then(() => { + // 组合商品展开后自动全选所有子 SKU + const expandedComboItems = allRows.value.filter( + (row: any) => row.source_combo_code + ) + if (expandedComboItems.length) { + const planQty = String(defaultPlanQty.value || '').trim() || '1' + expandedComboItems.forEach((row: any) => { + const item = buildSelectedItemFromStock(row, planQty) + if (item && !localSelectedItems.value.some( + (existing) => hasValidItemId(existing) && Number(existing.item_id) === Number(item.item_id) + )) { + localSelectedItems.value.push(item) + } + }) + } + }) .then(() => enrichLocalSelectedItems()) .then(() => syncSelectionFromLocal()) .finally(async () => { diff --git a/src/views/order/orderManagement/utils/stock-picker-helpers.ts b/src/views/order/orderManagement/utils/stock-picker-helpers.ts index 8bdd566d..528e851c 100644 --- a/src/views/order/orderManagement/utils/stock-picker-helpers.ts +++ b/src/views/order/orderManagement/utils/stock-picker-helpers.ts @@ -161,42 +161,67 @@ export function mapWarehousePickerItem(row: any, mode?: WarehouseSearchMode) { return mode === 'combo' ? mapComboPickerItem(row) : mapStockPickerItem(row) } -/** 解析 nameNotation:【1】商品A【2】商品B */ +/** 解析 nameNotation:【1】商品A+【1】商品B → Map<序号, 名称>(按顺序索引,数字为数量非序号) */ export function parseComboNameNotation(notation: string): Map { const map = new Map() const text = String(notation || '').trim() if (!text) return map + // nameNotation 格式:【数量】名称+【数量】名称+...,按顺序依次为第 1、2、3 项 const regex = /【(\d+)】([^【]*)/g + let idx = 0 let match: RegExpExecArray | null while ((match = regex.exec(text)) !== null) { - const index = Number(match[1]) - const name = String(match[2] || '').trim() - if (Number.isInteger(index) && index > 0 && name) { - map.set(index, name) + idx++ + // 去除末尾可能存在的 + 分隔符 + const name = String(match[2] || '').replace(/\+$/, '').trim() + if (name) { + map.set(idx, name) } } return map } -/** 将单条组合商品记录展开为子 SKU 草稿行(待库存查询补全编码/条码) */ +/** 解析 simpleNotation:159060|1,159083|1 → Map<序号, 编码> */ +export function parseComboSimpleNotation(notation: string): Map { + const map = new Map() + const text = String(notation || '').trim() + if (!text) return map + const pairs = text.split(',') + pairs.forEach((pair, idx) => { + const [code] = pair.split('|') + const trimmed = String(code || '').trim() + if (trimmed) { + map.set(idx + 1, trimmed) + } + }) + return map +} + +/** 将单条组合商品记录展开为子 SKU 草稿行(使用组合记录内置字段,无需额外 API 查询) */ export function expandComboRecordToDraftRows(combo: any) { const comboCode = getComboCode(combo) const comboName = getComboName(combo) const nameByIndex = parseComboNameNotation(combo?.nameNotation) + const simpleByIndex = parseComboSimpleNotation(combo?.simpleNotation) const items = mapComboGoodsItemsFromRecord(combo?.items) if (!items.length) return [] return items.map((item, index) => { const nameIndex = index + 1 + // 优先取 items 中的 item_code/item_name/barcode;其次从 simpleNotation/nameNotation 解析 const itemName = item.item_name || nameByIndex.get(nameIndex) || nameByIndex.get(Number(item.sort_order)) || '' + const itemCode = item.item_code + || simpleByIndex.get(nameIndex) + || String(item.item_goods_sku_id) + const barcode = item.barcode || itemCode || '' return { item_id: item.item_goods_sku_id, - item_code: item.item_code || String(item.item_goods_sku_id), + item_code: itemCode, item_name: itemName, - barcode: item.barcode || '', + barcode, source_combo_code: comboCode, source_combo_name: comboName, combo_item_quantity: item.item_quantity, @@ -205,10 +230,10 @@ export function expandComboRecordToDraftRows(combo: any) { }) } -/** 组合商品搜索结果 → 展开并补全为与普通商品一致的可选行 */ +/** 组合商品搜索结果 → 展开为子商品行(使用组合记录内置字段,无需额外 API 查询) */ export async function expandComboSearchResults( comboList: any[], - options: { storeId?: number } = {} + _options: { storeId?: number } = {} ) { const draftRows: any[] = [] for (const combo of comboList) { @@ -217,35 +242,10 @@ export async function expandComboSearchResults( } if (!draftRows.length) return [] - const skuIds = Array.from(new Set( - draftRows.map((row) => Number(row.item_id)).filter((id) => Number.isInteger(id) && id > 0) - )) - const enrichById = new Map>() - if (skuIds.length) { - const { res, list } = await queryStockProducts({ - keyword: skuIds.join(','), - storeId: options.storeId - }) - if (isStockApiSuccess(res)) { - for (const row of list) { - const mapped = mapStockPickerItem(row) - if (mapped.item_id) enrichById.set(mapped.item_id, mapped) - } - } - } - + // 使用组合记录的 simpleNotation / nameNotation / items 内置字段, + // 无需额外调用 stock.warehouse.search 查询子 SKU 编码 return draftRows.map((draft) => { - const enriched = enrichById.get(Number(draft.item_id)) - const merged = enriched - ? { - ...enriched, - source_combo_code: draft.source_combo_code, - source_combo_name: draft.source_combo_name, - combo_item_quantity: draft.combo_item_quantity, - _from_combo_expanded: true - } - : draft - const mapped = mapStockPickerItem(merged) + const mapped = mapStockPickerItem(draft) return mapped.item_id ? mapped : null }).filter((row): row is ReturnType => row != null) } @@ -431,12 +431,14 @@ export function applyStockMatchToSelectedItem { + const normalizedKeyword = String(keyword || '').trim() + if (!normalizedKeyword) return [] + + // 一次查询:不指定 mode + const { res, list } = await queryStockProducts({ + keyword: normalizedKeyword, + storeId + }) + + if (isStockApiSuccess(res) && list.length) { + const matched = findStockRowByKeyword(list, normalizedKeyword) + if (matched) { + // 组合商品:展开为子 SKU 列表 + if (isComboResponseRow(matched)) { + const expanded = expandComboRecordToDraftRows(matched) + return expanded + .map((draft) => mapStockPickerItem(draft)) + .filter((item) => item.item_id) + .map((item) => ({ + ...item, + source_combo_code: matched.combo_code ?? matched.custom_code ?? '', + source_combo_name: matched.combo_name ?? '', + is_combo: false, // 展开后子商品按普通商品处理 + combo_id: undefined + }) as OrderSelectedProductItem) + } + // 普通商品:直接返回 + const stockItem = toOrderSelectedProductItem(matched, { displayCode: normalizedKeyword }) + return stockItem?.item_id ? [stockItem] : [] + } + } + + // 未匹配 → 尝试 mode='combo' 查询 + const comboTry = await queryStockProducts({ + keyword: normalizedKeyword, + storeId, + mode: 'combo' + }) + if (isStockApiSuccess(comboTry.res) && comboTry.list.length) { + const comboMatched = findStockRowByKeyword(comboTry.list, normalizedKeyword, 'combo') + if (comboMatched) { + const expanded = expandComboRecordToDraftRows(comboMatched) + return expanded + .map((draft) => mapStockPickerItem(draft)) + .filter((item) => item.item_id) + .map((item) => ({ + ...item, + source_combo_code: comboMatched.combo_code ?? comboMatched.custom_code ?? '', + source_combo_name: comboMatched.combo_name ?? '', + is_combo: false, + combo_id: undefined + }) as OrderSelectedProductItem) + } + } + + return [] } export function indexStockRowsByLookupKeys(rows: any[], mode?: WarehouseSearchMode) { diff --git a/src/views/storage/productflow/index.vue b/src/views/storage/productflow/index.vue index 5853abbf..c7aa6513 100644 --- a/src/views/storage/productflow/index.vue +++ b/src/views/storage/productflow/index.vue @@ -172,7 +172,8 @@ import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' -import { stockTransactionList, transactionExport, transactionExportTaskProgress } from '@/api/stock/stock' +import { stockTransactionList } from '@/api/stock/stock' +import { transactionExport, transactionExportTaskProgress } from '@/api/stock.transaction/stock.transaction' import * as indexApi from '@/api/index/index' import { useSettingsStore } from '@/stores/modules/settings' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' @@ -226,6 +227,7 @@ const { exportProgressStatus, exportStatusLabel, submitExportTaskWithMode, + submitExportTask, resumeExportTaskFromStorage, hasPendingExportTask } = useAsyncExportTask({ @@ -532,7 +534,7 @@ async function handleExportAction(mode: 'all' | 'selected') { resumeExportTaskFromStorage() return } - await submitExportTaskWithMode(buildExportPayload(mode), mode) + await submitExportTask(buildExportPayload(mode)) } onMounted(() => { diff --git a/src/views/storage/productflow/productflow-config.ts b/src/views/storage/productflow/productflow-config.ts index 6a979fe2..6bf05b23 100644 --- a/src/views/storage/productflow/productflow-config.ts +++ b/src/views/storage/productflow/productflow-config.ts @@ -48,6 +48,7 @@ export const productflowToolbarButtons: ToolbarButtonConfig[] = [ { key: 'export', label: '导出', + action: 'export', buttonType: 'dropdown', size: 'small', dropdownOptions: [ diff --git a/src/views/storage/productflow/store/index.vue b/src/views/storage/productflow/store/index.vue index a0b2ab7f..ae797bf6 100644 --- a/src/views/storage/productflow/store/index.vue +++ b/src/views/storage/productflow/store/index.vue @@ -178,7 +178,8 @@ import UpperTable from '@/components/UpperTable/index.vue' import WarehouseSelect from '@/components/WarehouseSelect.vue' import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' -import { stockTransactionStoreList, transactionExportStore, transactionExportTaskProgress } from '@/api/stock/stock' +import { stockTransactionStoreList } from '@/api/stock/stock' +import { transactionExportStore, transactionExportTaskProgress } from '@/api/stock.transaction/stock.transaction' import * as indexApi from '@/api/index/index' import { useSettingsStore } from '@/stores/modules/settings' import { useUserStore } from '@/stores/modules/user' @@ -236,6 +237,7 @@ const { exportProgressStatus, exportStatusLabel, submitExportTaskWithMode, + submitExportTask, resumeExportTaskFromStorage, hasPendingExportTask } = useAsyncExportTask({ @@ -426,7 +428,6 @@ async function loadList() { } const res: any = await stockTransactionStoreList({ - store_id: Number(storeId), where: Object.keys(where).length > 0 ? where : undefined, pagination: { page: pagination.currentPage, @@ -555,7 +556,7 @@ async function handleExportAction(mode: 'all' | 'selected') { resumeExportTaskFromStorage() return } - await submitExportTaskWithMode(buildExportPayload(mode), mode) + await submitExportTask(buildExportPayload(mode)) } onMounted(() => { diff --git a/src/views/storage/report/index.vue b/src/views/storage/report/index.vue index 0acd0730..f7360362 100644 --- a/src/views/storage/report/index.vue +++ b/src/views/storage/report/index.vue @@ -131,9 +131,9 @@ import { exportInventoryReport, getExportTaskProgress, searchInventoryReport, - type StorageReportExportBody, - type StorageReportSearchBody -} from '@/api/storage.report/report' + type StockReportExportBody, + type StockReportSearchBody +} from '@/api/stock.report/stock.report' import * as indexApi from '@/api/index/index' import { buildReportTableColumns, @@ -200,7 +200,7 @@ const { hasPendingExportTask } = useAsyncExportTask({ storageKey: 'storage.report.export.taskId', - submitExport: (payload) => exportInventoryReport(payload as StorageReportExportBody), + submitExport: (payload) => exportInventoryReport(payload as StockReportExportBody), queryProgress: (params) => getExportTaskProgress(params) }) @@ -290,7 +290,7 @@ function applyClientPage() { const SORTABLE_FIELDS = new Set(['begin_total', 'inbound_total', 'outbound_total', 'end_total']) -function buildSortPayload(): StorageReportSearchBody['sort'] | undefined { +function buildSortPayload(): StockReportSearchBody['sort'] | undefined { if (!SORTABLE_FIELDS.has(currentSort.prop)) return undefined if (!currentSort.order) return undefined const sortOrder = currentSort.order === 'ascending' ? 'ASC' : 'DESC' @@ -302,14 +302,14 @@ function buildSortPayload(): StorageReportSearchBody['sort'] | undefined { } } -function buildReportQueryPayload(): StorageReportSearchBody { +function buildReportQueryPayload(): StockReportSearchBody { const where = normalizeScanConditionToReportWhere(currentConditionRaw.value) // 关键字搜索 if (keyword.value.trim()) { where.keyword = keyword.value.trim() } const sort = buildSortPayload() - const body: StorageReportSearchBody = {} + const body: StockReportSearchBody = {} if (Object.keys(where).length > 0) { body.where = where } diff --git a/src/views/storage/report/report-config.ts b/src/views/storage/report/report-config.ts index 4a22bef9..48000134 100644 --- a/src/views/storage/report/report-config.ts +++ b/src/views/storage/report/report-config.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs' -import type { StorageReportListItem } from '@/api/storage.report/report' +import type { StockReportListItem } from '@/api/stock.report/stock.report' export const reportFieldLabels: Record = { store_id: '货主ID', @@ -70,7 +70,7 @@ export type ReportColumn = { align?: 'left' | 'center' | 'right' sortable?: boolean | 'custom' sortOrders?: string[] - formatter?: (row: StorageReportListItem) => string + formatter?: (row: StockReportListItem) => string } /** 主表格固定列(与真实接口字段一致);按库位时后端可额外返回 space_*,由 buildReportTableColumns 追加 */ @@ -124,7 +124,7 @@ export const fixedReportColumns: ReportColumn[] = [ const FIXED_PROPS = new Set(fixedReportColumns.map((c) => c.prop)) -export function buildReportTableColumns(rows: StorageReportListItem[]) { +export function buildReportTableColumns(rows: StockReportListItem[]) { const cols = fixedReportColumns.map((c) => ({ ...c })) const extra = new Set() for (const row of rows) { diff --git a/src/views/storage/report/store.vue b/src/views/storage/report/store.vue index ff6d2ddb..eedb5cff 100644 --- a/src/views/storage/report/store.vue +++ b/src/views/storage/report/store.vue @@ -136,9 +136,9 @@ import { exportStoreReport, getExportTaskProgress, searchStoreReport, - type StorageReportExportBody, - type StorageReportSearchBody -} from '@/api/storage.report/report' + type StockReportExportBody, + type StockReportSearchBody +} from '@/api/stock.report/stock.report' import * as indexApi from '@/api/index/index' import { buildReportTableColumns, @@ -207,7 +207,7 @@ const { hasPendingExportTask } = useAsyncExportTask({ storageKey: 'storage.report.export.taskId', - submitExport: (payload) => exportStoreReport(payload as StorageReportExportBody), + submitExport: (payload) => exportStoreReport(payload as StockReportExportBody), queryProgress: (params) => getExportTaskProgress(params) }) @@ -306,7 +306,7 @@ function applyClientPage() { const SORTABLE_FIELDS = new Set(['begin_total', 'inbound_total', 'outbound_total', 'end_total']) -function buildSortPayload(): StorageReportSearchBody['sort'] | undefined { +function buildSortPayload(): StockReportSearchBody['sort'] | undefined { if (!SORTABLE_FIELDS.has(currentSort.prop)) return undefined if (!currentSort.order) return undefined const sortOrder = currentSort.order === 'ascending' ? 'ASC' : 'DESC' @@ -318,7 +318,7 @@ function buildSortPayload(): StorageReportSearchBody['sort'] | undefined { } } -function buildReportQueryPayload(): StorageReportSearchBody { +function buildReportQueryPayload(): StockReportSearchBody { const where = normalizeScanConditionToReportWhere(currentConditionRaw.value) if (selectedWarehouseId.value) { where.warehouse_id = selectedWarehouseId.value @@ -328,7 +328,7 @@ function buildReportQueryPayload(): StorageReportSearchBody { where.keyword = keyword.value.trim() } const sort = buildSortPayload() - const body: StorageReportSearchBody = {} + const body: StockReportSearchBody = {} if (Object.keys(where).length > 0) { body.where = where }