From 0d549b455f83b24e9a61f5610b53ac089284d42c Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Tue, 10 Nov 2026 18:00:21 +0800 Subject: [PATCH] =?UTF-8?q?feat(task-progress):=20=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=BC=B9=E7=AA=97=E6=94=AF=E6=8C=81=E5=B7=B2?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=A0=87=E7=AD=BE=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=8F=BD=E6=94=B6=E7=8A=B6=E6=80=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - task-progress 新增 tags 表单字段类型与 SelectedTags 组件,任务弹窗可展示 已选订单/运单/出库单标签并支持逐个移除,样式对齐「编辑投递计划」输入行 - 更新备注、更新订单备注/地址、同步订单号、分配储位、批量异步任务等表单, 以及待处理/异常/复核/波次面板接入该能力,提交前可核对并调整已选项 - 新增 orderTagItems 工具:按行或按 ids 顺序生成标签,兼容 id / order_id 与 delivery_order_code / order_code 等字段差异 - waybill.warehouse 新增 updateReceive、updateReceiveTaskProgress 异步接口, 运单页新增「更新揽收状态」工具栏按钮,接入任务进度轮询、结果汇总与列表刷新 - 库存批量编辑、出库单批量作废、收货列表等页面同步接入已选项标签展示 - UnifiedTaskProgressDialog 补充 remove-field-item 事件透传,保持各任务弹窗行为一致 --- src/api/waybill.warehouse/index.ts | 65 ++++++- src/components/task-progress/SelectedTags.vue | 109 ++++++++++++ .../task-progress/TaskProgressPanel.vue | 83 ++++++++- .../UnifiedTaskProgressDialog.vue | 9 +- src/components/task-progress/types.ts | 14 +- .../express/waybill/config/template-config.ts | 21 +++ src/views/express/waybill/index.vue | 160 +++++++++++++++++- .../order/orderManagement/exceptionOrder.vue | 109 +++++++----- .../form/UpdateOrderMetaForm.vue | 27 ++- .../orderManagement/form/UpdateRemarkForm.vue | 27 ++- .../order/orderManagement/pendingOrder.vue | 109 +++++++----- .../order/orderManagement/reviewOrder.vue | 17 ++ .../order/shared/form/BatchAsyncTaskForm.vue | 41 ++++- .../order/shared/form/StorageAllocateForm.vue | 44 ++++- .../order/shared/form/SyncOrderIdsForm.vue | 41 ++++- .../order/shared/form/UpdateAddressForm.vue | 27 ++- src/views/order/shared/orderTagItems.ts | 60 +++++++ .../component/PendingOrderListPanel.vue | 54 ++++++ .../stock/component/StockBatchEditDialog.vue | 25 ++- src/views/stock/stock/index.vue | 20 +++ src/views/storage/receiving/index.vue | 36 +++- src/views/storage/stockout/index.vue | 116 ++++++++++++- 22 files changed, 1085 insertions(+), 129 deletions(-) create mode 100644 src/components/task-progress/SelectedTags.vue create mode 100644 src/views/order/shared/orderTagItems.ts diff --git a/src/api/waybill.warehouse/index.ts b/src/api/waybill.warehouse/index.ts index 2f28fb86..f9b09275 100644 --- a/src/api/waybill.warehouse/index.ts +++ b/src/api/waybill.warehouse/index.ts @@ -186,11 +186,74 @@ export function waybillWarehouseExportTaskProgress( } as any) } +// ============ waybill.warehouse.updateReceive ============ + +/** waybill.warehouse.updateReceive 请求参数 */ +export type WaybillWarehouseUpdateReceiveParams = { + /** 运单号列表(字符串数组),提交后按 10 单一批调用外部接口;空数组返回失败 */ + waybillCodes?: string[] + /** waybillCodes 的下划线别名,二者取其一 */ + waybill_codes?: string[] +} + +/** + * waybill.warehouse.updateReceive:批量更新运单是否揽收-仓库侧 + * + * 按运单号调用外部访问接口 waybill.getreceive 查询揽收状态(单批最多 10 单,超出自动切批), + * 并把结果回写 wms_order_express.is_galaxy_receive(按 warehouse_id 隔离)。 + * 异步任务模式:返回任务受理信息(任务 ID 前缀 waybill_receive_),进度用 updateReceiveTaskProgress 查询。 + * 仓库未配置承接该回调方法的 API 应用时直接失败,不创建任务。 + */ +export function waybillWarehouseUpdateReceive( + data: WaybillWarehouseUpdateReceiveParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'waybill.warehouse.updateReceive', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +// ============ waybill.warehouse.updateReceiveTaskProgress ============ + +/** waybill.warehouse.updateReceiveTaskProgress 请求参数 */ +export type WaybillWarehouseUpdateReceiveTaskProgressParams = { + /** 异步任务ID(前缀 waybill_receive_)。与 taskId 二选一 */ + task_id?: string + /** 异步任务ID(别名,优先使用)。至少传入 taskId 或 task_id 之一 */ + taskId?: string +} + +/** waybill.warehouse.updateReceiveTaskProgress:运单揽收状态更新进度查询-仓库侧 */ +export function waybillWarehouseUpdateReceiveTaskProgress( + data: WaybillWarehouseUpdateReceiveTaskProgressParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'waybill.warehouse.updateReceiveTaskProgress', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + // ============ 模块导出 ============ export const waybillWarehouseModule = { list: waybillWarehouseList, detail: waybillWarehouseDetail, export: waybillWarehouseExport, - exportTaskProgress: waybillWarehouseExportTaskProgress + exportTaskProgress: waybillWarehouseExportTaskProgress, + updateReceive: waybillWarehouseUpdateReceive, + updateReceiveTaskProgress: waybillWarehouseUpdateReceiveTaskProgress } diff --git a/src/components/task-progress/SelectedTags.vue b/src/components/task-progress/SelectedTags.vue new file mode 100644 index 00000000..563f9d05 --- /dev/null +++ b/src/components/task-progress/SelectedTags.vue @@ -0,0 +1,109 @@ + + + + + + diff --git a/src/components/task-progress/TaskProgressPanel.vue b/src/components/task-progress/TaskProgressPanel.vue index 82887fb9..c9ed5bf3 100644 --- a/src/components/task-progress/TaskProgressPanel.vue +++ b/src/components/task-progress/TaskProgressPanel.vue @@ -18,10 +18,28 @@
@@ -270,9 +283,11 @@ import ColumnCellRenderer from './components/ColumnCellRenderer.vue' import OperationCellRenderer from './components/OperationCellRenderer.vue' import TransferByWaybillsDialog from './components/TransferByWaybillsDialog.vue' import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue' +import TaskProgressDialog from '@/components/TaskProgressDialog.vue' import OrderToolbarButtonGroup from '@/components/ToolbarButtonGroup/index.vue' import { waybillWarehouseDetail } from '@/api/waybill.warehouse' import { useAsyncExportTask } from '@/composables/useAsyncExportTask' +import { useTaskProgress } from '@/composables/useTaskProgress' import { extractStoreListFromResponse, mapExpressListToCompanySelectOptions, @@ -456,7 +471,8 @@ const buttonDisabledMap = computed>(() => ({ const buttonLoadingMap = computed>(() => ({ loading: loading.value, - exportLoading: exportLoading.value + exportLoading: exportLoading.value, + receiveLoading: receiveLoading.value })) const buttonLabelMap = computed>(() => ({ @@ -560,7 +576,8 @@ const toolbarActionMap: Record void> = { toggleDetailVisible: () => { detailVisible.value = !detailVisible.value }, handleExportSelected: () => { void handleExportSelected() }, handleExportAll: () => { void handleExportAll() }, - openTransferByWaybillsDialog: () => { openTransferByWaybillsDialog() } + openTransferByWaybillsDialog: () => { openTransferByWaybillsDialog() }, + handleUpdateReceive: () => { void handleUpdateReceive() } } function handleToolbarButtonClick(action: string) { @@ -715,6 +732,145 @@ function handleTransferByWaybillsSuccess() { void loadData() } +// ============================================================ +// 批量更新揽收状态(waybill.warehouse.updateReceive) +// ============================================================ + +/** 提交中(按钮 loading / 防重复提交) */ +const receiveLoading = ref(false) + +/** 解析异步任务响应体(兼容 data / data.data 嵌套) */ +function parseReceiveTaskPayload(res: any): Record { + if (!res || typeof res !== 'object') return {} + const root = res as Record + const nested = root.data + if (!nested || typeof nested !== 'object' || Array.isArray(nested)) return root + const deep = nested.data + if ( + deep + && typeof deep === 'object' + && !Array.isArray(deep) + && (deep.task_id || deep.taskId || deep.status || deep.progress !== undefined) + ) { + return deep + } + return nested +} + +/** 进度接口响应 → useTaskProgress 期望结构(频率字段做兼容归一) */ +function normalizeReceiveProgress(res: any) { + const payload = parseReceiveTaskPayload(res) + const rawStatus = String(payload.status || '').toLowerCase() + // 任务不存在/已过期:按失败处理,避免无意义轮询到超时 + const status = rawStatus === 'not_found' ? 'failed' : rawStatus + + const total = Number(payload.total ?? payload.total_count ?? payload.totalCount ?? 0) + const processed = Number( + payload.processed + ?? payload.processed_count + ?? payload.processedCount + ?? payload.current + ?? payload.done + ?? 0 + ) + const rawProgress = Number(payload.progress) + const progress = Number.isFinite(rawProgress) + ? rawProgress + : total > 0 + ? Math.round((processed / total) * 100) + : undefined + + return { + status, + progress, + message: String(payload.message || ''), + error: rawStatus === 'not_found' + ? (payload.message || '任务不存在或已过期') + : String(payload.error || ''), + result: payload + } +} + +const { + visible: receiveProgressVisible, + polling: receiveProgressPolling, + state: receiveProgressState, + startPolling: startReceivePolling, + close: closeReceiveProgress +} = useTaskProgress({ + interval: 1500, + // 200 次 × 1.5s ≈ 5 分钟上限,超时后提示刷新查看结果 + maxAttempts: 200, + pollFn: async (taskId: string) => { + const cfg = currentTabConfig.value + if (!cfg?.api?.updateReceiveProgress) throw new Error('揽收进度接口未配置') + const res = await cfg.api.updateReceiveProgress({ task_id: taskId }) + return normalizeReceiveProgress(res) + }, + onSuccess: async () => { + ElMessage.success('揽收状态更新完成') + upperTableRef.value?.clearSelection?.() + selectedRows.value = [] + await loadData() + }, + onError: (error: string) => { + ElMessage.error(error || '揽收状态更新失败') + } +}) + +const receiveProgressStatusLabel = computed(() => { + const map: Record = { + submitted: '已提交', + running: '处理中', + success: '已完成', + completed: '已完成', + failed: '失败', + error: '错误' + } + return map[receiveProgressState.status] || receiveProgressState.status || '—' +}) + +/** 勾选运单 → 提交揽收状态更新任务 → 轮询进度 */ +async function handleUpdateReceive() { + if (receiveLoading.value) return + if (!selectedRows.value.length) { + ElMessage.warning('请先勾选需要更新揽收状态的运单') + return + } + + const waybillCodes = selectedRows.value + .map((row: any) => String(row?.waybill_code ?? row?.waybillCode ?? '').trim()) + .filter(Boolean) + + if (!waybillCodes.length) { + ElMessage.warning('勾选的运单缺少运单号,无法更新揽收状态') + return + } + + const cfg = currentTabConfig.value + if (!cfg?.api?.updateReceive) { + ElMessage.error('揽收状态更新接口未配置') + return + } + + receiveLoading.value = true + try { + const res = await cfg.api.updateReceive({ waybillCodes }) + const payload = parseReceiveTaskPayload(res) + const taskId = String(payload.task_id || payload.taskId || '').trim() + if (!taskId) { + throw new Error(payload.message || res?.message || '揽收状态更新任务提交失败') + } + ElMessage.success(`已提交 ${waybillCodes.length} 个运单的揽收状态更新任务`) + // 异步任务:不 await,轮询由进度弹窗接管 + void startReceivePolling(taskId) + } catch (e: any) { + ElMessage.error(e?.message || '揽收状态更新失败') + } finally { + receiveLoading.value = false + } +} + // ============================================================ // 明细面板 // ============================================================ diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 869a02f4..b27861ae 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -215,6 +215,7 @@ v-model:allow-storage-location="storageForm.allowStorageLocation" :mode="storageDialogMode" :order-count="storagePendingOrderIds.length" + :order-items="storageOrderTagItems" :loading="storageAllocateLoading" :request-id="storageAllocateRequestId" :task-status="storageAllocateTaskStatus" @@ -223,6 +224,7 @@ :success-count="storageAllocateSuccessCount" :failed-count="storageAllocateFailedCount" :message="storageAllocateMessage" + @remove-order="(value) => removeSelectedOrder(value, storagePendingOrderIds)" @closed="resetStorageAllocateDialog" @submit="submitStorageAllocate" /> @@ -231,8 +233,10 @@ v-model:code="updateOrderMetaState.code" :mode="updateOrderMetaDialogMode" :order-count="updateOrderMetaOrderIds.length" + :order-items="updateOrderMetaTagItems" :loading="updateOrderMetaLoading" :options="updateOrderMetaOptions" + @remove-order="(value) => removeSelectedOrder(value, updateOrderMetaOrderIds)" @closed="resetUpdateOrderMetaDialog" @submit="submitUpdateOrderMeta" /> @@ -257,6 +261,7 @@ v-model="syncOrderIdsDialogVisible" :order-count="selectionRows.length" :order-ids="getSelectedIds()" + :order-items="selectedOrderTagItems" :loading="syncOrderIdsLoading" :request-id="syncOrderIdsRequestId" :task-status="syncOrderIdsTaskStatus" @@ -266,6 +271,7 @@ :success-count="syncOrderIdsSuccessCount" :failed-count="syncOrderIdsFailedCount" :message="syncOrderIdsMessage" + @remove-order="(value) => removeSelectedOrder(value)" @closed="resetSyncOrderIdsDialog" @submit="submitSyncOrderIds" /> @@ -281,7 +287,9 @@ v-model="updateAddressDialogVisible" v-model:form="updateAddressState" :order-count="updateAddressOrderIds.length" + :order-items="updateAddressTagItems" :loading="updateAddressLoading" + @remove-order="(value) => removeSelectedOrder(value, updateAddressOrderIds)" @closed="resetUpdateAddressDialog" @submit="submitUpdateAddress" /> @@ -289,7 +297,9 @@ v-model="updateRemarkDialogVisible" v-model:form="updateRemarkState" :order-count="updateRemarkOrderIds.length" + :order-items="updateRemarkTagItems" :loading="updateRemarkLoading" + @remove-order="(value) => removeSelectedOrder(value, updateRemarkOrderIds)" @closed="resetUpdateRemarkDialog" @submit="submitUpdateRemark" /> @@ -302,6 +312,7 @@ :result-count-label="batchAsyncTaskConfig.resultCountLabel" :result-ids-label="batchAsyncTaskConfig.resultIdsLabel" :order-count="batchAsyncTaskOrderIds.length" + :order-items="batchAsyncTagItems" :loading="batchAsyncTaskLoading" :phase="batchAsyncTaskPhase" :task-id="batchAsyncTaskProgress.taskId" @@ -313,6 +324,7 @@ :result-order-ids="batchAsyncTaskProgress.resultOrderIds" :accept-message="batchAsyncTaskProgress.acceptMessage" :error-message="batchAsyncTaskProgress.errorMessage" + @remove-order="(value) => removeSelectedOrder(value, batchAsyncTaskOrderIds)" @closed="resetBatchAsyncTaskDialog" @submit="submitBatchAsyncTask" /> @@ -348,17 +360,10 @@
-
- 已选订单数 - {{ resolveExceptionOrderIds.length }} 条 -
-
- 订单 ID -
- {{ id }} - — -
-
+

该操作会将异常订单恢复为正常待处理状态(step: 3 → 2)。 @@ -420,7 +425,7 @@