From c2c19faa15d175e77d751f0a3cd02c96bb0c0a01 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 22 Apr 2026 19:54:18 +0800 Subject: [PATCH] =?UTF-8?q?4=E6=9C=8822?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 7 + package.json | 1 + .../order.archiveorder/orderarchiveorder.ts | 30 +- .../order.deliveryOrder/orderdeliveryOrder.ts | 30 +- .../orderdeliveryexpectionorder.ts | 30 +- .../order.entrustorder/orderentrustorder.ts | 30 +- .../orderexpectionorder.ts | 26 + .../order.outboundOrder/orderoutboundOrder.ts | 26 + .../order.pendingOrder/orderpendingOrder.ts | 26 + src/api/order.reviewOrder/orderreviewOrder.ts | 26 + .../order/orderManagement/archiveOrder.vue | 11 +- .../component/WorkbenchOrderDetail.vue | 240 ++ .../config/order-common-config.ts | 61 +- .../orderManagement/deliveryException.vue | 11 +- .../order/orderManagement/deliveryOrder.vue | 43 +- .../orderManagement/entrustWarehouse.vue | 11 +- .../order/orderManagement/exceptionOrder.vue | 204 +- .../order/orderManagement/orderWorkbench.vue | 26 +- .../order/orderManagement/outboundOrder.vue | 30 +- .../order/orderManagement/pendingOrder.vue | 731 +++++- .../order/orderManagement/reviewOrder.vue | 42 +- src/views/store/index.vue | 91 +- workflows/api-doc-agent/config/响应.md | 2026 ++++++++++++---- workflows/api-doc-agent/config/接口.md | 34 +- workflows/api-doc-system/apidata/config.json | 46 +- workflows/api-doc-system/apidata/data.json | 2155 ++++++++++++----- .../interface-details/interface-details.json | 665 ++++- .../data/module-list/module-list.json | 89 +- .../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 | 72 +- .../_module.lifecycle.json | 2 +- .../order.deliveryexpectionorder/module.json | 72 +- .../_module.lifecycle.json | 2 +- .../module/order.deliveryorder/module.json | 72 +- .../order.entrustorder/_module.lifecycle.json | 2 +- .../module/order.entrustorder/module.json | 72 +- .../_module.lifecycle.json | 2 +- .../module/order.expectionorder/module.json | 72 +- .../module/order.index/_module.lifecycle.json | 2 +- .../data/module/order.index/module.json | 72 +- .../_module.lifecycle.json | 2 +- .../module/order.outboundorder/module.json | 72 +- .../order.pendingorder/_module.lifecycle.json | 2 +- .../module/order.pendingorder/module.json | 77 +- .../order.revieworder/_module.lifecycle.json | 2 +- .../data/module/order.revieworder/module.json | 72 +- .../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 +- .../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 +- .../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.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 +- 88 files changed, 5952 insertions(+), 1593 deletions(-) create mode 100644 src/views/order/orderManagement/component/WorkbenchOrderDetail.vue diff --git a/package-lock.json b/package-lock.json index 594aac00..5979ccca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@types/nprogress": "^0.2.3", "@vueuse/core": "^14.2.1", "axios": "^1.13.6", + "china-division": "^2.7.0", "dayjs": "^1.11.19", "echarts": "^6.0.0", "element-plus": "^2.13.3", @@ -3379,6 +3380,12 @@ "node": ">=0.8.0" } }, + "node_modules/china-division": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/china-division/-/china-division-2.7.0.tgz", + "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA==", + "license": "MIT" + }, "node_modules/chokidar": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", diff --git a/package.json b/package.json index cd51865f..430bf80f 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@types/nprogress": "^0.2.3", "@vueuse/core": "^14.2.1", "axios": "^1.13.6", + "china-division": "^2.7.0", "dayjs": "^1.11.19", "echarts": "^6.0.0", "element-plus": "^2.13.3", diff --git a/src/api/order.archiveorder/orderarchiveorder.ts b/src/api/order.archiveorder/orderarchiveorder.ts index cbf6bc6c..f2a705c9 100644 --- a/src/api/order.archiveorder/orderarchiveorder.ts +++ b/src/api/order.archiveorder/orderarchiveorder.ts @@ -20,6 +20,17 @@ export type ArchiveOrderListParams = { sort?: OrderSort } +export type ArchiveOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export function orderArchiveOrderList(data: ArchiveOrderListParams = {}): Promise { return request({ url: '/system', @@ -34,6 +45,21 @@ export function orderArchiveOrderList(data: ArchiveOrderListParams = {}): Promis } as any) } -export const orderArchiveOrder = { - list: orderArchiveOrderList +export function orderArchiveOrderDetail(data: ArchiveOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.archiveOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +export const orderArchiveOrder = { + list: orderArchiveOrderList, + detail: orderArchiveOrderDetail } diff --git a/src/api/order.deliveryOrder/orderdeliveryOrder.ts b/src/api/order.deliveryOrder/orderdeliveryOrder.ts index bc8727e8..7d40e0b1 100644 --- a/src/api/order.deliveryOrder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryOrder/orderdeliveryOrder.ts @@ -20,6 +20,17 @@ export type DeliveryOrderListParams = { sort?: OrderSort } +export type DeliveryOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Promise { return request({ url: '/system', @@ -34,6 +45,21 @@ export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Prom } as any) } -export const orderDeliveryOrder = { - list: orderDeliveryOrderList +export function orderDeliveryOrderDetail(data: DeliveryOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.deliveryOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +export const orderDeliveryOrder = { + list: orderDeliveryOrderList, + detail: orderDeliveryOrderDetail } diff --git a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts index 26c131f6..b3d94e62 100644 --- a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts +++ b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts @@ -20,6 +20,17 @@ export type DeliveryExpectionOrderListParams = { sort?: OrderSort } +export type DeliveryExpectionOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export function orderDeliveryExpectionOrderList(data: DeliveryExpectionOrderListParams = {}): Promise { return request({ url: '/system', @@ -34,6 +45,21 @@ export function orderDeliveryExpectionOrderList(data: DeliveryExpectionOrderList } as any) } -export const orderDeliveryExpectionOrder = { - list: orderDeliveryExpectionOrderList +export function orderDeliveryExpectionOrderDetail(data: DeliveryExpectionOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.deliveryExpectionOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +export const orderDeliveryExpectionOrder = { + list: orderDeliveryExpectionOrderList, + detail: orderDeliveryExpectionOrderDetail } diff --git a/src/api/order.entrustorder/orderentrustorder.ts b/src/api/order.entrustorder/orderentrustorder.ts index b745aedf..16bd4936 100644 --- a/src/api/order.entrustorder/orderentrustorder.ts +++ b/src/api/order.entrustorder/orderentrustorder.ts @@ -20,6 +20,17 @@ export type EntrustOrderListParams = { sort?: OrderSort } +export type EntrustOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export function orderEntrustOrderList(data: EntrustOrderListParams = {}): Promise { return request({ url: '/system', @@ -34,6 +45,21 @@ export function orderEntrustOrderList(data: EntrustOrderListParams = {}): Promis } as any) } -export const orderEntrustOrder = { - list: orderEntrustOrderList +export function orderEntrustOrderDetail(data: EntrustOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.entrustOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +export const orderEntrustOrder = { + list: orderEntrustOrderList, + detail: orderEntrustOrderDetail } diff --git a/src/api/order.expectionorder/orderexpectionorder.ts b/src/api/order.expectionorder/orderexpectionorder.ts index 805476e7..bc9989f3 100644 --- a/src/api/order.expectionorder/orderexpectionorder.ts +++ b/src/api/order.expectionorder/orderexpectionorder.ts @@ -20,6 +20,17 @@ export type ExpectionOrderListParams = { sort?: OrderSort } +export type ExpectionOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export type ExpectionOrderResolveExceptionParams = { ids: number[] } @@ -54,7 +65,22 @@ export function orderExpectionOrderResolveException( } as any) } +export function orderExpectionOrderDetail(data: ExpectionOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.expectionOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export const orderExpectionOrder = { list: orderExpectionOrderList, + detail: orderExpectionOrderDetail, resolveException: orderExpectionOrderResolveException } diff --git a/src/api/order.outboundOrder/orderoutboundOrder.ts b/src/api/order.outboundOrder/orderoutboundOrder.ts index 639d4fd9..321ad0e4 100644 --- a/src/api/order.outboundOrder/orderoutboundOrder.ts +++ b/src/api/order.outboundOrder/orderoutboundOrder.ts @@ -20,6 +20,17 @@ export type OutboundOrderListParams = { sort?: OrderSort } +export type OutboundOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export type ManualOutboundParams = { warehouseId?: number warehouse_id?: number @@ -56,7 +67,22 @@ export function orderOutboundOrderManualOutboundOrder(data: ManualOutboundParams } as any) } +export function orderOutboundOrderDetail(data: OutboundOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.outboundOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export const orderOutboundOrder = { list: orderOutboundOrderList, + detail: orderOutboundOrderDetail, manualOutboundOrder: orderOutboundOrderManualOutboundOrder } diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 0e137810..bb309e9a 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -22,6 +22,17 @@ export type PendingOrderListParams = { sort?: OrderSort; }; +export type PendingOrderDetailParams = { + ids?: Array | string | number; + id?: number | string; + order_id?: number | string; + orderId?: number | string; + tableType?: string; + tablePosition?: string; + type?: string; + moduleName?: string; +}; + /** markPendingOutboundOrder / cancelOrder:文档要求订单 ID 正整数数组,不支持单 id 或逗号字符串 */ export type PendingOrderIdsParams = { ids: number[]; @@ -128,6 +139,20 @@ export function orderPendingOrderReverseReviewOrder( } as any); } +export function orderPendingOrderDetail(data: PendingOrderDetailParams): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.detail", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderMarkPendingOutboundOrder( data: PendingOrderIdsParams, ): Promise { @@ -298,6 +323,7 @@ export function orderPendingOrderImportOrdersFromExcel( export const orderPendingOrder = { list: orderPendingOrderList, + detail: orderPendingOrderDetail, reverseReviewOrder: orderPendingOrderReverseReviewOrder, markPendingOutboundOrder: orderPendingOrderMarkPendingOutboundOrder, cancelOrder: orderPendingOrderCancelOrder, diff --git a/src/api/order.reviewOrder/orderreviewOrder.ts b/src/api/order.reviewOrder/orderreviewOrder.ts index d62c1010..ba2bf7e2 100644 --- a/src/api/order.reviewOrder/orderreviewOrder.ts +++ b/src/api/order.reviewOrder/orderreviewOrder.ts @@ -20,6 +20,17 @@ export type ReviewOrderListParams = { sort?: OrderSort } +export type ReviewOrderDetailParams = { + ids?: Array | string | number + id?: number | string + order_id?: number | string + orderId?: number | string + tableType?: string + tablePosition?: string + type?: string + moduleName?: string +} + export type ReviewOrderSubmitParams = { ids: Array } @@ -52,7 +63,22 @@ export function orderReviewOrderReviewOrder(data: ReviewOrderSubmitParams): Prom } as any) } +export function orderReviewOrderDetail(data: ReviewOrderDetailParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.reviewOrder.detail', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export const orderReviewOrder = { list: orderReviewOrderList, + detail: orderReviewOrderDetail, reviewOrder: orderReviewOrderReviewOrder } diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 821e17a2..b243f19e 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -64,7 +64,7 @@
- + @@ -72,8 +72,8 @@
-
- +
+

履约历程加载中...

@@ -105,11 +105,10 @@ import { orderArchiveOrder } from '@/api/order.archiveorder/orderarchiveorder' import { archiveAvailableFields, archiveColumns, - archiveOrderDetail, translateOrderField, getTagType } from './config/order-common-config' -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -119,7 +118,7 @@ const upperTable = ref(null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields))) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) diff --git a/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue b/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue new file mode 100644 index 00000000..0a47399e --- /dev/null +++ b/src/views/order/orderManagement/component/WorkbenchOrderDetail.vue @@ -0,0 +1,240 @@ + + + + + diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 3d83a6f6..a29fe817 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -352,23 +352,25 @@ export const deliverybuttonList: any[] = [ // revieworder相关配置 export const reviewAvailableFields = [ - { label: '货主', value: 'store_id', type: 'select', options: [] }, { label: '发货单号', value: 'delivery_order_code', type: 'text' }, { label: '店铺名称', value: 'shop_nick', type: 'text' }, - { label: '来源平台', value: 'source_platform_name', type: 'text' }, + { label: '平台编码', value: 'sys_platform_code', type: 'text' }, { label: '收货人', value: 'name', type: 'text' }, { label: '手机号', value: 'mobile', type: 'text' }, + { label: '订单状态', value: 'status', type: 'select', options: [ { label: '待审核', value: 'pedding' }, { label: '已创建', value: 'created' }, { label: '错误', value: 'error' } ] }, { label: '是否紧急', value: 'is_urgency', type: 'select', options: [ { label: '是', value: 'Y' }, { label: '否', value: 'N' } ] }, + { label: '同步状态', value: 'sync_status', type: 'select', options: [ { label: '待同步', value: 'padding' }, { label: '已完成', value: 'fin' }, { label: '错误', value: 'error' }, { label: '未同步', value: 'none' } ] }, { label: '创建时间', value: 'create_at', type: 'daterange' }, ] export const reviewColums = [ { prop: 'delivery_order_code', label: '发货单号', width: '170' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, - { prop: 'source_platform_code', label: '平台来源', width: '100' }, + { prop: 'sys_platform_code', label: '平台编码', width: '100' }, { prop: 'name', label: '收货人', width: '110' }, { prop: 'mobile', label: '手机号', width: '120' }, { prop: 'status', label: '订单状态', width: '100' }, + { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, { prop: 'items_total', label: '商品总数', width: '100' }, @@ -385,18 +387,18 @@ export const reviewOrderDetail = [ { prop: 'pre_delivery_order_code', label: '前置单号' }, { prop: 'order_type', label: '订单类型' }, { prop: 'order_flag', label: '订单标记' }, - { prop: 'source_platform_name', label: '来源平台' }, + { prop: 'sys_platform_name', label: '来源平台' }, + { prop: 'sys_platform_code', label: '平台编码' }, { prop: 'shop_nick', label: '店铺名称' }, { prop: 'buyer_nick', label: '买家昵称' }, { prop: 'seller_nick', label: '卖家昵称' }, { prop: 'status', label: '订单状态' }, - { prop: 'step', label: '流程步骤' }, { prop: 'is_urgency', label: '是否紧急' }, { prop: 'invoice_flag', label: '发票标记' }, { prop: 'sync_status', label: '同步状态' }, - { prop: 'store_id', label: '货主ID' }, - { prop: 'warehouse_id', label: '仓库ID' }, - { prop: 'warehouse_code', label: '仓库编码' }, + { prop: 'inspection_status', label: '审核状态' }, + { prop: 'source_order_codes', label: '来源单号' }, + { prop: 'pay_no', label: '支付单号' }, // 金额与商品 { prop: 'total_amount', label: '订单总金额' }, @@ -414,18 +416,22 @@ export const reviewOrderDetail = [ { prop: 'name', label: '收货人' }, { prop: 'mobile', label: '手机号码' }, { prop: 'tel', label: '固定电话' }, - { prop: 'full_address', label: '完整地址', span: 2 }, + { prop: 'province', label: '省份' }, + { prop: 'city', label: '城市' }, + { prop: 'area', label: '区县' }, + { prop: 'town', label: '镇街' }, + { prop: 'detail_address', label: '详细地址', span: 2 }, + { prop: 'zip_code', label: '邮编' }, { prop: 'logistics_name', label: '物流公司' }, - { prop: 'logistics_code', label: '物流编码' }, - { prop: 'express_code', label: '物流单号' }, + { prop: 'waybill_codes', label: '物流单号' }, { prop: 'delivery_type', label: '发货类型' }, - { prop: 'logistics_area_code', label: '物流区域编码' }, + { prop: 'weight_type', label: '重量类型' }, // 时间信息 { prop: 'place_order_time', label: '下单时间' }, { prop: 'pay_time', label: '支付时间' }, + { prop: 'delivery_time', label: '配送时间' }, { prop: 'create_at', label: '创建时间' }, - { prop: 'updated_at', label: '更新时间' }, { prop: 'operator_name', label: '审核人' }, { prop: 'operate_time', label: '审核时间' }, ] @@ -463,7 +469,8 @@ export const pendingAvailableFields = [ export const pendingCloums = [ { prop: 'delivery_order_code', label: '发货单号', width: '170' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, - { prop: 'source_platform_code', label: '平台来源', width: '100' }, + { prop: 'sys_platform_name', label: '平台来源', width: '120' }, + { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'name', label: '收货人', width: '100' }, { prop: 'mobile', label: '手机号', width: '120' }, { prop: 'status', label: '订单状态', width: '100' }, @@ -474,7 +481,6 @@ export const pendingCloums = [ { prop: 'pack_status', label: '打包状态', width: '100' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, { prop: 'waybill_codes', label: '物流单号', width: '160', formatter: waybillCodesFormatter }, - { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'total_amount', label: '订单金额', width: '110' }, { prop: 'items_count', label: '商品种类', width: '100' }, { prop: 'items_total', label: '商品总数', width: '100' }, @@ -490,18 +496,17 @@ export const pendingOrderDetail = [ { prop: 'pre_delivery_order_code', label: '前置单号' }, { prop: 'order_type', label: '订单类型' }, { prop: 'order_flag', label: '订单标记' }, - { prop: 'source_platform_name', label: '来源平台' }, + { prop: 'sys_platform_name', label: '来源平台' }, + { prop: 'sys_platform_code', label: '平台编码' }, { prop: 'shop_nick', label: '店铺名称' }, { prop: 'buyer_nick', label: '买家昵称' }, { prop: 'seller_nick', label: '卖家昵称' }, { prop: 'status', label: '订单状态' }, { prop: 'sync_status', label: '同步状态' }, - { prop: 'step', label: '流程步骤' }, { prop: 'is_urgency', label: '是否紧急' }, { prop: 'invoice_flag', label: '发票标记' }, - { prop: 'store_id', label: '货主ID' }, - { prop: 'warehouse_id', label: '仓库ID' }, - { prop: 'warehouse_code', label: '仓库编码' }, + { prop: 'source_order_codes', label: '来源单号' }, + { prop: 'pay_no', label: '支付单号' }, // 金额与商品 { prop: 'total_amount', label: '订单总金额' }, @@ -519,18 +524,22 @@ export const pendingOrderDetail = [ { prop: 'name', label: '收货人' }, { prop: 'mobile', label: '手机号码' }, { prop: 'tel', label: '固定电话' }, - { prop: 'full_address', label: '完整地址', span: 2 }, + { prop: 'province', label: '省份' }, + { prop: 'city', label: '城市' }, + { prop: 'area', label: '区县' }, + { prop: 'town', label: '镇街' }, + { prop: 'detail_address', label: '详细地址', span: 2 }, + { prop: 'zip_code', label: '邮编' }, { prop: 'logistics_name', label: '物流公司' }, - { prop: 'logistics_code', label: '物流编码' }, - { prop: 'express_code', label: '物流单号' }, + { prop: 'waybill_codes', label: '物流单号' }, { prop: 'delivery_type', label: '发货服务类型' }, - { prop: 'logistics_area_code', label: '快递区域编码' }, + { prop: 'weight_type', label: '重量类型' }, // 时间信息 { prop: 'place_order_time', label: '下单时间' }, { prop: 'pay_time', label: '支付时间' }, + { prop: 'delivery_time', label: '配送时间' }, { prop: 'create_at', label: '创建时间' }, - { prop: 'updated_at', label: '更新时间' }, { prop: 'operator_name', label: '操作人' }, { prop: 'operate_time', label: '操作时间' }, ] @@ -602,7 +611,7 @@ export const workbenchColumns = [ { prop: 'name', label: '收货人', minWidth: 100 }, { prop: 'mobile', label: '手机号', minWidth: 120 }, { prop: 'is_urgency', label: '是否紧急', minWidth: 100 }, - { prop: 'status', label: '状态', minWidth: 120 }, + { prop: 'status', label: '订单状态', minWidth: 120 }, { prop: 'sync_status', label: '同步状态', minWidth: 110 }, { prop: 'inspection_status', label: '审核状态', minWidth: 110 }, { prop: 'outbound_status', label: '出库状态', minWidth: 120 }, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 94301b66..8ed48c6c 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -64,7 +64,7 @@
- + @@ -72,8 +72,8 @@
-
- +
+

履约历程加载中...

@@ -105,11 +105,10 @@ import { orderDeliveryExpectionOrder } from '@/api/order.deliveryexpectionorder/ import { archiveAvailableFields, archiveColumns, - archiveOrderDetail, translateOrderField, getTagType } from './config/order-common-config' -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -119,7 +118,7 @@ const upperTable = ref(null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields))) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 79c422fe..2150904f 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -116,7 +116,6 @@
- @@ -124,16 +123,12 @@
-
- -
-
- - - - - -
+
@@ -159,11 +154,10 @@ import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder import { deliveryAvailableFields, deliveryColumns, - pendingOrderDetail, translateOrderField, getTagType } from './config/order-common-config' -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -171,7 +165,7 @@ const scanBox = ref(null) const upperTable = ref(null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(deliveryAvailableFields))) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) const exportLoading = ref(false) @@ -188,23 +182,6 @@ const selectedRow = computed(() => { return list.value.find((i: any) => i.id === selectedOrderId.value) || null }) -const detailItemRows = computed(() => { - const rawItems = selectedRow.value?.items - if (!rawItems) return [] - const specs = String(rawItems) - .split(/[,\n;]/) - .map((item) => item.trim()) - .filter((item) => !!item) - return specs.map((spec, index) => { - const [sku, qty] = spec.split('+') - return { - index: index + 1, - sku: sku || '-', - qty: qty || '-' - } - }) -}) - onMounted(() => { loadData() }) @@ -335,9 +312,5 @@ async function handleExport() { diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index 0aceb864..37c66fa0 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -64,7 +64,7 @@
- + @@ -72,8 +72,8 @@
-
- +
+

履约历程加载中...

@@ -105,11 +105,10 @@ import { orderEntrustOrder } from '@/api/order.entrustorder/orderentrustorder' import { archiveAvailableFields, archiveColumns, - archiveOrderDetail, translateOrderField, getTagType } from './config/order-common-config' -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -119,7 +118,7 @@ const upperTable = ref(null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(archiveAvailableFields))) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 5dcd1c23..7dfe380c 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -36,6 +36,26 @@ > 分配快递号 + + 修改快递 + + + 修改平台 + + + + + + {{ updateOrderMetaOrderIds.length }} 条 + + + + + + + + +
@@ -259,7 +319,6 @@ import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder' import { expectionColumns, - expectionOrderDetail, expectionOrderAvailableFields, expectionOrderbuttonList, translateOrderField, @@ -275,7 +334,7 @@ const EXPORT_TIME_PROPS = new Set([ 'operate_time', 'delivery_time' ]) -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import { exportUpperTableRows } from './utils/export' const scanBox = ref(null) @@ -284,13 +343,14 @@ const upperTable = ref(null) const presetTree = ref([]) const availableFieldsRef = reactive(JSON.parse(JSON.stringify(expectionOrderAvailableFields))) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) const exportLoading = ref(false) const allocateLoading = ref(false) const storageAllocateLoading = ref(false) +const updateOrderMetaLoading = ref(false) const queryTime = ref(0) const allocateDialogVisible = ref(false) @@ -304,6 +364,14 @@ const storageForm = reactive<{ allowStorageLocation: boolean }>({ const resolveExceptionDialogVisible = ref(false) const resolveExceptionLoading = ref(false) const resolveExceptionOrderIds = ref([]) +const updateOrderMetaDialogVisible = ref(false) +const updateOrderMetaDialogMode = ref<'express' | 'platform'>('express') +const updateOrderMetaOrderIds = ref([]) +const updateOrderMetaForm = reactive({ + code: '' +}) +const expressCodeOptions = ref>([]) +const platformCodeOptions = ref>([]) const pagination = reactive({ currentPage: 1, pageSize: 20, total: 0 }) const tableSize = ref('small') @@ -320,14 +388,11 @@ const selectedRow = computed(() => { return list.value.find((i: any) => i.id === selectedOrderId.value) || null }) -function translateField(fieldValue: string, value: any) { - const field = availableFieldsRef.find((f: any) => f.value === fieldValue) - if (field && field.options) { - const option = field.options.find((opt: any) => opt.value === value) - return option ? option.label : value - } - return value -} +const updateOrderMetaOptions = computed(() => { + return updateOrderMetaDialogMode.value === 'express' + ? expressCodeOptions.value + : platformCodeOptions.value +}) function orderFlagFullText(row: any): string { const v = row?.order_flag @@ -381,6 +446,26 @@ function normalizePositiveIntId(raw: unknown): number | null { return n } +function normalizeCode(value: unknown) { + return String(value ?? '').trim() +} + +function mapCodeOptions(rawList: any[], codeKeys: string[], nameKeys: string[]) { + const result: Array<{ label: string; value: string }> = [] + const seen = new Set() + for (const item of rawList || []) { + const code = normalizeCode(codeKeys.map((k) => item?.[k]).find((v) => v !== undefined && v !== null && v !== '')) + if (!code || seen.has(code)) continue + const name = normalizeCode(nameKeys.map((k) => item?.[k]).find((v) => v !== undefined && v !== null && v !== '')) + result.push({ + value: code, + label: name ? `${code} - ${name}` : code + }) + seen.add(code) + } + return result +} + function getSelectedIds(): number[] { const ids: number[] = [] for (const item of selectionRows.value) { @@ -531,6 +616,7 @@ async function submitAllocateExpress() { onMounted(() => { loadData() loadFilterData() + loadOrderMetaOptions() }) async function loadData() { @@ -607,6 +693,24 @@ async function loadFilterData() { } catch (e) {} } +async function loadOrderMetaOptions() { + try { + const [expressRes, platformRes] = await Promise.all([ + indexApi.getExpressList({}), + indexApi.getPlatformList({}) + ]) + const expressData: any = expressRes?.data + const platformData: any = platformRes?.data + const expressRaw = expressData?.list || expressData || [] + const platformRaw = platformData?.list || platformData || [] + expressCodeOptions.value = mapCodeOptions(expressRaw, ['code', 'logistics_code', 'express_code'], ['name', 'logistics_name', 'express_name']) + platformCodeOptions.value = mapCodeOptions(platformRaw, ['code', 'platform_code'], ['name', 'platform_name']) + } catch { + expressCodeOptions.value = [] + platformCodeOptions.value = [] + } +} + function handleConditionChange() { pagination.currentPage = 1 loadData() @@ -705,6 +809,78 @@ async function submitResolveException() { } } +function openUpdateOrderMetaDialog(mode: 'express' | 'platform') { + if (!selectionRows.value.length) { + ElMessage.warning(mode === 'express' ? '请先勾选需要修改快递的订单' : '请先勾选需要修改平台的订单') + return + } + const ids = getSelectedIds() + if (!ids.length) { + ElMessage.error('选中行缺少订单 id,请刷新后重试') + return + } + updateOrderMetaDialogMode.value = mode + updateOrderMetaOrderIds.value = [...ids] + updateOrderMetaForm.code = '' + updateOrderMetaDialogVisible.value = true +} + +function openUpdateOrderExpressDialog() { + openUpdateOrderMetaDialog('express') +} + +function openUpdateOrderPlatformDialog() { + openUpdateOrderMetaDialog('platform') +} + +function resetUpdateOrderMetaDialog() { + updateOrderMetaDialogMode.value = 'express' + updateOrderMetaOrderIds.value = [] + updateOrderMetaForm.code = '' +} + +async function submitUpdateOrderMeta() { + if (updateOrderMetaLoading.value) return + const order_ids = [...updateOrderMetaOrderIds.value] + const code = normalizeCode(updateOrderMetaForm.code) + if (!order_ids.length) { + ElMessage.error('没有可提交的订单') + return + } + if (!code) { + ElMessage.warning(updateOrderMetaDialogMode.value === 'express' ? '请输入快递编码' : '请输入平台编码') + return + } + + updateOrderMetaLoading.value = true + try { + const res = + updateOrderMetaDialogMode.value === 'express' + ? await orderPendingOrder.updateOrderExpress({ order_ids, express_code: code }) + : await orderPendingOrder.updateOrderPlatform({ order_ids, code }) + + const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') + if (!ok) { + ElMessage.error(res?.message || '批量修改失败') + return + } + + const updatedCount = Number(res?.data?.updated_count ?? order_ids.length) || 0 + ElMessage.success( + `${updateOrderMetaDialogMode.value === 'express' ? '快递信息' : '平台信息'}修改成功 ${updatedCount} 条` + ) + updateOrderMetaDialogVisible.value = false + upperTable.value?.clearSelection?.() + selectionRows.value = [] + hasSelection.value = false + await loadData() + } catch { + ElMessage.error(updateOrderMetaDialogMode.value === 'express' ? '修改快递失败' : '修改平台失败') + } finally { + updateOrderMetaLoading.value = false + } +} + // 统一执行命令 function handleCommand(commandName: string, subCommand?: string) { const handlers: Record = { diff --git a/src/views/order/orderManagement/orderWorkbench.vue b/src/views/order/orderManagement/orderWorkbench.vue index 3aded305..99e7f9ce 100644 --- a/src/views/order/orderManagement/orderWorkbench.vue +++ b/src/views/order/orderManagement/orderWorkbench.vue @@ -106,15 +106,14 @@
- +
-
- -
请从上方列表中选择一项查看订单明细
+
+
@@ -137,13 +136,12 @@ import { ElMessage } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' import ManualOutboundPanel from './component/ManualOutboundPanel.vue' -import OrderDetailPanel from './component/OrderDetailPanel.vue' +import WorkbenchOrderDetail from './component/WorkbenchOrderDetail.vue' import log from './component/log.vue' import { orderBadgeCount, orderList } from '@/api/order.index/orderindex' import { formatOrderTime, getTagType, - pendingOrderDetail, translateOrderField, workbenchAvailableFields, workbenchBadgeItems, @@ -154,7 +152,7 @@ const scanBox = ref(null) const loading = ref(false) const queryTime = ref(0) const quickSearch = ref('') -const activeTab = ref('orderDetail') +const activeTab = ref('items') const tableSize = ref('small') const presetTree = ref([]) const selectionRows = ref([]) @@ -191,8 +189,6 @@ const badgeItems = computed(() => ) const activeComponent = computed(() => ManualOutboundPanel) -const workbenchDetailConfig = pendingOrderDetail - function normalizeToWhere(condition: any) { if (!condition || typeof condition !== 'object') return {} const where: Record = {} @@ -409,21 +405,27 @@ onMounted(() => { .lower-level { flex: 0 0 38%; height: 38%; + display: flex; + flex-direction: column; + min-height: 0; .detail-header { + flex: 0 0 auto; background-color: #fafafa; border-bottom: 1px solid #ebeef5; } .detail-container { + flex: 1; + min-height: 0; padding: 0; - height: 100%; overflow: hidden; } } .detail-page { height: 100%; + min-height: 0; overflow-x: hidden; overflow-y: auto; } @@ -437,6 +439,10 @@ onMounted(() => { padding: 0; } + .items-detail-wrapper { + height: 100%; + } + .manual-outbound-wrapper { height: 100%; } diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index eac6c2a6..8a402512 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -114,7 +114,6 @@
- @@ -123,12 +122,16 @@
- + + (null) const upperTable = ref(null) const manualOutboundRef = ref(null) const presetTree = ref([]) -const activeTab = ref('details') +const activeTab = ref('items') const list = ref([]) const loading = ref(false) const manualLoading = ref(false) @@ -205,15 +206,6 @@ function sanitizeOutboundListWhere(where: Record) { return w } -const componentMap: Record = { - details: OrderDetailPanel, - items: orderdetail, - logs: log, - manualOutbound: OutboundManualOutboundForm -} - -const activeComponent = computed(() => componentMap[activeTab.value] || componentMap.details) - function buildWhere() { let where = buildWhereConditions(scanBox.value?.getConditions?.() || {}) if (quickSearch.value) { diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index f8968247..1e2e61ec 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -185,7 +185,7 @@
- + @@ -194,8 +194,8 @@
-
- +
+

配货明细加载中...

@@ -344,7 +344,20 @@ - + + + @@ -362,22 +375,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + +
+ + 智能识别(即将上线) +
+
+
- - - - + + + + + + + + + + + + + + @@ -385,11 +517,26 @@
订单明细 - 新增明细 +
+ 选择商品(多选) + 新增空白明细 +
- + - + + +
+ + 查询 +
+ + + + + + + +
+ +
+ +