diff --git a/src/api/order.expectionorder/orderexpectionorder.ts b/src/api/order.expectionorder/orderexpectionorder.ts index f39cc005..805476e7 100644 --- a/src/api/order.expectionorder/orderexpectionorder.ts +++ b/src/api/order.expectionorder/orderexpectionorder.ts @@ -20,6 +20,10 @@ export type ExpectionOrderListParams = { sort?: OrderSort } +export type ExpectionOrderResolveExceptionParams = { + ids: number[] +} + export function orderExpectionOrderList(data: ExpectionOrderListParams = {}): Promise { return request({ url: '/system', @@ -34,6 +38,23 @@ export function orderExpectionOrderList(data: ExpectionOrderListParams = {}): Pr } as any) } -export const orderExpectionOrder = { - list: orderExpectionOrderList +export function orderExpectionOrderResolveException( + data: ExpectionOrderResolveExceptionParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.expectionOrder.resolveException', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + +export const orderExpectionOrder = { + list: orderExpectionOrderList, + resolveException: orderExpectionOrderResolveException } diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index fffc0ff0..3eb66ef1 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -27,6 +27,12 @@ export type ManualOutboundParams = { executionTimeoutMs?: number } +export type QueryOrderLogsParams = { + id: string + page?: number + pageSize?: number +} + export function orderList(data: OrderListParams = {}): Promise { return request({ url: '/system', @@ -69,6 +75,20 @@ export function orderBadgeCount(): Promise { } as any) } +export function orderQueryOrderLogs(data: QueryOrderLogsParams): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.queryOrderLogs', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /** 订单明细行(历史接口 order.detail,未纳入远端 module 清单) */ export function orderDetail(data: Record = {}): Promise { return request({ @@ -88,5 +108,6 @@ export const order = { list: orderList, manualOutboundOrder: orderManualOutboundOrder, badgeCount: orderBadgeCount, + queryOrderLogs: orderQueryOrderLogs, detail: orderDetail } diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index b97221ef..0e137810 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -1,155 +1,299 @@ -import request from '@/utils/request' +import request from "@/utils/request"; -const v = '1.0' +const v = "1.0"; -export type OrderWhere = Record +// 啊大王大大 + +export type OrderWhere = Record; export type OrderSort = { - sortField?: string - sortOrder?: 'asc' | 'desc' | 'ASC' | 'DESC' - field?: string - order?: 'asc' | 'desc' | 'ASC' | 'DESC' -} + sortField?: string; + sortOrder?: "asc" | "desc" | "ASC" | "DESC"; + field?: string; + order?: "asc" | "desc" | "ASC" | "DESC"; +}; export type OrderPagination = { - page?: number - pageSize?: number -} + page?: number; + pageSize?: number; +}; export type PendingOrderListParams = { - pagination?: OrderPagination - where?: OrderWhere - sort?: OrderSort -} + pagination?: OrderPagination; + where?: OrderWhere; + sort?: OrderSort; +}; +/** markPendingOutboundOrder / cancelOrder:文档要求订单 ID 正整数数组,不支持单 id 或逗号字符串 */ export type PendingOrderIdsParams = { - ids: Array -} + ids: number[]; +}; export type PendingOrderReverseReviewParams = { - ids?: Array - id?: number | string - order_id?: number | string -} + ids: number[]; +}; export type PendingOrderAllocateExpressCodeParams = { - orders: Array> -} + orders: Array>; +}; + +export type PendingOrderUpdateOrderPlatformParams = { + order_ids: number[]; + code: string; +}; + +export type PendingOrderUpdateOrderExpressParams = { + order_ids: number[]; + express_code: string; +}; + +export type PendingOrderCloneOrderParams = { + order_id: number; +}; + +export type PendingOrderCreateOrderItem = { + item_code: string; + plan_qty: number; + item_name?: string; + order_line_no?: string; + actual_price?: number; +}; + +export type PendingOrderCreateOrderParams = { + store_id: number; + name: string; + mobile?: string; + tel?: string; + detail_address: string; + province?: string; + city?: string; + area?: string; + town?: string; + zip_code?: string; + items: PendingOrderCreateOrderItem[]; + delivery_order_code?: string; + logistics_code?: string; + logistics_name?: string; + sys_platform_code?: string; + source_platform_code?: string; + source_order_codes?: string; + order_type?: string; + is_urgency?: string; + invoice_flag?: string; +}; + +export type PendingOrderImportOrdersFromExcelParams = { + file_base64: string; +}; /** 与文档 Params 别名对齐;不再传 warehouse_id(由登录上下文决定仓库) */ export type PendingOrderAllocateStorageParams = { - allow_storage_location?: boolean - allowStorageLocation?: boolean - is_allow_storage?: boolean - isAllowStorage?: boolean - order_ids?: Array | string | number - orderIds?: Array | string | number - ids?: Array | string | number - order_id?: number | string - orderId?: number | string - id?: number | string -} + allow_storage_location?: boolean; + allowStorageLocation?: boolean; + is_allow_storage?: boolean; + isAllowStorage?: boolean; + order_ids?: Array | string | number; + orderIds?: Array | string | number; + ids?: Array | string | number; + order_id?: number | string; + orderId?: number | string; + id?: number | string; +}; export function orderPendingOrderList(data: PendingOrderListParams = {}): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.list', + method: "order.pendingOrder.list", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } -export function orderPendingOrderReverseReviewOrder(data: PendingOrderReverseReviewParams): Promise { +export function orderPendingOrderReverseReviewOrder( + data: PendingOrderReverseReviewParams, +): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.reverseReviewOrder', + method: "order.pendingOrder.reverseReviewOrder", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } -export function orderPendingOrderMarkPendingOutboundOrder(data: PendingOrderIdsParams): Promise { +export function orderPendingOrderMarkPendingOutboundOrder( + data: PendingOrderIdsParams, +): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.markPendingOutboundOrder', + method: "order.pendingOrder.markPendingOutboundOrder", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } export function orderPendingOrderCancelOrder(data: PendingOrderIdsParams): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.cancelOrder', + method: "order.pendingOrder.cancelOrder", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } export function orderPendingOrderAllocateExpressCode( - data: PendingOrderAllocateExpressCodeParams + data: PendingOrderAllocateExpressCodeParams, ): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.allocateExpressCode', + method: "order.pendingOrder.allocateExpressCode", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } export function orderPendingOrderAllocateStorage( - data: PendingOrderAllocateStorageParams + data: PendingOrderAllocateStorageParams, ): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.allocateStorage', + method: "order.pendingOrder.allocateStorage", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); } export function orderPendingOrderCancelAllocateStorage( - data: PendingOrderAllocateStorageParams + data: PendingOrderAllocateStorageParams, ): Promise { return request({ - url: '/system', - method: 'post', + url: "/system", + method: "post", params: { - method: 'order.pendingOrder.cancelAllocateStorage', + method: "order.pendingOrder.cancelAllocateStorage", v, - timestamp: Date.now() + timestamp: Date.now(), }, data, - isSystemApi: true - } as any) + isSystemApi: true, + } as any); +} + +export function orderPendingOrderUpdateOrderPlatform( + data: PendingOrderUpdateOrderPlatformParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.updateOrderPlatform", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +export function orderPendingOrderUpdateOrderExpress( + data: PendingOrderUpdateOrderExpressParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.updateOrderExpress", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +export function orderPendingOrderCloneOrder(data: PendingOrderCloneOrderParams): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.cloneOrder", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +export function orderPendingOrderCreateOrder(data: PendingOrderCreateOrderParams): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.createOrder", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +export function orderPendingOrderDownloadCreateTemplate(): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.downloadCreateTemplate", + v, + timestamp: Date.now(), + }, + data: {}, + isSystemApi: true, + } as any); +} + +export function orderPendingOrderImportOrdersFromExcel( + data: PendingOrderImportOrdersFromExcelParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pendingOrder.importOrdersFromExcel", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); } export const orderPendingOrder = { @@ -159,5 +303,11 @@ export const orderPendingOrder = { cancelOrder: orderPendingOrderCancelOrder, allocateExpressCode: orderPendingOrderAllocateExpressCode, allocateStorage: orderPendingOrderAllocateStorage, - cancelAllocateStorage: orderPendingOrderCancelAllocateStorage -} + cancelAllocateStorage: orderPendingOrderCancelAllocateStorage, + updateOrderPlatform: orderPendingOrderUpdateOrderPlatform, + updateOrderExpress: orderPendingOrderUpdateOrderExpress, + cloneOrder: orderPendingOrderCloneOrder, + createOrder: orderPendingOrderCreateOrder, + downloadCreateTemplate: orderPendingOrderDownloadCreateTemplate, + importOrdersFromExcel: orderPendingOrderImportOrdersFromExcel, +}; diff --git a/src/test.txt b/src/test.txt index 78839e93..e69de29b 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1,59 +0,0 @@ -接口文档更新: -[ - { - "version": "2026.04.12-system-01", - "date": "2026-04-12", - "summary": "新增订单工作台各分组 list 接口文档,说明 where 透传与分页上限(pageSize\u003C=200)", - "methods": [ - "order.list", - "order.reviewOrder.list", - "order.reviewOrder.reviewOrder", - "order.pendingOrder.list", - "order.expectionOrder.list", - "order.entrustOrder.list", - "order.deliveryOrder.list", - "order.deliveryExpectionOrder.list", - "order.archiveOrder.list" - ], - "notes": [ - "补充 order 工作台分组 list 接口,并说明所有 list 接口支持 pagination、where、sort;服务端对 pagination.pageSize 做上限截断(MAX=200)。", - "说明 where 参数会被 normalize 并交给解析器 parseWhereConditions,再与模块默认条件合并后用于底层查询;示例:reviewOrder 模块默认 step=0,pendingOrder 默认 step in [1,2],deliveryOrder 默认 dispatch_lane=m4 等。", - "补充待审核模块的审核提交接口 order.reviewOrder.reviewOrder,说明其用于更新订单审核状态/step,并保留 id、review_status、inspection_status、order_id 等兼容字段说明。", - "兼容入口(如 getreviewOrderlist / getdeliveryOrderlist 等)作为历史兼容保留,在文档中标为兼容说明,不作为主入口推荐。" - ], - "type": "added", - "module": "order" - }, - { - "version": "2026.04.13-system-01", - "date": "2026-04-13", - "summary": "新增待处理订单取消接口 order.pendingOrder.cancelOrder(ids-only)", - "methods": [ - "order.pendingOrder.cancelOrder" - ], - "notes": [ - "新增接口 order.pendingOrder.cancelOrder:用于批量取消待处理订单,接口仅接受 ids 数组入参(number[] 或 string[]),不再兼容 id/order_id/逗号字符串等兼容写法。", - "严格同仓校验:仓库上下文由当前登录用户的 store_id 决定,禁止传入 warehouse_id / warehouseId。", - "状态限制:仅允许 step ∈ [1,2] 且 outbound_status != 'padding' 的订单被取消;已取消或已完成的订单不可取消,状态不满足时返回 404/400。", - "取消后语义:接口将把订单表的 status 字段设为 'cancel' 并更新 updated_at;返回首个被取消的订单 id、status、updated_at、updated_count 与 ids 列表。", - "入参/响应契约已按代码侧约定(ids-only、同仓校验、允许状态集合、取消后语义)同步到 methods/system.json。" - ], - "type": "added", - "module": "order" - }, - { - "version": "2026.04.13-system-02", - "date": "2026-04-13", - "summary": "新增订单工作台角标聚合接口 order.badgeCount", - "methods": [ - "order.badgeCount" - ], - "notes": [ - "聚合返回 8 个订单工作台标签的展示值(用于前端 badge)。", - "按当前登录用户的 store_id 维度做短缓存;5 个模块查表统计数量,≥100 返回 '99+',否则返回实际数字(0..99)。", - "deliveryOrder、deliveryExpectionOrder、archiveOrder 三个字段固定返回 '99+'(不查表)。" - ], - "type": "added", - "module": "order" - } -] \ No newline at end of file diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 9f9d1cc9..821e17a2 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -44,13 +44,13 @@ @selection-change="onSelectionChange" > @@ -73,7 +73,7 @@
- +

履约历程加载中...

@@ -106,9 +106,10 @@ import { archiveAvailableFields, archiveColumns, archiveOrderDetail, - translateOrderField + translateOrderField, + getTagType } from './config/order-common-config' -import detail from './component/detail.vue' +import OrderDetailPanel from './component/OrderDetailPanel.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -149,10 +150,6 @@ function translateField(fieldValue: string, value: any) { return value } -function getStatusType(status: string) { - return 'info' -} - onMounted(() => { loadData() loadFilterData() diff --git a/src/views/order/orderManagement/component/OrderDetailPanel.vue b/src/views/order/orderManagement/component/OrderDetailPanel.vue new file mode 100644 index 00000000..7da49cf4 --- /dev/null +++ b/src/views/order/orderManagement/component/OrderDetailPanel.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue index 964ddf08..c5164536 100644 --- a/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue +++ b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue @@ -41,7 +41,7 @@ - - diff --git a/src/views/order/orderManagement/component/log.vue b/src/views/order/orderManagement/component/log.vue index a376f6e0..33fcd9b5 100644 --- a/src/views/order/orderManagement/component/log.vue +++ b/src/views/order/orderManagement/component/log.vue @@ -1,13 +1,224 @@ - + + + \ No newline at end of file + +.toolbar-btn-group { + margin-bottom: 5px; +} + +.el-table { + flex: 1; +} + +.pagination-container { + display: flex; + justify-content: flex-end; + align-items: center; + padding: 5px 10px; + border-top: 1px solid #e8e8e8; + background: #fff; + flex-shrink: 0; +} + +.pagination-container :deep(.el-pagination) { + --el-pagination-button-width: 28px; + --el-pagination-button-height: 28px; + font-size: 12px; +} + +.pagination-container :deep(.el-pagination .el-select .el-input__wrapper) { + min-height: 24px; +} + +.pagination-container :deep(.btn-prev), +.pagination-container :deep(.btn-next), +.pagination-container :deep(.el-pager li) { + border-radius: 4px; + color: #606266; +} + +.pagination-container :deep(.el-pager li.is-active) { + color: #409eff; + font-weight: 600; + background: #ffffff; +} + +:deep(.el-drawer__body) { + height: 100%; + padding: 0; +} + diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 1645130c..3d83a6f6 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -90,6 +90,95 @@ export const COMMON_TRANSLATIONS: Record> = { } } +// 通用标签类型映射 +export const COMMON_TAG_TYPES: Record> = { + is_urgency: { + 'Y': 'danger', + 'N': 'info' + }, + status: { + 'pedding': 'warning', + 'pending': 'warning', + 'created': 'success', + 'cancel': 'danger', + 'cancelled': 'danger', + 'error': 'danger', + 'after-sales-error': 'danger', + 'finished': 'success', + 'archived': 'info' + }, + sync_status: { + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success', + 'error': 'danger', + 'none': 'info' + }, + order_status: { + 'WAIT_AUDIT': 'warning', + 'AUDITED': 'success' + }, + storage_status: { + 'none': 'info', + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success' + }, + print_status: { + 'none': 'info', + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success' + }, + pick_status: { + 'none': 'info', + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success' + }, + pack_status: { + 'none': 'info', + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success' + }, + post_status: { + 'padding': 'warning', + 'pending': 'warning', + 'fin': 'success', + 'timeout': 'danger', + 'error': 'danger', + 'none': 'info' + }, + outbound_status: { + 'none': 'info', + 'padding': 'warning', + 'pending': 'warning', + 'pedding': 'warning', + 'processing': 'warning', + 'fin': 'success', + 'done': 'success', + 'finished': 'success', + 'error': 'danger', + 'failed': 'danger' + }, + inspection_status: { + 'none': 'info', + 'pending': 'warning', + 'padding': 'warning', + 'fin': 'success', + 'reject': 'danger', + 'error': 'danger' + } +} + +export function getTagType(field: string, value: any) { + if (COMMON_TAG_TYPES[field] && COMMON_TAG_TYPES[field][value] !== undefined) { + return COMMON_TAG_TYPES[field][value] + } + return 'info' +} + export function translateOrderField(field: string, value: any) { if (COMMON_TRANSLATIONS[field] && COMMON_TRANSLATIONS[field][value] !== undefined) { return COMMON_TRANSLATIONS[field][value] @@ -128,6 +217,49 @@ function orderTimeFormatter(_row: any, _column: any, cellValue: unknown) { return formatOrderTime(cellValue) } +function waybillCodesFormatter(_row: any, _column: any, cellValue: unknown) { + if (cellValue === undefined || cellValue === null || cellValue === '') return '-' + + const normalizeList = (list: any[]) => + list + .map((item) => String(item ?? '').trim()) + .filter((item) => item.length > 0) + .join(', ') + + if (Array.isArray(cellValue)) { + const text = normalizeList(cellValue) + return text || '-' + } + + const text = String(cellValue).trim() + if (!text) return '-' + + // 兼容后端返回 JSON 字符串:["776..."] / ["A","B"] + if (text.startsWith('[') && text.endsWith(']')) { + try { + const parsed = JSON.parse(text) + if (Array.isArray(parsed)) { + const normalized = normalizeList(parsed) + return normalized || '-' + } + } catch { + // 非法 JSON 时回退原文 + } + } + + return text +} + +/** 订单详情 descriptions 中需格式化为本地时间的字段(与列表 formatter 一致) */ +export const ORDER_DETAIL_TIME_FIELDS = new Set([ + 'place_order_time', + 'pay_time', + 'create_at', + 'created_at', + 'updated_at', + 'operate_time' +]) + // deliveryOrder相关配置 export const deliveryAvailableFields = [ { label: '货主', value: 'store_id', type: 'select', options: [] }, @@ -137,7 +269,7 @@ export const deliveryAvailableFields = [ { label: '收货人', value: 'name', type: 'text' }, { label: '手机号', value: 'mobile', type: 'text' }, { label: '物流公司', value: 'logistics_name', type: 'text' }, - { label: '物流单号', value: 'express_code', type: 'text' }, + { label: '物流单号', value: 'waybill_codes', type: 'text' }, { label: '紧急订单', value: 'is_urgency', type: 'select', options: [ { label: '是', value: 'Y' }, { label: '否', value: 'N' }, @@ -170,7 +302,7 @@ export const deliveryColumns = [ { prop: 'pick_status', label: '拣货', width: '100' }, { prop: 'pack_status', label: '打包', width: '100' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, - { prop: 'express_code', label: '物流单号', width: '160' }, + { prop: 'waybill_codes', label: '物流单号', width: '160', formatter: waybillCodesFormatter }, { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'dispatch_lane', label: '道口', width: '80' }, { prop: 'items_count', label: '商品种类', width: '100' }, @@ -318,7 +450,7 @@ export const pendingAvailableFields = [ { label: '店铺名称', value: 'shop_nick', type: 'text' }, { label: '来源平台', value: 'source_platform_name', type: 'text' }, { label: '物流公司', value: 'logistics_name', type: 'text' }, - { label: '物流单号', value: 'express_code', type: 'text' }, + { label: '物流单号', value: 'waybill_codes', type: 'text' }, { label: '收货人', value: 'name', type: 'text' }, { label: '手机号', value: 'mobile', type: 'text' }, { label: '省/市/区', value: 'province_city_area', type: 'text' }, @@ -341,7 +473,7 @@ export const pendingCloums = [ { prop: 'pick_status', label: '拣货状态', width: '100' }, { prop: 'pack_status', label: '打包状态', width: '100' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, - { prop: 'express_code', label: '物流单号', width: '160' }, + { 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' }, @@ -475,7 +607,7 @@ export const workbenchColumns = [ { prop: 'inspection_status', label: '审核状态', minWidth: 110 }, { prop: 'outbound_status', label: '出库状态', minWidth: 120 }, { prop: 'logistics_name', label: '物流公司', minWidth: 120 }, - { prop: 'express_code', label: '物流单号', minWidth: 140 }, + { prop: 'waybill_codes', label: '物流单号', minWidth: 140, formatter: waybillCodesFormatter }, { prop: 'items_total', label: '商品总数', minWidth: 100 }, { prop: 'total_amount', label: '订单金额', minWidth: 110 }, { prop: 'create_at', label: '创建时间', minWidth: 170, formatter: orderTimeFormatter }, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 2861587a..94301b66 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -44,13 +44,13 @@ @selection-change="onSelectionChange" > @@ -73,7 +73,7 @@
- +

履约历程加载中...

@@ -106,9 +106,10 @@ import { archiveAvailableFields, archiveColumns, archiveOrderDetail, - translateOrderField + translateOrderField, + getTagType } from './config/order-common-config' -import detail from './component/detail.vue' +import OrderDetailPanel from './component/OrderDetailPanel.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -149,10 +150,6 @@ function translateField(fieldValue: string, value: any) { return value } -function getStatusType(status: string) { - return 'info' -} - onMounted(() => { loadData() loadFilterData() diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 5f9a66a3..79c422fe 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -54,45 +54,55 @@ @@ -115,7 +125,7 @@
- +
@@ -144,15 +154,16 @@ import { ref, reactive, onMounted, computed } from 'vue' import { ElMessage } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' -import { orderDeliveryOrder } from '@/api/order.deliveryOrder/orderdeliveryOrder' +import { orderDeliveryOrder } from '@/api/order.deliveryorder/orderdeliveryOrder' import { deliveryAvailableFields, deliveryColumns, pendingOrderDetail, - translateOrderField + translateOrderField, + getTagType } from './config/order-common-config' -import detail from './component/detail.vue' +import OrderDetailPanel from './component/OrderDetailPanel.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index b7eb3668..0aceb864 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -44,13 +44,13 @@ @selection-change="onSelectionChange" > @@ -73,7 +73,7 @@
- +

履约历程加载中...

@@ -106,9 +106,10 @@ import { archiveAvailableFields, archiveColumns, archiveOrderDetail, - translateOrderField + translateOrderField, + getTagType } from './config/order-common-config' -import detail from './component/detail.vue' +import OrderDetailPanel from './component/OrderDetailPanel.vue' import log from './component/log.vue' import { exportUpperTableRows } from './utils/export' @@ -149,10 +150,6 @@ function translateField(fieldValue: string, value: any) { return value } -function getStatusType(status: string) { - return 'info' -} - onMounted(() => { loadData() loadFilterData() diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 18290f57..5dcd1c23 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -71,7 +71,15 @@ - 批量重置状态 + + 处理异常订单 +
@@ -99,13 +107,13 @@ @selection-change="onSelectionChange" > @@ -147,7 +155,7 @@
- +
@@ -205,19 +213,49 @@ + + + + + + {{ resolveExceptionOrderIds.length }} 条 + + +
{{ resolveExceptionOrderIds.join(', ') }}
+
+
+ +