diff --git a/dist.tar.gz b/dist.tar.gz index f1e729a9..6753305a 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index b9288a8d..3bbc7575 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -58,6 +58,19 @@ export type PendingOrderUpdateOrderExpressParams = { express_code: string; }; +export type PendingOrderUpdateAddressParams = { + ids: number[]; + name?: string; + mobile?: string; + tel?: string; + zip_code?: string; + province?: string; + city?: string; + area?: string; + town?: string; + detail_address?: string; +}; + export type PendingOrderCloneOrderParams = { order_id: number; }; @@ -391,6 +404,22 @@ export function orderPendingOrderUpdateOrderExpress( } as any); } +export function orderPendingOrderUpdateAddress( + data: PendingOrderUpdateAddressParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.updateAddress", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderCloneOrder(data: PendingOrderCloneOrderParams): Promise { return request({ url: "/system", @@ -419,20 +448,6 @@ export function orderPendingOrderCreateOrder(data: PendingOrderCreateOrderParams } as any); } -export function orderPendingOrderDownloadCreateTemplate(): Promise { - return request({ - url: "/system", - method: "post", - params: { - method: "order.pendingOrder.downloadCreateTemplate", - v, - timestamp: Date.now(), - }, - data: {}, - isSystemApi: true, - } as any); -} - export function orderPendingOrderImportOrdersFromExcel( data: PendingOrderImportOrdersFromExcelParams, ): Promise { @@ -478,9 +493,9 @@ export type OrderPendingOrderApi = { syncOrderIds: typeof orderPendingOrderSyncOrderIds; updateOrderPlatform: typeof orderPendingOrderUpdateOrderPlatform; updateOrderExpress: typeof orderPendingOrderUpdateOrderExpress; + updateAddress: typeof orderPendingOrderUpdateAddress; cloneOrder: typeof orderPendingOrderCloneOrder; createOrder: typeof orderPendingOrderCreateOrder; - downloadCreateTemplate: typeof orderPendingOrderDownloadCreateTemplate; importOrdersFromExcel: typeof orderPendingOrderImportOrdersFromExcel; parseAddress: typeof orderPendingOrderParseAddress; }; @@ -498,9 +513,9 @@ export const orderPendingOrder: OrderPendingOrderApi = { syncOrderIds: orderPendingOrderSyncOrderIds, updateOrderPlatform: orderPendingOrderUpdateOrderPlatform, updateOrderExpress: orderPendingOrderUpdateOrderExpress, + updateAddress: orderPendingOrderUpdateAddress, cloneOrder: orderPendingOrderCloneOrder, createOrder: orderPendingOrderCreateOrder, - downloadCreateTemplate: orderPendingOrderDownloadCreateTemplate, importOrdersFromExcel: orderPendingOrderImportOrdersFromExcel, parseAddress: orderPendingOrderParseAddress, }; diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index b474e5c3..9bfea8da 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -5,6 +5,7 @@ const v = '1.0' import type { WaveBatchListParams, WaveBatchListResponse, WaveBatchListWhere, WaveListPagination } from '@/api/order/order' export type { WaveBatchListParams, WaveBatchListResponse, WaveBatchListWhere, WaveListPagination } +export { unwrapWaveBatchListResponse } from '@/api/order/order' export type WavePickTaskListParams = { warehouse_id: number @@ -31,11 +32,96 @@ export type WavePickTaskListParams = { strategy_id?: number } +/** order.wave.wavePickTaskList 列表项(与 wms_wave_pick_task 主表字段对齐) */ +export type WavePickTaskListItem = { + task_id?: number | string + task_no?: string + batch_no?: string + warehouse_id?: number | string + status?: number | string + review_status?: number | string + pick_mode?: number | string + source?: number | string + wave_count?: number | string + order_count?: number | string + box_count?: number | string + operator_id?: number | string + operator_name?: string + creator_id?: number | string + creator_name?: string + pick_user_id?: number | string + pick_user_name?: string + review_user_id?: number | string + review_user_name?: string + current_cart_id?: number | string + current_cart_code_snapshot?: string + device_id?: string + start_at?: string + start_time?: string + finish_at?: string + finish_time?: string + review_start_time?: string + review_finish_time?: string + created_at?: string + create_time?: string + update_time?: string + [key: string]: unknown +} + +/** order.wave.wavePickTaskList 业务 data:list + 扁平分页字段 */ export type WavePickTaskListResponse = { - list: Array> - total?: number - page?: number - page_size?: number + list: WavePickTaskListItem[] + total: number + page: number + page_size: number +} + +export type WavePickTaskListApiResponse = WavePickTaskListResponse & { + code?: number + message?: string + data?: Partial & { + pagination?: { + total?: number + page?: number + pageSize?: number + page_size?: number + } + } +} + +/** 解析 order.wave.wavePickTaskList 响应(优先 data.{ list, total, page, page_size }) */ +export function unwrapWavePickTaskListResponse( + res: WavePickTaskListApiResponse | null | undefined, + fallbacks?: { page?: number; page_size?: number } +): WavePickTaskListResponse { + const payload = + res?.data !== undefined && res?.data !== null && typeof res.data === 'object' && !Array.isArray(res.data) + ? res.data + : res + + const pagination = + payload && typeof payload === 'object' && payload.pagination && typeof payload.pagination === 'object' + ? payload.pagination + : undefined + + const list = Array.isArray(payload?.list) + ? payload.list + : Array.isArray(res?.list) + ? res.list + : [] + + const total = Number(payload?.total ?? pagination?.total ?? res?.total ?? 0) + const page = Number(payload?.page ?? pagination?.page ?? res?.page ?? fallbacks?.page ?? 1) + const page_size = Number( + payload?.page_size ?? pagination?.page_size ?? pagination?.pageSize ?? res?.page_size ?? fallbacks?.page_size ?? 20 + ) + + return { + list, + total: Number.isFinite(total) ? total : 0, + page: Number.isFinite(page) && page > 0 ? page : (fallbacks?.page ?? 1), + page_size: Number.isFinite(page_size) && page_size > 0 ? page_size : (fallbacks?.page_size ?? 20) + } } export type WavePickTaskCancelParams = { @@ -584,7 +670,7 @@ export type WaveBatchRemoveOrdersResponse = { export function orderWaveWavePickTaskList( data: WavePickTaskListParams -): Promise }> { +): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 15b5af62..4214559b 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -27,8 +27,6 @@ export type WaveBatchListWhere = { storage_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ source?: number - /** 英文枚举:unsynced | partially_synced | synced */ - sync_assignment_status?: 'unsynced' | 'partially_synced' | 'synced' /** 英文枚举:unreviewed | partially_reviewed | reviewed */ review_assignment_status?: 'unreviewed' | 'partially_reviewed' | 'reviewed' } @@ -54,13 +52,17 @@ export type WaveListPagination = { } export type WaveBatchListItem = Record & { + wave_id?: number | string + wave_no?: string + wave_type?: number + wave_status?: number order_count?: number + processed_orders?: number storage_assignment_status?: string express_assignment_status?: string print_assignment_status?: string /** 0 普通波次,1 管理后台策略任务,2 PDA 策略任务 */ source?: number - sync_assignment_status?: string review_assignment_status?: string unreviewed_order_count?: number } @@ -70,10 +72,66 @@ export type WaveBatchListResponse = { pagination: WaveListPagination } +export type WaveBatchListApiResponse = WaveBatchListResponse & { + code?: number + message?: string + data?: Partial & { + total?: number + page?: number + page_size?: number + } +} + +/** 解析 order.wave.batchList 响应(优先 data.{ list, pagination }) */ +export function unwrapWaveBatchListResponse( + res: WaveBatchListApiResponse | null | undefined, + fallbacks?: { page?: number; pageSize?: number } +): WaveBatchListResponse { + const payload = + res?.data !== undefined && res?.data !== null && typeof res.data === 'object' && !Array.isArray(res.data) + ? res.data + : res + + const list = Array.isArray(payload?.list) + ? payload.list + : Array.isArray(res?.list) + ? res.list + : [] + + const paginationObj = + payload?.pagination && typeof payload.pagination === 'object' ? payload.pagination : undefined + + const payloadRecord = (payload && typeof payload === 'object' ? payload : {}) as Record + const resRecord = (res && typeof res === 'object' ? res : {}) as Record + + const page = Number(paginationObj?.page ?? payloadRecord.page ?? resRecord.page ?? fallbacks?.page ?? 1) + const pageSize = Number( + paginationObj?.pageSize ?? + (paginationObj as Record | undefined)?.page_size ?? + payloadRecord.page_size ?? + resRecord.page_size ?? + fallbacks?.pageSize ?? + 20 + ) + const total = Number(paginationObj?.total ?? payloadRecord.total ?? resRecord.total ?? 0) + + return { + list: list as WaveBatchListItem[], + pagination: { + page: Number.isFinite(page) && page > 0 ? page : (fallbacks?.page ?? 1), + pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : (fallbacks?.pageSize ?? 20), + total: Number.isFinite(total) ? total : 0, + totalPages: paginationObj?.totalPages, + hasPrevious: paginationObj?.hasPrevious, + hasNext: paginationObj?.hasNext + } + } +} + /** 文档模块 `order` 中的 `order.wave.batchList` */ export function orderModuleWaveBatchList( data: WaveBatchListParams = {} -): Promise }> { +): Promise { return request({ url: '/system', method: 'post', @@ -90,6 +148,38 @@ export function orderModuleWaveBatchList( /** 与 orderModuleWaveBatchList 同义,便于业务侧按 method 语义引用 */ export const orderWaveBatchList = orderModuleWaveBatchList -export const orderModule = { - waveBatchList: orderModuleWaveBatchList +export type PendingOrderDownloadCreateTemplateData = { + base64: string + filename: string + mime: string +} + +export type PendingOrderDownloadCreateTemplateResponse = { + code?: number + flag?: string + message?: string + base64?: string + filename?: string + mime?: string + data?: Partial +} + +/** 文档模块 `order` 中的 `order.pendingOrder.downloadCreateTemplate` */ +export function orderModulePendingOrderDownloadCreateTemplate(): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.pendingOrder.downloadCreateTemplate', + v, + timestamp: new Date().getTime() + }, + data: {}, + isSystemApi: true + } as any) +} + +export const orderModule = { + waveBatchList: orderModuleWaveBatchList, + pendingOrderDownloadCreateTemplate: orderModulePendingOrderDownloadCreateTemplate } diff --git a/src/components/SpacePicker/index.vue b/src/components/SpacePicker/index.vue index 754f6978..a1c46211 100644 --- a/src/components/SpacePicker/index.vue +++ b/src/components/SpacePicker/index.vue @@ -125,8 +125,8 @@ async function loadData(page = 1) { loading.value = true pagination.page = page try { - const keyword = String(keyword.value || '').trim() - const res: any = await indexApi.searchSpace({ keyword, page, pageSize: pagination.pageSize }) + const searchKeyword = String(keyword.value || '').trim() + const res: any = await indexApi.searchSpace({ keyword: searchKeyword, page, pageSize: pagination.pageSize }) const data = res && (res.data || res.list || res) const rawList = Array.isArray(data?.list) ? data.list : Array.isArray(data) ? data : [] list.value = rawList.map((item: any) => ({ diff --git a/src/components/UpperTable/index.vue b/src/components/UpperTable/index.vue index 62de8c48..0381c5ef 100644 --- a/src/components/UpperTable/index.vue +++ b/src/components/UpperTable/index.vue @@ -403,7 +403,19 @@ const props = defineProps({ rowClassName: { type: [String, Function], default: '', - } + }, + virtualThreshold: { + type: Number, + default: 80, + }, + virtualMaxVisibleRows: { + type: Number, + default: 0, + }, + virtualBufferRows: { + type: Number, + default: 12, + }, }) const emit = defineEmits([ @@ -471,8 +483,6 @@ const bodyScrollEl = ref(null) const columnConfigListRef = ref(null) const virtualScrollTop = ref(0) const virtualViewportHeight = ref(0) -const virtualBufferRows = 12 -const virtualThreshold = 80 const dragAutoScrollStep = ref(0) let dragAutoScrollRaf: number | null = null @@ -608,17 +618,23 @@ const virtualRowHeight = computed(() => { }) const shouldUseVirtual = computed(() => { - return props.data.length >= virtualThreshold + return props.data.length >= props.virtualThreshold }) const virtualVisibleCount = computed(() => { - if (!virtualViewportHeight.value) return props.pagination.pageSize || 20 - return Math.ceil(virtualViewportHeight.value / virtualRowHeight.value) + virtualBufferRows * 2 + const bufferRows = props.virtualBufferRows + const viewportCount = virtualViewportHeight.value + ? Math.ceil(virtualViewportHeight.value / virtualRowHeight.value) + bufferRows * 2 + : (props.pagination.pageSize || 20) + if (props.virtualMaxVisibleRows > 0) { + return Math.min(props.virtualMaxVisibleRows, viewportCount) + } + return viewportCount }) const virtualStartIndex = computed(() => { if (!shouldUseVirtual.value) return 0 - return Math.max(0, Math.floor(virtualScrollTop.value / virtualRowHeight.value) - virtualBufferRows) + return Math.max(0, Math.floor(virtualScrollTop.value / virtualRowHeight.value) - props.virtualBufferRows) }) const virtualEndIndex = computed(() => { diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 78438e68..c3f37477 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -25,10 +25,10 @@ style="display: none" @change="handleImportFileChange" /> - 选择Excel + 选择Excel 下载模板 - 添加明细 - 清除数据 + 添加明细 + 清除数据 确认创建 @@ -50,6 +50,23 @@ /> 已选文件:{{ importOrderFileName || '未选择' }} + + 共 {{ importPreviewRows.length }} 条明细,表格滑动窗口渲染最多 40 条 + + + +
+ +
+ 总计 {{ importProgress.total }} + 成功 {{ importProgress.success_count }} + 失败 {{ importProgress.fail_count }} + 导入中… +
@@ -60,7 +77,11 @@ :show-selection="true" :selectable="isPreviewRowSelectable" :loading="parseImportFileLoading" - :pagination="{ currentPage: 1, pageSize: 500, total: importPreviewRows.length }" + :show-pagination="false" + :pagination="{ currentPage: 1, pageSize: 40, total: importPreviewRows.length }" + :virtual-threshold="1" + :virtual-max-visible-rows="IMPORT_TABLE_VISIBLE_ROWS" + :virtual-buffer-rows="4" :columns="importPreviewColumns" row-key="_rowKey" :current-row-key="activePreviewRowKey" @@ -104,6 +125,8 @@ v-model="row.shop_nick" size="small" clearable + maxlength="200" + show-word-limit placeholder="自定义店铺名称" :disabled="isPreviewRowLocked(row)" @change="markPreviewRowDirty(row)" @@ -293,7 +316,8 @@
-
未勾选行时,识别地址将自动新建一行
+
未勾选行时,识别地址将自动新建 1 行
识别地址 清空 - + + +
+
批量创建明细
+
+ 粘贴地址后设置数量,点击识别地址将自动创建多条明细并填充识别结果 +
+
+ 创建数量 + + + 识别地址 + +
+
@@ -398,6 +448,7 @@ import type { SelectProductItem } from './SelectProductDialog.vue' import * as indexApi from '@/api/index/index' import { warehouseSearch } from '@/api/stock/stock' import { orderList } from '@/api/order.index/orderindex' +import { orderModule, type PendingOrderDownloadCreateTemplateResponse } from '@/api/order/order' import { extractPendingOrderParseAddressData, orderPendingOrder, @@ -455,6 +506,7 @@ type ImportPreviewRow = { province: string city: string area: string + town: string province_code: string city_code: string area_code: string @@ -487,15 +539,33 @@ const importPreviewColumns = [ { prop: 'row_action', label: '操作', width: '70', fixed: 'right' } ] +const SHOP_NICK_MAX_LENGTH = 200 +const PENDING_ORDER_TEMPLATE_FILENAME = '创建订单导入模板.xlsx' +const BATCH_CREATE_MAX_COUNT = 50 +const IMPORT_ORDER_CHECK_BATCH_SIZE = 200 +const IMPORT_API_CONCURRENCY = 5 +const IMPORT_ROW_BATCH_SIZE = 5 +const IMPORT_TABLE_VISIBLE_ROWS = 40 +const IMPORT_SOFT_ROW_LIMIT = 5000 + let previewRowKeySeed = 1 +let importRowsWriteQueue = Promise.resolve(undefined) +const stockLookupCache = new Map() +const addressParseCache = new Map() const importOrderLoading = ref(false) const downloadTemplateLoading = ref(false) const parseImportFileLoading = ref(false) +const isBulkImporting = ref(false) const importFileInputRef = ref(null) const importOrderFileName = ref('') const importPreviewRows = ref([]) const importOrderResult = ref(null) +const importProgress = ref({ + total: 0, + success_count: 0, + fail_count: 0 +}) const storeOptions = ref>([]) const importExpressOptions = ref>([]) const importPlatformOptions = ref>([]) @@ -507,6 +577,8 @@ const activePreviewRowKey = ref('') const selectedPreviewRowKeys = ref>(new Set()) const addressPasteText = ref('') const parseAddressLoading = ref(false) +const batchCreateCount = ref(1) +const batchParseAddressLoading = ref(false) const selectProductDialogVisible = ref(false) const selectProductTargetRow = ref(null) @@ -529,6 +601,19 @@ const importPreviewOrderCount = computed(() => { return keys.size }) +const importProgressPercent = computed(() => { + const { total, success_count, fail_count } = importProgress.value + if (!total) return 0 + return Math.min(100, Math.round(((success_count + fail_count) / total) * 100)) +}) + +const importProgressStatus = computed(() => { + if (importOrderLoading.value || !importProgress.value.total) return undefined + if (importProgress.value.fail_count > 0) return 'exception' as const + if (importProgress.value.success_count === importProgress.value.total) return 'success' as const + return undefined +}) + watch(visible, (opened) => { if (opened) { void loadStoreOptions() @@ -539,6 +624,7 @@ watch(visible, (opened) => { watch( importPreviewRows, () => { + if (isBulkImporting.value) return restorePreviewRowSelection() }, { deep: true } @@ -562,6 +648,7 @@ function createEmptyPreviewRowForm(): ImportPreviewRow { province: '', city: '', area: '', + town: '', province_code: '', city_code: '', area_code: '', @@ -612,19 +699,65 @@ function collectGroupOrderItems(rows: ImportPreviewRow[]) { return items } +function getStockLookupCacheKey(storeId: number | undefined, itemCode: string) { + const normalizedCode = String(itemCode || '').trim() + if (!normalizedCode) return '' + if (Number.isFinite(storeId) && Number(storeId) > 0) { + return `${Number(storeId)}:${normalizedCode}` + } + return `*:${normalizedCode}` +} + +function clearImportLookupCaches() { + stockLookupCache.clear() + addressParseCache.clear() +} + +async function runWithConcurrencyLimit( + tasks: Array<() => Promise>, + limit = IMPORT_API_CONCURRENCY +): Promise { + if (!tasks.length) return [] + const results: T[] = new Array(tasks.length) + let cursor = 0 + + async function worker() { + while (cursor < tasks.length) { + const index = cursor + cursor += 1 + const task = tasks[index] + if (!task) continue + results[index] = await task() + } + } + + const workerCount = Math.min(limit, tasks.length) + await Promise.all(Array.from({ length: workerCount }, () => worker())) + return results +} + async function lookupStockItemByCode(storeId: number, itemCode: string) { + const cacheKey = getStockLookupCacheKey(storeId, itemCode) + if (cacheKey && stockLookupCache.has(cacheKey)) { + return stockLookupCache.get(cacheKey) || null + } + const res: any = await warehouseSearch({ keyword: itemCode, store_id: storeId }) const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') - if (!ok) return null + if (!ok) { + if (cacheKey) stockLookupCache.set(cacheKey, null) + return null + } const list = (Array.isArray(res?.data) ? res.data : []).map(mapStockPickerItem) - return ( + const matched = list.find((row: any) => getStockItemCode(row) === itemCode) || list.find((row: any) => String(row.item_id) === itemCode) || null - ) + if (cacheKey) stockLookupCache.set(cacheKey, matched) + return matched } /** @@ -634,23 +767,122 @@ async function lookupStockItemByCodeAcrossStores(itemCode: string): Promise<{ matched: any | null detectedStoreId: number | undefined }> { + const cacheKey = getStockLookupCacheKey(undefined, itemCode) + if (cacheKey && stockLookupCache.has(cacheKey)) { + const cached = stockLookupCache.get(cacheKey) + if (cached && typeof cached === 'object' && 'matched' in cached) { + return cached as { matched: any | null; detectedStoreId: number | undefined } + } + } + const res: any = await warehouseSearch({ keyword: itemCode }) const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') - if (!ok) return { matched: null, detectedStoreId: undefined } + if (!ok) { + const empty = { matched: null, detectedStoreId: undefined } + if (cacheKey) stockLookupCache.set(cacheKey, empty) + return empty + } const list = (Array.isArray(res?.data) ? res.data : []).map(mapStockPickerItem) const exactMatch = list.find((row: any) => getStockItemCode(row) === itemCode) const fuzzyMatch = exactMatch || list.find((row: any) => String(row.item_id) === itemCode) || null - if (!fuzzyMatch) return { matched: null, detectedStoreId: undefined } + if (!fuzzyMatch) { + const empty = { matched: null, detectedStoreId: undefined } + if (cacheKey) stockLookupCache.set(cacheKey, empty) + return empty + } - // 检查所有匹配项的 store_id 是否一致(store_id 在 store_stock 内) const storeIds = new Set() for (const row of list) { const sid = Number(row.store_stock?.store_id ?? row.store_id) if (Number.isFinite(sid) && sid > 0) storeIds.add(sid) } const detectedStoreId = storeIds.size === 1 ? storeIds.values().next().value : undefined - return { matched: fuzzyMatch, detectedStoreId } + const result = { matched: fuzzyMatch, detectedStoreId } + if (cacheKey) stockLookupCache.set(cacheKey, result) + return result +} + +async function parseAddressCached(address: string): Promise { + const normalizedAddress = String(address || '').trim() + if (!normalizedAddress) return null + if (addressParseCache.has(normalizedAddress)) { + return addressParseCache.get(normalizedAddress) || null + } + + try { + const res: any = await orderPendingOrderParseAddress({ address: normalizedAddress }) + const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') + if (!ok) { + addressParseCache.set(normalizedAddress, null) + return null + } + const data = extractPendingOrderParseAddressData(res) + addressParseCache.set(normalizedAddress, data || null) + return data || null + } catch { + addressParseCache.set(normalizedAddress, null) + return null + } +} + +async function checkExistingOrderCodes(orderCodes: string[]) { + const uniqueCodes = Array.from( + new Set(orderCodes.map((code) => String(code || '').trim()).filter(Boolean)) + ) + if (!uniqueCodes.length) return new Set() + + const existCodeSet = new Set() + const tasks = [] + for (let index = 0; index < uniqueCodes.length; index += IMPORT_ORDER_CHECK_BATCH_SIZE) { + const chunk = uniqueCodes.slice(index, index + IMPORT_ORDER_CHECK_BATCH_SIZE) + tasks.push(async () => { + const existRes: any = await orderList({ where: { delivery_order_code: chunk } }) + const existOk = existRes && (existRes.code === 1 || existRes.code === 200 || existRes.flag === 'success') + if (!existOk) return + const existList = Array.isArray(existRes?.data?.list) ? existRes.data.list : [] + for (const order of existList) { + const code = String(order?.delivery_order_code || '').trim() + if (code) existCodeSet.add(code) + } + }) + } + await runWithConcurrencyLimit(tasks, 4) + return existCodeSet +} + +function markRowsWithExistingOrderCodes(rows: ImportPreviewRow[], existCodeSet: Set) { + for (const row of rows) { + const code = String(row.delivery_order_code || '').trim() + if (code && existCodeSet.has(code)) { + row._orderExists = true + row._orderExistsCode = code + } + } +} + +async function resolveAddressesForImportGroups(groups: Map) { + const tasks: Array<() => Promise> = [] + + for (const [, rows] of groups) { + const header = rows[0] + if (!header) continue + if (String(header.province || '').trim() && String(header.city || '').trim() && String(header.area || '').trim()) { + continue + } + const address = String(header.detail_address || '').trim() + if (!address) continue + + tasks.push(async () => { + const data = await parseAddressCached(address) + if (!data) return + for (const row of rows) { + applyParsedAddressToRow(row, data) + } + }) + } + + await runWithConcurrencyLimit(tasks) } async function resolveMissingItemIdsForGroup(rows: ImportPreviewRow[]) { @@ -765,6 +997,9 @@ function getRowIssues(row: ImportPreviewRow): string[] { if (isRequiredFieldEmpty(row, 'detail_address')) issues.push('详细地址未填写') if (!row.selected_items.length) issues.push('商品未选择') else if (hasUnmatchedItems(row)) issues.push('商品未匹配') + if (String(row.shop_nick || '').trim().length > SHOP_NICK_MAX_LENGTH) { + issues.push(`店铺名称超过 ${SHOP_NICK_MAX_LENGTH} 字`) + } return issues } @@ -784,7 +1019,78 @@ function isRequiredFieldEmpty(row: ImportPreviewRow, field: string): boolean { } function isPreviewRowLocked(row: ImportPreviewRow) { - return row.import_status === '成功' + return row.import_status === '识别中' || row.import_status === '创建中' +} + +function hasFullRegion(row: ImportPreviewRow) { + return Boolean( + String(row.province || '').trim() + && String(row.city || '').trim() + && String(row.area || '').trim() + ) +} + +function withImportRowsLock(fn: () => T | Promise): Promise { + const run = importRowsWriteQueue.then(() => fn()) + importRowsWriteQueue = run.then( + () => undefined, + () => undefined + ) + return run +} + +function getLiveOrderGroupRows(rows: ImportPreviewRow[]) { + const rowKeySet = new Set(rows.map((row) => row._rowKey)) + return importPreviewRows.value.filter((row) => rowKeySet.has(row._rowKey)) +} + +function getLiveImportRowByKey(rowKey: string) { + return importPreviewRows.value.find((row) => row._rowKey === rowKey) || null +} + +function getPendingImportRows() { + return importPreviewRows.value.filter((row) => { + return row.import_status === '待创建' || row.import_status === '失败' + }) +} + +function chunkImportRows(rows: ImportPreviewRow[], size = IMPORT_ROW_BATCH_SIZE) { + const chunks: ImportPreviewRow[][] = [] + for (let index = 0; index < rows.length; index += size) { + chunks.push(rows.slice(index, index + size)) + } + return chunks +} + +async function setOrderGroupRowsStatus(rows: ImportPreviewRow[], status: string, message = '') { + const rowKeySet = new Set(rows.map((row) => row._rowKey)) + await withImportRowsLock(() => { + importPreviewRows.value = importPreviewRows.value.map((row) => { + if (!rowKeySet.has(row._rowKey)) return row + return { ...row, import_status: status, import_message: message } + }) + }) +} + +async function removeOrderGroupRows(rows: ImportPreviewRow[]) { + const rowKeySet = new Set(rows.map((row) => row._rowKey)) + await withImportRowsLock(() => { + for (const key of rowKeySet) { + selectedPreviewRowKeys.value.delete(key) + if (activePreviewRowKey.value === key) { + activePreviewRowKey.value = '' + } + } + importPreviewRows.value = importPreviewRows.value.filter((row) => !rowKeySet.has(row._rowKey)) + renumberPreviewRows() + }) + + if (!importPreviewRows.value.length) { + resetAddressPanelState() + } else if (!activePreviewRowKey.value) { + const nextRow = importPreviewRows.value.find((item) => !isPreviewRowLocked(item)) || importPreviewRows.value[0] + if (nextRow) void selectPreviewRow(nextRow) + } } function isPreviewRowSelectable(row: ImportPreviewRow) { @@ -863,11 +1169,26 @@ function mergeDuplicateOrderRows(rows: ImportPreviewRow[]): ImportPreviewRow[] { if (!existing.logistics_code && row.logistics_code) existing.logistics_code = row.logistics_code if (!existing.sys_platform_code && row.sys_platform_code) existing.sys_platform_code = row.sys_platform_code if (!existing.shop_nick && row.shop_nick) existing.shop_nick = row.shop_nick + if (!existing.town && row.town) existing.town = row.town } } return Array.from(map.values()) } +function normalizeShopNick(value: unknown): string | undefined { + const text = String(value ?? '').trim() + if (!text) return undefined + return text.slice(0, SHOP_NICK_MAX_LENGTH) +} + +function resolveLogisticsName(code: string): string | undefined { + const normalizedCode = String(code || '').trim() + if (!normalizedCode) return undefined + const matched = importExpressOptions.value.find((item) => String(item.value || '').trim() === normalizedCode) + const label = String(matched?.label || '').trim() + return label || undefined +} + function getOrderGroupKey(row: ImportPreviewRow) { const code = String(row.delivery_order_code || '').trim() return code || row._rowKey @@ -980,14 +1301,29 @@ function getNextPreviewRowTemplate(copyFrom?: ImportPreviewRow): ImportPreviewRo } } -function addImportPreviewRow(copyFrom?: ImportPreviewRow) { - const nextRow = getNextPreviewRowTemplate(copyFrom) - importPreviewRows.value.push(nextRow) +function addImportPreviewRows(count: number, copyFrom?: ImportPreviewRow): ImportPreviewRow[] { + const safeCount = Math.max(1, Math.floor(Number(count) || 1)) + const created: ImportPreviewRow[] = [] + let templateSource = copyFrom + + for (let index = 0; index < safeCount; index += 1) { + const nextRow = getNextPreviewRowTemplate(templateSource) + importPreviewRows.value.push(nextRow) + created.push(nextRow) + templateSource = nextRow + } + renumberPreviewRows() importOrderResult.value = null if (!importOrderFileName.value) { importOrderFileName.value = '手动录入' } + return created +} + +function addImportPreviewRow(copyFrom?: ImportPreviewRow) { + const [nextRow] = addImportPreviewRows(1, copyFrom) + if (!nextRow) return clearPreviewRowSelection() void selectPreviewRow(nextRow) } @@ -1009,7 +1345,7 @@ function removeImportPreviewRow(row: ImportPreviewRow) { } function markPreviewRowDirty(row: ImportPreviewRow) { - if (row.import_status === '成功') return + if (isPreviewRowLocked(row)) return row.import_status = '待创建' row.import_message = '' importOrderResult.value = null @@ -1026,7 +1362,12 @@ function handleDeliveryOrderCodeChange(row: ImportPreviewRow, newVal: string) { } function hasPendingRows(): boolean { - return importPreviewRows.value.some((row) => row.import_status === '待创建') + return importPreviewRows.value.some((row) => { + return row.import_status === '待创建' + || row.import_status === '失败' + || row.import_status === '识别中' + || row.import_status === '创建中' + }) } async function confirmClose(): Promise { @@ -1058,13 +1399,25 @@ async function handleCloseClick() { if (ok) visible.value = false } +function resetImportProgress() { + importProgress.value = { + total: 0, + success_count: 0, + fail_count: 0 + } +} + function resetImportOrderDialog() { + importRowsWriteQueue = Promise.resolve(undefined) importOrderFileName.value = '' importPreviewRows.value = [] importOrderResult.value = null + resetImportProgress() defaultStoreId.value = undefined activePreviewRowKey.value = '' + isBulkImporting.value = false clearPreviewRowSelection() + clearImportLookupCaches() resetAddressPanelState() if (importFileInputRef.value) { importFileInputRef.value.value = '' @@ -1075,8 +1428,11 @@ function clearImportData() { importOrderFileName.value = '' importPreviewRows.value = [] importOrderResult.value = null + resetImportProgress() activePreviewRowKey.value = '' + isBulkImporting.value = false clearPreviewRowSelection() + clearImportLookupCaches() resetAddressPanelState() if (importFileInputRef.value) { importFileInputRef.value.value = '' @@ -1127,6 +1483,7 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview const province = toImportString(pickImportValue(row, ['省份', 'province'])) const city = toImportString(pickImportValue(row, ['城市', 'city'])) const area = toImportString(pickImportValue(row, ['区/县', '区县', 'area'])) + const town = toImportString(pickImportValue(row, ['镇/街道', 'town'])) const regionCodes = resolvePreviewRowRegionCodes({ province, city, area }) if (!deliveryOrderCode && !storeId && !name && !itemCode && !planQty) { @@ -1147,6 +1504,7 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview province, city, area, + town, province_code: regionCodes.provinceCode, city_code: regionCodes.cityCode, area_code: regionCodes.districtCode, @@ -1154,7 +1512,7 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview plan_qty: planQty || '1', logistics_code: toImportString(pickImportValue(row, ['快递编码', 'logistics_code'])), sys_platform_code: toImportString(pickImportValue(row, ['系统平台编码', 'sys_platform_code', '平台编码'])), - shop_nick: toImportString(pickImportValue(row, ['店铺名称', '店铺名', 'shop_nick', '店铺昵称'])), + shop_nick: normalizeShopNick(pickImportValue(row, ['店铺名称', '店铺名', 'shop_nick', '店铺昵称'])) || '', import_status: '待创建', import_message: '' } @@ -1166,11 +1524,12 @@ async function parseImportPreviewFromFile(file: File) { } parseImportFileLoading.value = true + isBulkImporting.value = true importOrderResult.value = null clearPreviewRowSelection() try { const buffer = await file.arrayBuffer() - const workbook = XLSX.read(buffer, { type: 'array' }) + const workbook = XLSX.read(buffer, { type: 'array', cellDates: false }) const sheetName = workbook.SheetNames[0] if (!sheetName) { ElMessage.warning('Excel 中没有可读取的工作表') @@ -1184,121 +1543,58 @@ async function parseImportPreviewFromFile(file: File) { return } - const rawRows = XLSX.utils.sheet_to_json>(sheet, { defval: '' }) - console.log('【Excel导入】原始行数据(前3行):', rawRows.slice(0, 3).map((r: any) => { - const keys = Object.keys(r) - return { keys, sample: keys.slice(0, 8).map(k => `${k}=${r[k]}`) } - })) + const rawRows = XLSX.utils.sheet_to_json>(sheet, { defval: '', raw: true }) + if (rawRows.length > IMPORT_SOFT_ROW_LIMIT) { + ElMessage.warning(`单次导入建议不超过 ${IMPORT_SOFT_ROW_LIMIT} 行,请拆分 Excel 后重试`) + return + } + const previewRows: ImportPreviewRow[] = [] for (let index = 0; index < rawRows.length; index += 1) { const previewRow = buildPreviewRow(rawRows[index] || {}, index + 1) if (previewRow) previewRows.push(previewRow) } - // 合并相同订单号的行 const mergedRows = mergeDuplicateOrderRows(previewRows) - importPreviewRows.value = mergedRows - renumberPreviewRows() if (!mergedRows.length) { + importPreviewRows.value = [] ElMessage.warning('未解析到有效明细行,可手动添加明细') return } - // 省市区为空时自动地址智能识别(逐个订单串行执行避免并发) - for (const row of mergedRows) { - if (String(row.province || '').trim() && String(row.city || '').trim() && String(row.area || '').trim()) { - continue - } - const address = String(row.detail_address || '').trim() - if (!address) continue - try { - const res: any = await orderPendingOrderParseAddress({ address }) - const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') - if (!ok) continue - const data = extractPendingOrderParseAddressData(res) - if (data) { - if (data.province) row.province = String(data.province).trim() - if (data.city) row.city = String(data.city).trim() - if (data.area) row.area = String(data.area).trim() - if (data.detailAddress) row.detail_address = String(data.detailAddress).trim() - if (data.name && !row.name) row.name = String(data.name).trim() - if (data.mobile && !row.mobile) row.mobile = String(data.mobile).trim() - const regionCodes = resolvePreviewRowRegionCodes({ province: row.province, city: row.city, area: row.area }) - if (regionCodes.provinceCode) row.province_code = regionCodes.provinceCode - if (regionCodes.cityCode) row.city_code = regionCodes.cityCode - if (regionCodes.districtCode) row.area_code = regionCodes.districtCode - } - } catch { - // 解析失败不影响导入 - } - } - - // 订单号预检查:查询系统中是否已存在相同订单号 const orderCodesToCheck = mergedRows - .map((r) => String(r.delivery_order_code || '').trim()) + .map((row) => String(row.delivery_order_code || '').trim()) .filter(Boolean) if (orderCodesToCheck.length) { try { - const existRes: any = await orderList({ where: { delivery_order_code: orderCodesToCheck } }) - const existOk = existRes && (existRes.code === 1 || existRes.code === 200 || existRes.flag === 'success') - if (existOk) { - const existList = Array.isArray(existRes?.data?.list) ? existRes.data.list : [] - const existCodeSet = new Set(existList.map((o: any) => String(o.delivery_order_code || '').trim()).filter(Boolean)) - for (const row of mergedRows) { - const code = String(row.delivery_order_code || '').trim() - if (code && existCodeSet.has(code)) { - row._orderExists = true - row._orderExistsCode = code - } - } - } + const existCodeSet = await checkExistingOrderCodes(orderCodesToCheck) + markRowsWithExistingOrderCodes(mergedRows, existCodeSet) } catch { // 检查失败不影响导入 } } - // 自动匹配商品(按 item_code 查询并填充 item_id) - for (const row of mergedRows) { - let storeId = Number(row.store_id) - for (const item of row.selected_items) { - if (hasValidSelectedItemId(item)) continue - const itemCode = String(item.item_code || '').trim() - if (!itemCode) continue - try { - if (Number.isFinite(storeId) && storeId > 0) { - const matched = await lookupStockItemByCode(storeId, itemCode) - if (matched?.item_id) { - item.item_id = matched.item_id - if (!item.item_name) item.item_name = matched.item_name - } - } else { - // 无货主:全库搜索,尝试自动推断货主 - const { matched, detectedStoreId } = await lookupStockItemByCodeAcrossStores(itemCode) - if (matched?.item_id) { - item.item_id = matched.item_id - if (!item.item_name) item.item_name = matched.item_name - if (detectedStoreId !== undefined && !row.store_id) { - row.store_id = detectedStoreId - storeId = detectedStoreId - } - } - } - } catch { - // 匹配失败不影响导入 - } - } - } + importPreviewRows.value = mergedRows + renumberPreviewRows() + await nextTick() const firstRow = mergedRows[0] if (firstRow) { void selectPreviewRow(firstRow) } - ElMessage.success(`已解析 ${mergedRows.length} 个订单,请确认货主与明细后批量创建`) + + const orderCount = new Set( + mergedRows.map((row) => getOrderGroupKey(row)) + ).size + ElMessage.success( + `已导入 ${mergedRows.length} 行明细(${orderCount} 个订单)。地址识别与商品匹配将在确认创建时执行` + ) } catch (error) { console.error('parse import excel failed:', error) importPreviewRows.value = [] ElMessage.error('解析 Excel 失败') } finally { + isBulkImporting.value = false parseImportFileLoading.value = false } } @@ -1341,6 +1637,8 @@ function buildCreateOrderPayload(rows: ImportPreviewRow[]): PendingOrderCreateOr order_line_no: String(index + 1) })) + const logisticsCode = String(header.logistics_code || '').trim() || undefined + return { store_id: Number(header.store_id), name: String(header.name || '').trim(), @@ -1350,11 +1648,13 @@ function buildCreateOrderPayload(rows: ImportPreviewRow[]): PendingOrderCreateOr province: String(header.province || '').trim(), city: String(header.city || '').trim(), area: String(header.area || '').trim(), + town: String(header.town || '').trim() || undefined, items, delivery_order_code: String(header.delivery_order_code || '').trim() || undefined, - logistics_code: String(header.logistics_code || '').trim() || undefined, + logistics_code: logisticsCode, + logistics_name: resolveLogisticsName(logisticsCode || ''), sys_platform_code: String(header.sys_platform_code || '').trim() || undefined, - shop_nick: String(header.shop_nick || '').trim() || undefined + shop_nick: normalizeShopNick(header.shop_nick) } } @@ -1370,7 +1670,81 @@ function collectPendingSelectedItems(rows: ImportPreviewRow[]) { return items } -function validatePreviewRowsBeforeSubmit(options?: { requireItemId?: boolean }) { +function getOrderGroupLabel(rows: ImportPreviewRow[], groupKey?: string) { + const header = rows[0] + return String(header?.delivery_order_code || '').trim() + || (groupKey ? `明细组 ${groupKey}` : `第 ${header?.row_no ?? 0} 行`) +} + +function validateOrderGroupRows( + rows: ImportPreviewRow[], + groupKey: string, + options?: { requireItemId?: boolean; allowPendingAddress?: boolean; silent?: boolean } +): string | null { + const header = rows[0] + if (!header) return '订单明细为空' + const orderLabel = getOrderGroupLabel(rows, groupKey) + + if (!header.store_id || !Number.isFinite(Number(header.store_id)) || Number(header.store_id) <= 0) { + return `订单「${orderLabel}」:请选择货主` + } + const storeValid = storeOptions.value.some((item) => Number(item.value) === Number(header.store_id)) + if (!storeValid) { + return `订单「${orderLabel}」:货主无效,请重新选择` + } + if (header._orderExists) { + return `订单「${orderLabel}」:订单号已存在,请修改` + } + if (!String(header.name || '').trim()) { + return `订单「${orderLabel}」:请填写收件人` + } + if (!String(header.detail_address || '').trim()) { + return `订单「${orderLabel}」:请填写详细地址` + } + if (!String(header.mobile || '').trim() && !String(header.tel || '').trim()) { + return `订单「${orderLabel}」:手机号与电话至少填一项` + } + + if (!options?.allowPendingAddress || hasFullRegion(header)) { + if (!String(header.province || '').trim()) { + return `订单「${orderLabel}」:请选择省份` + } + if (!String(header.city || '').trim()) { + return `订单「${orderLabel}」:请选择城市` + } + if (!String(header.area || '').trim()) { + return `订单「${orderLabel}」:请选择区/县` + } + } else if (!hasFullRegion(header) && !String(header.detail_address || '').trim()) { + return `订单「${orderLabel}」:请填写详细地址或选择省市区` + } + + if (String(header.shop_nick || '').trim().length > SHOP_NICK_MAX_LENGTH) { + return `订单「${orderLabel}」:店铺名称不能超过 ${SHOP_NICK_MAX_LENGTH} 个字符` + } + + const pendingItems = collectPendingSelectedItems(rows) + if (!pendingItems.length) { + return `订单「${orderLabel}」:请至少选择 1 个商品` + } + if (pendingItems.some((item) => !Number.isInteger(Number(item.plan_qty)) || Number(item.plan_qty) <= 0)) { + return `订单「${orderLabel}」:计划数量须为正整数` + } + + if (options?.requireItemId) { + const items = collectGroupOrderItems(rows) + if (!items.length) { + return `订单「${orderLabel}」:存在未匹配的商品,请重新添加商品` + } + if (items.some((item) => !Number.isInteger(item.item_id) || item.item_id <= 0)) { + return `订单「${orderLabel}」:存在未匹配的商品,请重新添加商品` + } + } + + return null +} + +function validatePreviewRowsBeforeSubmit(options?: { requireItemId?: boolean; allowPendingAddress?: boolean }) { const groups = groupPendingRowsByOrder() if (!groups.size) { ElMessage.warning('没有待创建的订单') @@ -1378,103 +1752,16 @@ function validatePreviewRowsBeforeSubmit(options?: { requireItemId?: boolean }) } for (const [groupKey, rows] of groups) { - const header = rows[0] - if (!header) continue - const orderLabel = String(header.delivery_order_code || '').trim() || `明细组 ${groupKey}` - - if (!header.store_id || !Number.isFinite(Number(header.store_id)) || Number(header.store_id) <= 0) { - ElMessage.warning(`订单「${orderLabel}」:请选择货主`) + const message = validateOrderGroupRows(rows, groupKey, options) + if (message) { + ElMessage.warning(message) return false } - const storeValid = storeOptions.value.some((item) => Number(item.value) === Number(header.store_id)) - if (!storeValid) { - ElMessage.warning(`订单「${orderLabel}」:货主无效,请重新选择`) - return false - } - if (header._orderExists) { - ElMessage.warning(`订单「${orderLabel}」:订单号已存在,请修改`) - return false - } - if (!String(header.name || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:请填写收件人`) - return false - } - if (!String(header.detail_address || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:请填写详细地址`) - return false - } - if (!String(header.mobile || '').trim() && !String(header.tel || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:手机号与电话至少填一项`) - return false - } - if (!String(header.province || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:请选择省份`) - return false - } - if (!String(header.city || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:请选择城市`) - return false - } - if (!String(header.area || '').trim()) { - ElMessage.warning(`订单「${orderLabel}」:请选择区/县`) - return false - } - - const pendingItems = collectPendingSelectedItems(rows) - - if (!pendingItems.length) { - ElMessage.warning(`订单「${orderLabel}」:请至少选择 1 个商品`) - return false - } - if (pendingItems.some((item) => !Number.isInteger(Number(item.plan_qty)) || Number(item.plan_qty) <= 0)) { - ElMessage.warning(`订单「${orderLabel}」:计划数量须为正整数`) - return false - } - - if (options?.requireItemId) { - const items = collectGroupOrderItems(rows) - if (!items.length) { - ElMessage.warning(`订单「${orderLabel}」:存在未匹配的商品,请重新添加商品`) - return false - } - if (items.some((item) => !Number.isInteger(item.item_id) || item.item_id <= 0)) { - ElMessage.warning(`订单「${orderLabel}」:存在未匹配的商品,请重新添加商品`) - return false - } - } } return true } -function applyOrderGroupResult( - rows: ImportPreviewRow[], - success: boolean, - options?: { - message?: string - data?: { order_id?: number | string; delivery_order_code?: string; step?: number | string; step_label?: string } - } -) { - const apiMessage = String(options?.message ?? '').trim() - const rowKeySet = new Set(rows.map((row) => row._rowKey)) - importPreviewRows.value = importPreviewRows.value.map((row) => { - if (!rowKeySet.has(row._rowKey)) return row - if (success) { - return { - ...row, - delivery_order_code: String(options?.data?.delivery_order_code || row.delivery_order_code || '').trim(), - import_status: '成功', - import_message: apiMessage || '创建成功' - } - } - return { - ...row, - import_status: '失败', - import_message: apiMessage || '创建失败' - } - }) -} - function base64ToBlob(base64: string, mime = 'application/octet-stream') { const marker = 'base64,' const idx = base64.indexOf(marker) @@ -1499,7 +1786,7 @@ function saveBlob(blob: Blob, fileName: string) { } function ensureXlsxFileName(fileName: string) { - const name = String(fileName || '').trim() || `pending-order-template-${Date.now()}.xlsx` + const name = String(fileName || '').trim() || PENDING_ORDER_TEMPLATE_FILENAME return name.toLowerCase().endsWith('.xlsx') ? name : `${name}.xlsx` } @@ -1507,7 +1794,8 @@ async function handleDownloadCreateTemplate() { if (downloadTemplateLoading.value) return downloadTemplateLoading.value = true try { - const res = await orderPendingOrder.downloadCreateTemplate() + const res: PendingOrderDownloadCreateTemplateResponse = + await orderModule.pendingOrderDownloadCreateTemplate() const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') if (!ok) { ElMessage.error(res?.message || '下载模板失败') @@ -1518,9 +1806,11 @@ async function handleDownloadCreateTemplate() { ElMessage.error('模板数据为空') return } - const mime = String(res?.mime || res?.data?.mime || 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') + const mime = String( + res?.mime || res?.data?.mime || 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' + ) const filename = ensureXlsxFileName( - String(res?.filename || res?.data?.filename || `pending-order-template-${Date.now()}.xlsx`) + String(res?.filename || res?.data?.filename || PENDING_ORDER_TEMPLATE_FILENAME) ) saveBlob(base64ToBlob(base64, mime), filename) ElMessage.success('模板下载成功') @@ -1531,6 +1821,145 @@ async function handleDownloadCreateTemplate() { } } +async function markImportRowFailed( + row: ImportPreviewRow, + message: string, + result: ImportOrderResult +) { + const liveRow = getLiveImportRowByKey(row._rowKey) + if (!liveRow) return + const groupKey = getOrderGroupKey(liveRow) + const orderLabel = getOrderGroupLabel([liveRow], groupKey) + result.fail_count += 1 + result.fail_orders.push({ delivery_order_code: orderLabel, error: message }) + importProgress.value.fail_count += 1 + await setOrderGroupRowsStatus([liveRow], '失败', message || '创建失败') +} + +async function parseAddressForImportRow(row: ImportPreviewRow): Promise { + const liveRow = getLiveImportRowByKey(row._rowKey) + if (!liveRow) return '明细不存在' + + if (hasFullRegion(liveRow)) return null + + const address = String(liveRow.detail_address || '').trim() + if (!address) { + return '详细地址为空,无法识别省市区' + } + + const data = await parseAddressCached(address) + if (!data) { + return '地址识别失败,请检查详细地址' + } + + applyParsedAddressToRow(liveRow, data) + return null +} + +async function createOrderForImportRow( + row: ImportPreviewRow, + result: ImportOrderResult +) { + const liveRow = getLiveImportRowByKey(row._rowKey) + if (!liveRow) return + + const groupKey = getOrderGroupKey(liveRow) + const orderLabel = getOrderGroupLabel([liveRow], groupKey) + + try { + await setOrderGroupRowsStatus([liveRow], '创建中', '正在创建订单') + + const currentRow = getLiveImportRowByKey(row._rowKey) + if (!currentRow) return + + const resolved = await resolveMissingItemIdsForGroup([currentRow]) + if (!resolved) { + await markImportRowFailed(currentRow, '商品匹配失败,请重新选择商品', result) + return + } + + const refreshedRow = getLiveImportRowByKey(row._rowKey) + if (!refreshedRow) return + + const itemValidationMessage = validateOrderGroupRows( + [refreshedRow], + groupKey, + { requireItemId: true, silent: true } + ) + if (itemValidationMessage) { + await markImportRowFailed(refreshedRow, itemValidationMessage, result) + return + } + + const payload = buildCreateOrderPayload([refreshedRow]) + const res = await orderPendingOrder.createOrder(payload) + const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') + const apiMessage = String(res?.message ?? '').trim() + + if (!ok) { + await markImportRowFailed(refreshedRow, apiMessage || '创建订单失败', result) + return + } + + const data = res?.data || {} + result.success_count += 1 + result.success_orders.push({ + delivery_order_code: data.delivery_order_code || orderLabel, + order_id: data.order_id, + step: data.step, + step_label: data.step_label + }) + importProgress.value.success_count += 1 + await removeOrderGroupRows([refreshedRow]) + } catch (error: any) { + const message = String(error?.message ?? '').trim() || '创建订单失败' + const currentRow = getLiveImportRowByKey(row._rowKey) + if (currentRow) { + await markImportRowFailed(currentRow, message, result) + } + } +} + +async function processImportRowBatch(batch: ImportPreviewRow[], result: ImportOrderResult) { + const createTasks: Array<() => Promise> = [] + + for (const row of batch) { + const liveRow = getLiveImportRowByKey(row._rowKey) + if (!liveRow) continue + + await setOrderGroupRowsStatus([liveRow], '识别中', '正在识别地址') + + const parseError = await parseAddressForImportRow(liveRow) + if (parseError) { + await markImportRowFailed(liveRow, parseError, result) + continue + } + + const refreshedRow = getLiveImportRowByKey(row._rowKey) + if (!refreshedRow) continue + + const groupKey = getOrderGroupKey(refreshedRow) + const validationMessage = validateOrderGroupRows( + [refreshedRow], + groupKey, + { requireItemId: false } + ) + if (validationMessage) { + await markImportRowFailed(refreshedRow, validationMessage, result) + continue + } + + const rowKey = refreshedRow._rowKey + createTasks.push(async () => { + await createOrderForImportRow({ _rowKey: rowKey } as ImportPreviewRow, result) + }) + } + + if (createTasks.length) { + await runWithConcurrencyLimit(createTasks, IMPORT_API_CONCURRENCY) + } +} + async function submitImportOrders() { if (importOrderLoading.value || parseImportFileLoading.value) return if (!importPreviewRows.value.length) { @@ -1538,48 +1967,25 @@ async function submitImportOrders() { return } - // 省市区为空时,自动使用详细地址做地址智能识别 - const groupsBeforeValidate = groupPendingRowsByOrder() - for (const [, rows] of groupsBeforeValidate) { - const header = rows[0] - if (!header) continue - if (String(header.province || '').trim() && String(header.city || '').trim() && String(header.area || '').trim()) { - continue - } - const address = String(header.detail_address || '').trim() - if (!address) continue - try { - const res: any = await orderPendingOrderParseAddress({ address }) - const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') - if (!ok) continue - const data = extractPendingOrderParseAddressData(res) - for (const row of rows) { - applyParsedAddressToRow(row, data) - } - } catch { - // 解析失败不影响提交流程 - } - } + if (!validatePreviewRowsBeforeSubmit({ allowPendingAddress: true })) return - if (!validatePreviewRowsBeforeSubmit()) return - - const groups = groupPendingRowsByOrder() - importOrderLoading.value = true - - for (const [, rows] of groups) { - const resolved = await resolveMissingItemIdsForGroup(rows) - if (!resolved) { - importOrderLoading.value = false - return - } - } - if (!validatePreviewRowsBeforeSubmit({ requireItemId: true })) { - importOrderLoading.value = false + const pendingRows = getPendingImportRows() + if (!pendingRows.length) { + ElMessage.warning('没有待创建的订单') return } + const batches = chunkImportRows(pendingRows, IMPORT_ROW_BATCH_SIZE) + + importOrderLoading.value = true + importProgress.value = { + total: pendingRows.length, + success_count: 0, + fail_count: 0 + } + const result: ImportOrderResult = { - total: groups.size, + total: pendingRows.length, success_count: 0, fail_count: 0, success_orders: [], @@ -1587,40 +1993,12 @@ async function submitImportOrders() { } try { - for (const [, rows] of groups) { - const orderLabel = String(rows[0]?.delivery_order_code || '').trim() || `第 ${rows[0]?.row_no} 行` - try { - const payload = buildCreateOrderPayload(rows) - const res = await orderPendingOrder.createOrder(payload) - const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') - const apiMessage = String(res?.message ?? '').trim() - if (!ok) { - const message = apiMessage || '创建订单失败' - result.fail_count += 1 - result.fail_orders.push({ delivery_order_code: orderLabel, error: message }) - applyOrderGroupResult(rows, false, { message }) - continue - } - - const data = res?.data || {} - result.success_count += 1 - result.success_orders.push({ - delivery_order_code: data.delivery_order_code || orderLabel, - order_id: data.order_id, - step: data.step, - step_label: data.step_label - }) - applyOrderGroupResult(rows, true, { message: apiMessage, data }) - } catch (error: any) { - const message = String(error?.message ?? '').trim() || '创建订单失败' - result.fail_count += 1 - result.fail_orders.push({ delivery_order_code: orderLabel, error: message }) - applyOrderGroupResult(rows, false, { message }) - } + for (const batch of batches) { + await processImportRowBatch(batch, result) } importOrderResult.value = result - ElMessage.success(`批量创建完成:成功 ${result.success_count} 个,失败 ${result.fail_count} 个`) + ElMessage.success(`批量创建完成:成功 ${result.success_count} 条,失败 ${result.fail_count} 条`) if (result.success_count > 0) { emit('success') } @@ -1646,6 +2024,8 @@ function selectPreviewRow(row: ImportPreviewRow) { function resetAddressPanelState() { addressPasteText.value = '' parseAddressLoading.value = false + batchCreateCount.value = 1 + batchParseAddressLoading.value = false } function openSelectProductDialog(row: ImportPreviewRow) { @@ -1671,6 +2051,7 @@ function applyParsedAddressToRow(row: ImportPreviewRow, data: PendingOrderParseA if (data.province) row.province = String(data.province).trim() if (data.city) row.city = String(data.city).trim() if (data.area) row.area = String(data.area).trim() + if (data.town) row.town = String(data.town).trim() if (data.detailAddress) row.detail_address = String(data.detailAddress).trim() if (data.name) row.name = String(data.name).trim() if (data.mobile) row.mobile = String(data.mobile).trim() @@ -1687,6 +2068,19 @@ function applyParsedAddressToRow(row: ImportPreviewRow, data: PendingOrderParseA markPreviewRowDirty(row) } +async function requestParsedAddressData(address: string) { + const res = await orderPendingOrderParseAddress({ address }) + const ok = res && (res.code === 1 || res.code === 200 || (res as any).flag === 'success') + if (!ok) { + throw new Error(res?.message || '地址解析失败') + } + const data = extractPendingOrderParseAddressData(res) + if (!data) { + throw new Error('地址解析结果为空') + } + return data +} + async function handleParseAddress() { const address = addressPasteText.value.trim() if (!address) { @@ -1696,20 +2090,16 @@ async function handleParseAddress() { parseAddressLoading.value = true try { - const res = await orderPendingOrderParseAddress({ address }) - const ok = res && (res.code === 1 || res.code === 200 || (res as any).flag === 'success') - if (!ok) { - ElMessage.error(res?.message || '地址解析失败') - return - } - - const data = extractPendingOrderParseAddressData(res) + const data = await requestParsedAddressData(address) let targetRows = selectedPreviewRowsForAddress.value if (!targetRows.length) { - // 无选中行时自动新建一行 - addImportPreviewRow() - targetRows = selectedPreviewRowsForAddress.value + const [nextRow] = addImportPreviewRows(1) + if (!nextRow) return + clearPreviewRowSelection() + selectPreviewRowInTable(nextRow, true) + activePreviewRowKey.value = nextRow._rowKey + targetRows = [nextRow] } for (const row of targetRows) { @@ -1718,14 +2108,57 @@ async function handleParseAddress() { const count = targetRows.length ElMessage.success(count > 1 ? `地址解析成功,已填充 ${count} 行` : '地址解析成功') - } catch (error) { + } catch (error: any) { console.error('parse address failed:', error) - ElMessage.error('地址解析失败') + ElMessage.error(error?.message || '地址解析失败') } finally { parseAddressLoading.value = false } } +async function handleBatchParseAndCreate() { + const address = addressPasteText.value.trim() + if (!address) { + ElMessage.warning('请粘贴地址') + return + } + + const count = Math.floor(Number(batchCreateCount.value)) + if (!Number.isFinite(count) || count < 1) { + ElMessage.warning('请输入有效的创建数量') + return + } + if (count > BATCH_CREATE_MAX_COUNT) { + ElMessage.warning(`单次最多创建 ${BATCH_CREATE_MAX_COUNT} 条明细`) + return + } + + batchParseAddressLoading.value = true + try { + const data = await requestParsedAddressData(address) + + clearPreviewRowSelection() + const newRows = addImportPreviewRows(count) + for (const row of newRows) { + applyParsedAddressToRow(row, data) + selectPreviewRowInTable(row, true) + } + + const firstRow = newRows[0] + if (firstRow) { + activePreviewRowKey.value = firstRow._rowKey + } + restorePreviewRowSelection() + + ElMessage.success(`地址解析成功,已批量创建 ${newRows.length} 条明细`) + } catch (error: any) { + console.error('batch parse address failed:', error) + ElMessage.error(error?.message || '地址解析失败') + } finally { + batchParseAddressLoading.value = false + } +} + function mapStockPickerItem(row: any) { const itemId = getStockItemId(row) return { @@ -1859,6 +2292,7 @@ function getStockItemCode(row: any) { min-width: 320px; display: flex; flex-direction: column; + overflow-y: auto; border: 1px solid #ebeef5; border-radius: 4px; padding: 10px; @@ -1896,6 +2330,32 @@ function getStockItemCode(row: any) { margin-top: 10px; } +.address-panel-divider { + margin: 12px 0; +} + +.address-batch-section { + flex: 0 0 auto; +} + +.address-batch-controls { + display: flex; + align-items: center; + gap: 8px; + margin-top: 10px; + flex-wrap: wrap; +} + +.address-batch-label { + font-size: 13px; + color: #606266; + white-space: nowrap; +} + +.address-batch-count { + width: 110px; +} + .address-panel-hint { margin-top: 12px; font-size: 12px; @@ -1909,4 +2369,33 @@ function getStockItemCode(row: any) { font-size: 12px; line-height: 1.6; } + +.import-progress-panel { + margin-bottom: 10px; + padding: 10px 12px; + border: 1px solid #ebeef5; + border-radius: 4px; + background: #fafafa; +} + +.import-progress-meta { + display: flex; + align-items: center; + gap: 16px; + margin-top: 8px; + font-size: 13px; + color: #606266; +} + +.import-progress-success { + color: #67c23a; +} + +.import-progress-fail { + color: #f56c6c; +} + +.import-progress-running { + color: #409eff; +} diff --git a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue index 017115fe..84e4d0ad 100644 --- a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue +++ b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue @@ -2,81 +2,26 @@
请从上方列表中选择一项查看订单明细
未查询到订单明细数据
@@ -86,8 +31,15 @@ import { ref, watch } from 'vue' import { ElMessage } from 'element-plus' import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder' -import { getTagType, translateOrderField } from '../config/order-common-config' -import { resolveOrderRecheckStatus } from '../utils/order-index-helpers' +import { + ORDER_DETAIL_TIME_FIELDS, + formatOrderTime, + getTagType, + pendingOrderDetailSections, + translateOrderField, + type OrderDetailFieldConfig +} from '../config/order-common-config' +import { parseOrderDetailPayload, resolveOrderRecheckStatus } from '../utils/order-index-helpers' const props = defineProps<{ row: Record | null @@ -98,21 +50,85 @@ const loading = ref(false) const detail = ref | null>(null) let latestRequestId = 0 -function formatTime(value: unknown) { - if (!value) return '-' - const text = String(value) - return text.replace('T', ' ').replace('.000Z', '') -} - function formatAmount(value: unknown) { if (value === null || value === undefined || value === '') return '-' const n = Number(value) return Number.isFinite(n) ? n.toFixed(2) : String(value) } -function formatRegion(data: Record) { - const parts = [data.province, data.city, data.area].filter(Boolean) - return parts.length ? parts.join(' / ') : '-' +function formatWaybillCodes(value: unknown) { + if (value === undefined || value === null || value === '') return '-' + + const normalizeList = (list: unknown[]) => + list + .map((item) => String(item ?? '').trim()) + .filter((item) => item.length > 0) + .join(', ') + + if (Array.isArray(value)) { + const text = normalizeList(value) + return text || '-' + } + + const text = String(value).trim() + if (!text) return '-' + + if (text.startsWith('[') && text.endsWith(']')) { + try { + const parsed = JSON.parse(text) + if (Array.isArray(parsed)) { + const normalized = normalizeList(parsed) + return normalized || '-' + } + } catch { + // 非法 JSON 时回退原文 + } + } + + return text +} + +function getFieldRawValue(prop: string) { + if (!detail.value) return undefined + if (prop === 'recheck_status') { + return resolveOrderRecheckStatus(detail.value) + } + return detail.value[prop] +} + +function displayFieldValue(field: OrderDetailFieldConfig) { + const raw = getFieldRawValue(field.prop) + if (raw === undefined || raw === null || raw === '') return '-' + + if (field.waybill) { + return formatWaybillCodes(raw) + } + + if (field.amount) { + return formatAmount(raw) + } + + if (field.time || ORDER_DETAIL_TIME_FIELDS.has(field.prop)) { + return formatOrderTime(raw) + } + + if (field.tag) { + return translateOrderField(field.prop, raw) + } + + return raw +} + +function normalizeDetailPayload(payload: Record) { + const orderDetail = payload.order || payload.detail || payload + if (!orderDetail || typeof orderDetail !== 'object') return null + + const waybillCodes = payload.waybill_codes ?? orderDetail.waybill_codes + return { + ...orderDetail, + recheck_status: resolveOrderRecheckStatus(orderDetail), + waybill_codes: waybillCodes + } } async function loadDetail() { @@ -136,8 +152,8 @@ async function loadDetail() { detail.value = null return } - const payload = res?.data || {} - detail.value = payload.order || payload.detail || payload || null + const payload = parseOrderDetailPayload(res) + detail.value = normalizeDetailPayload(payload) } catch { if (requestId !== latestRequestId) return ElMessage.error('获取订单明细失败') diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 464fbb80..22306c1f 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -445,12 +445,132 @@ function waybillCodesFormatter(_row: any, _column: any, cellValue: unknown) { export const ORDER_DETAIL_TIME_FIELDS = new Set([ 'place_order_time', 'pay_time', + 'delivery_time', 'create_at', 'created_at', 'updated_at', - 'operate_time' + 'operate_time', + 'recheck_time' ]) +export type OrderDetailFieldConfig = { + prop: string + label: string + span?: number + tag?: boolean + amount?: boolean + time?: boolean + waybill?: boolean +} + +export type OrderDetailSectionConfig = { + title: string + column?: number + fields: OrderDetailFieldConfig[] +} + +/** 待处理订单详情分区(对齐 order.pendingOrder.detail 响应字段) */ +export const pendingOrderDetailSections: OrderDetailSectionConfig[] = [ + { + title: '基础信息', + column: 4, + fields: [ + { prop: 'delivery_order_code', label: '发货单号' }, + { prop: 'pre_delivery_order_code', label: '前置单号' }, + { prop: 'order_type', label: '订单类型' }, + { prop: 'create_channel', label: '创建渠道' }, + { prop: 'order_flag', label: '订单标记', span: 4 }, + { prop: 'sys_platform_name', label: '来源平台' }, + { prop: 'sys_platform_code', label: '平台编码', tag: true }, + { prop: 'source_platform_name', label: '来源平台名' }, + { prop: 'source_order_codes', label: '来源单号' }, + { prop: 'shop_nick', label: '店铺名称' }, + { prop: 'buyer_nick', label: '买家昵称' }, + { prop: 'seller_nick', label: '卖家昵称' }, + { prop: 'store_id', label: '货主ID' }, + { prop: 'warehouse_id', label: '仓库ID' }, + { prop: 'is_urgency', label: '是否紧急', tag: true }, + { prop: 'invoice_flag', label: '发票标记', tag: true }, + { prop: 'pay_no', label: '支付单号' } + ] + }, + { + title: '流程与状态', + column: 4, + fields: [ + { prop: 'status', label: '订单状态', tag: true }, + { prop: 'step', label: '流程步骤' }, + { prop: 'sync_status', label: '同步状态', tag: true }, + { prop: 'inspection_status', label: '审核状态', tag: true }, + { prop: 'recheck_status', label: '复核状态', tag: true }, + { prop: 'outbound_status', label: '出库状态', tag: true }, + { prop: 'storage_status', label: '分配状态', tag: true }, + { prop: 'post_status', label: '快递状态', tag: true }, + { prop: 'pick_status', label: '拣货状态', tag: true }, + { prop: 'pack_status', label: '打包状态', tag: true }, + { prop: 'print_status', label: '打印状态', tag: true }, + { prop: 'sended_status', label: '发货状态', tag: true }, + { prop: 'claim_status', label: '认领状态', tag: true }, + { prop: 'lock_status', label: '锁定状态', tag: true }, + { prop: 'intercept_status', label: '拦截状态', tag: true }, + { prop: 'wave_no', label: '波次号' }, + { prop: 'wave_id', label: '波次ID' } + ] + }, + { + title: '收货与物流', + column: 3, + fields: [ + { prop: 'name', label: '收货人' }, + { prop: 'mobile', label: '手机号' }, + { prop: 'tel', label: '固定电话' }, + { prop: 'email', label: '邮箱' }, + { prop: 'province', label: '省份' }, + { prop: 'city', label: '城市' }, + { prop: 'area', label: '区/县' }, + { prop: 'town', label: '镇/街道' }, + { prop: 'zip_code', label: '邮编' }, + { prop: 'detail_address', label: '详细地址', span: 3 }, + { prop: 'logistics_name', label: '物流公司' }, + { prop: 'logistics_code', label: '快递编码' }, + { prop: 'express_code', label: '快递单号' }, + { prop: 'waybill_codes', label: '运单号', span: 3, waybill: true }, + { prop: 'delivery_type', label: '发货服务类型' }, + { prop: 'weight_type', label: '重量类型' } + ] + }, + { + title: '金额汇总', + column: 4, + fields: [ + { prop: 'total_amount', label: '订单总金额', amount: true }, + { prop: 'item_amount', label: '商品金额', amount: true }, + { prop: 'discount_amount', label: '折扣金额', amount: true }, + { prop: 'freight', label: '运费', amount: true }, + { prop: 'ar_amount', label: '应收金额', amount: true }, + { prop: 'got_amount', label: '实收金额', amount: true }, + { prop: 'service_fee', label: '服务费', amount: true }, + { prop: 'items_count', label: '商品种类' }, + { prop: 'items_total', label: '商品总数' }, + { prop: 'items_weight', label: '总重量' } + ] + }, + { + title: '时间信息', + column: 4, + fields: [ + { prop: 'place_order_time', label: '下单时间', time: true }, + { prop: 'pay_time', label: '支付时间', time: true }, + { prop: 'delivery_time', label: '配送时间', time: true }, + { prop: 'create_at', label: '创建时间', time: true }, + { prop: 'updated_at', label: '更新时间', time: true }, + { prop: 'recheck_time', label: '复核时间', time: true }, + { prop: 'operator_name', label: '操作人' }, + { prop: 'operate_time', label: '操作时间', time: true } + ] + } +] + /** * 仅列表基础能力:刷新 / 导出 / 字段设置 / 详情开关。 diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index e72ecf8a..75e4f3b0 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -128,12 +128,6 @@ - - - -