From a01f1371dbd5375e368d514d5ddc75dbb11a0f13 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 25 Sep 2026 03:14:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=BE=85=E5=A4=84=E7=90=86=E8=AE=A2?= =?UTF-8?q?=E5=8D=95):=20=E5=BB=BA=E5=8D=95=E5=BC=B9=E7=AA=97=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=A2=84=E8=A7=88=E6=94=AF=E6=8C=81=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=81=E5=8B=BE=E9=80=89=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8E=E5=AF=BC=E5=87=BA=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 筛选:预览表格新增「全部 / 有异常 / 正常」下拉(含计数),切换时同步异常口径、回到第 1 页并恢复勾选。 批量操作:新增「删除选中(N)」「导出选中(N)」;单行/批量删除后保持当前筛选与页码,并在当前筛选结果内选中下一行。 导出选中:列名与列序取自「下载模板」的模板表头(解析失败回退内置表头),一条明细含多商品拆多行,导出文件可直接再次导入;本地 XLSX 生成并下载。 重构:表头别名抽为 IMPORT_FIELD_ALIASES,导入解析(buildPreviewRow)与导出共用;重置弹窗时异常筛选还原为「全部」。 --- .../component/CreatePendingOrderDialog.vue | 326 ++++++++++++++++-- 1 file changed, 290 insertions(+), 36 deletions(-) diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 0e177ea4..275a6bf6 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -51,6 +51,21 @@ 地址重识 清除数据 + + 删除选中{{ selectedPreviewRowCount ? `(${selectedPreviewRowCount})` : '' }} + + + 导出选中{{ selectedPreviewRowCount ? `(${selectedPreviewRowCount})` : '' }} + + + + 已选文件:{{ importOrderFileName || '未选择' }} @@ -581,17 +610,39 @@ const provinceOptions = buildProvinceOptions() const previewTableRef = ref | null>(null) const previewPagination = reactive({ currentPage: 1, pageSize: 100, total: 0 }) +/** 预览表格筛选:全部 / 有异常(_issueCount > 0) / 正常 */ +type PreviewIssueFilter = 'all' | 'issue' | 'normal' +const previewIssueFilter = ref('all') +const issuePreviewRows = computed(() => + importPreviewRows.value.filter((row) => Number(row._issueCount || 0) > 0) +) +const issueRowsCount = computed(() => issuePreviewRows.value.length) +const normalRowsCount = computed(() => importPreviewRows.value.length - issueRowsCount.value) +const previewIssueFilterOptions = computed(() => [ + { label: `全部 (${importPreviewRows.value.length})`, value: 'all' as PreviewIssueFilter }, + { label: `有异常 (${issueRowsCount.value})`, value: 'issue' as PreviewIssueFilter }, + { label: `正常 (${normalRowsCount.value})`, value: 'normal' as PreviewIssueFilter } +]) +const filteredPreviewRows = computed(() => { + if (previewIssueFilter.value === 'all') return importPreviewRows.value + const wantIssue = previewIssueFilter.value === 'issue' + return importPreviewRows.value.filter( + (row) => Number(row._issueCount || 0) > 0 === wantIssue + ) +}) const previewTableRows = computed(() => { - const rows = importPreviewRows.value + const rows = filteredPreviewRows.value const start = (previewPagination.currentPage - 1) * previewPagination.pageSize return rows.slice(start, start + previewPagination.pageSize) }) const activePreviewRowKey = ref('') const selectedPreviewRowKeys = ref>(new Set()) +const selectedPreviewRowCount = computed(() => selectedPreviewRowKeys.value.size) const addressPasteText = ref('') const parseAddressLoading = ref(false) const reRecognizeAddressLoading = ref(false) const checkDeliveryCodeLoading = ref(false) +const exportSelectedLoading = ref(false) const selectProductDialogVisible = ref(false) const selectProductTargetRow = ref(null) @@ -651,7 +702,7 @@ watch(resetToken, () => { }) watch( - () => importPreviewRows.value.length, + () => filteredPreviewRows.value.length, (length) => { previewPagination.total = length const maxPage = Math.max(1, Math.ceil(length / previewPagination.pageSize) || 1) @@ -664,7 +715,7 @@ watch( function resetPreviewPagination() { previewPagination.currentPage = 1 - previewPagination.total = importPreviewRows.value.length + previewPagination.total = filteredPreviewRows.value.length } function handlePreviewPageChange(page: number) { @@ -679,11 +730,21 @@ function handlePreviewPageSizeChange(size: number) { } function navigatePreviewPageToRow(row: ImportPreviewRow) { - const index = importPreviewRows.value.findIndex((item) => item._rowKey === row._rowKey) + // 只在当前筛选结果内定位;找不到就保持筛选与页码不变 + // (删除行后自动领选下一行、勾选等操作都不得改变筛选状态) + const index = filteredPreviewRows.value.findIndex((item) => item._rowKey === row._rowKey) if (index < 0) return previewPagination.currentPage = Math.floor(index / previewPagination.pageSize) + 1 } +/** 切换筛选:先重算异常口径(缓存 _issueCount),再回到第 1 页并恢复选中 */ +function handlePreviewIssueFilterChange() { + syncAllPreviewRowIssues() + previewPagination.currentPage = 1 + previewPagination.total = filteredPreviewRows.value.length + void nextTick(() => restorePreviewRowSelection()) +} + function handleMinimize() { persistCreateOrderDraft() minimizeCreateOrderDialog() @@ -1236,7 +1297,8 @@ function removeImportPreviewRow(row: ImportPreviewRow) { renumberPreviewRows() importOrderResult.value = null if (activePreviewRowKey.value === row._rowKey) { - const nextRow = importPreviewRows.value.find((item) => !isPreviewRowLocked(item)) || importPreviewRows.value[0] + // 下一行优先从当前筛选结果里取,避免删除后筛选被重置(筛选状态保持不变) + const nextRow = filteredPreviewRows.value.find((item) => !isPreviewRowLocked(item)) || filteredPreviewRows.value[0] if (nextRow) { void selectPreviewRow(nextRow) } else { @@ -1246,6 +1308,48 @@ function removeImportPreviewRow(row: ImportPreviewRow) { } } +/** 批量删除当前勾选的明细行(已创建成功的行不可删除);删除后保持当前筛选状态与页码 */ +async function removeSelectedPreviewRows() { + const keys = selectedPreviewRowKeys.value + const targetRows = importPreviewRows.value.filter( + (row) => keys.has(row._rowKey) && !isPreviewRowLocked(row) + ) + if (!targetRows.length) { + ElMessage.warning('请先勾选要删除的明细(已创建成功的行不可删除)') + return + } + + try { + await ElMessageBox.confirm( + `确认删除已勾选的 ${targetRows.length} 行明细?`, + '批量删除', + { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + ) + } catch { + return + } + + const removedKeySet = new Set(targetRows.map((row) => row._rowKey)) + importPreviewRows.value = importPreviewRows.value.filter((row) => !removedKeySet.has(row._rowKey)) + renumberPreviewRows() + importOrderResult.value = null + removedKeySet.forEach((key) => selectedPreviewRowKeys.value.delete(key)) + + if (removedKeySet.has(activePreviewRowKey.value)) { + const nextRow = filteredPreviewRows.value.find((item) => !isPreviewRowLocked(item)) || filteredPreviewRows.value[0] + if (nextRow) { + void selectPreviewRow(nextRow) + } else { + activePreviewRowKey.value = '' + resetAddressPanelState() + } + } + + // 表格数据重建后恢复剩余勾选(不调 clearSelection,避免把跨页勾选一并清掉) + void nextTick(() => restorePreviewRowSelection()) + ElMessage.success(`已删除 ${targetRows.length} 行明细`) +} + function markPreviewRowDirty(row: ImportPreviewRow) { if (row.import_status === '成功') return row.import_status = '待创建' @@ -1470,6 +1574,7 @@ function resetImportOrderDialog() { importOrderResult.value = null defaultStoreId.value = undefined activePreviewRowKey.value = '' + previewIssueFilter.value = 'all' resetPreviewPagination() clearPreviewRowSelection() resetAddressPanelState() @@ -1483,6 +1588,7 @@ function clearImportData() { importPreviewRows.value = [] importOrderResult.value = null activePreviewRowKey.value = '' + previewIssueFilter.value = 'all' resetPreviewPagination() clearPreviewRowSelection() resetAddressPanelState() @@ -1495,6 +1601,165 @@ function triggerImportFileSelect() { importFileInputRef.value?.click() } +/** 导入模板可识别的字段键(与 buildPreviewRow 解析出的行字段一一对应) */ +type ImportFieldKey = + | 'delivery_order_code' + | 'store_id' + | 'name' + | 'mobile' + | 'tel' + | 'province' + | 'city' + | 'area' + | 'detail_address' + | 'item_code' + | 'plan_qty' + | 'shop_nick' + | 'remark' + | 'logistics_code' + | 'source_platform_code' + | 'sys_platform_code' + +/** + * 导入模板列名(含后端可能使用的别名) + * - 导入解析(buildPreviewRow)用它的顺序取值; + * - 「导出选中」用它反查模板表头对应的字段,保证导出的列名/列序与模板一致、可直接再次导入。 + */ +const IMPORT_FIELD_ALIASES: Record = { + delivery_order_code: ['*订单号', '订单号*', '订单号', 'delivery_order_code', '发货单号'], + store_id: ['*货主ID', '货主ID*', '货主ID', 'store_id', '货主', '*货主', '货主*'], + name: ['*收件人', '收件人*', '收件人', '收件人姓名', '*收件人姓名', '姓名', '收货人', 'name'], + mobile: ['手机号', '手机', '手机号码', '*手机号', '*手机号(mobile/tel至少填一项)', '联系电话', '联系方式', 'mobile'], + tel: ['电话', 'tel'], + province: ['省份', 'province'], + city: ['城市', 'city'], + area: ['区/县', '区县', 'area'], + detail_address: ['*详细地址', '详细地址*', '详细地址', 'detail_address'], + item_code: ['*商品编码', '商品编码*', '商品编码', 'item_code'], + plan_qty: ['*计划数量', '计划数量*', '计划数量', 'plan_qty'], + shop_nick: ['*自定义店铺', '自定义店铺*', '自定义店铺', '店铺名称', '*店铺名称', '店铺名称*', 'shop_nick', '店铺'], + remark: ['留言', '*留言', '留言*', 'remark', '备注', '订单备注'], + logistics_code: ['快递编码', 'logistics_code'], + source_platform_code: ['来源平台编码', 'source_platform_code', '来源平台'], + sys_platform_code: ['系统平台编码', 'sys_platform_code', '平台编码'] +} + +/** 「导出选中」在拿不到模板时的兼顾表头(均为上述别名主名,保证导出文件仍能被导入识别) */ +const FALLBACK_EXPORT_HEADER = [ + '*订单号', '*货主ID', '*自定义店铺', '留言', '*收件人', '手机号', '电话', + '省份', '城市', '区/县', '*详细地址', '*商品编码', '*计划数量', + '快递编码', '来源平台编码', '系统平台编码' +] + +/** 表头归一化:去空白与 * 号、转小写,用于模板表头与字段别名互认 */ +function normalizeImportHeaderText(text: unknown): string { + return String(text ?? '').replace(/[\s**]/g, '').toLowerCase() +} + +/** 按模板表头文本反查预览行字段;返回空串表示该列不参与导出(模板里的额外列) */ +function resolveImportFieldByHeader(header: unknown): string { + const norm = normalizeImportHeaderText(header) + if (!norm) return '' + for (const [field, aliases] of Object.entries(IMPORT_FIELD_ALIASES)) { + if (aliases.some((alias) => normalizeImportHeaderText(alias) === norm)) return field + } + return '' +} + +/** 取建单模板的表头与工作表名(与「下载模板」同一个接口) */ +async function fetchCreateTemplateLayout(): Promise<{ header: string[]; sheetName: string }> { + try { + const res: any = await orderPendingOrder.downloadCreateTemplate() + const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') + const base64 = String(res?.base64 || res?.data?.base64 || '').trim() + if (!ok || !base64) return { header: FALLBACK_EXPORT_HEADER, sheetName: 'Sheet1' } + const workbook = XLSX.read(base64, { type: 'base64' }) + const sheetName = workbook.SheetNames[0] || 'Sheet1' + const sheet = workbook.Sheets[sheetName] + const matrix = (sheet ? XLSX.utils.sheet_to_json(sheet, { header: 1, blankrows: false }) : []) as unknown[][] + const headerRow = (matrix[0] || []).map((cell) => String(cell ?? '').trim()).filter(Boolean) + return { header: headerRow.length ? headerRow : FALLBACK_EXPORT_HEADER, sheetName } + } catch { + return { header: FALLBACK_EXPORT_HEADER, sheetName: 'Sheet1' } + } +} + +/** 导出单元格取值:与 buildPreviewRow 的解析字段一一对应 */ +function getExportCellValue( + row: ImportPreviewRow, + item: PreviewSelectedItem | null, + field: string +): string | number { + switch (field) { + case 'delivery_order_code': return String(row.delivery_order_code || '').trim() + case 'store_id': return row.store_id ? Number(row.store_id) : '' + case 'name': return String(row.name || '') + case 'mobile': return String(row.mobile || '') + case 'tel': return String(row.tel || '') + case 'province': return String(row.province || '') + case 'city': return String(row.city || '') + case 'area': return String(row.area || '') + case 'detail_address': return String(row.detail_address || '') + case 'shop_nick': return String(row.shop_nick || '') + case 'remark': return String(row.remark || '') + case 'logistics_code': return String(row.logistics_code || '') + case 'source_platform_code': return String(row.source_platform_code || '') + case 'sys_platform_code': return String(row.sys_platform_code || '') + case 'item_code': return String(item?.item_code || '') + case 'plan_qty': return String(item?.plan_qty || row.plan_qty || '1') + default: return '' + } +} + +function buildExportFileName(): string { + const now = new Date() + const pad = (value: number) => String(value).padStart(2, '0') + const stamp = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}` + return `建单明细-${stamp}.xlsx` +} + +/** + * 导出选中明细:列名/列序取自「下载模板」的表头,与导入格式一致(可直接再次导入)。 + * 一条明细行含多个商品时拆成多行,与导入按行解析、按订单号合并的语义保持一致。 + */ +async function handleExportSelectedPreviewRows() { + if (exportSelectedLoading.value) return + const keys = selectedPreviewRowKeys.value + const targetRows = importPreviewRows.value.filter((row) => keys.has(row._rowKey)) + if (!targetRows.length) { + ElMessage.warning('请先勾选要导出的明细') + return + } + + exportSelectedLoading.value = true + try { + const { header, sheetName } = await fetchCreateTemplateLayout() + const headerFields = header.map((text) => resolveImportFieldByHeader(text)) + const matrix: Array> = [header] + for (const row of targetRows) { + const items = row.selected_items.length ? row.selected_items : [null] + for (const item of items) { + matrix.push(headerFields.map((field) => getExportCellValue(row, item, field))) + } + } + + const worksheet = XLSX.utils.aoa_to_sheet(matrix) + const workbook = XLSX.utils.book_new() + XLSX.utils.book_append_sheet(workbook, worksheet, sheetName) + const buffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' }) + saveBlob( + new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }), + buildExportFileName() + ) + ElMessage.success(`已导出 ${targetRows.length} 行明细(格式与建单模板一致)`) + } catch (error) { + console.error('export selected preview rows failed:', error) + ElMessage.error('导出失败') + } finally { + exportSelectedLoading.value = false + } +} + function pickImportValue(row: Record, keys: string[]) { for (const key of keys) { if (Object.prototype.hasOwnProperty.call(row, key)) { @@ -1520,22 +1785,16 @@ function isEmptyImportRow(row: Record) { function buildPreviewRow(row: Record, rowNo: number): ImportPreviewRow | null { if (isEmptyImportRow(row)) return null - const deliveryOrderCode = toImportString(pickImportValue(row, [ - '*订单号', - '订单号*', - '订单号', - 'delivery_order_code', - '发货单号' - ])) - const storeRaw = pickImportValue(row, ['*货主ID', '货主ID*', '货主ID', 'store_id', '货主', '*货主', '货主*']) - const name = toImportString(pickImportValue(row, ['*收件人', '收件人*', '收件人', '收件人姓名', '*收件人姓名', '姓名', '收货人', 'name'])) - const itemCode = toImportString(pickImportValue(row, ['*商品编码', '商品编码*', '商品编码', 'item_code'])) - const planQty = toImportString(pickImportValue(row, ['*计划数量', '计划数量*', '计划数量', 'plan_qty'])) + const deliveryOrderCode = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.delivery_order_code)) + const storeRaw = pickImportValue(row, IMPORT_FIELD_ALIASES.store_id) + const name = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.name)) + const itemCode = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.item_code)) + const planQty = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.plan_qty)) const storeId = resolveStoreId(storeRaw) - const province = toImportString(pickImportValue(row, ['省份', 'province'])) - const city = toImportString(pickImportValue(row, ['城市', 'city'])) - const area = toImportString(pickImportValue(row, ['区/县', '区县', 'area'])) - const detailAddressRaw = toImportString(pickImportValue(row, ['*详细地址', '详细地址*', '详细地址', 'detail_address'])) + const province = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.province)) + const city = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.city)) + const area = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.area)) + const detailAddressRaw = toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.detail_address)) const regionCodes = resolvePreviewRowRegionCodes({ province, city, area }) if (!deliveryOrderCode && !storeId && !name && !itemCode && !planQty) { @@ -1549,20 +1808,11 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview row_no: rowNo, delivery_order_code: deliveryOrderCode, store_id: storeId, - shop_nick: toImportString(pickImportValue(row, [ - '*自定义店铺', - '自定义店铺*', - '自定义店铺', - '店铺名称', - '*店铺名称', - '店铺名称*', - 'shop_nick', - '店铺' - ])), - remark: toImportString(pickImportValue(row, ['留言', '*留言', '留言*', 'remark', '备注', '订单备注'])), + shop_nick: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.shop_nick)), + remark: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.remark)), name, - mobile: toImportString(pickImportValue(row, ['手机号', '手机', '手机号码', '*手机号', '*手机号(mobile/tel至少填一项)', '联系电话', '联系方式', 'mobile'])), - tel: toImportString(pickImportValue(row, ['电话', 'tel'])), + mobile: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.mobile)), + tel: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.tel)), detail_address: detailAddressRaw, _source_address: detailAddressRaw, province, @@ -1573,9 +1823,9 @@ function buildPreviewRow(row: Record, rowNo: number): ImportPreview area_code: regionCodes.districtCode, selected_items: selectedItems, plan_qty: planQty || '1', - logistics_code: toImportString(pickImportValue(row, ['快递编码', 'logistics_code'])), - source_platform_code: toImportString(pickImportValue(row, ['来源平台编码', 'source_platform_code', '来源平台'])), - sys_platform_code: toImportString(pickImportValue(row, ['系统平台编码', 'sys_platform_code', '平台编码'])), + logistics_code: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.logistics_code)), + source_platform_code: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.source_platform_code)), + sys_platform_code: toImportString(pickImportValue(row, IMPORT_FIELD_ALIASES.sys_platform_code)), import_status: '待创建', import_message: '' } @@ -2306,6 +2556,10 @@ async function handleParseAddress() { width: 180px; } +.preview-issue-filter { + width: 150px; +} + .issue-indicator { display: flex; align-items: center;