diff --git a/package-lock.json b/package-lock.json index 0be2cc07..0132e9e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -97,6 +97,7 @@ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -2067,6 +2068,7 @@ "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/lodash": "*" } @@ -2208,6 +2210,7 @@ "integrity": "sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.58.2", "@typescript-eslint/types": "8.58.2", @@ -2791,6 +2794,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "license": "MIT", + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3188,6 +3192,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -4490,6 +4495,7 @@ "integrity": "sha512-+L0vBFYGIpSNIt/KWTpFonPrqYvgKw1eUI5Vn7mEogrQcWtWYtNQ7dNqC+px/J0idT3BAkiWrhfS7k+Tum8TUA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", @@ -6343,13 +6349,15 @@ "version": "4.17.23", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-es": { "version": "4.17.23", "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz", "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-unified": { "version": "1.0.3", @@ -7176,6 +7184,7 @@ "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz", "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==", "license": "MIT", + "peer": true, "dependencies": { "@vue/devtools-api": "^7.7.7" }, @@ -7251,6 +7260,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -9029,6 +9039,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -9306,6 +9317,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -9552,6 +9564,7 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.29.tgz", "integrity": "sha512-BZqN4Ze6mDQVNAni0IHeMJ5mwr8VAJ3MQC9FmprRhcBYENw+wOAAjRj8jfmN6FLl0j96OXbR+CjWhmAmM+QGnA==", "license": "MIT", + "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.29", "@vue/compiler-sfc": "3.5.29", @@ -9591,6 +9604,7 @@ "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "debug": "^4.4.0", "eslint-scope": "^8.2.0 || ^9.0.0", diff --git a/src/api/order.packing/packing.ts b/src/api/order.packing/packing.ts index 71951140..578bc40c 100644 --- a/src/api/order.packing/packing.ts +++ b/src/api/order.packing/packing.ts @@ -127,3 +127,100 @@ export function packingForceRecord(data: PackingForceRecordParams): Promise + /** 排序参数,语义与 order.packing.list 的 sort 一致:sortField 白名单 id/order_id/warehouse_id/workbench_id/wave_id/pack_quantity/pack_mode/status/start_time/end_time/create_time/update_time,sortOrder asc/desc,默认 create_time desc */ + sort?: { + sortField?: string + sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC' + } +} + +/** order.packing.export 响应(提交成功即返回任务受理信息) */ +export type PackingExportResponse = { + /** 任务 ID(后端生成,格式 packing_export_{warehouseId}_{timestamp}_{random}) */ + task_id: string + /** 任务状态:submitted/running/success/failed/not_found(提交成功时为 submitted) */ + status: string + /** 当前进度百分比(0-100),提交时返回 0 */ + progress: number + /** 当前已处理记录数(打包任务条数) */ + current_count: number + /** 总记录数(若有) */ + total_count: number + /** 任务提示信息 */ + message: string + /** 任务执行结果(提交时为 null;后台完成后为上传信息对象,含 filename/url/fileKey/cdnUrl/cosUrl/current_count/total_count/sheet_count) */ + result: Record | null + /** 失败时的错误信息(非失败时为空字符串) */ + error: string + /** 任务更新时间(Unix 毫秒时间戳) */ + update_time: number + code?: number +} + +/** order.packing.export:提交打包任务导出任务(异步,返回 task_id;导出进度/下载经 order.packing.exportTaskProgress 查询)。免权限免日志免鉴权口径与 order.export 一致。 */ +export function packingExport(data: PackingExportParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.packing.export', + v, + timestamp: new Date().getTime(), + }, + data, + isSystemApi: true, + } as any) +} + +/** order.packing.exportTaskProgress 请求参数 */ +export type PackingExportTaskProgressParams = { + /** 任务 ID(下划线写法,兼容) */ + task_id?: string + /** 任务 ID(驼峰写法,兼容) */ + taskId?: string +} + +/** order.packing.exportTaskProgress 响应 */ +export type PackingExportTaskProgressResponse = { + /** 任务 ID(缺失时为空字符串,status=not_found) */ + task_id: string + /** 任务状态:submitted/running/success/failed/not_found */ + status: string + /** 进度百分比(0-100) */ + progress: number + /** 当前已处理记录数(打包任务条数) */ + current_count: number + /** 总记录数 */ + total_count: number + /** 任务提示信息 */ + message: string + /** 任务执行结果对象(完成后含 filename/url/fileKey/cdnUrl/cosUrl 等;未完成或 not_found 时为 null) */ + result: Record | null + /** 失败时的错误信息(非失败时为空字符串) */ + error: string + /** 任务完成后下载链接(从 result.url/cdnUrl/cosUrl/fileKey 兜底取);未完成或不存在时为空字符串 */ + download_url: string + /** 最近一次状态更新时间(Unix 毫秒时间戳) */ + update_time: number + code?: number +} + +/** order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度。免权限免日志口径与 order.exportTaskProgress 一致。 */ +export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.packing.exportTaskProgress', + v, + timestamp: new Date().getTime(), + }, + data, + isSystemApi: true, + } as any) +} diff --git a/src/api/order/packing/index.ts b/src/api/order/packing/index.ts index f47b676c..cfb083df 100644 --- a/src/api/order/packing/index.ts +++ b/src/api/order/packing/index.ts @@ -187,3 +187,85 @@ export function packingForceRecord(data: PackingForceRecordParams): Promise<{ isSystemApi: true } as any) } + +/** order.packing.export 请求参数(where/sort 语义与 order.packing.list 一致;warehouse_id 由服务端注入,禁止前端传入) */ +export type PackingExportParams = { + /** 查询条件,语义与 order.packing.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入) */ + where?: Record + /** 排序参数:sortField + sortOrder(asc/desc) */ + sort?: PackingListSort +} + +/** order.packing.export 响应(提交成功即返回任务受理信息) */ +export type PackingExportResponse = { + /** 任务 ID(后端生成,格式 packing_export_{warehouseId}_{timestamp}_{random}) */ + task_id: string + /** 任务状态:submitted/running/success/failed/not_found(提交成功时为 submitted) */ + status: string + /** 当前进度百分比(0-100),提交时返回 0 */ + progress: number + /** 当前已处理记录数(打包任务条数) */ + current_count: number + /** 总记录数 */ + total_count: number + /** 任务提示信息 */ + message: string + /** 任务执行结果(提交时为 null;完成后为上传信息对象) */ + result: Record | null + /** 失败时的错误信息 */ + error: string + /** 任务更新时间(Unix 毫秒时间戳) */ + update_time: number +} + +/** + * order.packing.export:提交打包任务导出任务(异步,立即返回 task_id) + * 后台异步生成单 Sheet Excel 并上传,导出进度/下载经 order.packing.exportTaskProgress 查询;免权限免日志口径与 order.export 一致 + */ +export function packingExport(data: PackingExportParams = {}): Promise<{ + code: number + message: string + data: PackingExportResponse +}> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.packing.export', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** order.packing.exportTaskProgress 请求参数 */ +export type PackingExportTaskProgressParams = { + /** 任务 ID(下划线写法,兼容) */ + task_id?: string + /** 任务 ID(驼峰写法,兼容) */ + taskId?: string +} + +/** + * order.packing.exportTaskProgress:按 task_id 查询打包任务导出任务进度 + * 上传完成后返回 download_url;task_id 缺失或缓存未命中时 status=not_found(正常响应);免权限免日志口径与 order.exportTaskProgress 一致 + */ +export function packingExportTaskProgress(data: PackingExportTaskProgressParams): Promise<{ + code: number + message: string + data: PackingExportResponse & { download_url: string } +}> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.packing.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/api/report/report.ts b/src/api/report/report.ts index f114d215..e8b54660 100644 --- a/src/api/report/report.ts +++ b/src/api/report/report.ts @@ -95,47 +95,56 @@ export function generateTaskProgress( export interface DeliveryPlanSaveParams { /** 货主ID(必填,正整数;<=0 报错) */ store_id: number - /** 计划名称(可选,仅展示字段,不参与幂等/关联逻辑;未传不覆盖,null/空串/全空白归一化为 null 清空;非空 trim 后 ≤100 字符,超长报错) */ + /** 计划名称(可选,仅展示字段,不参与幂等/关联逻辑;未传不覆盖既有值,null/空串/全空白归一化为 null 显式清空;非空 trim 后 ≤100 字符,超长报错) */ name?: string | null - /** 报表定义ID(必填,正整数;须为已启用 is_enabled=1 的报表定义;与 reportId 二选一,均传优先 reportId) */ - report_id: number + /** 报表定义ID(与 reportId 二选一,均传时优先 reportId;须为已启用 is_enabled=1 的报表定义) */ + report_id?: number /** 报表定义ID驼峰别名(兼容,优先级高于 report_id) */ reportId?: number - /** 每日投递时间点数组(HH:mm 24 小时制,非空;自动去重并升序) */ + /** 每日投递时间点数组(HH:mm 24 小时制,非空;自动去重并按升序排序;支持 JSON 字符串数组) */ schedule_times: string[] - /** 投递渠道:仅支持 inbox,默认 inbox;wecom/link 已弃用 */ + /** 投递渠道:仅支持 inbox(默认 inbox);wecom/link 已弃用,传入非法渠道报错;历史 wecom/link 计划在投递时按 inbox 兜底执行 */ channel?: string - /** 补投宽限分钟(0-1440),默认 60 */ + /** 补投宽限分钟(0-1440),默认 60;越界值夹取到 0-1440 */ late_grace_minutes?: number - /** 备注(最长 500 字符) */ + /** 备注(最长 500 字符,超出截断) */ remark?: string - /** 文本通知模板(≤500,标签 {time}/{url}/{report_name}/{biz_date}) */ + /** 文本通知模板(≤500 字符,超出报错;标签白名单 {time}/{url}/{report_name}/{biz_date},含白名单外标签报错并列出非法标签;空值视为未启用清空配置;仅入参存在时生效,未传不修改既有配置) */ notify_template?: string - /** 通知群ID数组(wms_inbox_group.id,正整数去重 ≤20) */ + /** 通知群ID数组(wms_inbox_group.id,正整数去重升序 ≤20;保存时校验存在性,软删群报错并列出缺失 ID,被屏蔽群仍可选中;支持 JSON 字符串数组;空数组视为不选择群)。该群同时作为报表文件消息投递目标:配置后文件消息仅逐群投递到这些群;未配置时回退货主默认站内信群 */ notify_group_ids?: number[] - /** 通知成员ID数组(外部 IM 用户 ID,去重 ≤100) */ + /** 通知成员ID数组(外部 IM 用户 ID,非空字符串去重 ≤100;推送时 user_id 支持数组整体透传不循环拆发;支持 JSON 字符串数组;空数组视为不选择成员) */ notify_member_ids?: string[] } export interface DeliveryPlanItem { + /** 投递计划ID */ id: number + /** 货主ID */ store_id: number /** 货主名称(列表/详情展示) */ store_name?: string - /** 计划名称 */ + /** 计划名称(未设置时为空字符串) */ name: string /** 关联的报表定义ID(wms_report_definition.id) */ report_definition_id: number /** 关联报表名称(前端由 report_definition_id 关联填充) */ report_name?: string + /** 每日投递时间点数组(HH:mm,去重升序) */ schedule_times: string[] + /** 投递渠道:inbox(渠道已收敛,仅支持 inbox) */ channel: string /** 是否启用:0=停用 1=启用 */ enabled: number + /** 补投宽限分钟(0-1440) */ late_grace_minutes: number + /** 备注 */ remark: string + /** 文本通知模板(未配置时为空字符串) */ notify_template: string + /** 通知群ID数组(wms_inbox_group.id,去重升序;未选择时 null);同时为报表文件消息投递目标群(配置后文件消息仅投递这些群,未配置时回退货主默认站内信群) */ notify_group_ids: number[] | null + /** 通知成员ID数组(外部 IM 用户 ID,去重;未选择时 null) */ notify_member_ids: string[] | null created_at: string updated_at: string diff --git a/src/views/Externalwarehouse/shipperSigning/index.vue b/src/views/Externalwarehouse/shipperSigning/index.vue index 20c96c9c..44bcb558 100644 --- a/src/views/Externalwarehouse/shipperSigning/index.vue +++ b/src/views/Externalwarehouse/shipperSigning/index.vue @@ -140,7 +140,7 @@ import { ref, reactive, onMounted } from 'vue' import { ElMessage } from 'element-plus' import { Search, Refresh } from '@element-plus/icons-vue' -import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse' +import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' diff --git a/src/views/data/newpackingflow/config/packingflow-config.ts b/src/views/data/newpackingflow/config/packingflow-config.ts index 49c7fafb..4ed4e685 100644 --- a/src/views/data/newpackingflow/config/packingflow-config.ts +++ b/src/views/data/newpackingflow/config/packingflow-config.ts @@ -84,8 +84,8 @@ export interface FieldDefinition { // ============================================================ export const VALUE_MAPS: Record> = { status: { - '0': '待处理', '1': '打包中', '2': '已完成', '3': '异常', - '待处理': '待处理', '打包中': '打包中', '已完成': '已完成', '异常': '异常' + '0': '未打包', '1': '打包中', '2': '已打包', + '未打包': '未打包', '打包中': '打包中', '已打包': '已打包' }, pack_mode: { '1': '散单', '2': '团购', @@ -163,10 +163,9 @@ export function calcPackDuration(startTime: any, endTime: any): string { export const TAG_RESOLVERS: Record string> = { resolveStatusTag(v) { const s = Number(v) - if (s === 0) return 'info' // 待处理 + if (s === 0) return 'info' // 未打包 if (s === 1) return 'warning' // 打包中 - if (s === 2) return 'success' // 已完成 - if (s === 3) return 'danger' // 异常 + if (s === 2) return 'success' // 已打包 return 'info' }, resolvePackModeTag(v) { @@ -252,7 +251,7 @@ export const FIELD_DICT: Record = { table: { width: 100, align: 'center' }, slot: { type: 'tag', tagResolver: 'resolveStatusTag', translateField: 'status' }, detailLabel: '任务状态', - filterParamMap: { '待处理': '0', '打包中': '1', '已完成': '2', '异常': '3' } + filterParamMap: { '未打包': '0', '打包中': '1', '已打包': '2' } }, start_time: { key: 'start_time', diff --git a/src/views/data/packingflow/index.vue b/src/views/data/packingflow/index.vue index 704e50fb..104d8cf8 100644 --- a/src/views/data/packingflow/index.vue +++ b/src/views/data/packingflow/index.vue @@ -274,6 +274,20 @@ + + + @@ -281,7 +295,7 @@ import { ref, reactive, computed, onMounted } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import dayjs from 'dayjs' -import { packingList, packingGet, packingSetEndTime, packingForceRecord, type PackingTaskItem, type PackingListSort } from '@/api/order/packing/index' +import { packingList, packingGet, packingSetEndTime, packingForceRecord, packingExport, packingExportTaskProgress, type PackingTaskItem, type PackingListSort } from '@/api/order/packing/index' import { packingColumns, createAvailableFields, @@ -303,6 +317,8 @@ import VideoListDialog from './components/VideoListDialog.vue' import VideoPlayerDialog from './components/VideoPlayerDialog.vue' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { safeInvoke } from '@/utils/safe-invoke' +import { useAsyncExportTask } from '@/composables/useAsyncExportTask' +import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue' // ─── 列配置 ───────────────────────────────────────────────────────────────── const columns = packingColumns @@ -361,9 +377,29 @@ const queryForm = reactive({ const whereConditions = ref>({}) +// ─── 打包任务导出(order.packing.export + order.packing.exportTaskProgress) ── +// 下拉选项:导出选中(按勾选任务ID导出)/ 导出全部(按当前排序全量导出) +// 传参逻辑参考 express/returnUnpack:where/sort 语义与 order.packing.list 一致,warehouse_id 服务端注入禁止前端传 +const { + exportLoading, + exportDialogVisible, + exportTaskProgress, + exportProgressPercent, + exportProgressStatus, + exportStatusLabel, + submitExportTask, + resumeExportTaskFromStorage, + hasPendingExportTask +} = useAsyncExportTask({ + storageKey: 'data:packingflow:exportTaskId', + submitExport: (payload) => packingExport(payload as any), + queryProgress: (params) => packingExportTaskProgress(params) +}) + // ─── 工具栏状态管理 ──────────────────────────────────────────────────────── const buttonLoadingMap = computed(() => ({ - loading: loading.value + loading: loading.value, + exportLoading: exportLoading.value })) const buttonDisabledMap = computed(() => ({})) @@ -398,7 +434,9 @@ function resolveButtonLabel(defaultLabel: string, dynamicLabelKey?: string) { const toolbarActionMap: Record void> = { loadData: () => { void loadData() }, openColumnConfigPanel: () => openColumnConfigPanel(), - toggleDetailVisible: () => toggleDetailVisible() + toggleDetailVisible: () => toggleDetailVisible(), + handleExportSelected: () => { void handleExportSelected() }, + handleExportAll: () => { void handleExportAll() } } function handleToolbarButtonClick(action: ToolbarButtonConfig['action']) { @@ -411,6 +449,60 @@ function handleSelectionChange(rows: PackingTaskItem[]) { selectionRows.value = rows || [] } +// ─── 导出处理(导出选中 / 导出全部)─────────────────────────────────────── +/** 构建导出参数:selected=true 仅按勾选任务运单号(waybill_code)过滤;false 全量导出并透传当前排序;where 格式结构与 order.packing.list 一致 */ +function buildPackingExportPayload(selected: boolean): Record { + const payload: Record = {} + if (selected) { + const waybillCodes = selectionRows.value + .map((row) => row?.waybill_code) + .filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '') + if (waybillCodes.length) { + payload.where = { waybill_code: { operator: 'in', value: waybillCodes } } + } + } + if (sortState.value?.sortField) { + payload.sort = { + sortField: sortState.value.sortField, + sortOrder: String(sortState.value.sortOrder || 'desc').toLowerCase() + } + } + return payload +} + +async function handleExportSelected() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选要导出的打包任务') + return + } + if (hasPendingExportTask()) { + ElMessage.warning('检测到未完成导出任务,请等待当前任务完成后再试') + resumeExportTaskFromStorage() + return + } + const waybillCodes = selectionRows.value + .map((row) => row?.waybill_code) + .filter((v: any) => v !== undefined && v !== null && String(v).trim() !== '') + if (!waybillCodes.length) { + ElMessage.warning('选中的记录无有效运单号') + return + } + await submitExportTask(buildPackingExportPayload(true)) +} + +async function handleExportAll() { + if (!list.value.length) { + ElMessage.warning('当前无数据可导出') + return + } + if (hasPendingExportTask()) { + ElMessage.warning('检测到未完成导出任务,请等待当前任务完成后再试') + resumeExportTaskFromStorage() + return + } + await submitExportTask(buildPackingExportPayload(false)) +} + function openColumnConfigPanel() { tableRef.value?.openColumnConfig?.() } @@ -523,17 +615,21 @@ const selectedRow = ref(null) const detailLoading = ref(false) const detail = ref({}) -function handleRowClick(row: PackingTaskItem) { +function handleRowClick(row: PackingTaskItem | null) { + // current-change 在分页/数据刷新清空选中时会以 null 触发,仅清空选中,不加载详情 selectedRow.value = row - loadDetail(row) + if (!row) return + void loadDetail(row) } -async function openDetail(row: PackingTaskItem) { +function openDetail(row: PackingTaskItem | null) { + if (!row) return selectedRow.value = row - loadDetail(row) + void loadDetail(row) } -async function loadDetail(row: PackingTaskItem) { +async function loadDetail(row: PackingTaskItem | null | undefined) { + if (!row || row.id == null) return detailLoading.value = true try { const res = await packingGet(Number(row.id)) @@ -545,11 +641,11 @@ async function loadDetail(row: PackingTaskItem) { return } detail.value = res.data ?? row - currentVideos.value = (detail.value.videos as VideoItem[]) || [] + currentVideos.value = ((detail.value?.videos || []) as VideoItem[]) } catch (e: any) { ElMessage.error(e?.message || '获取详情异常') detail.value = row - currentVideos.value = (row.videos as VideoItem[]) || [] + currentVideos.value = ((row.videos || []) as VideoItem[]) } finally { detailLoading.value = false } diff --git a/src/views/data/packingflow/packingflow-config.ts b/src/views/data/packingflow/packingflow-config.ts index 00b73825..3510c360 100644 --- a/src/views/data/packingflow/packingflow-config.ts +++ b/src/views/data/packingflow/packingflow-config.ts @@ -7,6 +7,19 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o export const packingflowToolbarButtons: ToolbarButtonConfig[] = [ { key: 'refresh', label: '刷新', category: 'refresh', size: 'small', loadingKey: 'loading', action: 'loadData' }, + { + key: 'export', + label: '导出', + category: 'setting', + size: 'small', + loadingKey: 'exportLoading', + action: 'handleExportSelected', + buttonType: 'dropdown', + dropdownOptions: [ + { label: '导出选中', action: 'handleExportSelected' }, + { label: '导出全部', action: 'handleExportAll', divided: true } + ], + }, { key: 'columnConfig', label: '字段设置', category: 'setting', size: 'small', action: 'openColumnConfigPanel' }, { key: 'toggleDetail', @@ -38,12 +51,11 @@ export interface PackModeConfigItem { // 状态配置 // ============================================================================= -/** 任务状态映射 */ +/** 任务状态映射(仅三态:未打包/打包中/已打包,无错误状态) */ export const statusConfig: StatusConfigMap = { - 0: { text: '待处理', tagType: 'info' }, + 0: { text: '未打包', tagType: 'info' }, 1: { text: '打包中', tagType: 'warning' }, - 2: { text: '已完成', tagType: 'success' }, - 3: { text: '异常', tagType: 'danger' } + 2: { text: '已打包', tagType: 'success' } } /** 打包模式映射 */ @@ -231,10 +243,9 @@ export const baseAvailableFields = [ type: 'select' as const, options: [ { label: '全部', value: undefined }, - { label: '待处理', value: 0 }, + { label: '未打包', value: 0 }, { label: '打包中', value: 1 }, - { label: '已完成', value: 2 }, - { label: '异常', value: 3 } + { label: '已打包', value: 2 } ] }), packingScanField('workflow', { diff --git a/src/views/express/returnUnpack/returnUnpack-config.ts b/src/views/express/returnUnpack/returnUnpack-config.ts index d917eb6b..9a2bd9ff 100644 --- a/src/views/express/returnUnpack/returnUnpack-config.ts +++ b/src/views/express/returnUnpack/returnUnpack-config.ts @@ -5,14 +5,14 @@ import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/o // 对齐 returnUnpack.list 接口文档 where 参数 // ============================================================ export const returnUnpackAvailableFields = [ - { - value: 'unpack_no', - label: '拆包单号', - type: 'text', - placeholder: '拆包单号模糊搜索', - operators: ['like'], - defaultOperator: 'like', - }, + // { + // value: 'unpack_no', + // label: '拆包单号', + // type: 'text', + // placeholder: '拆包单号模糊搜索', + // operators: ['like'], + // defaultOperator: 'like', + // }, { value: 'waybill_code', label: '退回运单号', diff --git a/src/views/express/waybill/config/template-config.ts b/src/views/express/waybill/config/template-config.ts index 8b0f7a4d..ad3be195 100644 --- a/src/views/express/waybill/config/template-config.ts +++ b/src/views/express/waybill/config/template-config.ts @@ -101,7 +101,7 @@ export const VALUE_MAPS: Record> = { 'true': '是', 'false': '否' }, packStatus: { - '未打包': '未打包', '已打包': '已打包', '打包中': '打包中' + '未打包': '未打包', '打包中': '打包中', '已打包': '已打包' } } diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index de0f3131..09901760 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -56,15 +56,15 @@ @selection-change="onSelectionChange" >