From 8a1cc63a0941f5d539156474709b0fb9acce3129 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Fri, 29 May 2026 18:21:11 +0800 Subject: [PATCH] 529 --- src/api/order.index/orderindex.ts | 86 + .../packagematerial.ts | 107 + .../packagesupplier.ts | 97 + src/composables/useOrderAsyncExport.ts | 202 + src/lang/en-US.ts | 2 + src/lang/zh-CN.ts | 2 + src/router/map.ts | 2 + src/views/material/packageMaterial/index.vue | 578 + .../package-material-config.ts | 252 + src/views/material/packageSupplier/index.vue | 456 + .../package-supplier-config.ts | 236 + .../order/orderManagement/archiveOrder.vue | 94 +- .../component/ExpressWaybillPanel.vue | 344 + .../component/OrderExportProgressDialog.vue | 71 + .../component/OrderWorkbenchListDialog.vue | 237 + .../component/OutboundManualOutboundForm.vue | 4 +- .../component/WorkbenchOrderDetail.vue | 3 +- .../order/orderManagement/component/log.vue | 70 +- .../config/order-common-config.ts | 9 + .../orderManagement/deliveryException.vue | 94 +- .../order/orderManagement/deliveryOrder.vue | 94 +- .../orderManagement/entrustWarehouse.vue | 94 +- .../order/orderManagement/exceptionOrder.vue | 103 +- src/views/order/orderManagement/index.vue | 5 + .../order/orderManagement/outboundOrder.vue | 74 +- .../order/orderManagement/pendingOrder.vue | 115 +- .../order/orderManagement/reviewOrder.vue | 88 +- .../utils/order-index-helpers.ts | 164 + .../utils/order-page-export.ts | 60 + .../orderManagement/utils/toolbar-actions.ts | 6 + .../express-interface-config.ts | 2 +- .../system/setting/expressinterface/index.vue | 2 +- src/views/system/setting/shops/index.vue | 2 +- workflows/api-doc-agent/config/响应.md | 22523 +-------------- workflows/api-doc-agent/config/接口.md | 31 +- workflows/api-doc-system/apidata/config.json | 27 +- workflows/api-doc-system/apidata/data.json | 22550 +--------------- .../interface-details/interface-details.json | 1075 +- .../data/module-list/module-list.json | 237 +- .../data/module/config/_module.lifecycle.json | 2 +- .../data/module/config/module.json | 4 +- .../module/dashboard/_module.lifecycle.json | 2 +- .../data/module/dashboard/module.json | 4 +- .../data/module/index/_module.lifecycle.json | 2 +- .../data/module/index/module.json | 4 +- .../order.archiveorder/_module.lifecycle.json | 2 +- .../module/order.archiveorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../order.deliveryexpectionorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/order.deliveryorder/module.json | 4 +- .../order.entrustorder/_module.lifecycle.json | 2 +- .../module/order.entrustorder/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/order.expectionorder/module.json | 4 +- .../module/order.index/_module.lifecycle.json | 2 +- .../data/module/order.index/module.json | 331 +- .../_module.lifecycle.json | 2 +- .../module/order.outboundorder/module.json | 4 +- .../order.pendingorder/_module.lifecycle.json | 2 +- .../module/order.pendingorder/module.json | 4 +- .../module/order.print/_module.lifecycle.json | 2 +- .../data/module/order.print/module.json | 94 +- .../order.recheckorder/_module.lifecycle.json | 2 +- .../module/order.recheckorder/module.json | 4 +- .../order.revieworder/_module.lifecycle.json | 2 +- .../data/module/order.revieworder/module.json | 4 +- .../module/order.wave/_module.lifecycle.json | 2 +- .../data/module/order.wave/module.json | 4 +- .../data/module/order/_module.lifecycle.json | 2 +- .../data/module/order/module.json | 4 +- .../data/module/pick/_module.lifecycle.json | 2 +- .../data/module/pick/module.json | 4 +- .../data/module/print/_module.lifecycle.json | 2 +- .../data/module/print/module.json | 4 +- .../printer.station/_module.lifecycle.json | 2 +- .../data/module/printer.station/module.json | 4 +- .../setting.account/_module.lifecycle.json | 2 +- .../data/module/setting.account/module.json | 4 +- .../setting.express/_module.lifecycle.json | 2 +- .../data/module/setting.express/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../setting.expressinterface/module.json | 4 +- .../_module.lifecycle.json | 12 + .../setting.packagematerial/module.json | 285 + .../_module.lifecycle.json | 12 + .../setting.packagesupplier/module.json | 255 + .../setting.permission/_module.lifecycle.json | 2 +- .../module/setting.permission/module.json | 4 +- .../setting.platform/_module.lifecycle.json | 2 +- .../data/module/setting.platform/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/setting.printtemplate/module.json | 4 +- .../setting.role/_module.lifecycle.json | 2 +- .../data/module/setting.role/module.json | 4 +- .../setting.warehouse/_module.lifecycle.json | 2 +- .../data/module/setting.warehouse/module.json | 4 +- .../data/module/shops/_module.lifecycle.json | 2 +- .../data/module/shops/module.json | 4 +- .../data/module/stock/_module.lifecycle.json | 2 +- .../data/module/stock/module.json | 4 +- .../storage.entry/_module.lifecycle.json | 2 +- .../data/module/storage.entry/module.json | 4 +- .../storage.inventory/_module.lifecycle.json | 2 +- .../data/module/storage.inventory/module.json | 4 +- .../storage.report/_module.lifecycle.json | 2 +- .../data/module/storage.report/module.json | 4 +- .../storage.stockout/_module.lifecycle.json | 2 +- .../data/module/storage.stockout/module.json | 4 +- .../storage_receiving/_module.lifecycle.json | 2 +- .../data/module/storage_receiving/module.json | 4 +- .../data/module/store/_module.lifecycle.json | 2 +- .../data/module/store/module.json | 4 +- .../_module.lifecycle.json | 2 +- .../module/storewarehouse.store/module.json | 4 +- .../data/module/user/_module.lifecycle.json | 2 +- .../data/module/user/module.json | 4 +- .../module/warehouse/_module.lifecycle.json | 2 +- .../data/module/warehouse/module.json | 4 +- .../api-doc-system/data/pending-updates.json | 122 +- 120 files changed, 6909 insertions(+), 44620 deletions(-) create mode 100644 src/api/setting.packagematerial/packagematerial.ts create mode 100644 src/api/setting.packagesupplier/packagesupplier.ts create mode 100644 src/composables/useOrderAsyncExport.ts create mode 100644 src/views/material/packageMaterial/index.vue create mode 100644 src/views/material/packageMaterial/package-material-config.ts create mode 100644 src/views/material/packageSupplier/index.vue create mode 100644 src/views/material/packageSupplier/package-supplier-config.ts create mode 100644 src/views/order/orderManagement/component/ExpressWaybillPanel.vue create mode 100644 src/views/order/orderManagement/component/OrderExportProgressDialog.vue create mode 100644 src/views/order/orderManagement/component/OrderWorkbenchListDialog.vue create mode 100644 src/views/order/orderManagement/utils/order-index-helpers.ts create mode 100644 src/views/order/orderManagement/utils/order-page-export.ts create mode 100644 workflows/api-doc-system/data/module/setting.packagematerial/_module.lifecycle.json create mode 100644 workflows/api-doc-system/data/module/setting.packagematerial/module.json create mode 100644 workflows/api-doc-system/data/module/setting.packagesupplier/_module.lifecycle.json create mode 100644 workflows/api-doc-system/data/module/setting.packagesupplier/module.json diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index b493d36c..f5914d8c 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -40,6 +40,32 @@ export type QueryOrderLogListParams = { orderId?: string | number } +export type UpdateExpressWeighingWeightParams = { + order_id: number | string + waybill_code?: string + weighing_weight: number | string +} + +export type BindExpressPackageMaterialParams = { + order_id: number | string + waybill_code: string + package_material_code: string +} + +export type OrderExportParams = { + table_type?: string + tableType?: string + module?: string + module_name?: string + where?: Record + sort?: OrderListParams['sort'] +} + +export type OrderExportTaskProgressParams = { + task_id?: string + taskId?: string +} + /** order.queryOrderLogList 单条日志 */ export type OrderLogListItem = { id: number @@ -125,6 +151,62 @@ export function orderQueryOrderLogList(data: QueryOrderLogListParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.updateExpressWeighingWeight', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderBindExpressPackageMaterial(data: BindExpressPackageMaterialParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.bindExpressPackageMaterial', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderExport(data: OrderExportParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.export', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +export function orderExportTaskProgress(data: OrderExportTaskProgressParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /** 订单明细行(历史接口 order.detail,未纳入远端 module 清单) */ export function orderDetail(data: Record = {}): Promise { return request({ @@ -146,5 +228,9 @@ export const order = { badgeCount: orderBadgeCount, queryOrderLogs: orderQueryOrderLogs, queryOrderLogList: orderQueryOrderLogList, + updateExpressWeighingWeight: orderUpdateExpressWeighingWeight, + bindExpressPackageMaterial: orderBindExpressPackageMaterial, + export: orderExport, + exportTaskProgress: orderExportTaskProgress, detail: orderDetail } diff --git a/src/api/setting.packagematerial/packagematerial.ts b/src/api/setting.packagematerial/packagematerial.ts new file mode 100644 index 00000000..a8fab7d0 --- /dev/null +++ b/src/api/setting.packagematerial/packagematerial.ts @@ -0,0 +1,107 @@ +import request from '@/utils/request' + +const v = '1.0' + +export type PackageMaterialPagination = { + page?: number + pageSize?: number +} + +export type PackageMaterialGetParams = { + pagination?: PackageMaterialPagination + where?: Record +} + +export type PackageMaterialCreatePayload = { + material_code: string + material_name: string + material_type?: string + spec?: string + length?: number + width?: number + height?: number + weight?: number + cost_price?: number + status?: number +} + +export type PackageMaterialUpdatePayload = { + id: number + material_id?: number + materialId?: number + material_code?: string + material_name?: string + material_type?: string + spec?: string + length?: number + width?: number + height?: number + weight?: number + cost_price?: number + status?: number +} + +export function packageMaterialCreate(data: PackageMaterialCreatePayload) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.create', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageMaterialUpdate(data: PackageMaterialUpdatePayload) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageMaterialDelete(data: { ids: Array | string | number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.delete', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageMaterialGet(data?: PackageMaterialGetParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.get', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} + +export function packageMaterialList(data?: PackageMaterialGetParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageMaterial.list', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} diff --git a/src/api/setting.packagesupplier/packagesupplier.ts b/src/api/setting.packagesupplier/packagesupplier.ts new file mode 100644 index 00000000..1d7ef537 --- /dev/null +++ b/src/api/setting.packagesupplier/packagesupplier.ts @@ -0,0 +1,97 @@ +import request from '@/utils/request' + +const v = '1.0' + +export type PackageSupplierPagination = { + page?: number + pageSize?: number +} + +export type PackageSupplierGetParams = { + pagination?: PackageSupplierPagination + where?: Record +} + +export type PackageSupplierCreatePayload = { + supplier_code: string + supplier_name: string + contact_name?: string + contact_phone?: string + status?: number +} + +export type PackageSupplierUpdatePayload = { + id: number + supplier_id?: number + supplierId?: number + supplier_code?: string + supplier_name?: string + contact_name?: string + contact_phone?: string + status?: number +} + +export function packageSupplierCreate(data: PackageSupplierCreatePayload) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageSupplier.create', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageSupplierUpdate(data: PackageSupplierUpdatePayload) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageSupplier.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageSupplierDelete(data: { ids: Array | string | number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageSupplier.delete', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function packageSupplierGet(data?: PackageSupplierGetParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageSupplier.get', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} + +export function packageSupplierList(data?: PackageSupplierGetParams) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.packageSupplier.list', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} diff --git a/src/composables/useOrderAsyncExport.ts b/src/composables/useOrderAsyncExport.ts new file mode 100644 index 00000000..a05f968a --- /dev/null +++ b/src/composables/useOrderAsyncExport.ts @@ -0,0 +1,202 @@ +import { computed, onBeforeUnmount, reactive, ref } from 'vue' +import { ElMessage } from 'element-plus' +import { orderExport, orderExportTaskProgress } from '@/api/order.index/orderindex' +import { + downloadOrderExportFile, + isOrderIndexApiSuccess, + parseOrderExportTaskPayload +} from '@/views/order/orderManagement/utils/order-index-helpers' + +export type OrderAsyncExportPayload = { + table_type?: string + tableType?: string + module?: string + module_name?: string + where?: Record + sort?: Record +} + +export function useOrderAsyncExport(storageKey?: string) { + const exportLoading = ref(false) + const exportDialogVisible = ref(false) + const exportTaskProgress = reactive({ + taskId: '', + status: 'submitted', + progress: 0, + message: '', + error: '', + downloadUrl: '', + updateTime: 0 + }) + + let exportPollingTimer: number | null = null + + function resetExportProgress() { + exportTaskProgress.taskId = '' + exportTaskProgress.status = 'submitted' + exportTaskProgress.progress = 0 + exportTaskProgress.message = '' + exportTaskProgress.error = '' + exportTaskProgress.downloadUrl = '' + exportTaskProgress.updateTime = 0 + } + + function stopExportPolling() { + if (exportPollingTimer) { + window.clearTimeout(exportPollingTimer) + exportPollingTimer = null + } + } + + function scheduleExportPolling(delay = 1500) { + stopExportPolling() + exportPollingTimer = window.setTimeout(() => { + void refreshExportTaskProgress() + }, delay) + } + + function saveExportTaskId(taskId: string) { + if (!storageKey || !taskId) return + try { + window.localStorage.setItem(storageKey, taskId) + } catch { + // ignore + } + } + + function clearSavedExportTaskId() { + if (!storageKey) return + try { + window.localStorage.removeItem(storageKey) + } catch { + // ignore + } + } + + async function refreshExportTaskProgress() { + if (!exportTaskProgress.taskId) return + try { + const res: any = await orderExportTaskProgress({ task_id: exportTaskProgress.taskId }) + if (!isOrderIndexApiSuccess(res)) { + scheduleExportPolling() + return + } + const payload = parseOrderExportTaskPayload(res) + exportTaskProgress.status = String(payload.status || exportTaskProgress.status) + exportTaskProgress.progress = Number.isFinite(Number(payload.progress)) + ? Number(payload.progress) + : exportTaskProgress.progress + exportTaskProgress.message = String(payload.message || '') + exportTaskProgress.error = String(payload.error || '') + exportTaskProgress.downloadUrl = String(payload.download_url || payload.downloadUrl || '') + exportTaskProgress.updateTime = Number(payload.update_time || payload.updateTime || 0) + + if (exportTaskProgress.status === 'success') { + stopExportPolling() + exportLoading.value = false + clearSavedExportTaskId() + try { + if (exportTaskProgress.downloadUrl) { + downloadOrderExportFile(exportTaskProgress.downloadUrl) + ElMessage.success(exportTaskProgress.message || '导出完成,文件已开始下载') + } else { + ElMessage.warning(exportTaskProgress.message || '导出完成,但未返回下载地址') + } + } finally { + window.setTimeout(() => { + exportDialogVisible.value = false + resetExportProgress() + }, 1200) + } + return + } + + if (exportTaskProgress.status === 'failed' || exportTaskProgress.status === 'not_found') { + stopExportPolling() + exportLoading.value = false + clearSavedExportTaskId() + ElMessage.error(exportTaskProgress.error || exportTaskProgress.message || '导出任务失败') + return + } + + scheduleExportPolling() + } catch { + scheduleExportPolling(2000) + } + } + + async function submitExportTask(payload: OrderAsyncExportPayload) { + if (exportLoading.value) return + exportLoading.value = true + resetExportProgress() + exportDialogVisible.value = true + try { + const res: any = await orderExport(payload) + if (!isOrderIndexApiSuccess(res)) { + throw new Error(res?.message || '导出任务提交失败') + } + const data = parseOrderExportTaskPayload(res) + const taskId = String(data.task_id || data.taskId || '').trim() + if (!taskId) { + throw new Error(res?.message || '导出任务提交失败') + } + exportTaskProgress.taskId = taskId + exportTaskProgress.status = String(data.status || 'submitted') + exportTaskProgress.progress = Number.isFinite(Number(data.progress)) ? Number(data.progress) : 0 + exportTaskProgress.message = String(data.message || '任务已受理') + exportTaskProgress.error = String(data.error || '') + exportTaskProgress.updateTime = Number(data.update_time || data.updateTime || 0) + saveExportTaskId(taskId) + scheduleExportPolling(800) + } catch (error: any) { + exportLoading.value = false + exportDialogVisible.value = false + resetExportProgress() + ElMessage.error(error?.message || '导出任务提交失败') + } + } + + const exportProgressPercent = computed(() => { + const value = Number(exportTaskProgress.progress || 0) + if (!Number.isFinite(value)) return 0 + return Math.max(0, Math.min(100, value)) + }) + + const exportProgressStatus = computed(() => { + if (exportTaskProgress.status === 'failed' || exportTaskProgress.status === 'not_found') { + return 'exception' + } + if (exportTaskProgress.status === 'success' || exportProgressPercent.value >= 100) { + return 'success' + } + return undefined + }) + + const exportStatusLabel = computed(() => { + const map: Record = { + submitted: '已提交', + running: '执行中', + success: '已完成', + failed: '失败', + not_found: '未找到' + } + return map[exportTaskProgress.status] || exportTaskProgress.status || '—' + }) + + onBeforeUnmount(() => { + stopExportPolling() + }) + + return { + exportLoading, + exportDialogVisible, + exportTaskProgress, + exportProgressPercent, + exportProgressStatus, + exportStatusLabel, + submitExportTask, + refreshExportTaskProgress, + resetExportProgress, + stopExportPolling + } +} diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index 631af11b..2acd7787 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -61,6 +61,8 @@ export default { // 'StoreIndex':'Store', 'expressinterface':'Express Interface', 'shops':'Shops', + 'packageMaterial':'Package Material', + 'packageSupplier':'Package Supplier', }, "login": { "title": "Login", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index 83ffb89b..9f9a2fd5 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -62,6 +62,8 @@ export default { // 'StoreIndex':'货主', 'expressinterface':'快递接口', 'shops':'店铺管理', + 'packageMaterial':'包材管理', + 'packageSupplier':'包装供应商', }, "login": { "title": "登录", diff --git a/src/router/map.ts b/src/router/map.ts index 2a3e0030..e8a00f88 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -39,4 +39,6 @@ export const componentMap: Record = { 'system/setting/expressinterface/index':() => import('@/views/system/setting/expressinterface/index.vue'), 'system/setting/encoding/index':() => import('@/views/system/setting/encoding/index.vue'), 'system/setting/shops/index':() => import('@/views/system/setting/shops/index.vue'), + 'material/packageMaterial/index':() => import('@/views/material/packageMaterial/index.vue'), + 'material/packageSupplier/index':() => import('@/views/material/packageSupplier/index.vue'), }; \ No newline at end of file diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue new file mode 100644 index 00000000..a86b8376 --- /dev/null +++ b/src/views/material/packageMaterial/index.vue @@ -0,0 +1,578 @@ + + + + + diff --git a/src/views/material/packageMaterial/package-material-config.ts b/src/views/material/packageMaterial/package-material-config.ts new file mode 100644 index 00000000..b617c129 --- /dev/null +++ b/src/views/material/packageMaterial/package-material-config.ts @@ -0,0 +1,252 @@ +export type PackageMaterialRecord = { + id?: number + material_code?: string + material_name?: string + material_type?: string + spec?: string + length?: number + width?: number + height?: number + weight?: number + cost_price?: number + status?: number + created_at?: string + updated_at?: string +} + +export const packageMaterialColumns = [ + { prop: 'id', label: 'ID', width: '80', sortable: true }, + { prop: 'material_code', label: '包材编码', minWidth: '130', showOverflowTooltip: true }, + { prop: 'material_name', label: '包材名称', minWidth: '150', showOverflowTooltip: true }, + { prop: 'material_type', label: '包材类型', minWidth: '110', showOverflowTooltip: true }, + { prop: 'spec', label: '规格', minWidth: '120', showOverflowTooltip: true }, + { prop: 'dimensions', label: '尺寸(L×W×H)', minWidth: '140', align: 'center' }, + { prop: 'weight', label: '重量', width: '90', align: 'right' }, + { prop: 'cost_price', label: '成本价', width: '100', align: 'right' }, + { prop: 'status', label: '状态', width: '90', align: 'center' }, + { prop: 'actions', label: '操作', width: '150', align: 'center', fixed: 'right' } +] + +export const packageMaterialScanFields = [ + { + value: 'quickWhere', + label: '关键词', + type: 'text', + placeholder: '编码/名称/类型', + operators: ['contains'], + defaultOperator: 'contains' + }, + { + value: 'material_code', + label: '包材编码', + type: 'text', + placeholder: '请输入包材编码', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'material_name', + label: '包材名称', + type: 'text', + placeholder: '请输入包材名称', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'material_type', + label: '包材类型', + type: 'text', + placeholder: '请输入包材类型', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'status', + label: '状态', + type: 'select', + clearable: true, + options: [ + { label: '启用', value: '1' }, + { label: '停用', value: '0' } + ] + }, + { + value: 'id', + label: 'ID', + type: 'number', + placeholder: '包材 ID', + operators: ['eq', 'ne'], + defaultOperator: 'eq' + } +] + +function getFieldConfig(key: string, fields: typeof packageMaterialScanFields) { + return fields.find((f) => f.value === key) +} + +function mapFieldType(type: string, value: unknown) { + if (type === 'daterange' || Array.isArray(value)) return 'daterange' + if (type === 'number' || typeof value === 'number') return 'number' + return 'text' +} + +function processConditionValue(key: string, raw: any, fields: typeof packageMaterialScanFields) { + if (key === 'quickWhere') { + const val = raw?.value !== undefined ? raw.value : raw + const text = val == null ? '' : String(val).trim() + return text ? text : null + } + + const config = getFieldConfig(key, fields) + const fieldType = config?.type || 'text' + + if (raw && typeof raw === 'object' && !Array.isArray(raw)) { + const op = raw.operator || (fieldType === 'select' ? 'eq' : fieldType === 'number' ? 'eq' : 'contains') + const type = raw.type || mapFieldType(fieldType, raw.value) + + if (['isnull', 'isnotnull'].includes(op)) { + return { operator: op, value: null, type } + } + + const val = raw.value !== undefined ? raw.value : raw + if (val === null || val === undefined || val === '' || (Array.isArray(val) && val.length === 0)) { + return null + } + + if (fieldType === 'select') { + return { operator: op || 'eq', value: val, type: 'text' } + } + + return { operator: op, value: val, type } + } + + if (raw === null || raw === undefined || raw === '' || (Array.isArray(raw) && raw.length === 0)) { + return null + } + + const simpleOp = fieldType === 'select' || fieldType === 'number' ? 'eq' : 'contains' + return { operator: simpleOp, value: raw, type: mapFieldType(fieldType, raw) } +} + +export function normalizePackageMaterialScanConditionToWhere( + condition: any, + fields: typeof packageMaterialScanFields = packageMaterialScanFields +): Record { + if (!condition) return {} + + const conds = + condition?.conditions && typeof condition.conditions === 'object' + ? condition.conditions + : condition && typeof condition === 'object' + ? condition + : null + + if (!conds) return {} + + const where: Record = {} + for (const key of Object.keys(conds)) { + const result = processConditionValue(key, conds[key], fields) + if (result == null) continue + if (key === 'quickWhere' && typeof result === 'string') { + where.quickWhere = result + } else { + where[key] = result + } + } + return where +} + +export function formatPackageMaterialStatus(status: string | number | undefined) { + const raw = String(status ?? '').trim() + if (!raw) return { text: '--', type: 'info' as const } + if (['1', 'ACTIVE', 'ENABLED', 'ENABLE'].includes(raw)) { + return { text: '启用', type: 'success' as const } + } + if (['0', 'INACTIVE', 'DISABLED', 'DISABLE'].includes(raw)) { + return { text: '停用', type: 'danger' as const } + } + return { text: String(status), type: 'info' as const } +} + +export function formatDimensions(row: PackageMaterialRecord): string { + const parts = [row.length, row.width, row.height].map((v) => { + if (v === null || v === undefined) return null + return String(v) + }) + const valid = parts.filter(Boolean) + return valid.length ? valid.join(' × ') : '--' +} + +export function formatNumber(value: unknown, digits = 2): string { + if (value === null || value === undefined || value === '') return '--' + const num = Number(value) + if (!Number.isFinite(num)) return String(value) + return Number.isInteger(num) ? String(num) : num.toFixed(digits) +} + +export function buildPackageMaterialListPayload(options: { + page: number + pageSize: number + where?: Record +}) { + const payload: Record = { + page: options.page, + pageSize: options.pageSize, + pagination: { + page: options.page, + pageSize: options.pageSize + } + } + if (options.where && Object.keys(options.where).length) { + payload.where = options.where + } + return payload +} + +/** 兼容 setting.packageMaterial.get 扁平响应与 data 嵌套响应 */ +export function parsePackageMaterialListResponse(res: any): { + list: PackageMaterialRecord[] + total: number + page?: number + pageSize?: number +} { + const pick = (obj: any) => { + if (Array.isArray(obj)) { + return { list: obj as PackageMaterialRecord[], total: obj.length, page: undefined, pageSize: undefined } + } + if (!obj || typeof obj !== 'object') { + return { list: [] as PackageMaterialRecord[], total: 0, page: undefined, pageSize: undefined } + } + const list = Array.isArray(obj.list) + ? obj.list + : Array.isArray(obj.records) + ? obj.records + : Array.isArray(obj.items) + ? obj.items + : [] + const total = Number(obj.pagination?.total ?? obj.total ?? obj.count ?? 0) + const page = Number(obj.page ?? obj.pagination?.page) + const pageSize = Number(obj.page_size ?? obj.pageSize ?? obj.pagination?.pageSize) + return { + list, + total: Number.isFinite(total) ? total : list.length, + page: Number.isFinite(page) && page > 0 ? page : undefined, + pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : undefined + } + } + + const nested = res?.data + if (Array.isArray(nested)) return pick(nested) + if ( + nested && + typeof nested === 'object' && + (Array.isArray(nested.list) || + nested.total !== undefined || + nested.page !== undefined || + nested.page_size !== undefined) + ) { + return pick(nested) + } + + return pick(res) +} diff --git a/src/views/material/packageSupplier/index.vue b/src/views/material/packageSupplier/index.vue new file mode 100644 index 00000000..5345f2e2 --- /dev/null +++ b/src/views/material/packageSupplier/index.vue @@ -0,0 +1,456 @@ + + + + + diff --git a/src/views/material/packageSupplier/package-supplier-config.ts b/src/views/material/packageSupplier/package-supplier-config.ts new file mode 100644 index 00000000..8dd362c4 --- /dev/null +++ b/src/views/material/packageSupplier/package-supplier-config.ts @@ -0,0 +1,236 @@ +export type PackageSupplierRecord = { + id?: number + supplier_code?: string + supplier_name?: string + contact_name?: string + contact_phone?: string + status?: number + created_at?: string + updated_at?: string +} + +export const packageSupplierColumns = [ + { prop: 'id', label: 'ID', width: '80', sortable: true }, + { prop: 'supplier_code', label: '供应商编码', minWidth: '130', showOverflowTooltip: true }, + { prop: 'supplier_name', label: '供应商名称', minWidth: '160', showOverflowTooltip: true }, + { prop: 'contact_name', label: '联系人', minWidth: '120', showOverflowTooltip: true }, + { prop: 'contact_phone', label: '联系电话', minWidth: '140', showOverflowTooltip: true }, + { prop: 'status', label: '状态', width: '90', align: 'center' }, + { prop: 'actions', label: '操作', width: '150', align: 'center', fixed: 'right' } +] + +export const packageSupplierScanFields = [ + { + value: 'quickWhere', + label: '关键词', + type: 'text', + placeholder: '编码/名称/联系人/电话', + operators: ['contains'], + defaultOperator: 'contains' + }, + { + value: 'supplier_code', + label: '供应商编码', + type: 'text', + placeholder: '请输入供应商编码', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'supplier_name', + label: '供应商名称', + type: 'text', + placeholder: '请输入供应商名称', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'contact_name', + label: '联系人', + type: 'text', + placeholder: '请输入联系人', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'contact_phone', + label: '联系电话', + type: 'text', + placeholder: '请输入联系电话', + operators: ['eq', 'contains', 'like'], + defaultOperator: 'contains' + }, + { + value: 'status', + label: '状态', + type: 'select', + clearable: true, + options: [ + { label: '启用', value: '1' }, + { label: '停用', value: '0' } + ] + }, + { + value: 'id', + label: 'ID', + type: 'number', + placeholder: '供应商 ID', + operators: ['eq', 'ne'], + defaultOperator: 'eq' + } +] + +function getFieldConfig(key: string, fields: typeof packageSupplierScanFields) { + return fields.find((f) => f.value === key) +} + +function mapFieldType(type: string, value: unknown) { + if (type === 'daterange' || Array.isArray(value)) return 'daterange' + if (type === 'number' || typeof value === 'number') return 'number' + return 'text' +} + +function processConditionValue(key: string, raw: any, fields: typeof packageSupplierScanFields) { + if (key === 'quickWhere') { + const val = raw?.value !== undefined ? raw.value : raw + const text = val == null ? '' : String(val).trim() + return text ? text : null + } + + const config = getFieldConfig(key, fields) + const fieldType = config?.type || 'text' + + if (raw && typeof raw === 'object' && !Array.isArray(raw)) { + const op = raw.operator || (fieldType === 'select' ? 'eq' : fieldType === 'number' ? 'eq' : 'contains') + const type = raw.type || mapFieldType(fieldType, raw.value) + + if (['isnull', 'isnotnull'].includes(op)) { + return { operator: op, value: null, type } + } + + const val = raw.value !== undefined ? raw.value : raw + if (val === null || val === undefined || val === '' || (Array.isArray(val) && val.length === 0)) { + return null + } + + if (fieldType === 'select') { + return { operator: op || 'eq', value: val, type: 'text' } + } + + return { operator: op, value: val, type } + } + + if (raw === null || raw === undefined || raw === '' || (Array.isArray(raw) && raw.length === 0)) { + return null + } + + const simpleOp = fieldType === 'select' || fieldType === 'number' ? 'eq' : 'contains' + return { operator: simpleOp, value: raw, type: mapFieldType(fieldType, raw) } +} + +export function normalizePackageSupplierScanConditionToWhere( + condition: any, + fields: typeof packageSupplierScanFields = packageSupplierScanFields +): Record { + if (!condition) return {} + + const conds = + condition?.conditions && typeof condition.conditions === 'object' + ? condition.conditions + : condition && typeof condition === 'object' + ? condition + : null + + if (!conds) return {} + + const where: Record = {} + for (const key of Object.keys(conds)) { + const result = processConditionValue(key, conds[key], fields) + if (result == null) continue + if (key === 'quickWhere' && typeof result === 'string') { + where.quickWhere = result + } else { + where[key] = result + } + } + return where +} + +export function formatPackageSupplierStatus(status: string | number | undefined) { + const raw = String(status ?? '').trim() + if (!raw) return { text: '--', type: 'info' as const } + if (['1', 'ACTIVE', 'ENABLED', 'ENABLE'].includes(raw)) { + return { text: '启用', type: 'success' as const } + } + if (['0', 'INACTIVE', 'DISABLED', 'DISABLE'].includes(raw)) { + return { text: '停用', type: 'danger' as const } + } + return { text: String(status), type: 'info' as const } +} + +export function buildPackageSupplierListPayload(options: { + page: number + pageSize: number + where?: Record +}) { + const payload: Record = { + page: options.page, + pageSize: options.pageSize, + pagination: { + page: options.page, + pageSize: options.pageSize + } + } + if (options.where && Object.keys(options.where).length) { + payload.where = options.where + } + return payload +} + +/** 兼容 setting.packageSupplier.get 扁平响应与 data 嵌套响应 */ +export function parsePackageSupplierListResponse(res: any): { + list: PackageSupplierRecord[] + total: number + page?: number + pageSize?: number +} { + const pick = (obj: any) => { + if (Array.isArray(obj)) { + return { list: obj as PackageSupplierRecord[], total: obj.length, page: undefined, pageSize: undefined } + } + if (!obj || typeof obj !== 'object') { + return { list: [] as PackageSupplierRecord[], total: 0, page: undefined, pageSize: undefined } + } + const list = Array.isArray(obj.list) + ? obj.list + : Array.isArray(obj.records) + ? obj.records + : Array.isArray(obj.items) + ? obj.items + : [] + const total = Number(obj.pagination?.total ?? obj.total ?? obj.count ?? 0) + const page = Number(obj.page ?? obj.pagination?.page) + const pageSize = Number(obj.page_size ?? obj.pageSize ?? obj.pagination?.pageSize) + return { + list, + total: Number.isFinite(total) ? total : list.length, + page: Number.isFinite(page) && page > 0 ? page : undefined, + pageSize: Number.isFinite(pageSize) && pageSize > 0 ? pageSize : undefined + } + } + + const nested = res?.data + if (Array.isArray(nested)) return pick(nested) + if ( + nested && + typeof nested === 'object' && + (Array.isArray(nested.list) || + nested.total !== undefined || + nested.page !== undefined || + nested.page_size !== undefined) + ) { + return pick(nested) + } + + return pick(res) +} diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 8a5a6631..d37f693f 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -82,7 +82,7 @@ - + @@ -112,6 +112,17 @@ + + @@ -137,7 +148,8 @@ import { import PendingOrderDetailPanel from './component/PendingOrderDetailPanel.vue' import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' import log from './component/log.vue' -import { exportUpperTableRows } from './utils/export' +import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' +import { createOrderPageExport } from './utils/order-page-export' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -152,7 +164,6 @@ const activeTab = ref('detail') const list = ref([]) const loading = ref(false) -const exportLoading = ref(false) const queryTime = ref(0) const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) @@ -221,21 +232,12 @@ async function loadData() { loading.value = true const start = Date.now() try { - let where = buildWhereConditions(scanBox.value?.getConditions?.() || {}) - if (quickSearch.value) { - where.delivery_order_code = { - operator: 'like', - value: quickSearch.value, - type: 'text' - } - } - where = sanitizeArchiveListWhere(where) const params = { pagination: { page: pagination.currentPage, pageSize: pagination.pageSize }, - where, + where: buildWhere(), sort: { sortField: 'updated_at', sortOrder: 'DESC' as const @@ -282,6 +284,43 @@ function buildWhereConditions(rawConditions: Record) { return where } +function buildWhere() { + let where = buildWhereConditions(scanBox.value?.getConditions?.() || {}) + if (quickSearch.value) { + where.delivery_order_code = { + operator: 'like', + value: quickSearch.value, + type: 'text' + } + } + return sanitizeArchiveListWhere(where) +} + +const pageExport = createOrderPageExport({ + scopeKey: 'archiveOrder', + buildWhere, + buildSort: () => ({ + sortField: 'updated_at', + sortOrder: 'DESC' + }), + selectionRows, + columns, + fileNamePrefix: '归档订单', + storageKey: 'orderManagement:archiveOrder:exportTaskId' +}) + +const { + exportLoading, + exportSelectionLoading, + exportDialogVisible, + exportTaskProgress, + exportProgressPercent, + exportProgressStatus, + exportStatusLabel, + handleExport, + handleExportSelection +} = pageExport + async function loadFilterData() { try { const [storesRes, expressRes]: any = await Promise.all([ @@ -339,36 +378,18 @@ function onQuickSearch() { loadData() } -async function handleExport() { - if (!selectionRows.value.length) { - ElMessage.warning('请先勾选要导出的订单') - return - } - exportLoading.value = true - try { - exportUpperTableRows({ - rows: selectionRows.value, - columns: columns.value, - fileName: `归档订单-${Date.now()}.xlsx`, - transformCell: (prop, value) => translateOrderField(prop, value) - }) - ElMessage.success('导出完成') - } catch (error) { - ElMessage.error('导出失败') - } finally { - exportLoading.value = false - } -} - function openColumnConfigPanel() { upperTable.value?.openColumnConfig?.() } const buttonLoadingMap = computed>(() => ({ - exportLoading: exportLoading.value + exportLoading: exportLoading.value, + exportSelectionLoading: exportSelectionLoading.value })) -const buttonDisabledMap = computed>(() => ({})) +const buttonDisabledMap = computed>(() => ({ + hasNoSelection: selectionRows.value.length === 0 +})) const buttonLabelMap = computed>(() => ({ detailToggleLabel: detailVisible.value ? '隐藏详情' : '显示详情' @@ -377,6 +398,7 @@ const buttonLabelMap = computed>(() => ({ const { actionMap: toolbarActionMap } = createSimpleListToolbarController({ loadData, handleExport, + handleExportSelection, openColumnConfigPanel, toggleDetailVisible }) diff --git a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue new file mode 100644 index 00000000..98fc0bc5 --- /dev/null +++ b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue @@ -0,0 +1,344 @@ + + + + + diff --git a/src/views/order/orderManagement/component/OrderExportProgressDialog.vue b/src/views/order/orderManagement/component/OrderExportProgressDialog.vue new file mode 100644 index 00000000..fafe82fa --- /dev/null +++ b/src/views/order/orderManagement/component/OrderExportProgressDialog.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/order/orderManagement/component/OrderWorkbenchListDialog.vue b/src/views/order/orderManagement/component/OrderWorkbenchListDialog.vue new file mode 100644 index 00000000..20447438 --- /dev/null +++ b/src/views/order/orderManagement/component/OrderWorkbenchListDialog.vue @@ -0,0 +1,237 @@ + + + + + diff --git a/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue index c5164536..dc8deaf3 100644 --- a/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue +++ b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue @@ -41,7 +41,7 @@