diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index e48a0d84..3dadb906 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -598,8 +598,8 @@ export function orderPendingOrderParseAddress( }, data, isSystemApi: true, - // 地址解析可能调用外部服务,延长超时时间至 35 秒 - timeout: 35000, + // 地址解析可能调用外部服务,延长超时时间至 60 秒 + timeout: 60000, } as any); } diff --git a/src/api/order/packing/index.ts b/src/api/order/packing/index.ts index e9abfd2b..f47b676c 100644 --- a/src/api/order/packing/index.ts +++ b/src/api/order/packing/index.ts @@ -121,7 +121,7 @@ export function packingGet(id: number): Promise<{ export type PackingSetEndTimeParams = { /** 打包任务ID(必填) */ id: number - /** 结束时间 YYYY-MM-DD HH:mm:ss 格式(必填) */ + /** 结束时间(ISO 8601 格式,如 2026-07-27T11:00:00.000Z,必填) */ end_time: string } diff --git a/src/api/setting.warehouse/settingwarehouse.ts b/src/api/setting.warehouse/settingwarehouse.ts index 141162a8..0595d7df 100644 --- a/src/api/setting.warehouse/settingwarehouse.ts +++ b/src/api/setting.warehouse/settingwarehouse.ts @@ -62,6 +62,10 @@ export const DEFAULT_WAREHOUSE_SENDER_FIELDS: Required v.trim()) } + // 打包最大时长(分钟,须为大于 0 的整数;默认 散单 3 / 团购 40) + const singlePackMax = Number(base.single_order_pack_max_minutes) + base.single_order_pack_max_minutes = + Number.isFinite(singlePackMax) && singlePackMax > 0 ? Math.trunc(singlePackMax) : 3 + const groupPackMax = Number(base.group_order_pack_max_minutes) + base.group_order_pack_max_minutes = + Number.isFinite(groupPackMax) && groupPackMax > 0 ? Math.trunc(groupPackMax) : 40 + return base as SettingWarehouseSubjectConfig } diff --git a/src/api/shops/shops.ts b/src/api/shops/shops.ts index 124ca34c..28fcf60c 100644 --- a/src/api/shops/shops.ts +++ b/src/api/shops/shops.ts @@ -51,12 +51,11 @@ export function shopsDel(data: { id: number }) { }) } -/** 编辑店铺 */ +/** 编辑店铺(仅允许修改 platform_code / custom_name) */ export function shopsEdit(data: { id: number platform_code?: string custom_name?: string - shop_name?: string }) { return request({ url: '/system', diff --git a/src/api/waybill.warehouse/index.ts b/src/api/waybill.warehouse/index.ts index 615ddf1f..f932d949 100644 --- a/src/api/waybill.warehouse/index.ts +++ b/src/api/waybill.warehouse/index.ts @@ -38,10 +38,14 @@ export type WaybillWarehouseListWhere = { hasWeighingWeight?: boolean /** 关键词搜索:同时匹配运单号、主单号、订单号 */ keyword?: string - /** 创建时间起始,格式 YYYY-MM-DD */ + /** 创建时间起始,格式 YYYY-MM-DD(兼容旧写法) */ createdAtStart?: string - /** 创建时间截止,格式 YYYY-MM-DD */ + /** 创建时间截止,格式 YYYY-MM-DD(兼容旧写法) */ createdAtEnd?: string + /** 创建时间范围:{ operator: 'between', value: [起始时间, 结束时间] } */ + createdAt?: { operator: string; value: string[] } + /** 运单ID列表(勾选导出,按 wms_order_express.id 精确过滤) */ + ids?: number[] } /** waybill.warehouse.list 排序参数 */ diff --git a/src/views/data/packingflow/index.vue b/src/views/data/packingflow/index.vue index 760e6f68..704e50fb 100644 --- a/src/views/data/packingflow/index.vue +++ b/src/views/data/packingflow/index.vue @@ -83,6 +83,14 @@