From 0d57e2d04aac0a5a07911229f597b13be6fcf4c5 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 21 Oct 2026 18:00:05 +0800 Subject: [PATCH] 1 --- .../order.deliveryorder/orderdeliveryOrder.ts | 67 ++ src/api/order.wave/orderwave.ts | 6 + src/components/ScanBox/index.vue | 210 ++++- src/components/UpperTable/index.vue | 6 + src/lang/en-US.ts | 1 + src/lang/zh-CN.ts | 1 + src/router/map.ts | 2 + .../detail/AfterSaleDetailDialog.vue | 13 +- src/views/afterSale/list/afterSale-config.ts | 21 +- src/views/afterSale/list/index.vue | 14 +- .../typelist/config/template-config.ts | 43 +- .../components/ColumnCellRenderer.vue | 72 ++ .../components/OperationCellRenderer.vue | 175 +++++ .../data/ordersummary/components/TabArea.vue | 132 ++++ .../config/components/DetailPanel.vue | 185 +++++ .../config/components/LogPanel.vue | 274 +++++++ .../ordersummary/config/template-config.ts | 692 +++++++++++++++++ src/views/data/ordersummary/index.vue | 724 ++++++++++++++++++ .../ordersummary/pages/ExampleFormDialog.vue | 107 +++ .../returnrecord/returnReceivedTask-config.ts | 4 +- src/views/express/returnUnpack/index.vue | 7 +- .../returnUnpack/returnUnpack-config.ts | 8 + .../express/waybill/config/template-config.ts | 22 +- .../autoReply/components/FunctionPanel.vue | 4 +- .../inbox/autoReply/components/GroupPanel.vue | 3 +- .../autoReply/components/KeywordPanel.vue | 4 +- .../autoReply/components/NumberRulePanel.vue | 4 +- .../inbox/autoReply/components/ReplyPanel.vue | 2 +- src/views/inbox/autoReply/index.vue | 8 +- src/views/inbox/group/group-config.ts | 2 +- src/views/inbox/message/index.vue | 14 +- .../component/CreatePendingOrderDialog.vue | 275 +++++-- .../config/order-common-config.ts | 62 +- .../order/waveOrder/WavePickTaskListPanel.vue | 38 +- .../order/waveOrder/config/wave-config.ts | 6 +- .../stock/combo_stock/combo-stock-config.ts | 4 +- src/views/stock/stock/index.vue | 19 +- src/views/stock/stock/stock-config.ts | 36 +- .../inventory/component/panelstockdetail.vue | 216 +++--- src/views/storage/inventory/index.vue | 2 +- .../storage/productflow/productflow-config.ts | 2 +- .../storage/receiving/component/Product.vue | 29 +- src/views/storage/report/index.vue | 13 +- .../config/components/CheckItemsPanel.vue | 384 +++++----- .../config/components/CheckRecordsPanel.vue | 10 + .../stockcheck/config/template-config.ts | 34 +- src/views/storage/stockcheck/index.vue | 4 +- src/views/store/shipperSigning/index.vue | 14 +- src/views/store/stores/index.vue | 134 ++-- src/views/store/stores/store-config.ts | 17 +- .../video/newcamara/config/camara-config.ts | 1 - .../config/camaraserver-config.ts | 1 - 52 files changed, 3478 insertions(+), 650 deletions(-) create mode 100644 src/views/data/ordersummary/components/ColumnCellRenderer.vue create mode 100644 src/views/data/ordersummary/components/OperationCellRenderer.vue create mode 100644 src/views/data/ordersummary/components/TabArea.vue create mode 100644 src/views/data/ordersummary/config/components/DetailPanel.vue create mode 100644 src/views/data/ordersummary/config/components/LogPanel.vue create mode 100644 src/views/data/ordersummary/config/template-config.ts create mode 100644 src/views/data/ordersummary/index.vue create mode 100644 src/views/data/ordersummary/pages/ExampleFormDialog.vue diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index e0469f2b..ca31b726 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -248,6 +248,72 @@ export function orderDeliveryOrderDetail(data: DeliveryOrderDetailParams): Promi * order.deliveryOrder.quickSearch:按关键词跨表联合搜索(运单号/发货单号/外部订单号/平台交易单号) * 工单页「发起售后单-关联订单-选择订单」使用;联合查询较慢,超时时间延长至 20 秒(axios 默认 10 秒) */ +/** + * order.deliveryOrder.summary:配送订单每日汇总 + * + * - 以自然日为维度统计订单量 / 迁入配送表订单量 / 发货量 / 拦截 / 取消 + * - 仓库取自登录上下文;可选 store_id 按货主过滤 + * - 默认最近 7 个自然日(含今天),单次最多 90 天,区间内无数据的日期补 0 + */ +export type DeliveryOrderSummaryParams = { + /** 开始日期 yyyy-MM-dd,缺省为结束日往前 6 天 */ + start_date?: string + /** 结束日期 yyyy-MM-dd,缺省为今天 */ + end_date?: string + /** 货主ID过滤,不传或 <=0 表示不按货主过滤 */ + store_id?: number +} + +/** 每日汇总中的一天统计行 */ +export type DeliveryOrderSummaryItem = { + /** 统计日期 yyyy-MM-dd */ + date: string + /** 当日订单量 */ + order_count: number + /** 当日迁入配送表订单量 */ + dispatch_count: number + /** 当日发货订单数 */ + shipped_count: number + /** 当日发货商品件数 */ + shipped_items_total: number + /** 当日发货金额 */ + shipped_amount: number + /** 当日拦截数量 */ + intercepted_count: number + /** 当日库内确定拦截数量 */ + intercepted_at_warehouse_count: number + /** 当日取消数量 */ + cancelled_count: number +} + +/** 区间合计(字段口径与 list 中对应字段相同) */ +export type DeliveryOrderSummaryTotals = Omit + +/** order.deliveryOrder.summary 响应(data 位于顶层) */ +export type DeliveryOrderSummaryPayload = { + warehouse_id: number + store_id: number | null + start_date: string + end_date: string + day_count: number + list: DeliveryOrderSummaryItem[] + summary: DeliveryOrderSummaryTotals +} + +export function orderDeliveryOrderSummary(data: DeliveryOrderSummaryParams = {}): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'order.deliveryOrder.summary', + v, + timestamp: Date.now() + }, + data, + isSystemApi: true + } as any) +} + export function orderDeliveryOrderQuickSearch(keyword: string): Promise { return request({ url: '/system', @@ -268,4 +334,5 @@ export const orderDeliveryOrder = { list: orderDeliveryOrderList, detail: orderDeliveryOrderDetail, quickSearch: orderDeliveryOrderQuickSearch, + summary: orderDeliveryOrderSummary, } diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index e717458f..74f8a61b 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -58,6 +58,12 @@ export type WavePickTaskListParams = { keyword?: string start_time_start?: string start_time_end?: string + /** 完成时间范围(时间筛选模式为「完成时间」时传递) */ + finish_time_start?: string + finish_time_end?: string + /** 创建时间范围(时间筛选模式为「创建时间」时传递) */ + create_time_start?: string + create_time_end?: string /** 兼容历史 where 结构(当存在顶层同名参数时顶层优先);本页仅用于承载文档未列出的 operator_name(操作人) */ where?: Record /** 接口文档标注:当前主表未存该字段、会被忽略,建议勿使用 */ diff --git a/src/components/ScanBox/index.vue b/src/components/ScanBox/index.vue index ac2e7c25..76e1ed40 100644 --- a/src/components/ScanBox/index.vue +++ b/src/components/ScanBox/index.vue @@ -38,7 +38,7 @@
-