This commit is contained in:
yin 2026-09-25 17:59:55 +08:00
parent a01f1371db
commit 835eede083
15 changed files with 1218 additions and 260 deletions

View File

@ -15,52 +15,168 @@ export function getDashboardData(method: string, data: any) {
} as any)
}
/** dashboard.* 通用响应信封(业务字段与信封同级:flag/code/message/data/timestamp) */
export type DashboardEnvelope<T> = {
/** 结果标记,成功为 success */
flag?: string
/** 业务码,成功为 200 */
code?: number
message?: string
/** 服务器时间戳(秒) */
timestamp?: number
data: T
}
/** dashboard.storeStats 的 data(仓库发货统计;货主端自动跨已签约仓库汇总) */
export type DashboardStoreStatsData = {
/** 今日订单数(待处理 + 今日已出库) */
todayOrders: number
/** 今日新增较昨日增长率(%),昨日为 0 时按 100 或 0 计算 */
orderTrend: number
/** 未分配快递号订单数 */
unassignedOrders: number
/** 未打印订单数 */
unprintedOrders: number
/** 未拣货订单数 */
unpickedOrders: number
/** 待发货订单数 */
pendingShipments: number
/** 发货进度(%),(待处理-待发货)/待处理 */
shipmentProgress: number
/** 今日已出库订单数 */
todayOutbound: number
/** 出库完成率(%),今日出库/(待发货+今日出库) */
outboundRate: number
/** 拦截订单数 */
interceptedOrders: number
/** 异常订单数(step=3) */
exceptionOrders: number
/** 已复核订单数 */
recheckedOrders: number
/** 已打包订单数 */
packedOrders: number
}
/**
* 获取仓库基础统计数据
* dashboard.warehouseStats 的 data(**固定演示数据**,非实时查询结果,仅供前端展示与调试)。
* ⚠️ 字段少于 storeStats:**不含** recheckedOrders / packedOrders。
*/
export function getWarehouseStats(data: any = {}) {
export type DashboardWarehouseStatsData = {
todayOrders: number
orderTrend: number
unassignedOrders: number
unprintedOrders: number
unpickedOrders: number
pendingShipments: number
shipmentProgress: number
todayOutbound: number
outboundRate: number
interceptedOrders: number
exceptionOrders: number
}
/** dashboard.express_ratio / platform_distribution 的 data 元素(饼图,按订单数降序) */
export type DashboardPieItem = {
/** 快递公司名称(未填写时为「未指定快递」)/ 平台名称(未填写时为「未指定平台」) */
name: string
/** 该名称下的待处理订单数 */
value: number
/** 图表配色 */
itemStyle?: { color?: string }
}
/** dashboard.hot_order_rank 的 data 元素(今日销量 Top10,name 已脱敏) */
export type DashboardHotOrderRankItem = {
/** 排行序号(从 1 开始) */
id: number
/** 脱敏后商品名称(前 2 字符 + *** + 后 2 字符;长度不足 4 字符时为 ***) */
name: string
/** 库存商品ID(stock_warehouse.id);极端情况下回退商品编码字符串 */
sku: number | string
/** 今日销量(件数) */
value: number
/** 环比昨日百分比(1 位小数;昨日为 0 且今日 >0 时为 100) */
trend: number
}
/** dashboard.order_trend 的 data(按小时统计当日 08:00 至当前小时) */
export type DashboardOrderTrendData = {
/** 统计范围,固定为 day */
range: string
/** 统计日期(YYYY-MM-DD) */
date: string
summary: {
/** 当日订单总数 */
total_orders: number
/** 当日发货总数 */
total_shipments: number
/** 发货率(%,1 位小数) */
shipment_rate: number
/** 订单峰值时段(如 08:00) */
peak_hour: string
/** 峰值时段订单数 */
peak_orders: number
}
/** 时段列表(08:00 至当前小时,如 ['08:00','09:00']) */
categories: string[]
/** 各时段订单数(与 categories 一一对应) */
orders: number[]
/** 各时段发货数(与 categories 一一对应) */
shipments: number[]
}
/**
* 获取仓库发货统计(**演示数据**:固定演示值,非实时查询;无业务入参)
*/
export function getWarehouseStats(
data: Record<string, unknown> = {}
): Promise<DashboardEnvelope<DashboardWarehouseStatsData>> {
return getDashboardData('dashboard.warehouseStats', data)
}
/**
* 获取门店基础统计数据
* 获取门店/仓库发货统计(真实查询;无业务入参,依据登录用户上下文区分仓库端与货主端)
*/
export function getStoreStats(data: any = {}) {
export function getStoreStats(
data: Record<string, unknown> = {}
): Promise<DashboardEnvelope<DashboardStoreStatsData>> {
return getDashboardData('dashboard.storeStats', data)
}
export type OrderTrendData = Record<string, unknown>
export type OrderTrendData = DashboardOrderTrendData
export type OrderTrendResponse = {
code?: number
message?: string
data?: OrderTrendData
}
export type OrderTrendResponse = DashboardEnvelope<OrderTrendData>
/**
* 获取订单趋势数据
* 获取订单趋势数据(无业务入参,依据当前用户绑定仓库统计)
*/
export function getOrderTrend(data: Record<string, unknown> = {}): Promise<OrderTrendResponse> {
return getDashboardData('dashboard.order_trend', data)
}
/**
* 获取平台分布数据
* 获取平台分布数据(饼图;无业务入参,货主端跨已签约仓库汇总)
*/
export function getPlatformDist(data: any = {}) {
export function getPlatformDist(
data: Record<string, unknown> = {}
): Promise<DashboardEnvelope<DashboardPieItem[]>> {
return getDashboardData('dashboard.platform_distribution', data)
}
/**
* 获取商品排行数据
* 获取热销商品排行(今日销量 Top10;无业务入参)
*/
export function getHotOrderRank(data: any = {}) {
export function getHotOrderRank(
data: Record<string, unknown> = {}
): Promise<DashboardEnvelope<DashboardHotOrderRankItem[]>> {
return getDashboardData('dashboard.hot_order_rank', data)
}
/**
* 获取快递占比数据
* 获取快递占比数据(饼图;无业务入参,货主端跨已签约仓库汇总)
*/
export function getExpressRatio(data: any = {}) {
export function getExpressRatio(
data: Record<string, unknown> = {}
): Promise<DashboardEnvelope<DashboardPieItem[]>> {
return getDashboardData('dashboard.express_ratio', data)
}

View File

@ -84,11 +84,19 @@ export type FrontConfigSaveInfoParams = {
theme?: Record<string, unknown> | string | null
}
/** frontConfig.getDomain / setDomain 响应:域名与 DNS TXT 归属验证状态(9 字段) */
/**
* frontConfig.getDomain / setDomain / checkDomain 响应:域名与 DNS TXT 归属验证状态(16 字段)。
* 分两组:①生效域名组 9 字段(domain/domain_status/verify_host/verify_value/cname/verified_at/attempts/last_error);
* ②待验证域名组 7 字段(pending_*,两阶段域名切换新增)。
* 两阶段语义:domain 始终是「生效域名」,切换期间(pending_active=true)仍为旧域名并继续对外服务,
* 只有 TXT 校验通过被提升后才换成新域名;pending_domain 是用户提交、等待 TXT 校验的待验证域名,
* 从未生效、不参与 frontConfig.getByDomain 放行。
*/
export type FrontConfigDomain = {
warehouse_id?: number
/** 生效域名(未设置为空字符串;变更统一走 frontConfig.setDomain,由待验证组提升而来) */
domain?: string
/** 0 未验证 / 1 已验证 / 2 验证失败 */
/** 生效域名验证状态:0 未验证 / 1 已验证 / 2 验证失败 */
domain_status?: number
/** 待添加的 TXT 记录主机名(如 wmsv-xxxxxxxxxx.<domain>);domain_status=1 时返回空字符串 */
verify_host?: string
@ -102,10 +110,24 @@ export type FrontConfigDomain = {
attempts?: number
/** 最近一次校验失败原因(脱敏截断;未失败为空字符串) */
last_error?: string
/** 待验证域名(切换中非空;未发起切换为空字符串)。setDomain 只登记到本字段,校验通过后才提升为 domain */
pending_domain?: string
/** 待验证域名的 TXT 记录主机名(pending_domain 非空时**始终回显**,用户据此配置 TXT 记录) */
pending_verify_host?: string
/** 待验证域名的 TXT 记录值(32 位 hex;pending_domain 为空时返回空字符串) */
pending_verify_value?: string
/** 待验证域名校验尝试次数 */
pending_attempts?: number
/** 待验证域名最近一次校验失败原因(脱敏截断;未失败为空字符串) */
pending_last_error?: string
/** 发起本次域名切换的时间(无待验证域名为 null) */
pending_created_at?: string | null
/** 是否处于域名切换中(等价于 pending_domain 非空;true=待验证域名已登记、等待 TXT 校验) */
pending_active?: boolean
[key: string]: unknown
}
/** frontConfig.checkDomain 响应:getDomain 的 9 字段 + 本次校验结果 */
/** frontConfig.checkDomain 响应:getDomain 的 16 字段 + 本次校验结果 */
export type FrontConfigCheckDomainResult = FrontConfigDomain & {
/** 本次校验是否通过 */
verified?: boolean
@ -176,17 +198,29 @@ export function frontConfigGetDomain(): Promise<FrontConfigDomain & { code?: num
}
/**
* 设置或变更当前仓库域名并发起 DNS TXT 归属验证(生成 verify_host/verify_value,domain_status 置 0)。
* 注意:域名变更会同时清空既有证书并重置同步状态,需重新上传证书;域名全局唯一(被占用返回 409)。
* 设置或变更当前仓库域名(**两阶段切换的第一阶段**):只登记「待验证域名」pending_domain 并下发一次性
* DNS TXT 校验记录,**不直接改动生效域名**,也不影响既有证书与同步状态——切换期间旧域名页面与
* frontConfig.getByDomain 公共拉取仍正常可用。
* 分支:入参 == 生效域名 → 取消待切换(清空 pending 组);入参 == 现有 pending_domain → 幂等短路/补发校验码;
* 其它 → 查重(其他仓库已占用返回 409)后写入 pending 组。
* TXT 校验通过需再调 frontConfig.checkDomain(或等定时任务),届时 pending_domain 才提升为生效域名,
* **并会清空证书 5 列与重置同步状态**(切换完成后必须重新上传证书)。
* 响应口径同 frontConfig.getDomain(16 字段)。
*/
export function frontConfigSetDomain(data: {
/** 自持域名(必填 ≤100,统一转小写存储,全局唯一) */
/** 待验证域名(必填,trim 后非空、≤100 字符、全局唯一、形态校验;统一转小写存储) */
domain: string
}): Promise<FrontConfigDomain & { code?: number; message?: string }> {
return postFrontConfig<FrontConfigDomain>('frontConfig.setDomain', data)
}
/** 主动校验域名 DNS TXT 归属记录并回写库(成功→domain_status=1 并清理该域名公共缓存;失败→domain_status=2) */
/**
* 主动校验域名 TXT 归属记录并回写库(两条路径,响应均同 getDomain 的 16 字段 + 本次校验结果):
* ①存在 pending_domain → 校验待验证域名,通过则提升为生效域名(清空 pending 组、旧域名进下线队列、
* 清空证书并重置同步状态)并清理新旧两个公共缓存;不通过仅累加 pending_attempts 并写 pending_last_error。
* ②无 pending_domain → 保持升级前口径:生效域名已验证则短路返回 verified=true(不写库);
* 未设置域名返回 400「请先设置域名」;历史未验证行沿用生效域名的 domain_verify_* 校验并回写。
*/
export function frontConfigCheckDomain(): Promise<
FrontConfigCheckDomainResult & { code?: number; message?: string }
> {

View File

@ -460,4 +460,92 @@ export function toOrder(data: IndexToOrderParams): Promise<IndexToOrderResponse>
data,
isSystemApi: true
} as any)
}
// ============ index.uploadClientErrorLog ============
/**
* 客户端错误日志上报条目(字段命名兼容 snake_case 与 camelCase 别名)。
* ⚠️ `error_message` 与 `error_stack` **至少一项有值**,否则该条被判为无效(计入 rejected)。
*/
export type ClientErrorLogItem = {
/** 客户端类型:android/ios/web 等(表宽 32,超出截断);别名 clientType */
client_type?: string
/** 客户端版本号(表宽 64,超出截断);别名 appVersion */
app_version?: string
/** 设备唯一标识(表宽 128,超出截断);别名 deviceId */
device_id?: string
/** 操作系统版本(表宽 64,超出截断);别名 osVersion */
os_version?: string
/** 设备型号(表宽 128,超出截断);别名 deviceModel */
device_model?: string
/** 错误类型/等级(表宽 64,超出截断);别名 errorType */
error_type?: string
/** 错误信息(与 error_stack 至少一项有值;超出截断至 5000 字符);别名 errorMessage */
error_message?: string
/** 错误堆栈(与 error_message 至少一项有值;超出截断至 65535 字符);别名 errorStack */
error_stack?: string
/** 附加上下文(字符串或对象,对象序列化为 JSON 字符串;超出截断至 65535 字符) */
extra?: string | Record<string, unknown>
/** 上报幂等ID(唯一索引 uk_report_uuid;重复上报静默成功、不产生重复行;缺失时服务端生成 srv-{uuid},不保证幂等) */
report_uuid?: string
/** 客户端错误发生时间(仅参考,不作为记录时间):毫秒/秒时间戳或日期字符串,非法值存 null */
client_time?: string | number
}
/**
* index.uploadClientErrorLog 入参:支持三种形态(三选一)
* - 单条对象:`{ client_type, error_message, ... }`
* - 数组:`[ { ... }, { ... } ]`
* - 包裹形态:`{ logs: [ { ... }, ... ] }`
* 单次最多 50 条(超出报 400)。
*/
export type ClientErrorLogUploadParams =
| ClientErrorLogItem
| ClientErrorLogItem[]
| { logs: ClientErrorLogItem[] }
/** index.uploadClientErrorLog 响应(方法级错误为 HTTP 200 + flag=failure,code=400/500) */
export type ClientErrorLogUploadResponse = {
/** 结果标记:success */
flag?: string
/** 业务码:200 成功;400 入参形状错误/空数据/超 50 条/全部条目无效;500 查询或写入失败 */
code?: number
/** 提示文案(成功为「上报成功」) */
message?: string
/** 服务处理结果标记(400/500 失败响应无此字段) */
success?: boolean
/** 本次上报条数 */
total?: number
/** 新入库条数 */
accepted?: number
/** 幂等去重条数(report_uuid 已存在,静默成功、不产生重复行) */
duplicated?: number
/** 校验失败条数 */
rejected?: number
/** 拒绝明细(最多 10 条) */
rejected_reasons?: { index: number; reason: string }[]
/** 服务端响应时间戳(秒) */
timestamp?: number
}
/**
* 上报客户端错误日志(免登录、免权限、免鉴权,保留系统日志):批量写入服务端暂存表 wms_client_error_log。
* 入参支持单条对象 / 数组 / `{ logs: [...] }` 三种形态,单次最多 50 条。
* `report_uuid` 幂等去重(重复上报静默成功);`client_time` 仅参考。
*/
export function uploadClientErrorLog(
data: ClientErrorLogUploadParams
): Promise<ClientErrorLogUploadResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'index.uploadClientErrorLog',
v: '1.0',
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -13,7 +13,9 @@ export type ReturnReceivedCreateParams = {
}
/** returnReceived.create:退回包裹扫码登记(30日内同仓库同单号幂等,以第一次为准) */
export function returnReceivedCreate(data: ReturnReceivedCreateParams): Promise<any> {
export function returnReceivedCreate(
data: ReturnReceivedCreateParams
): Promise<ReturnReceivedCreateResponse> {
return request({
url: '/system',
method: 'post',
@ -37,8 +39,14 @@ export type ReturnReceivedListWhere = {
scan_date?: { operator: 'between' | 'gte' | 'lte'; value: [string, string] | string }
/** 扫描人员工号ID(等值) */
scanner_id?: number
/** 扫描人员名称快照(等值) */
scanner_name?: string
/** 货主ID(等值) */
store_id?: number
/** 运单ID(等值,原单退回时回填) */
order_express_id?: number
/** 订单ID(等值,原单退回时回填) */
order_id?: number
/** 是否原单退回:true=有关联原运单,false=无关联 */
is_original_return?: boolean
/** 登记时间范围 { operator:'between'|'gte'|'lte', value:[start,end] 或单值 } */
@ -51,7 +59,7 @@ export type ReturnReceivedListWhere = {
export type ReturnReceivedListSort = {
/** 排序字段:id / scan_date / created_at / updated_at / waybill_code */
sortField?: 'id' | 'scan_date' | 'created_at' | 'updated_at' | 'waybill_code'
/** 排序方向:asc / desc */
/** 排序方向:asc / desc(默认 created_at desc) */
sortOrder?: 'asc' | 'desc'
}
@ -62,8 +70,90 @@ export type ReturnReceivedListParams = {
sort?: ReturnReceivedListSort
}
/** 退回收到登记记录(list 行 / create.record / detail.record 共用字段) */
export type ReturnReceivedRecord = {
id: number
warehouse_id?: number
/** 退回收件运单号(扫描到的退回包裹单号) */
waybill_code: string
/** 扫描日期(YYYY-MM-DD) */
scan_date?: string
scanner_id?: number
/** 扫描人员名称快照 */
scanner_name?: string
/** 原运单ID(原单退回时回填,否则 null) */
order_express_id?: number | null
/** 原订单ID(原单退回时回填,否则 null) */
order_id?: number | null
/** 货主ID(原单退回时回填,否则 null) */
store_id?: number | null
remark?: string | null
/** 是否已通知(0=未通知 1=已通知;由定时任务维护) */
is_notified?: number
/** 是否原单退回(派生字段) */
is_original_return?: boolean
/** 货主的合约货主备注名称(wms_store_warehouse.store_remask;非原单退回时为空字符串) */
store_remark?: string
created_at?: string
updated_at?: string
[key: string]: unknown
}
/** returnReceived.list 分页信息 */
export type ReturnReceivedPagination = {
page: number
pageSize: number
total: number
totalPages?: number
hasPrevious?: boolean
hasNext?: boolean
}
/** returnReceived.list 响应(/system 网关:业务字段与信封同级,无 data 包裹) */
export type ReturnReceivedListResponse = {
flag?: string
/** 业务码:1 / 200 / 20000 均视为成功 */
code?: number
message?: string
timestamp?: number
list?: ReturnReceivedRecord[]
pagination?: ReturnReceivedPagination
/** 兼容 data 包裹形态 */
data?: {
list?: ReturnReceivedRecord[]
pagination?: ReturnReceivedPagination
}
}
/** returnReceived.create 响应(平铺形态,兼容 data 包裹) */
export type ReturnReceivedCreateResponse = {
flag?: string
code?: number
message?: string
timestamp?: number
/** 登记记录(含完整登记字段与派生 is_original_return/store_remark) */
record?: ReturnReceivedRecord
/** 是否原单退回 */
is_original_return?: boolean
/** 货主的合约货主备注名称(非原单退回时为空字符串) */
store_remark?: string
/** 加急标记:退回查询记录表(wms_return_query_log)存在本仓库 + 本运单号记录时为 true,否则 false(查询失败降级 false) */
is_urgent?: boolean
/** 是否命中 30 日幂等(true=返回第一次登记结果,未重复写入) */
duplicated?: boolean
data?: {
record?: ReturnReceivedRecord
is_original_return?: boolean
store_remark?: string
is_urgent?: boolean
duplicated?: boolean
}
}
/** returnReceived.list:退回收到登记分页列表(仓库隔离,服务端注入 warehouse_id) */
export function returnReceivedList(data: ReturnReceivedListParams = {}): Promise<any> {
export function returnReceivedList(
data: ReturnReceivedListParams = {}
): Promise<ReturnReceivedListResponse> {
return request({
url: '/system',
method: 'post',
@ -127,9 +217,13 @@ export function returnReceivedDelete(data: ReturnReceivedDeleteParams): Promise<
/** returnReceived.export 请求参数(where/sort 语义与 returnReceived.list 一致) */
export type ReturnReceivedExportParams = {
/** 查询条件,语义与 returnReceived.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入) */
/**
* 查询条件,语义与 returnReceived.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入)。
* 支持字段:waybill_code(模糊)、scan_date/created_at/updated_at(范围)、
* scanner_id/scanner_name/store_id/order_express_id/order_id(等值)、is_original_return(是否原单退回)
*/
where?: Record<string, any>
/** 排序参数,语义与 returnReceived.list 的 sort 一致 */
/** 排序参数,语义与 returnReceived.list 的 sort 一致(sortField 白名单 id/scan_date/created_at/updated_at/waybill_code,默认 created_at desc) */
sort?: {
sortField?: string
sortOrder?: string

View File

@ -2,6 +2,90 @@ import request from '@/utils/request'
const v = '1.0'
// ============ 记录与响应类型 ============
/**
* 运单退回登记记录(list 行 / create.record / detail.record 共用字段)。
* ⚠️ `group_id/group_name/user_id/user_name` 为**登记来源**:仅站内信「查退回」触发登记时写入,后台登记为 null。
* ⚠️ `is_notified/is_back` 由定时任务与拆包联动维护,登记接口不维护。
*/
export type ReturnWaybillRecord = {
id: number
warehouse_id?: number
store_id?: number
/** 运单号 */
waybill_code: string
/** 登记来源群ID(站内信触发登记时写入;后台登记为 null) */
group_id?: number | null
/** 登记来源群名称(站内信触发登记时写入;后台登记为 null) */
group_name?: string | null
/** 登记来源用户ID(站内信发送人;后台登记为 null) */
user_id?: number | null
/** 登记来源用户名称(站内信发送人;后台登记为 null) */
user_name?: string | null
remark?: string | null
/** 是否已通知(0=未通知 1=已通知;由定时任务维护) */
is_notified?: number
/** 是否退回(0=未退回 1=已退回;由拆包单提交联动维护) */
is_back?: number
created_at?: string
updated_at?: string
[key: string]: unknown
}
/** returnWaybill.list 分页信息 */
export type ReturnWaybillPagination = {
page: number
pageSize: number
total: number
totalPages?: number
hasPrevious?: boolean
hasNext?: boolean
}
/** returnWaybill.list 响应(/system 网关:业务字段与信封同级;兼容 data 包裹) */
export type ReturnWaybillListResponse = {
flag?: string
code?: number
message?: string
timestamp?: number
list?: ReturnWaybillRecord[]
pagination?: ReturnWaybillPagination
data?: {
list?: ReturnWaybillRecord[]
pagination?: ReturnWaybillPagination
}
}
/** returnWaybill.create 响应(平铺形态,兼容 data 包裹) */
export type ReturnWaybillCreateResponse = {
flag?: string
code?: number
message?: string
timestamp?: number
/** 登记记录(含登记来源字段;后台登记时来源均为 null) */
record?: ReturnWaybillRecord
/** 是否命中已有记录(同仓库+货主+运单号已存在时为 true,返回已有记录、不重复插入) */
duplicated?: boolean
data?: {
record?: ReturnWaybillRecord
duplicated?: boolean
}
}
/** returnWaybill.detail 响应 */
export type ReturnWaybillDetailResponse = {
flag?: string
code?: number
message?: string
timestamp?: number
/** 登记记录完整信息(含登记来源字段;后台登记为 null) */
record?: ReturnWaybillRecord
data?: {
record?: ReturnWaybillRecord
}
}
// ============ returnWaybill.create ============
/** returnWaybill.create 请求参数 */
@ -15,7 +99,9 @@ export type ReturnWaybillCreateParams = {
}
/** returnWaybill.create:运单退回登记(录入「货主 + 运单号」退回关系) */
export function returnWaybillCreate(data: ReturnWaybillCreateParams): Promise<any> {
export function returnWaybillCreate(
data: ReturnWaybillCreateParams
): Promise<ReturnWaybillCreateResponse> {
return request({
url: '/system',
method: 'post',
@ -78,7 +164,7 @@ export type ReturnWaybillListWhere = {
export type ReturnWaybillListSort = {
/** 排序字段 */
sortField?: 'id' | 'created_at' | 'updated_at' | 'waybill_code'
/** 排序方向:asc / desc */
/** 排序方向:asc / desc(默认 created_at desc) */
sortOrder?: 'asc' | 'desc'
}
@ -90,7 +176,9 @@ export type ReturnWaybillListParams = {
}
/** returnWaybill.list:运单退回登记分页列表(仓库隔离,服务端注入 warehouse_id) */
export function returnWaybillList(data: ReturnWaybillListParams = {}): Promise<any> {
export function returnWaybillList(
data: ReturnWaybillListParams = {}
): Promise<ReturnWaybillListResponse> {
return request({
url: '/system',
method: 'post',
@ -113,7 +201,9 @@ export type ReturnWaybillDetailParams = {
}
/** returnWaybill.detail:运单退回登记详情(仓库隔离校验) */
export function returnWaybillDetail(data: ReturnWaybillDetailParams): Promise<any> {
export function returnWaybillDetail(
data: ReturnWaybillDetailParams
): Promise<ReturnWaybillDetailResponse> {
return request({
url: '/system',
method: 'post',

View File

@ -133,6 +133,11 @@ export type SettingWarehouseSubjectConfig = SettingWarehouseSenderConfig & {
single_order_pack_max_minutes?: number
/** 团购打包最大时长,单位:分钟,默认 40 */
group_order_pack_max_minutes?: number
/**
* 大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,
* 单位:秒/单,默认 3,**必须大于 0**(用于 workbench 大团购波次打包时长闸门与倒计时)
*/
big_group_pack_coefficient?: number
/** 拆包最大录制时长,单位:分钟,默认 5,min 1;超过上限时拆包提交的结束时间自动截断为开始时间+上限 */
return_unpack_max_record_minutes?: number
max_wave_quantity?: number
@ -407,6 +412,13 @@ export function normalizeWarehouseSubjectConfig(
base.group_order_pack_max_minutes =
Number.isFinite(groupPackMax) && groupPackMax > 0 ? Math.trunc(groupPackMax) : 40
// 大团购打包系数(秒/单,默认 3,必须大于 0;允许小数,保留原值)
const bigGroupPackCoefficient = Number(base.big_group_pack_coefficient)
base.big_group_pack_coefficient =
Number.isFinite(bigGroupPackCoefficient) && bigGroupPackCoefficient > 0
? bigGroupPackCoefficient
: 3
// 默认库位(库位ID,未配置时为 null)
const locIdRaw = base.default_location_id
if (locIdRaw === undefined || locIdRaw === null || locIdRaw === '') {

View File

@ -66,7 +66,7 @@ export type WaybillWarehouseListParams = {
sort?: WaybillWarehouseListSort
}
/** 单次请求可覆盖的配置(不传则使用全局默认超时 10 秒) */
/** 单次请求可覆盖的配置(不传则使用 list 类接口默认超时 5 分钟) */
export type WaybillRequestOptions = {
/** 超时时间(毫秒) */
timeout?: number

View File

@ -171,6 +171,8 @@ export interface WorkbenchQueryOrderOrder {
wave_id?: number
/** 波次号 */
wave_no?: string
/** 波次范围:0=未分配波次 1=大团购 2=散单 3=小团购 4=单品单件(来自订单行 wave_scope) */
wave_scope?: number
/** 打单状态 */
post_status?: string
/** 拣货状态 */
@ -279,6 +281,42 @@ export interface WorkbenchBusinessResponse {
code?: number
}
/**
* workbench.packOrder 响应(`business({ name: 'packOrder', data })`)。
* 推荐只传 token + key(key 来自 workbench.queryOrder 响应,20 分钟有效)。
* ⚠️ 大团购波次(order.wave_scope=1)才附倒计时字段 pack_wait_seconds / pack_start_time,其他波次两字段均为 0。
*/
export interface WorkbenchPackOrderResult {
/** 打包任务ID(wms_pack_task.id) */
task_id: number
/** 订单ID */
order_id: number
/** 发货单号 */
delivery_order_code: string
/** 波次号 */
wave_no: string
/** 是否散单:1=散单 0=团购(波次类型 wave_type=1 时判定为团购) */
isSandan: number
/** 打包模式:1=散单 2=团购 */
pack_mode: number
/** 任务状态:1=打包中 2=已完成 */
status: number
/** 大团购倒计时等待秒数(大团购打包系数 × 当前波次打包数 ÷ 当前工作台打包人数;仅 wave_scope=1 有值,其他波次为 0) */
pack_wait_seconds: number
/** 开始打包时间(毫秒时间戳;仅 wave_scope=1 有值,其他波次为 0) */
pack_start_time: number
/** 团购波次信息(仅团购单 isSandan=0 时返回) */
batch?: {
wave_id: number
wave_no: string
/** 波次类型(1=团购) */
wave_type: number
/** 波次订单总数(current+dispatch 分表实时统计) */
total_orders: number
}
code?: number
}
/** 工作台业务入口(免登录免鉴权,入参 name + data) */
export function business(
data: WorkbenchBusinessParams

View File

@ -6,18 +6,46 @@ import {
import router from '@/router'
import { useUserStore } from '@/stores/modules/user'
/** 全局默认超时时间(毫秒) */
const DEFAULT_TIMEOUT_MS = 10000
/** 常规 list 类接口默认超时时间(毫秒):5 分钟 */
const LIST_TIMEOUT_MS = 5 * 60 * 1000
/**
* 「常规 list 类接口」判定规则:网关接口名(params.method)以 list 结尾,不区分大小写。
* 例如 waybill.warehouse.list / order.deliveryOrder.list / order.list /
* afterSale.workList / index.getExpressList / stock.warehouse.getProhibitedList 等。
* 此类查询多涉及大表扫描或多表聚合,10 秒全局默认值容易超时。
*/
const LIST_METHOD_PATTERN = /list$/i
// create an axios instance
const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API,
timeout: 10000, // 建议适当延长超时时间
timeout: DEFAULT_TIMEOUT_MS, // 全局默认 10 秒;常规 list 类接口在拦截器里放宽到 5 分钟
// withCredentials: true, // 根据实际情况决定是否开启
});
// 定义业务成功码
const SUCCESS_CODES = [200, 20000, 1,0] // 支持多种成功码
/** 业务扩展请求配置:silentError=true 时拦截器不弹错误提示,由调用方自行兜底(如公共品牌按域名拉取) */
type ServiceRequestConfig = { silentError?: boolean }
/**
* 业务扩展请求配置:
* - `silentError`:true 时拦截器不弹错误提示,由调用方自行兜底(如公共品牌按域名拉取)
* - `listTimeout`:单独控制 list 类接口超时。传毫秒数表示覆盖默认 5 分钟;
* 传 `false` 表示不套用 list 默认超时(保持全局默认 10 秒)
*/
type ServiceRequestConfig = {
silentError?: boolean
listTimeout?: number | false
}
/** 取出网关接口名(`/system` 网关通过 `params.method` 指定,如 waybill.warehouse.list) */
function getGatewayMethod(config: { params?: unknown }): string | undefined {
const params = config.params as { method?: unknown } | undefined
return typeof params?.method === 'string' ? params.method : undefined
}
// 错误码映射
const ERROR_CODE_MAP = {
@ -59,6 +87,21 @@ service.interceptors.request.use(
config => {
config.headers['platform'] ='web';
config.headers['project'] ='all';
// 常规 list 类接口超时处理,优先级:
// listTimeout(数字) > 调用方显式 timeout > list 默认 5 分钟 > 全局默认 10 秒
// 说明:仅当 timeout 仍为全局默认值时才套用 5 分钟,避免覆盖调用方单独放宽的超时
//(如长轮询 70 秒、地址解析 10 分钟);若某 list 接口需要坚持 10 秒,传 listTimeout: false
const extraConfig = config as unknown as ServiceRequestConfig
if (typeof extraConfig.listTimeout === 'number') {
config.timeout = extraConfig.listTimeout
} else if (extraConfig.listTimeout !== false && config.timeout === DEFAULT_TIMEOUT_MS) {
const gatewayMethod = getGatewayMethod(config)
if (gatewayMethod && LIST_METHOD_PATTERN.test(gatewayMethod)) {
config.timeout = LIST_TIMEOUT_MS
}
}
// 添加 token
const token = getToken()
if (token) {

View File

@ -75,6 +75,12 @@
@refresh="handleRefresh"
@sort-change="handleSortChange"
>
<template #column-is_notified="{ row }">
<span :class="getStatusTextClass(row.is_notified ? 'success' : 'info')">
{{ row.is_notified ? '已通知' : '未通知' }}
</span>
</template>
<template #column-is_original_return="{ row }">
<span :class="getStatusTextClass(row.is_original_return ? 'success' : 'info')">
{{ row.is_original_return ? '是' : '否' }}
@ -133,6 +139,11 @@
<el-descriptions-item label="扫描人员">{{ detailData.record?.scanner_name ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="仓库ID">{{ detailData.record?.warehouse_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="货主ID">{{ detailData.record?.store_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="是否已通知">
<span :class="getStatusTextClass(detailData.record?.is_notified ? 'success' : 'info')">
{{ detailData.record?.is_notified ? '已通知' : '未通知' }}
</span>
</el-descriptions-item>
<el-descriptions-item label="是否原单退回">
<span :class="getStatusTextClass(detailData.record?.is_original_return ? 'success' : 'info')">
{{ detailData.record?.is_original_return ? '是' : '否' }}
@ -443,11 +454,16 @@ function buildWhereFromConditions(conditions: Record<string, any>) {
where[key] = { operator: 'between', value }
break
case 'scanner_id':
case 'store_id': {
case 'store_id':
case 'order_express_id':
case 'order_id': {
const n = Number(value)
if (!Number.isNaN(n)) where[key] = n
break
}
case 'scanner_name':
where.scanner_name = String(value)
break
case 'is_original_return':
where.is_original_return = Boolean(value)
break
@ -543,12 +559,13 @@ async function handleRegister() {
})
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
const data = res.data ?? res
const urgentTip = data.is_urgent ? '(加急件)' : ''
if (data.duplicated) {
ElMessage.warning(`该运单号 30 日内已登记(记录ID ${data.record?.id ?? data.id}),已返回第一次登记结果`)
ElMessage.warning(`该运单号 30 日内已登记(记录ID ${data.record?.id ?? data.id}),已返回第一次登记结果${urgentTip}`)
} else if (data.is_original_return) {
ElMessage.success(`登记成功:命中原单退回,原运单ID ${data.record?.order_express_id ?? data.order_express_id}`)
ElMessage.success(`登记成功:命中原单退回,原运单ID ${data.record?.order_express_id ?? data.order_express_id}${urgentTip}`)
} else {
ElMessage.success('登记成功')
ElMessage.success(`登记成功${urgentTip}`)
}
registerForm.waybillCode = ''
registerForm.remark = ''

View File

@ -26,6 +26,14 @@ export const returnReceivedAvailableFields = [
operators: ['eq'],
defaultOperator: 'eq',
},
{
value: 'scanner_name',
label: '扫描人员名称',
type: 'text',
placeholder: '扫描人员名称(等值)',
operators: ['eq'],
defaultOperator: 'eq',
},
{
value: 'store_id',
label: '货主',
@ -33,6 +41,22 @@ export const returnReceivedAvailableFields = [
placeholder: '请选择货主',
options: [] as { label: string; value: unknown }[],
},
{
value: 'order_express_id',
label: '原运单ID',
type: 'number',
placeholder: '原运单ID(等值)',
operators: ['eq'],
defaultOperator: 'eq',
},
{
value: 'order_id',
label: '原订单ID',
type: 'number',
placeholder: '原订单ID(等值)',
operators: ['eq'],
defaultOperator: 'eq',
},
{
value: 'is_original_return',
label: '是否原单退回',
@ -63,6 +87,7 @@ export const returnReceivedColumns = [
{ prop: 'scanner_name', label: '扫描人员', minWidth: '100', showOverflowTooltip: true },
// { prop: 'warehouse_id', label: '仓库ID', width: '100' },
// { prop: 'store_id', label: '货主ID', width: '100' },
{ prop: 'is_notified', label: '是否已通知', width: '110' },
{ prop: 'is_original_return', label: '是否原单退回', width: '110' },
{ prop: 'order_express_id', label: '原运单ID', width: '100' },
{ prop: 'order_id', label: '原订单ID', width: '100' },

View File

@ -7,12 +7,6 @@
<div class="left-top">
<span class="left-title">拆包工作台</span>
<div class="left-top-actions">
<el-switch
v-model="osdEnabled"
size="small"
active-text="字幕推送"
:title="osdEnabled ? '拆包扫码时自动推送 OSD 字幕到已选摄像头' : '开启后扫码自动推送 OSD 字幕到已选摄像头'"
/>
<el-button size="small" @click="openCameraSettings">摄像头设置</el-button>
</div>
</div>
@ -78,7 +72,7 @@
</el-form-item>
<el-form-item label="操作">
<div class="unpack-actions">
<el-button size="small" type="success" :loading="createLoading" :disabled="!!createResult?.id" @click="() => handleCreate()">创建</el-button>
<el-button size="small" type="primary" :loading="createLoading" :disabled="!!createResult?.id" @click="() => handleCreate()">创建</el-button>
<template v-if="createResult?.id">
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="success" :loading="submitLoading" @click="handleSubmit">提交</el-button>
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="warning" :loading="cancelLoading" @click="handleCancel">取消</el-button>
@ -111,6 +105,7 @@
<span class="scan-commands-title">📟 扫码指令</span>
<el-button link size="small" type="primary" @click="printScanStickers">打印贴纸</el-button>
</div>
<div class="scan-commands-sub">扫码枪扫条码,或直接点击条码执行对应操作</div>
<div
v-for="cmd in displayCommands"
:key="cmd"
@ -125,8 +120,14 @@
<span v-if="isActiveCmd(cmd)" class="scan-command-current" title="当前默认状态">●</span>
<el-button link size="small" class="scan-copy-btn" @click="copyScanCommand(CMD[cmd])">复制</el-button>
</div>
<svg :ref="barcodeRefs[cmd]" class="scan-command-barcode-img"></svg>
<div class="scan-command-code">{{ CMD[cmd] }}</div>
<div
class="scan-command-hit"
:title="`点击执行:${CMD_LABEL[cmd]}`"
@click="runScanCommandByClick(cmd)"
>
<svg :ref="barcodeRefs[cmd]" class="scan-command-barcode-img"></svg>
<div class="scan-command-code">{{ CMD[cmd] }}</div>
</div>
</div>
</div>
</div>
@ -144,8 +145,7 @@
<span class="create-result-title">开单结果</span>
</div>
<div v-if="createResult" class="create-result-body">
<el-descriptions :column="2" size="small" border>
<el-descriptions-item label="拆包单ID">{{ createResult.id ?? '-' }}</el-descriptions-item>
<el-descriptions :column="4" size="small" border class="create-result-desc">
<el-descriptions-item label="拆包单号">{{ createResult.record?.unpack_no ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="运单号">{{ createResult.record?.waybill_code ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="拆包状态">
@ -153,12 +153,13 @@
{{ statusLabel(createResult.record?.status) }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="是否原单退回">
<el-descriptions-item label="原单退回">
<el-tag :type="createResult.is_original_return ? 'success' : 'info'" size="small">
{{ createResult.is_original_return ? '是' : '否' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="货主备注">{{ createResult.store_remark || '-' }}</el-descriptions-item>
<el-descriptions-item label="货主备注" :span="3">{{ createResult.store_remark || '-' }}</el-descriptions-item>
<el-descriptions-item label="拆包单ID">{{ createResult.id ?? '-' }}</el-descriptions-item>
</el-descriptions>
<!-- <div v-if="createResult.is_original_return && createResult.order_items?.length" class="order-items-block">
@ -184,7 +185,7 @@
</el-table>
</div> -->
</div>
<el-empty v-else description="点击「创建拆包」后显示开单结果" :image-size="60" />
<el-empty v-else description="扫描/输入运单号后点击「创建」,开单结果将显示在这里" :image-size="60" />
</div>
</div>
<div
@ -244,94 +245,99 @@
<div class="right-body">
<!-- 商品对照(订单商品 vs 已拆商品):按商品编码匹配,直接合并进下方明细表 -->
<div v-if="hasOrderItems" class="detail-compare-bar">
<div class="compare-legend">
<span class="legend-item legend-item--matched">一致 {{ compareSummary.matched }}</span>
<span class="legend-item legend-item--qty_diff">数量差异 {{ compareSummary.qtyDiff }}</span>
<span class="legend-item legend-item--order_only">仅订单 {{ compareSummary.orderOnly }}</span>
<span class="legend-item legend-item--unpack_only">仅拆包 {{ compareSummary.unpackOnly }}</span>
</div>
<div class="compare-toolbar">
<div class="compare-stats">
<span class="compare-stat">
原订单 <b>{{ compareSummary.orderTypes }}</b> 类 / <b>{{ compareSummary.orderQty }}</b> 件
</span>
<span class="compare-stat">
已扫描 <b>{{ compareSummary.unpackTypes }}</b> 类 / <b>{{ compareSummary.unpackQty }}</b> 件
</span>
<el-button size="small" :loading="detailListLoading" @click="loadDetailList">刷新</el-button>
</div>
<div class="compare-legend">
<span class="legend-item legend-item--matched">一致 {{ compareSummary.matched }}</span>
<span class="legend-item legend-item--qty_diff">数量差异 {{ compareSummary.qtyDiff }}</span>
<span class="legend-item legend-item--order_only">仅订单 {{ compareSummary.orderOnly }}</span>
<span class="legend-item legend-item--unpack_only">仅拆包 {{ compareSummary.unpackOnly }}</span>
</div>
</div>
<div class="detail-list-head">
<span class="detail-list-title">拆包明细({{ detailTableRows.length }} 项)</span>
<el-button size="small" :loading="detailListLoading" @click="loadDetailList">刷新</el-button>
</div>
<el-table
v-loading="detailListLoading"
:data="pagedDetailRows"
:row-class-name="detailRowClassName"
:span-method="detailSpanMethod"
size="small"
border
class="detail-table detail-compare-table"
empty-text="暂无明细"
>
<!-- 左侧:原订单商品(开单查到) -->
<!-- 左侧:原单商品(同一商品的多条拆包记录合并成一格,显示订单/退回/差异) -->
<el-table-column
v-if="hasOrderItems"
label="原订单商品"
align="center"
label="原单商品"
min-width="210"
class-name="compare-order-column"
label-class-name="compare-group-label--order"
>
<el-table-column label="图片" width="70" align="center">
<template #default="{ row }">
<el-image
v-if="row.__order?.images?.length"
:src="row.__order.images[0]"
:preview-src-list="row.__order.images"
preview-teleported
fit="cover"
class="stock-thumb"
/>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="商品编码" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.code || '—' }}</template>
</el-table-column>
<el-table-column label="商品名称" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.name || '—' }}</template>
</el-table-column>
<el-table-column label="规格" min-width="90" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.spec || '—' }}</template>
</el-table-column>
<el-table-column label="订单数量" width="80" align="right">
<template #default="{ row }">{{ row.__order ? row.__order.qty : '—' }}</template>
</el-table-column>
<template #default="{ row }">
<div class="compare-order-cell">
<div class="compare-order-title">
{{
formatItemTitle(
row.__order?.name || row.__unpack?.name,
row.__order?.spec || row.__unpack?.spec
) || '—'
}}
</div>
<div class="compare-order-code">{{ row.__order?.code || row.__unpack?.code || '—' }}</div>
<div class="compare-order-stats">
<span class="compare-order-stat">订单:<b>{{ row.__order ? (row.__groupOrderQty ?? 0) : '—' }}</b></span>
<span class="compare-order-stat">退回:<b>{{ row.__groupUnpackQty ?? 0 }}</b></span>
<span
v-if="row.__groupDiff != null"
class="compare-order-stat"
:class="diffClass(row.__groupDiff)"
>
差异:<b>{{ formatDiff(row.__groupDiff) }}</b>
</span>
</div>
<el-tag v-if="!row.__order" size="small" type="info" effect="plain">非原单商品</el-tag>
</div>
</template>
</el-table-column>
<!-- 右侧:扫描添加的商品(拆包),同一个商品与左侧同行显示 -->
<el-table-column label="扫描添加的商品(拆包)" align="center">
<el-table-column label="图片" width="70" align="center" class-name="compare-divider-left">
<!-- 右侧:该商品对应的拆包记录(同商品多条记录逐行展示) -->
<el-table-column label="拆包明细" align="center">
<el-table-column label="拆包商品" min-width="180" class-name="compare-divider-left">
<template #default="{ row }">
<el-image
v-if="row.__unpack && detailImage(row)"
:src="detailImage(row)"
:preview-src-list="detailImages(row)"
preview-teleported
fit="cover"
class="stock-thumb"
/>
<div v-if="row.__unpack" class="compare-unpack-cell">
<el-image
v-if="detailImage(row)"
:src="detailImage(row)"
:preview-src-list="detailImages(row)"
preview-teleported
fit="cover"
class="stock-thumb compare-unpack-thumb"
/>
<div class="compare-unpack-info">
<div class="compare-unpack-title">
<el-tag size="small" type="primary" effect="plain">拆包</el-tag>
<span class="compare-unpack-name">
{{ formatItemTitle(row.__unpack?.name, row.__unpack?.spec) || '—' }}
</span>
</div>
<div class="compare-unpack-barcode">{{ row.barcode || '—' }}</div>
</div>
</div>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="商品编码" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.code || '—' }}</template>
</el-table-column>
<el-table-column label="商品名称" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.name || '—' }}</template>
</el-table-column>
<el-table-column label="规格" min-width="90" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.spec || '—' }}</template>
</el-table-column>
<el-table-column label="条码" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '—' }}</template>
</el-table-column>
<el-table-column label="拆包数量" width="160">
<el-table-column label="数量" width="150">
<template #default="{ row }">
<div v-if="row.__unpack" class="compare-qty-cell">
<el-input-number
@ -355,7 +361,7 @@
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="产品状态" width="90">
<el-table-column label="产品状态" width="90" align="center">
<template #default="{ row }">
<el-tag
v-if="row.__unpack"
@ -661,7 +667,7 @@ import {
import { list as cameraList, setOsd } from '@/api/camera/camera'
import CameraLivePreview, { type CameraLiveItem } from './CameraLivePreview.vue'
import JsBarcode from 'jsbarcode'
import { CMD, CMD_LABEL, CMD_TAG_TYPE, SCAN_COMMANDS, resolveScanCommand } from './scan-commands'
import { CMD, CMD_LABEL, CMD_TAG_TYPE, SCAN_COMMANDS, resolveScanCommand, type ScanCommand } from './scan-commands'
import StockPickerDialog from '@/views/express/returnUnpack/components/StockPickerDialog.vue'
import { queryStockProducts, mapStockPickerItem, getStockStoreId } from '@/views/order/orderManagement/utils/stock-picker-helpers'
import { orderDetail, orderList } from '@/api/order.index/orderindex'
@ -968,8 +974,8 @@ function saveCameraSettings() {
cameraSettingsVisible.value = false
ElMessage.success('摄像头设置已保存')
persistCameraSelection()
// 摄像头选择变化后,向新选中的摄像头重新推送当前字幕
void pushOsdText(undefined, true)
// 摄像头选择变化后,向新选中的摄像头强制重新推送当前字幕
void pushOsdText()
}
// ==================== 摄像头选择持久化 ====================
@ -1012,13 +1018,10 @@ function restoreCameraSelection() {
}
// ==================== OSD 字幕推送 ====================
// 拆包扫码时把「单号 + 商品条码」通过 camera.setOsd 推送到已选摄像头,叠加到监控画面
const OSD_ENABLED_STORAGE_KEY = 'returnUnpackWork:osdEnabled'
// 拆包扫码时把「单号 + 商品条码」通过 camera.setOsd 强制推送到已选摄像头,叠加到监控画面
// 已去掉「字幕推送」开关:始终推送;也不再做文本去重,保证每次动作都强制下发
const OSD_IDLE_TEXT = '无任务'
const osdEnabled = ref(true)
const lastScannedBarcode = ref('')
const osdPushing = ref(false)
let lastOsdText: string | null = null
let osdNoCameraWarned = false
/** 当前应推送的字幕文本:单号:xxx(扫到商品条码后追加 商品条码:xxx);无拆包时显示待命文字 */
@ -1030,9 +1033,8 @@ function buildOsdText(): string {
: `单号:${waybill}`
}
/** 推送 OSD 字幕到所有已选摄像头(失败静默:请求层已提示;全部失败则允许下次重试) */
async function pushOsdText(text?: string, force = false) {
if (!osdEnabled.value) return
/** 强制推送 OSD 字幕到所有已选摄像头(强制:无开关、不去重;失败静默:请求层已提示) */
async function pushOsdText(text?: string) {
const cameras = selectedCameras.value
if (!cameras.length) {
if (!osdNoCameraWarned) {
@ -1044,41 +1046,13 @@ async function pushOsdText(text?: string, force = false) {
// 空文本 → 直接推「无任务」待命文字覆盖旧字幕
const raw = text != null ? String(text).trim() : buildOsdText()
const t = raw === '' ? OSD_IDLE_TEXT : raw
if (!force && t === lastOsdText) return
lastOsdText = t
osdPushing.value = true
try {
const results = await Promise.allSettled(
cameras.map((c) => setOsd({ id: c.id, text: t, x: -0.9, y: 0.8 }))
)
const okCount = results.filter((r) => r.status === 'fulfilled' && isOk(r.value)).length
if (okCount === 0) {
lastOsdText = null
} else if (t) {
ElMessage.success(`字幕已推送:${t}`)
}
} finally {
osdPushing.value = false
}
const results = await Promise.allSettled(
cameras.map((c) => setOsd({ id: c.id, text: t, x: -0.9, y: 0.8 }))
)
const okCount = results.filter((r) => r.status === 'fulfilled' && isOk(r.value)).length
if (okCount > 0) ElMessage.success(`字幕已推送:${t}`)
}
function restoreOsdEnabled() {
try {
const raw = localStorage.getItem(OSD_ENABLED_STORAGE_KEY)
if (raw != null) osdEnabled.value = raw === '1' || raw === 'true'
} catch {
// 读取失败忽略
}
}
watch(osdEnabled, (v) => {
try {
localStorage.setItem(OSD_ENABLED_STORAGE_KEY, v ? '1' : '0')
} catch {
// 存储失败忽略
}
})
// ==================== 明细操作 ====================
function openAddDetail() {
@ -1453,12 +1427,14 @@ const detailTableRows = computed<any[]>(() => {
const orderMap = orderItemByCode.value
const details = detailList.value ?? []
const scannedCodes = new Set<string>()
const rows: any[] = details.map((row) => {
const rows: any[] = details.map((row, index) => {
const unpack = normalizeUnpackCompareItem(row)
if (unpack.code) scannedCodes.add(unpack.code)
const order = unpack.code ? orderMap.get(unpack.code) : undefined
return {
...row,
// 左侧「原单商品」按该键合并单元格:有商品编码用编码,无编码的行各自成一格
__groupCode: unpack.code || `__row_${index}`,
__orderOnly: false,
__order: order
? { code: unpack.code, name: order.name, spec: order.spec, qty: order.qty, images: order.images }
@ -1472,6 +1448,7 @@ const detailTableRows = computed<any[]>(() => {
for (const [code, order] of orderMap) {
if (scannedCodes.has(code)) continue
rows.push({
__groupCode: code,
__orderOnly: true,
id: null,
__order: { code, name: order.name, spec: order.spec, qty: order.qty, images: order.images },
@ -1481,7 +1458,34 @@ const detailTableRows = computed<any[]>(() => {
})
}
return rows
// 同一商品的多条拆包记录聚拢到相邻位置(保持首次出现顺序),并在组内汇总
// 「订单:N 退回:M 差异:D」,供左侧合并单元格展示(退回 = 该商品已拆数量合计)
const groups = new Map<string, any[]>()
for (const row of rows) {
const list = groups.get(row.__groupCode)
if (list) list.push(row)
else groups.set(row.__groupCode, [row])
}
const ordered: any[] = []
const emitted = new Set<string>()
for (const row of rows) {
const key = row.__groupCode
if (emitted.has(key)) continue
emitted.add(key)
const group = groups.get(key) ?? [row]
const orderQty = Number(group[0]?.__order?.qty ?? 0)
const unpackQty = group.reduce(
(acc, item) => acc + (item.__unpack ? Number(item.quantity ?? 0) : 0),
0
)
for (const item of group) {
item.__groupOrderQty = orderQty
item.__groupUnpackQty = unpackQty
item.__groupDiff = group[0]?.__order ? unpackQty - orderQty : null
}
ordered.push(...group)
}
return ordered
})
/** 前端分页切片(全量数据一次取回,切换页不再请求) */
@ -1490,6 +1494,28 @@ const pagedDetailRows = computed(() => {
return detailTableRows.value.slice(start, start + detailPagination.pageSize)
})
/** 页内同商品分组的行数(从当前行往下连续同组的数量):用于合并左侧单元格 */
const pagedRowSpans = computed<number[]>(() => {
const rows = pagedDetailRows.value
const spans: number[] = new Array(rows.length).fill(1)
for (let i = rows.length - 1; i >= 0; i -= 1) {
const next = rows[i + 1]
spans[i] = next && next.__groupCode === rows[i].__groupCode ? (spans[i + 1] ?? 1) + 1 : 1
}
return spans
})
/** 表格合并:左侧「原单商品」列按商品编码合并(页内),其余单元格不合并 */
function detailSpanMethod({ rowIndex, columnIndex }: { rowIndex: number; columnIndex: number }) {
if (!hasOrderItems.value || columnIndex !== 0) return [1, 1]
const rows = pagedDetailRows.value
const current = rows[rowIndex]
const prev = rows[rowIndex - 1]
if (!current) return [1, 1]
if (prev && prev.__groupCode === current.__groupCode) return [0, 0]
return [pagedRowSpans.value[rowIndex] ?? 1, 1]
}
watch(
detailTableRows,
(rows) => {
@ -1506,6 +1532,21 @@ function formatDiff(diff: number | null | undefined): string {
return diff > 0 ? `+${diff}` : String(diff)
}
/** 差异配色:0 一致(绿)/ 正数多拆(橙)/ 负数少拆(红) */
function diffClass(diff: number | null | undefined): string {
if (diff == null || !Number.isFinite(diff)) return ''
if (diff === 0) return 'compare-diff--matched'
return diff > 0 ? 'compare-diff--over' : 'compare-diff--short'
}
/** 商品展示名:名称(规格),名称缺失时只返回规格 */
function formatItemTitle(name: unknown, spec: unknown): string {
const n = String(name ?? '').trim()
const s = String(spec ?? '').trim()
if (!n) return s
return s ? `${n}(${s})` : n
}
/** 开单查到、但尚未扫码的订单商品行:整行灰底 */
function detailRowClassName({ row }: { row: any }): string {
return row?.__orderOnly ? 'detail-row--order-only' : ''
@ -1874,6 +1915,14 @@ async function copyScanCommand(code: string) {
}
}
/**
* 点击条码执行对应指令:与扫码枪扫到同一条码**完全等效**(走同一个 routeScan 路由,
* 同样单次直接执行、不弹二次确认),便于无扫码枪时用鼠标操作。
*/
function runScanCommandByClick(cmd: ScanCommand) {
routeScan(CMD[cmd])
}
/** 页面展示的指令(隐藏「取消拆包」条码;扫码识别与打印贴纸仍保留全部指令) */
const displayCommands = computed(() => SCAN_COMMANDS.filter((cmd) => cmd !== 'cancel'))
@ -2077,7 +2126,6 @@ onMounted(async () => {
loadUnpackList()
await loadCameraList()
restoreCameraSelection()
restoreOsdEnabled()
window.addEventListener('keydown', handleKeydown)
nextTick(() => {
renderBarcodes()
@ -2312,7 +2360,7 @@ async function confirmRemoveDetail() {
padding: 12px;
box-sizing: border-box;
gap: 12px;
background: #f0f2f5;
background: #f2f4f8;
overflow: hidden;
}
@ -2325,20 +2373,28 @@ async function confirmRemoveDetail() {
}
.left-panel {
flex: 0 0 340px;
flex: 0 0 356px;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
padding: 16px;
border: 1px solid #e6ebf2;
border-radius: 10px;
padding: 14px 16px 16px;
display: flex;
flex-direction: column;
gap: 14px;
gap: 12px;
overflow-y: auto;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
box-shadow: 0 1px 3px rgba(16, 24, 40, 0.04), 0 8px 24px -16px rgba(16, 24, 40, 0.12);
}
.waybill-form {
width: 100%;
:deep(.el-form-item) {
margin-bottom: 12px;
}
:deep(.el-form-item__label) {
color: #606266;
}
}
/* 左侧顶部:标题 + 摄像头设置 */
@ -2347,12 +2403,26 @@ async function confirmRemoveDetail() {
align-items: center;
justify-content: space-between;
gap: 8px;
padding-bottom: 10px;
border-bottom: 1px solid #f0f2f5;
}
.left-title {
font-size: 14px;
display: flex;
align-items: center;
font-size: 15px;
font-weight: 600;
color: #303133;
color: #1f2d3d;
letter-spacing: 0.2px;
&::before {
content: '';
width: 3px;
height: 15px;
margin-right: 8px;
border-radius: 2px;
background: var(--el-color-primary, #409eff);
}
}
.left-top-actions {
@ -2408,7 +2478,10 @@ async function confirmRemoveDetail() {
/* 扫码指令说明区块 */
.scan-commands-tips {
border-top: 1px dashed #e8eef7;
display: flex;
flex-direction: column;
gap: 8px;
border-top: 1px solid #f0f2f5;
padding-top: 12px;
}
@ -2416,33 +2489,39 @@ async function confirmRemoveDetail() {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
}
.scan-commands-title {
display: flex;
align-items: center;
font-size: 13px;
font-weight: 600;
color: #303133;
color: #1f2d3d;
}
.scan-commands-sub {
font-size: 12px;
color: #909399;
margin-bottom: 10px;
line-height: 1.5;
margin-top: -2px;
}
/* 单列排列 */
/* 单列排列:卡片紧凑、hover 提示可点 */
.scan-command-row {
position: relative;
display: flex;
flex-direction: column;
gap: 5px;
gap: 6px;
padding: 8px 10px;
margin-bottom: 12px;
border: 1px solid #ebeef5;
border: 1px solid #edf1f7;
border-radius: 8px;
background: #fff;
background: #fcfdff;
transition: border-color 0.15s ease, box-shadow 0.15s ease;
&:hover {
border-color: #d9ecff;
box-shadow: 0 2px 8px -4px rgba(64, 158, 255, 0.35);
}
}
/* 激活状态:左上角色条指示 */
@ -2486,6 +2565,24 @@ async function confirmRemoveDetail() {
border-radius: 6px;
}
/* 条码区域:可直接点击执行该指令(与扫码等效) */
.scan-command-hit {
display: flex;
flex-direction: column;
gap: 5px;
border-radius: 6px;
cursor: pointer;
transition: background-color 0.15s ease;
&:hover {
background: #ecf5ff;
}
&:active {
background: #d9ecff;
}
}
.scan-command-code {
font-family: Consolas, Monaco, monospace;
font-size: 11px;
@ -2544,18 +2641,33 @@ async function confirmRemoveDetail() {
overflow: hidden;
}
/* 拖动把手:半透明热区 + 中间小横条,hover 变主色提示可拖 */
.split-stack .pane-resizer {
flex: 0 0 6px;
min-height: 6px;
background: #e4e7ed;
cursor: row-resize;
flex: 0 0 8px;
min-height: 8px;
flex-shrink: 0;
position: relative;
z-index: 2;
}
background: transparent;
cursor: row-resize;
.split-stack .pane-resizer:hover {
background: #dcdfe6;
&::after {
content: '';
position: absolute;
left: 50%;
top: 50%;
width: 44px;
height: 3px;
transform: translate(-50%, -50%);
border-radius: 2px;
background: #dcdfe6;
transition: width 0.15s ease, background-color 0.15s ease;
}
&:hover::after {
width: 64px;
background: var(--el-color-primary, #409eff);
}
}
.upper-wrapper {
@ -2587,11 +2699,12 @@ async function confirmRemoveDetail() {
.right-body {
flex: 1;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
border: 1px solid #e6ebf2;
border-radius: 10px;
min-height: 0;
overflow: auto;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
padding: 12px;
box-shadow: 0 1px 3px rgba(16, 24, 40, 0.04), 0 8px 24px -16px rgba(16, 24, 40, 0.12);
}
/* 开单结果区域:占满上部分区,拖动把手时与明细表格一起按比例伸缩 */
@ -2599,17 +2712,19 @@ async function confirmRemoveDetail() {
flex: 1 1 0;
min-height: 0;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
padding: 10px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
border: 1px solid #e6ebf2;
border-radius: 10px;
padding: 12px 14px;
box-shadow: 0 1px 3px rgba(16, 24, 40, 0.04), 0 8px 24px -16px rgba(16, 24, 40, 0.12);
display: flex;
flex-direction: column;
overflow: hidden;
}
.create-result-header {
margin-bottom: 8px;
margin-bottom: 10px;
padding-bottom: 8px;
border-bottom: 1px solid #f0f2f5;
display: flex;
align-items: center;
justify-content: space-between;
@ -2621,9 +2736,20 @@ async function confirmRemoveDetail() {
}
.create-result-title {
font-size: 14px;
display: flex;
align-items: center;
font-size: 15px;
font-weight: 600;
color: #303133;
color: #1f2d3d;
&::before {
content: '';
width: 3px;
height: 15px;
margin-right: 8px;
border-radius: 2px;
background: var(--el-color-primary, #409eff);
}
}
/* 拆包订单明细面板 */
@ -2672,14 +2798,14 @@ async function confirmRemoveDetail() {
.unpack-actions {
display: flex;
gap: 4px;
flex-wrap: nowrap;
gap: 6px;
flex-wrap: wrap;
width: 100%;
}
/* 一行 4 个按钮均分整个输入框宽度:保留按钮自身内边距,清除默认外边距 */
/* 按钮自动均分一行:1 个占满整行、2 个各半行、超出则换行(长文案不拥挤) */
.unpack-actions :deep(.el-button) {
flex: 1 1 0;
flex: 1 1 calc(50% - 3px);
min-width: 0;
margin: 0;
}
@ -2690,6 +2816,17 @@ async function confirmRemoveDetail() {
overflow: auto;
}
/* 开单结果:表头列淡底、四列一行更紧凑易读 */
.create-result-body :deep(.el-descriptions__cell.is-bordered-label) {
background: #fafbfc;
color: #606266;
font-weight: 500;
}
.create-result :deep(.el-empty__description p) {
color: #909399;
}
.order-items-block {
margin-top: 8px;
}
@ -2702,20 +2839,23 @@ async function confirmRemoveDetail() {
}
/* ==================== 商品对照(订单商品 vs 已拆商品) ==================== */
/* 对照工具条:图例 + 统计 + 刷新 */
/* 对照汇总:第一行「原订单/已扫描 类件统计」,第二行对照状态图例 */
.detail-compare-bar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px 12px;
flex-wrap: wrap;
margin-bottom: 8px;
flex-direction: column;
align-items: stretch;
gap: 6px;
margin-bottom: 10px;
padding: 8px 10px;
border: 1px solid #eef2f7;
border-radius: 8px;
background: #f7f9fc;
}
.compare-toolbar {
.compare-stats {
display: flex;
align-items: center;
gap: 12px;
gap: 18px;
flex-wrap: wrap;
}
@ -2728,6 +2868,21 @@ async function confirmRemoveDetail() {
}
}
/* 明细标题行:拆包明细(N 项) + 刷新 */
.detail-list-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
margin-bottom: 8px;
}
.detail-list-title {
font-size: 13px;
font-weight: 600;
color: #303133;
}
/* 图例:一致 / 数量差异 / 仅订单 / 仅拆包 */
.compare-legend {
display: flex;
@ -2741,33 +2896,46 @@ async function confirmRemoveDetail() {
.legend-item {
display: inline-flex;
align-items: center;
padding: 1px 8px;
gap: 5px;
padding: 2px 10px;
border: 1px solid transparent;
border-radius: 10px;
line-height: 18px;
&--matched {
background: #f0f9eb;
border: 1px solid #e1f3d8;
color: #67c23a;
&::before {
content: '';
width: 6px;
height: 6px;
border-radius: 50%;
background: currentColor;
opacity: 0.85;
}
}
&--qty_diff {
background: #fdf6ec;
border: 1px solid #faecd8;
color: #e6a23c;
}
/* ⚠️ 必须写完整类名:本文件是纯 CSS(<style scoped> 未声明 lang="scss"),
`&--matched` 这类 SCSS 后缀拼接在原生 CSS 嵌套中非法会被整条丢弃(曾导致图例无配色) */
.legend-item--matched {
background: #f0f9eb;
border-color: #e1f3d8;
color: #67c23a;
}
&--order_only {
background: #fef0f0;
border: 1px solid #fde2e2;
color: #f56c6c;
}
.legend-item--qty_diff {
background: #fdf6ec;
border-color: #faecd8;
color: #e6a23c;
}
&--unpack_only {
background: #ecf5ff;
border: 1px solid #d9ecff;
color: #409eff;
}
.legend-item--order_only {
background: #fef0f0;
border-color: #fde2e2;
color: #f56c6c;
}
.legend-item--unpack_only {
background: #ecf5ff;
border-color: #d9ecff;
color: #409eff;
}
/* 左侧原订单商品 / 右侧扫描添加的商品:分组表头底色 + 中缝分隔 */
@ -2815,6 +2983,102 @@ async function confirmRemoveDetail() {
color: #f56c6c;
}
/* 左侧「原单商品」合并单元格:商品名(规格)/ 编码 / 订单:N 退回:M 差异:D */
.compare-order-cell {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 3px;
padding: 2px 0;
}
.compare-order-title {
font-size: 13px;
font-weight: 600;
color: #303133;
line-height: 1.35;
word-break: break-all;
}
.compare-order-code {
font-family: Consolas, Monaco, monospace;
font-size: 12px;
color: #909399;
word-break: break-all;
}
.compare-order-stats {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
font-size: 12px;
color: #606266;
b {
font-weight: 600;
}
}
.compare-order-stat {
white-space: nowrap;
}
/* 差异配色:一致(绿)/ 多拆(橙)/ 少拆(红) */
.compare-diff--matched b {
color: #67c23a;
}
.compare-diff--over b {
color: #e6a23c;
}
.compare-diff--short b {
color: #f56c6c;
}
/* 右侧拆包单元格:缩略图 + 「拆包」标记 + 商品名(规格) + 条码 */
.compare-unpack-cell {
display: flex;
align-items: center;
gap: 6px;
text-align: left;
}
.compare-unpack-thumb {
flex: 0 0 auto;
width: 32px;
height: 32px;
}
.compare-unpack-info {
display: flex;
flex-direction: column;
gap: 2px;
min-width: 0;
}
.compare-unpack-title {
display: flex;
align-items: center;
gap: 4px;
min-width: 0;
}
.compare-unpack-name {
font-size: 12px;
color: #303133;
line-height: 1.35;
word-break: break-all;
}
.compare-unpack-barcode {
font-family: Consolas, Monaco, monospace;
font-size: 11px;
color: #909399;
word-break: break-all;
}
/* 开单查到但尚未扫码的订单商品行:整行灰底 */
.detail-table :deep(.detail-row--order-only) {
--el-table-tr-bg-color: #f5f7fa;
@ -2942,6 +3206,32 @@ async function confirmRemoveDetail() {
width: 100%;
}
/* 表头淡底加粗、单元格紧凑、悬停整行高亮 */
.detail-table :deep(.el-table__header th.el-table__cell) {
background: #fafbfc;
color: #606266;
font-weight: 600;
}
.detail-table :deep(.el-table__cell) {
padding: 5px 0;
}
.detail-table :deep(.el-table__body tr:hover > td.el-table__cell) {
background: #f5faff;
}
/* 未扫码的订单商品行保持灰底(不被悬停高亮覆盖) */
.detail-table :deep(.el-table__body tr.detail-row--order-only:hover > td.el-table__cell) {
background: #f5f7fa;
}
/* 左侧「原单商品」合并列:淡底区分左右两侧,内容垂直居中 */
.detail-compare-table :deep(td.compare-order-column) {
background: #fbfcfe;
vertical-align: middle;
}
.stock-thumb {
width: 48px;
height: 48px;

View File

@ -100,6 +100,16 @@
</span>
</template>
<template #column-group_name="{ row }">
<span v-if="row.group_name">{{ row.group_name }}</span>
<span v-else>-</span>
</template>
<template #column-user_name="{ row }">
<span v-if="row.user_name">{{ row.user_name }}</span>
<span v-else>-</span>
</template>
<template #column-store_id="{ row }">
<span v-if="row.store_id != null">{{ row.store_id }}</span>
<span v-else>-</span>
@ -148,6 +158,10 @@
{{ detailRecord.is_back ? '已退回' : '未退回' }}
</span>
</el-descriptions-item>
<el-descriptions-item label="登记来源群">{{ detailRecord.group_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="登记来源群ID">{{ detailRecord.group_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="登记来源人">{{ detailRecord.user_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="登记来源人ID">{{ detailRecord.user_id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="登记时间">{{ formatTime(detailRecord.created_at) }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ formatTime(detailRecord.updated_at) }}</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{ detailRecord.remark || '-' }}</el-descriptions-item>

View File

@ -50,6 +50,8 @@ export const returnWaybillColumns = [
// { prop: 'store_id', label: '货主ID', width: '100' },
{ prop: 'is_notified', label: '是否已通知', width: '110' },
{ prop: 'is_back', label: '是否退回', width: '100' },
{ prop: 'group_name', label: '登记来源群', minWidth: '140', showOverflowTooltip: true },
{ prop: 'user_name', label: '登记来源人', minWidth: '120', showOverflowTooltip: true },
{ prop: 'remark', label: '备注', minWidth: '140', showOverflowTooltip: true },
{ prop: 'created_at', label: '登记时间', width: '170', sortable: 'custom' },
{ prop: 'updated_at', label: '更新时间', width: '170', sortable: 'custom' },

View File

@ -158,14 +158,23 @@
<header class="front-config-panel__head">
<h3 class="front-config-panel__title">域名设置</h3>
<p class="front-config-panel__desc">
域名全局唯一;保存后按下方 TXT 记录在域名服务商添加解析并校验通过,才能上传证书(域名变更会同时清空已上传证书)
域名全局唯一。保存域名只是登记「待验证域名」并下发 TXT 校验记录,生效域名保持不变(切换中旧域名继续服务);TXT 校验通过后待验证域名才提升为生效域名,并会清空原证书(需重新上传)
</p>
</header>
<el-alert
v-if="frontDomainUnverified"
v-if="frontDomainPendingActive"
type="info"
title="域名切换中"
:description="`待验证域名 ${frontDomainMeta.pending_domain}:生效域名 ${frontDomainMeta.domain || '(未设置)'} 仍继续对外服务、证书不会被清空。请在 DNS 添加下方 TXT 记录后点击「校验 DNS」;校验通过后待验证域名才会成为生效域名,届时原证书会被清空,需重新上传。`"
show-icon
:closable="false"
class="front-config-alert"
/>
<el-alert
v-if="frontDomainUnverified && !frontDomainPendingActive"
type="warning"
title="域名待验证"
:description="`域名 ${frontDomainMeta.domain} 的 DNS TXT 归属记录尚未校验通过(${frontDomainMeta.last_error || '请添加 TXT 记录后点击「校验 DNS」'}),验证通过前无法上传证书。`"
:description="`域名 ${frontDomainMeta.domain} 的 DNS TXT 归属记录尚未校验通过(${frontDomainLastError || '请添加 TXT 记录后点击「校验 DNS」'}),验证通过前无法上传证书。`"
show-icon
:closable="false"
class="front-config-alert"
@ -181,7 +190,11 @@
placeholder="如 self.example.com(全局唯一)"
/>
<el-button type="primary" :loading="frontDomainSaving" @click="saveFrontDomain">保存域名</el-button>
<el-button :loading="frontDomainChecking" :disabled="!frontDomainMeta.domain" @click="checkFrontDomain">
<el-button
:loading="frontDomainChecking"
:disabled="!frontDomainMeta.domain && !frontDomainMeta.pending_domain"
@click="checkFrontDomain"
>
校验 DNS
</el-button>
</div>
@ -191,16 +204,23 @@
验证时间:{{ formatFrontDateTime(frontDomainMeta.verified_at) }} · 尝试 {{ frontDomainMeta.attempts ?? 0 }} 次
</span>
</div>
<div v-if="frontDomainPendingActive" class="front-cert-meta">
<el-tag type="warning" size="small" effect="plain">待验证域名</el-tag>
<span class="front-config-hint">
{{ frontDomainMeta.pending_domain }} · 发起时间 {{ formatFrontDateTime(frontDomainMeta.pending_created_at) }} · 尝试
{{ frontDomainMeta.pending_attempts ?? 0 }} 次
</span>
</div>
</el-form-item>
<template v-if="frontDomainNeedsVerify">
<el-form-item label="TXT 主机名">
<div class="front-config-field-row">
<el-input :model-value="frontDomainMeta.verify_host || ''" readonly class="front-config-field" />
<el-input :model-value="frontDomainTxtHost" readonly class="front-config-field" />
<el-button
link
type="primary"
:disabled="!frontDomainMeta.verify_host"
@click="copyFrontText(frontDomainMeta.verify_host)"
:disabled="!frontDomainTxtHost"
@click="copyFrontText(frontDomainTxtHost)"
>
复制
</el-button>
@ -208,12 +228,12 @@
</el-form-item>
<el-form-item label="TXT 记录值">
<div class="front-config-field-row">
<el-input :model-value="frontDomainMeta.verify_value || ''" readonly class="front-config-field" />
<el-input :model-value="frontDomainTxtValue" readonly class="front-config-field" />
<el-button
link
type="primary"
:disabled="!frontDomainMeta.verify_value"
@click="copyFrontText(frontDomainMeta.verify_value)"
:disabled="!frontDomainTxtValue"
@click="copyFrontText(frontDomainTxtValue)"
>
复制
</el-button>
@ -223,15 +243,15 @@
<el-form-item label="CNAME 指向">
<el-input :model-value="frontDomainMeta.cname || '—'" readonly class="front-config-field" />
</el-form-item>
<el-form-item v-if="frontDomainMeta.last_error" label="最近失败原因">
<span class="front-domain-error">{{ frontDomainMeta.last_error }}</span>
<el-form-item v-if="frontDomainLastError" label="最近失败原因">
<span class="front-domain-error">{{ frontDomainLastError }}</span>
</el-form-item>
</el-form>
<div class="front-config-panel__footer">
<el-button :loading="frontDomainRefreshing" @click="refreshFrontDomain">刷新状态</el-button>
<span class="front-config-hint">
添加 TXT 记录后点击「校验 DNS」;验证通过(domain_status=1)后方可上传证书。
「刷新状态」仅重查该域名的验证状态,不覆盖未保存的输入
添加 TXT 记录后点击「校验 DNS」;校验通过后待验证域名才提升为生效域名(期间原生效域名继续服务),域名验证通过(domain_status=1)后方可上传证书。
「刷新状态」仅重查域名验证状态,不覆盖未保存的输入
</span>
</div>
</section>
@ -371,9 +391,10 @@ type FrontInfoMeta = {
[key: string]: unknown
}
/** frontConfig.getDomain / checkDomain 响应:域名与 DNS TXT 验证状态 */
/** frontConfig.getDomain / checkDomain 响应:域名与 DNS TXT 验证状态(两阶段:生效域名组 9 字段 + 待验证域名组 7 字段) */
type FrontDomainMeta = {
warehouse_id?: number
/** 生效域名(未设置为空串;切换中仍为旧域名并继续服务) */
domain?: string
/** 0 未验证 / 1 已验证 / 2 验证失败 */
domain_status?: number
@ -386,6 +407,20 @@ type FrontDomainMeta = {
verified_at?: string | null
attempts?: number
last_error?: string
/** 待验证域名(切换中非空;未发起切换为空串)——setDomain 只登记到本字段 */
pending_domain?: string
/** 待验证域名的 TXT 记录主机名(pending_domain 非空时始终回显) */
pending_verify_host?: string
/** 待验证域名的 TXT 记录值 */
pending_verify_value?: string
/** 待验证域名校验尝试次数 */
pending_attempts?: number
/** 待验证域名最近一次校验失败原因 */
pending_last_error?: string
/** 发起本次域名切换的时间 */
pending_created_at?: string | null
/** 是否处于域名切换中(等价于 pending_domain 非空) */
pending_active?: boolean
[key: string]: unknown
}
@ -476,8 +511,35 @@ const frontHasCert = computed(() => Boolean(frontCertMeta.cert_pem && String(fro
/** 是否回显私钥(key_pem 非空) */
const frontHasKey = computed(() => Boolean(frontCertMeta.key_pem && String(frontCertMeta.key_pem).trim()))
/** 域名验证状态 tag:0 未验证(灰)/ 1 已验证(绿)/ 2 验证失败(红) */
const frontDomainStatusTag = computed<{ type: 'success' | 'danger' | 'info'; text: string }>(() => {
/** 是否处于域名切换中(两阶段:pending_domain 非空 / pending_active 为 true) */
const frontDomainPendingActive = computed(
() => Boolean(frontDomainMeta.pending_active) || Boolean(frontDomainMeta.pending_domain)
)
/** 当前需要用户配置的 TXT 主机名:切换中取「待验证域名组」,否则取「生效域名组」 */
const frontDomainTxtHost = computed(() =>
frontDomainPendingActive.value
? String(frontDomainMeta.pending_verify_host || '')
: String(frontDomainMeta.verify_host || '')
)
/** 当前需要用户配置的 TXT 记录值(取组规则同 TXT 主机名) */
const frontDomainTxtValue = computed(() =>
frontDomainPendingActive.value
? String(frontDomainMeta.pending_verify_value || '')
: String(frontDomainMeta.verify_value || '')
)
/** 当前展示的失败原因:切换中看待验证域名组,否则看生效域名组 */
const frontDomainLastError = computed(() =>
frontDomainPendingActive.value
? String(frontDomainMeta.pending_last_error || '')
: String(frontDomainMeta.last_error || '')
)
/** 域名状态 tag:切换中(黄)/ 已验证(绿)/ 验证失败(红)/ 未验证(灰) */
const frontDomainStatusTag = computed<{ type: 'success' | 'danger' | 'warning' | 'info'; text: string }>(() => {
if (frontDomainPendingActive.value) return { type: 'warning', text: '切换中' }
const s = Number(frontDomainMeta.domain_status)
if (s === FRONT_DOMAIN_STATUS.verified) return { type: 'success', text: '已验证' }
if (s === FRONT_DOMAIN_STATUS.failed) return { type: 'danger', text: '验证失败' }
@ -489,9 +551,11 @@ const frontDomainUnverified = computed(
() => Boolean(frontDomainMeta.domain) && Number(frontDomainMeta.domain_status) !== FRONT_DOMAIN_STATUS.verified
)
/** 未验证/验证失败时展示 DNS TXT 校验记录(已验证时后端返回空串,无需展示) */
const frontDomainNeedsVerify = computed(
() => frontDomainUnverified.value && Boolean(frontDomainMeta.verify_host || frontDomainMeta.verify_value)
/** 是否展示 TXT 校验记录:切换中看待验证域名组,否则仅未验证/验证失败的生效域名需要 */
const frontDomainNeedsVerify = computed(() =>
frontDomainPendingActive.value
? Boolean(frontDomainTxtHost.value || frontDomainTxtValue.value)
: frontDomainUnverified.value && Boolean(frontDomainMeta.verify_host || frontDomainMeta.verify_value)
)
/** 是否允许上传证书:以 getCert 的 can_set_cert 为准;响应缺该字段时按 domain + domain_status=1 兜底 */
@ -695,8 +759,9 @@ async function fetchFrontInfo(): Promise<FrontFetchResult> {
}
/**
* 拉取域名与 DNS 验证状态(frontConfig.getDomain)。
* fillForm=false 时只刷新状态(domain_status/verify_host/verify_value/cname/attempts/last_error/verified_at),
* 拉取域名与 DNS 验证状态(frontConfig.getDomain,16 字段:生效域名组 9 + 待验证域名组 7)。
* fillForm=false 时只刷新状态(domain_status/verify_host/verify_value/cname/attempts/last_error/verified_at
* 与 pending_domain/pending_verify_host/pending_verify_value/pending_attempts/pending_last_error/pending_active),
* 不覆盖尚未保存的域名输入框(「刷新状态」按钮用)。
*/
async function fetchFrontDomain(fillForm = true): Promise<FrontFetchResult> {
@ -705,8 +770,12 @@ async function fetchFrontDomain(fillForm = true): Promise<FrontFetchResult> {
if (!res || !okCode(res.code)) return { ok: false, message: res?.message || '获取域名配置失败' }
const domainMeta = unwrapFrontPayload(res as Record<string, unknown>)
fillFrontMeta(frontDomainMeta, domainMeta)
// 取库内已保存域名回填(空串表示未设置;getCert 也返回 domain,作兜底)
if (fillForm) frontDomainForm.domain = String(domainMeta.domain || frontCertMeta.domain || '')
// 回填:切换中优先回显待验证域名(用户正在等验证的那个),否则回显生效域名;空串表示未设置
if (fillForm) {
frontDomainForm.domain = String(
domainMeta.pending_domain || domainMeta.domain || frontCertMeta.domain || ''
)
}
return { ok: true }
} catch (e: unknown) {
return { ok: false, message: e instanceof Error ? e.message : '获取域名配置失败' }
@ -809,7 +878,11 @@ async function saveFrontConfig() {
}
}
/** 保存/变更自持域名:成功后会生成 DNS TXT 校验记录(domain_status=0),并清空既有证书 */
/**
* 保存/变更自持域名(两阶段切换的第一阶段):只登记「待验证域名」pending_domain 并下发一次性 TXT 校验记录,
* **生效域名与既有证书均不变**(切换期间旧域名继续服务);校验通过后才提升为生效域名并清空证书(需重传)。
* 传回已登记的待验证域名 → 幂等短路/补发校验码;传回生效域名 → 取消待切换。
*/
async function saveFrontDomain() {
const domain = frontDomainForm.domain.trim()
if (!domain) {
@ -823,7 +896,18 @@ async function saveFrontDomain() {
ElMessage.error(res?.message || '保存域名失败')
return
}
ElMessage.success('域名已保存;请按下方 TXT 记录添加解析后点击「校验 DNS」')
const data = unwrapFrontPayload(res as Record<string, unknown>)
const pendingDomain = String(data.pending_domain || '')
const effectiveDomain = String(data.domain || '')
if (data.pending_active === true || pendingDomain) {
ElMessage.success(
`已登记待验证域名 ${pendingDomain || domain};请在 DNS 添加下方 TXT 记录后点击「校验 DNS」,校验通过前生效域名 ${effectiveDomain || '(未设置)'} 继续服务`
)
} else if (effectiveDomain.toLowerCase() === domain.toLowerCase()) {
ElMessage.success('已取消待切换域名,生效域名与证书均保持不变')
} else {
ElMessage.success('域名已保存')
}
await loadFrontConfig()
} catch (e: unknown) {
ElMessage.error(e instanceof Error ? e.message : '保存域名失败')
@ -832,12 +916,17 @@ async function saveFrontDomain() {
}
}
/** 主动校验域名 DNS TXT 归属记录(成功→domain_status=1,可上传证书;失败→domain_status=2 并回写原因) */
/**
* 主动校验域名 DNS TXT 归属记录(两阶段后兼顶两条路径):
* 切换中(pending_domain 非空)→ 校验待验证域名,通过则提升为生效域名并**清空原证书**;
* 无待验证域名 → 按升级前口径校验生效域名(已验证则直接返回 verified=true)。
*/
async function checkFrontDomain() {
if (!frontDomainMeta.domain) {
if (!frontDomainMeta.domain && !frontDomainMeta.pending_domain) {
ElMessage.warning('请先保存自持域名')
return
}
const wasSwitching = frontDomainPendingActive.value
frontDomainChecking.value = true
try {
const res = await frontConfigCheckDomain()
@ -848,9 +937,15 @@ async function checkFrontDomain() {
return
}
if (data.verified === true) {
ElMessage.success('DNS 校验通过,域名已验证,可以上传证书了')
if (wasSwitching) {
ElMessage.success('DNS 校验通过,待验证域名已提升为生效域名;原证书已清空,请重新上传证书')
} else {
ElMessage.success('DNS 校验通过,域名已验证,可以上传证书了')
}
} else {
ElMessage.warning(String(data.last_error || 'DNS 校验未通过,请确认 TXT 记录已生效后重试'))
ElMessage.warning(
String(data.pending_last_error || data.last_error || 'DNS 校验未通过,请确认 TXT 记录已生效后重试')
)
}
await loadFrontConfig()
} catch (e: unknown) {