This commit is contained in:
yin 2026-09-30 18:13:53 +08:00
parent 1836500043
commit 48dbe020ff
10 changed files with 1026 additions and 180 deletions

View File

@ -15,6 +15,8 @@ export interface ApiAppItem {
self_app_secret: string // 列表返回脱敏后的 Secret(如 "ce4f07a1****")
self_ip_whitelist: string[] | null
callback_url: string | null
/** 承接的出站回调 method 列表(空/未勾选=不承接任何回调) */
callback_functions?: string[] | null
interface_type_id: number
rate_limit: number
sign_method: string
@ -40,6 +42,8 @@ export interface ApiAppFlatResponse {
self_app_secret: string // 创建/重置时是完整密钥,列表/详情时脱敏
self_ip_whitelist: string[] | null
callback_url: string | null
/** 承接的出站回调 method 列表(create/update 回显;detail 亦返回) */
callback_functions?: string[] | null
interface_type_id: number
rate_limit: number
sign_method: string
@ -79,6 +83,11 @@ export interface ApiAppCreateParams {
interface_type_id?: number
self_ip_whitelist?: string[]
callback_url?: string
/**
* 承接的出站回调 method 列表,仅允许注册表(apiApp.listCallbackFunctions)中的方法
* (如 notify.reply);空数组/不传 = 不承接任何回调
*/
callback_functions?: string[]
rate_limit?: number
}
@ -88,6 +97,11 @@ export interface ApiAppUpdateParams {
app_name?: string
self_ip_whitelist?: string[]
callback_url?: string
/**
* 承接的出站回调 method 列表,仅允许注册表中的方法;
* **空数组 = 清空承接(不承接任何回调)**
*/
callback_functions?: string[]
rate_limit?: number
is_enabled?: number
}
@ -197,3 +211,49 @@ export function apiAppRegenerateSecret(
isSystemApi: true
} as any)
}
// ============================================================
// 出站回调 method 注册表(apiApp.listCallbackFunctions)
// ============================================================
/** 注册表条目:兼容后端返回「字符串数组」或「对象数组」两种形态 */
export type ApiAppCallbackFunction =
| string
| {
/** 回调 method,如 notify.reply */
method: string
/** 展示名称(可选) */
title?: string
/** 说明(可选) */
description?: string
[key: string]: unknown
}
/** 列表响应(list/total 在顶层,与 apiApp.list 口径一致) */
export interface ApiAppListCallbackFunctionsResponse {
flag?: string
code: number
message?: string
list: ApiAppCallbackFunction[]
total: number
timestamp?: number
}
/**
* 拉取出站回调 method 注册表(代码注册,供管理端多选列表使用)
*
* 应用勾选后由服务端按 method 自动路由出站回调;入参无。
*/
export function apiAppListCallbackFunctions(): Promise<ApiAppListCallbackFunctionsResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'apiApp.listCallbackFunctions',
v,
timestamp: Date.now()
},
data: {},
isSystemApi: true
} as any)
}

View File

@ -238,6 +238,11 @@ export type PendingOrderManualWaybillParams = {
waybill_code: string
/** 物流接口名称(选填),trim 后为空则传 null */
logistics_interface_name?: string | null
/**
* 快递编码(选填):可为系统编码或仓库自定义编码;传入时同步修改订单的快递信息
* (行为参考 order.pendingOrder.updateOrderExpress);不传时运单记录沿用订单当前系统快递信息
*/
express_code?: string | null
}
export type PendingOrderManualWaybillData = {
@ -247,6 +252,16 @@ export type PendingOrderManualWaybillData = {
business_key?: number
logistics_interface_name?: string | null
create_at?: string
/** 传入的快递编码,未传时不返回 */
express_code?: string | null
/** 写入订单的系统快递编码,仅在传入 express_code 时返回 */
sys_logistics_code?: string | null
/** 写入订单的系统快递名称,仅在传入 express_code 时返回 */
sys_logistics_name?: string | null
/** 写入订单与运单记录的快递编码(自定义或系统),仅在传入 express_code 时返回 */
logistics_code?: string | null
/** 写入订单与运单记录的快递名称(自定义或系统),仅在传入 express_code 时返回 */
logistics_name?: string | null
}
export type PendingOrderManualWaybillResponse = PendingOrderManualWaybillData & {

View File

@ -37,12 +37,21 @@ export type StockCheckStatus =
/** 明细盘点进度(主表 detail_status) */
export type StockCheckDetailStatus = 'none_checked' | 'partial_checked' | 'all_checked'
/** 盘点范围类型 */
/**
* 盘点范围类型
*
* 明细行形态由 type 决定:
* all / location → 明细为「库位行」(scope_type=location,一行=一个库位,行内按商品聚合 stocks[])
* store / goods → 明细为「商品行」(scope_type=goods,一行=一个库存商品)
*/
export type StockCheckType =
| 'all' // 全盘(缺省)
| 'store' // 按货主
| 'goods' // 按商品
| 'location' // 按库位
| 'all' // 按库位盘点(缺省):添加明细未传库位时由后端自动拉取全仓库启用库位生成盘点范围
| 'location' // 按库位盘点(指定库位)
| 'store' // 按货主按商品盘点(商品行)
| 'goods' // 按商品盘点(商品行)
/** 明细行形态(stock.check.detail 的 rows[].scope_type) */
export type StockCheckScopeType = 'goods' | 'location'
/** 盘点方式 */
export type StockCheckMode =
@ -112,7 +121,7 @@ export type StockCheckRecord = {
[key: string]: unknown
}
/** 明细的库位聚合(stock.check.detail 的 rows[].locations) */
/** 明细的库位聚合(stock.check.result 的 rows[].locations,按首条记录 id 升序) */
export type StockCheckDetailLocation = {
location_id?: number | null
/** 库位编码;「无库位」分组为空串或 null */
@ -122,45 +131,96 @@ export type StockCheckDetailLocation = {
}
/**
* 盘点明细行(stock.check.detail 返回):商品快照 + 已盘聚合字段 + 作业记录
* 库位行内的商品聚合(stock.check.result 的 rows[].stocks,按 stock_id 升序)
*
* 注意:实盘数量/差异已不是单值,而是按作业记录聚合的 checked_quantity / diff_quantity;
* 库位为多个(location_codes 数组 + locations 按库位聚合;无库位分组的编码为空串/null)。
* 仅 scope_type=location 的结果行有此字段,且**仅含存在作业记录的商品**;
* 商品行(scope_type=goods)为商品快照本身,无此字段。
*/
export type StockCheckDetailRow = {
id: number
check_id: number
warehouse_id?: number
export type StockCheckDetailStock = {
/** 商品库存ID(wms_stock_warehouse.id) */
stock_id: number
item_code?: string
item_name?: string
spec?: string
batch_no?: string
/** 账面数量(快照) */
system_quantity?: number
/** 已盘数量 = 该明细作业记录 quantity 合计(无作业记录时为 null) */
/** 账面数量(查 wms_storage:space_id+stock_id SUM(quantity);location_id 为空时按 0) */
system_quantity?: number | null
/** 该商品在本库位的实盘数量(作业记录 quantity 合计;无记录时为 null) */
checked_quantity?: number | null
/** 差异数量 = 已盘数量 - 账面快照(无作业记录时为 null) */
/** 差异数量 = 实盘 - 账面(无记录时为 null) */
diff_quantity?: number | null
/** 是否有差异:0|1(无作业记录时为 null) */
[key: string]: unknown
}
/**
* 盘点**范围行**(stock.check.detail 的 rows 元素)—— 纯范围行,**不含任何盘点作业聚合**
*
* 两种形态(看 scope_type):
* - goods(商品行):stock_id 与商品快照有值,location_id/location_code 为 null
* - location(库位行):location_id/location_code 有值,stock_id 与商品快照为 null
*
* ⚠️ 需要 checked_quantity/diff_quantity/is_diff/status/location_codes/checkers/
* last_checked_at/records/locations/stocks 等盘点结果聚合时,请用 stockCheckResult。
*/
export type StockCheckDetailRow = {
/** 明细ID */
id: number
check_id: number
warehouse_id?: number
/** 明细行形态:goods=商品行 / location=库位行 */
scope_type?: StockCheckScopeType | string
/** 商品库存ID(wms_stock_warehouse.id;仅商品行有值) */
stock_id?: number | null
/** 库位ID(wms_location_space.id;仅库位行有值) */
location_id?: number | null
/** 库位编码(仅库位行有值) */
location_code?: string | null
/** 商品编码(商品快照;库位行为 null) */
item_code?: string | null
/** 商品名称(商品快照;库位行为 null) */
item_name?: string | null
/** 规格(商品快照;库位行为 null) */
spec?: string | null
/** 批次号(商品快照;库位行为 null) */
batch_no?: string | null
/** 账面数量快照(商品行为快照值,库位行为 0) */
system_quantity?: number | null
remark?: string | null
created_at?: string
updated_at?: string
[key: string]: unknown
}
/**
* 盘点**结果行**(stock.check.result 的 rows 元素)= 范围行 + 作业记录聚合
*
* 两种形态(看 scope_type):
* - goods(商品行):商品快照 + 聚合字段
* - location(库位行):无商品快照,改为 stocks[] 按商品聚合(仅含存在作业记录的商品)
*
* 共同具备:checked_quantity / diff_quantity / is_diff / status / location_codes /
* checkers / last_checked_at + records + locations;
* 无作业记录时聚合字段为 null、records/locations/stocks 为空数组。
*/
export type StockCheckResultRow = StockCheckDetailRow & {
/** 已盘数量(商品行=作业记录 quantity 合计;库位行=行内商品实盘合计;无记录为 null) */
checked_quantity?: number | null
/** 差异数量(商品行=已盘-账面;库位行=行内各商品差异代数和;无记录为 null) */
diff_quantity?: number | null
/** 是否有差异:0|1(无记录时为 null) */
is_diff?: boolean | number | null
/** 明细状态:checked=有作业记录 / unchecked=未盘 */
/** 盘点状态:checked=有作业记录 / unchecked=未盘 */
status?: 'checked' | 'unchecked' | string
/** 已盘库位编码数组(去重;无库位分组的编码为空串/null) */
location_codes?: string[]
/** 盘点人数组(去重) */
checkers?: string[]
/** 最近上报时间 */
/** 最近上报时间(无记录为 null) */
last_checked_at?: string | null
/** 该明细的全部作业记录(无记录时为空数组) */
records?: StockCheckRecord[]
/** 按库位聚合(无记录时为空数组) */
/** 按库位聚合(无记录时为空数组;空库位记录归 location_code=null 组) */
locations?: StockCheckDetailLocation[]
remark?: string | null
created_at?: string
updated_at?: string
[key: string]: unknown
/** 库位行的商品聚合(商品行为 undefined;无记录时为空数组) */
stocks?: StockCheckDetailStock[]
}
// ============ stock.check.create ============
@ -243,22 +303,34 @@ export function stockCheckList(
// ============ stock.check.addDetail ============
/** stock.check.addDetail 请求参数 */
/** stock.check.addDetail 请求参数(与任务 type 对齐:商品类传 stock_ids,库位类传 locations) */
export type StockCheckAddDetailParams = {
/** 盘点任务ID */
id: number
/** 商品库存ID列表(wms_stock_warehouse.id) */
stock_ids: number[]
/**
* 商品库存ID列表(wms_stock_warehouse.id):type=store/goods 按商品盘点时使用,
* 与 locations 按任务类型二选一
*/
stock_ids?: number[]
/**
* 库位编码列表(wms_location_space.space_code):type=all/location 按库位盘点时使用,
* 与 stock_ids 按任务类型二选一;**type=all 未传时由后端自动拉取全仓库启用库位生成盘点范围**
*/
locations?: string[]
/** 库位编码列表(兼容别名;locations 优先,两者都传时以 locations 为准) */
location_codes?: string[]
}
/** stock.check.addDetail 响应 */
export type StockCheckAddDetailResponse = {
/** 本次新增明细数 */
added: number
/** 已存在被跳过(幂等)的 stock_id 数 */
/** 已存在被跳过(幂等)的盘点项数 */
skipped: number
/** 无效商品库存ID列表(不存在或不属于当前仓库) */
/** 无效商品库存ID列表(不存在、不属于当前仓库,或商品货主与任务货主不一致) */
invalid_stock_ids: number[]
/** 无效库位编码列表(当前仓库不存在对应库位编码) */
invalid_locations: string[]
/** 重算后的明细总行数 */
total_items: number
}
@ -342,17 +414,22 @@ export type StockCheckDetailParams = {
id: number
}
/** stock.check.detail 响应 */
/** stock.check.detail 响应(纯范围行,**不含盘点作业聚合**) */
export type StockCheckDetailResponse = {
/** 盘点主表信息 */
check: StockCheckTask
/** 全部明细行 */
/** 全部范围行 */
rows: StockCheckDetailRow[]
/** 明细总条数 */
total: number
}
/** stock.check.detail:拉取盘点任务主表 + 全部明细行(不分页) */
/**
* stock.check.detail:拉取盘点任务主表 + 全部**范围行**(不分页)
*
* rows 为纯范围行(商品行/库位行的商品/库位快照),不含盘点作业聚合;
* 需要已盘/差异/状态/作业记录等「盘点结果」时请用 stockCheckResult。
*/
export function stockCheckDetail(
data: StockCheckDetailParams
): Promise<StockCheckDetailResponse & { code?: number; message?: string; data?: Partial<StockCheckDetailResponse> }> {
@ -369,21 +446,70 @@ export function stockCheckDetail(
} as any)
}
// ============ stock.check.result ============
/** stock.check.result 请求参数 */
export type StockCheckResultParams = {
/** 盘点任务ID */
id: number
}
/** stock.check.result 响应(范围行 + 盘点作业聚合) */
export type StockCheckResultResponse = {
/** 盘点主表信息 */
check: StockCheckTask
/** 全部结果行 */
rows: StockCheckResultRow[]
/** 明细总条数 */
total: number
}
/**
* stock.check.result:拉取盘点明细**结果**(按范围行聚合作业记录)
*
* 与 detail 同结构(check/rows/total),但 rows 额外带:
* checked_quantity / diff_quantity / is_diff / status / location_codes / checkers /
* last_checked_at + records + locations(库位行还有 stocks 按商品聚合)。
*/
export function stockCheckResult(
data: StockCheckResultParams
): Promise<StockCheckResultResponse & { code?: number; message?: string; data?: Partial<StockCheckResultResponse> }> {
return request({
url: '/system',
method: 'post',
params: {
method: 'stock.check.result',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
// ============ stock.check.report ============
/** stock.check.report 请求参数(覆盖式:同明细 + 同库位重复上报为更新) */
/** stock.check.report 请求参数(覆盖式:同明细 + 同商品 + 同库位重复上报为更新) */
export type StockCheckReportParams = {
/** 盘点任务ID */
id: number
/** 盘点明细ID */
detail_id: number
/**
* 库位编码(可空):未传或为空串均写入「无库位」分组(库中 location_code 存空串);
* 库位编码(可空):
* - 商品行(scope_type=goods):未传或为空串均写入「无库位」分组(库中 location_code 存空串)
* - 库位行(scope_type=location):以明细库位为准,**传入时必须与明细库位一致**
* 匹配 space_code 时回填 location_id
*/
location?: string
/** 实盘数量(不小于 0 的整数) */
quantity: number
/**
* 商品库存ID(wms_stock_warehouse.id):
* - 商品行:可选(传入必须与明细商品一致,否则报错)
* - 库位行:**必填**,且商品必须属于本仓库
*/
stock_id?: number
}
/** stock.check.report 响应 */
@ -392,7 +518,7 @@ export type StockCheckReportResponse = {
record: StockCheckRecord
/** 盘点明细ID */
detail_id: number
/** 本次上报模式:created=首次上报新增记录 / updated=同明细+同库位覆盖更新 */
/** 本次上报模式:created=首次上报新增记录 / updated=同明细+同商品+同库位重复上报更新已有记录 */
mode: 'created' | 'updated' | string
total_items: number
/** 已盘行数(存在作业记录的明细数) */
@ -522,13 +648,16 @@ export type StockCheckFinishResponse = {
total_items: number
/** 已盘行数(存在作业记录的明细数) */
checked_items: number
/** 未盘明细数(无作业记录的明细数,完成时按实盘 0 处理计为盘亏) */
/**
* 未盘明细数(无作业记录的明细数)
* 口径:未盘**商品行**按实盘 0 处理计为盘亏;未盘**库位行**不计差异
*/
unchecked_items: number
/** 差异行数(含未盘明细按实盘 0 计算的差异) */
/** 差异行数(商品行:实盘合计与账面快照不一致;库位行:行内任一商品实盘与账面不一致;未盘商品明细按实盘 0 计入) */
diff_items: number
/** 盘盈合计(作业记录数量合计大于账面快照的差异合计) */
/** 盘盈合计(商品行:实盘合计大于账面快照的差异;库位行:按商品实盘大于 wms_storage 账面的差异) */
profit_total: number
/** 盘亏合计(实盘小于账面快照的差异绝对值合计,含未盘明细的账面快照数) */
/** 盘亏合计(商品行:实盘小于账面快照的差异绝对值,含未盘明细的账面快照数;库位行:按商品实盘小于 wms_storage 账面的差异绝对值) */
loss_total: number
}
@ -670,9 +799,9 @@ export type StockCheckExportResponse = {
status: string
/** 进度百分比(0-100) */
progress: number
/** 当前已处理明细数 */
/** 当前已处理明细行数(Sheet2「盘点明细」已写入的作业记录行数) */
current_count: number
/** 明细总行数 */
/** Sheet2「盘点明细」总行数(作业记录总数,导出前即确定) */
total_count: number
message: string
/** 任务成功时的结果对象(含 filename/fileKey/url/cdnUrl/cosUrl) */
@ -684,7 +813,15 @@ export type StockCheckExportResponse = {
/**
* stock.check.export:提交盘点任务导出任务(异步)。
* 每个盘点任务一个 Sheet(Sheet 名=盘点单号);单次最多 50 个盘点任务。
*
* Excel 两个 Sheet:
* - Sheet1「盘点单」:一行一个盘点任务(单号/名称/范围/方式/状态/进度/日期/货主ID/创建人/
* 明细行数/已盘行数/差异行数/开始时间/结束时间/备注)
* - Sheet2「盘点明细」:一行一条实际盘点记录(作业记录)——单号/商品编码/商品名称/
* 库位编码(空库位输出为空)/实盘数量/盘点人/盘点时间;
* **未盘的任务范围行不再导出**,商品快照从 wms_stock_warehouse 补齐
* 进度经 Redis 缓存追踪(key stock_check_export_task_*,TTL 1800 秒),立即返回任务ID;
* 单次最多 50 个盘点任务。
*/
export function stockCheckExport(
data: StockCheckExportParams = {}
@ -743,3 +880,57 @@ export function stockCheckExportTaskProgress(
isSystemApi: true
} as any)
}
// ============ stock.check.batchDelete ============
/** stock.check.batchDelete 请求参数 */
export type StockCheckBatchDeleteParams = {
/**
* 盘点任务ID数组(兼容单值;服务端归一化为去重后的正整数,**单次上限 200**)
*/
ids: number[] | number
}
/** stock.check.batchDelete 响应 */
export type StockCheckBatchDeleteResponse = {
/** 入参去重后的任务ID数量 */
total: number
/** 实际删除的任务数量(仅作废任务) */
deleted_count: number
/** 跳过的任务数量(非作废状态或查不到的任务) */
skipped_count: number
/** 已删除的任务ID列表(保持入参顺序) */
deleted_ids: number[]
/** 跳过的任务ID列表(保持入参顺序) */
skipped_ids: number[]
}
/**
* stock.check.batchDelete:**批量删除盘点任务**(仅删除「已作废」任务)
*
* - 仅 `status=cancelled`(作废)的任务会被级联删除;其他状态及查不到的任务跳过(计入 skipped_ids)
* - 删除链(事务内):作业记录 wms_stock_check_record → 明细 wms_stock_check_detail → 主表 wms_stock_check
* - warehouse_id 由服务端从登录上下文注入,前端不传;按 id + warehouse_id 做仓库隔离
* - 单次上限 200 个任务
*/
export function stockCheckBatchDelete(
data: StockCheckBatchDeleteParams
): Promise<
StockCheckBatchDeleteResponse & {
code?: number
message?: string
data?: Partial<StockCheckBatchDeleteResponse>
}
> {
return request({
url: '/system',
method: 'post',
params: {
method: 'stock.check.batchDelete',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}

View File

@ -2,14 +2,23 @@
CheckItemsPanel — 盘点明细面板(库存盘点 stock.check)
职责:
1. 拉取 stock.check.detail,渲染盘点明细行(商品/批次/库位/账面/已盘合计/差异/状态)
2. 盘点作业:行内或批量上报(stock.check.report,**覆盖式**:同明细 + 同库位重复上报=更新记录)
—— 行上是「上报库位 + 本库位数量」输入,「已盘合计/库位/盘点人/最近上报」为后端按作业记录聚合的只读值
3. 完成盘点(stock.check.finish,允许部分未盘完成:未盘明细按实盘 0 计入盘亏)
4. 「添加商品」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
1. 拉取盘点明细并渲染:
- 已有/可能有作业记录的阶段(approved/checking/completed/cancelled)→ **stock.check.result**
(范围行 + 已盘/差异/状态/作业记录聚合)
- 尚未开始作业的阶段(created/rejected/submitted,必然无作业记录)→ **stock.check.detail**
(纯范围行,不含聚合;此时作业类列不渲染,无需多发一次聚合查询)
行形态由任务 type 决定:
- 商品行(scope_type=goods,type=store/goods):一行一个库存商品(商品快照 + 已盘聚合)
- 库位行(scope_type=location,type=all/location):一行一个库位,行内按商品聚合 stocks[],
上报需带 stock_id → 展开行内按商品逐条上报
2. 盘点作业:行内或批量上报(stock.check.report,**覆盖式**:
商品行=同明细+同库位;库位行=同明细+同商品+同库位,均重复上报为更新)
3. 完成盘点(stock.check.finish,允许部分未盘完成:
未盘商品明细按实盘 0 计入盘亏与差异行数,未盘库位明细不计差异)
4. 「添加商品 / 添加库位」交给宿主 index.vue 打开 CheckStockPickerDialog(emit add-items)
状态约束(与后端一致):
- created/rejected → 可添加商品(addDetail)
- created/rejected → 可添加明细(addDetail)
- approved/checking → 可上报(report)、可完成(finish)
- mode=blind 盲盘 → 账面数量/差异在前端不可见
- 明细 status:checked=有作业记录 / unchecked=未盘
@ -21,7 +30,7 @@
<div class="left-actions">
<el-button size="small" type="primary" :loading="loading" @click="loadItems">刷新</el-button>
<el-button v-if="canAddItems" size="small" type="primary" plain @click="emit('add-items')">
添加商品
{{ isLocationTask ? '添加库位' : '添加商品' }}
</el-button>
<el-button
v-if="canReport"
@ -46,6 +55,7 @@
</el-button>
</div>
<div class="right-actions">
<span v-if="!useResultSource" class="hint-text">未开始盘点:仅展示盘点范围</span>
<span v-if="isQuantityMasked" class="hint-text">盲盘:账面数量不可见</span>
<span class="stat-text">
明细 {{ stats.total }} · 已盘 {{ stats.checked }} · 差异 {{ stats.diff }}
@ -65,14 +75,105 @@
:height="tableHeight"
>
<el-table-column type="index" label="#" width="56" align="center" :index="indexMethod" />
<el-table-column prop="item_code" label="商品编码" min-width="130" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="spec" label="规格" min-width="110" show-overflow-tooltip />
<el-table-column prop="batch_no" label="批次号" min-width="110" show-overflow-tooltip />
<!-- 库位行:展开后按商品逐行上报(report 需要 stock_id) -->
<el-table-column v-if="isLocationTask" type="expand" width="46">
<template #default="{ row }">
<div class="stock-expand">
<el-table :data="rowStocks(row)" border size="small">
<el-table-column type="index" label="#" width="46" align="center" />
<el-table-column prop="item_code" label="商品编码" min-width="130" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="160" show-overflow-tooltip />
<el-table-column label="账面数量" width="100" align="center">
<template #default="scope">{{ maskQuantity(scope.row.system_quantity) }}</template>
</el-table-column>
<el-table-column label="已盘" width="90" align="center">
<template #default="scope">{{ scope.row.checked_quantity ?? '—' }}</template>
</el-table-column>
<el-table-column label="差异" width="90" align="center">
<template #default="scope">
<span v-if="isQuantityMasked" class="hint-text">—</span>
<span v-else :class="diffClass(scope.row.diff_quantity)">
{{ formatDiff(scope.row.diff_quantity) }}
</span>
</template>
</el-table-column>
<el-table-column label="本库位数量" width="140" align="center">
<template #default="scope">
<el-input-number
v-if="canReport"
v-model="stockQuantityMap[stockKey(row.id, scope.row.stock_id)]"
size="small"
:min="0"
:step="1"
step-strictly
controls-position="right"
class="quantity-input"
/>
<span v-else class="hint-text">—</span>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="scope">
<el-button
v-if="canReport"
link
type="primary"
size="small"
:loading="reportingId === Number(row.id)"
@click="reportStock(row, scope.row)"
>
上报
</el-button>
<span v-else class="hint-text">—</span>
</template>
</el-table-column>
<template #empty>
<div class="empty-tip">该库位暂无可盘商品</div>
</template>
</el-table>
</div>
</template>
</el-table-column>
<!-- 商品行:商品快照列 -->
<el-table-column
v-if="!isLocationTask"
prop="item_code"
label="商品编码"
min-width="130"
show-overflow-tooltip
/>
<el-table-column
v-if="!isLocationTask"
prop="item_name"
label="商品名称"
min-width="160"
show-overflow-tooltip
/>
<el-table-column
v-if="!isLocationTask"
prop="spec"
label="规格"
min-width="110"
show-overflow-tooltip
/>
<el-table-column
v-if="!isLocationTask"
prop="batch_no"
label="批次号"
min-width="110"
show-overflow-tooltip
/>
<!-- 库位行:商品数(明细下面按商品聚合) -->
<el-table-column v-if="isLocationTask" label="商品数" width="80" align="center">
<template #default="{ row }">{{ rowStocks(row).length }}</template>
</el-table-column>
<el-table-column label="库位" min-width="130" show-overflow-tooltip>
<template #default="{ row }">
<!-- 库位行:库位以明细自身库位为准,只读 -->
<span v-if="isLocationTask">{{ formatLocationCodes(row) }}</span>
<el-input
v-if="canReport"
v-else-if="canReport"
v-model="locationMap[row.id]"
size="small"
placeholder="库位编码(可留空=无库位)"
@ -80,10 +181,10 @@
<span v-else>{{ formatLocationCodes(row) }}</span>
</template>
</el-table-column>
<el-table-column label="账面数量" width="100" align="center">
<el-table-column v-if="!isLocationTask" label="账面数量" width="100" align="center">
<template #default="{ row }">{{ maskQuantity(row.system_quantity) }}</template>
</el-table-column>
<el-table-column label="本库位数量" width="130" align="center">
<el-table-column v-if="!isLocationTask" label="本库位数量" width="130" align="center">
<template #default="{ row }">
<el-input-number
v-if="canReport"
@ -98,36 +199,46 @@
<span v-else class="hint-text">—</span>
</template>
</el-table-column>
<el-table-column label="已盘合计" width="100" align="center">
<el-table-column v-if="useResultSource" label="已盘合计" width="100" align="center">
<template #default="{ row }">{{ row.checked_quantity ?? '—' }}</template>
</el-table-column>
<el-table-column label="差异" width="90" align="center">
<el-table-column v-if="useResultSource" label="差异" width="90" align="center">
<template #default="{ row }">
<span v-if="isQuantityMasked" class="hint-text">—</span>
<span v-else :class="diffClass(row.diff_quantity)">{{ formatDiff(row.diff_quantity) }}</span>
</template>
</el-table-column>
<el-table-column label="盘点状态" width="100" align="center">
<el-table-column v-if="useResultSource" label="盘点状态" width="100" align="center">
<template #default="{ row }">
<span :class="getStatusTextClass(itemStatusTag(row.status))">
{{ translate('check_item_status', row.status) }}
</span>
</template>
</el-table-column>
<el-table-column label="盘点人" width="110" show-overflow-tooltip>
<el-table-column v-if="useResultSource" label="盘点人" width="110" show-overflow-tooltip>
<template #default="{ row }">{{ formatCheckers(row) }}</template>
</el-table-column>
<el-table-column label="最近上报" width="160">
<el-table-column v-if="useResultSource" label="最近上报" width="160">
<template #default="{ row }">{{ formatTime(row.last_checked_at) }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center" fixed="right">
<el-table-column label="操作" width="110" align="center" fixed="right">
<template #default="{ row }">
<!-- 库位行:在展开行里按商品上报 -->
<el-button
v-if="canReport"
v-if="canReport && isLocationTask"
link
type="primary"
size="small"
:loading="reportingId === row.id"
@click="toggleExpand(row)"
>
{{ isRowExpanded(row) ? '收起' : '展开上报' }}
</el-button>
<el-button
v-else-if="canReport"
link
type="primary"
size="small"
:loading="reportingId === Number(row.id)"
@click="reportRow(row)"
>
上报
@ -162,11 +273,13 @@ import { computed, nextTick, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { useResizeObserver } from '@vueuse/core'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import { formatTime, isCheckApiSuccess, translate } from '../template-config'
import { formatTime, isCheckApiSuccess, isLocationScopeType, translate } from '../template-config'
import {
stockCheckDetail,
stockCheckFinish,
stockCheckReport
stockCheckReport,
stockCheckResult,
type StockCheckReportParams
} from '@/api/stock.check/stock.check'
defineOptions({ name: 'CheckItemsPanel' })
@ -177,7 +290,7 @@ const props = defineProps<{
}>()
const emit = defineEmits<{
/** 点击「添加商品」→ 宿主打开 CheckStockPickerDialog */
/** 点击「添加商品 / 添加库位」→ 宿主打开 CheckStockPickerDialog */
(e: 'add-items'): void
/** 明细发生变化(加商品 / 上报 / 完成)→ 宿主刷新列表 */
(e: 'changed'): void
@ -188,10 +301,21 @@ const emit = defineEmits<{
// ============================================================
const taskId = computed(() => Number(props.row?.id) || 0)
const taskStatus = computed(() => String(props.row?.status ?? ''))
/** created/rejected:可添加商品(addDetail) */
/** created/rejected:可添加明细(addDetail:商品类传 stock_ids / 库位类传 locations) */
const canAddItems = computed(() => ['created', 'rejected'].includes(taskStatus.value))
/** approved/checking:可上报实盘、可完成 */
const canReport = computed(() => ['approved', 'checking'].includes(taskStatus.value))
/** 库位类任务(type=all/location):明细为「库位行」,上报需带 stock_id → 在展开行里按商品上报 */
const isLocationTask = computed(() => isLocationScopeType(props.row?.type))
/**
* 是否已有/可能有作业记录 —— 决定明细取数接口:
* true → stock.check.result(范围行 + 作业聚合)
* false → stock.check.detail(纯范围行,不含聚合)
* created/rejected/submitted 阶段后端不会有作业记录,聚合字段必然为空,故只取范围行。
*/
const useResultSource = computed(
() => !['created', 'rejected', 'submitted'].includes(taskStatus.value)
)
/** 盲盘:账面数量前端不可见 */
const isBlind = computed(() => String(props.row?.mode ?? '') === 'blind')
const isQuantityMasked = computed(
@ -208,22 +332,53 @@ const reportingId = ref<number | null>(null)
const finishing = ref(false)
const stats = reactive({ total: 0, checked: 0, diff: 0 })
/** 实盘数量输入(明细ID → 数量) */
/** 商品行实盘数量输入(明细ID → 数量) */
const quantityMap = reactive<Record<string, number | undefined>>({})
/** 库位输入(明细ID → 库位编码) */
/** 库位行实盘数量输入(`明细ID:stockID` → 数量) */
const stockQuantityMap = reactive<Record<string, number | undefined>>({})
/** 商品行库位输入(明细ID → 库位编码) */
const locationMap = reactive<Record<string, string>>({})
/** 库位行内商品的数量输入 key */
function stockKey(detailId: unknown, stockId: unknown): string {
return `${detailId}:${stockId}`
}
/** 库位行内的商品聚合(无 stocks 时返回空数组) */
function rowStocks(item: Record<string, any>): Record<string, any>[] {
return Array.isArray(item?.stocks) ? item.stocks : []
}
function hasQuantity(value: unknown): boolean {
if (value === undefined || value === null || (value as any) === '') return false
return Number.isFinite(Number(value))
}
/** 本次上报目标:商品行只带明细;库位行还需带 stock_id */
type ReportTarget = { item: Record<string, any>; stock?: Record<string, any> }
const emptyText = computed(() =>
canAddItems.value ? '暂无盘点明细,可点击「添加商品」生成明细' : '暂无盘点明细'
canAddItems.value
? `暂无盘点明细,可点击「${isLocationTask.value ? '添加库位' : '添加商品'}」生成明细`
: '暂无盘点明细'
)
/** 已填写实盘数量的行(可上报) */
const dirtyRows = computed(() =>
items.value.filter((item) => {
const qty = quantityMap[String(item.id)]
return qty !== undefined && qty !== null && Number.isFinite(Number(qty))
})
)
/** 已填写实盘数量的行(商品行按明细 / 库位行按明细+商品) */
const dirtyRows = computed<ReportTarget[]>(() => {
const list: ReportTarget[] = []
for (const item of items.value) {
if (isLocationTask.value) {
for (const stock of rowStocks(item)) {
if (hasQuantity(stockQuantityMap[stockKey(item.id, stock.stock_id)])) {
list.push({ item, stock })
}
}
} else if (hasQuantity(quantityMap[String(item.id)])) {
list.push({ item })
}
}
return list
})
// ============================================================
// 表格高度 / 分页
@ -252,6 +407,15 @@ function handlePageChange() {
nextTick(() => tableRef.value?.setScrollTop?.(0))
}
/** 展开/收起库位行(展开行内才有按商品上报的入口) */
function toggleExpand(row: Record<string, any>) {
tableRef.value?.toggleRowExpansion?.(row)
}
function isRowExpanded(row: Record<string, any>): boolean {
return Boolean(tableRef.value?.store?.states?.expandRows?.[String(row?.id)])
}
// ============================================================
// 加载明细
// ============================================================
@ -262,7 +426,10 @@ async function loadItems() {
}
loading.value = true
try {
const res: any = await stockCheckDetail({ id: taskId.value })
// 有作业记录阶段取「结果」(含已盘/差异/作业记录聚合);未开始作业阶段只取「范围行」
const res: any = useResultSource.value
? await stockCheckResult({ id: taskId.value })
: await stockCheckDetail({ id: taskId.value })
if (!isCheckApiSuccess(res)) {
throw new Error(res?.message || '获取盘点明细失败')
}
@ -324,11 +491,12 @@ function formatCheckers(item: Record<string, any>): string {
}
/**
* 上报输入回填:库位仅有 1 个时回填(便于覆盖上报);数量不预填
* 上报输入回填:商品行库位仅有 1 个时回填(便于覆盖上报);数量不预填
* (行上的 checked_quantity 是该明细全部作业记录的合计,不等于本次上报值)
*/
function resetInputs() {
for (const key of Object.keys(quantityMap)) delete quantityMap[key]
for (const key of Object.keys(stockQuantityMap)) delete stockQuantityMap[key]
for (const key of Object.keys(locationMap)) delete locationMap[key]
for (const item of items.value) {
const codes = resolveLocationCodes(item)
@ -339,9 +507,11 @@ function resetInputs() {
// ============================================================
// 上报实盘(stock.check.report)
// ============================================================
/** 取该行待上报的数量;非法返回 null */
function resolveQuantity(item: Record<string, any>): number | null {
const raw = quantityMap[String(item.id)]
/** 取本次待上报的数量;非法返回 null */
function resolveQuantity(target: ReportTarget): number | null {
const raw = target.stock
? stockQuantityMap[stockKey(target.item.id, target.stock.stock_id)]
: quantityMap[String(target.item.id)]
if (raw === undefined || raw === null || (raw as any) === '') return null
const qty = Number(raw)
if (!Number.isFinite(qty) || qty < 0) return null
@ -352,22 +522,35 @@ function resolveQuantity(item: Record<string, any>): number | null {
* 上报一行;silent=true 时不弹单行成功提示(批量上报用)
* @returns 是否成功
*/
async function doReport(item: Record<string, any>, silent = false): Promise<boolean> {
const quantity = resolveQuantity(item)
async function doReport(target: ReportTarget, silent = false): Promise<boolean> {
const { item, stock } = target
const quantity = resolveQuantity(target)
if (quantity === null) {
if (!silent) ElMessage.warning('请输入不小于 0 的实盘数量')
return false
}
const key = String(item.id)
const location = String(locationMap[key] ?? '').trim()
const payload: StockCheckReportParams = {
id: taskId.value,
detail_id: Number(item.id),
quantity
}
if (stock) {
// 库位行:stock_id 必填,库位以明细库位为准(传入必须一致)
payload.stock_id = Number(stock.stock_id)
const loc = resolveLocationCodes(item)[0]
if (loc) payload.location = loc
} else {
// 商品行:stock_id 可选(传入必须与明细商品一致)
const stockId = Number(item.stock_id)
if (Number.isFinite(stockId) && stockId > 0) payload.stock_id = stockId
const location = String(locationMap[String(item.id)] ?? '').trim()
if (location) payload.location = location
}
reportingId.value = Number(item.id)
try {
const res: any = await stockCheckReport({
id: taskId.value,
detail_id: Number(item.id),
...(location ? { location } : {}),
quantity
})
const res: any = await stockCheckReport(payload)
if (!isCheckApiSuccess(res)) {
throw new Error(res?.message || '上报失败')
}
@ -387,15 +570,23 @@ async function doReport(item: Record<string, any>, silent = false): Promise<bool
}
}
/** 行内上报 */
/** 行内上报(商品行) */
async function reportRow(item: Record<string, any>) {
const ok = await doReport(item)
const ok = await doReport({ item })
if (!ok) return
// 覆盖式上报可能更新已有记录,明细行上的聚合字段需重拉
await loadItems()
emit('changed')
}
/** 展开行内上报(库位行的某个商品) */
async function reportStock(item: Record<string, any>, stock: Record<string, any>) {
const ok = await doReport({ item, stock })
if (!ok) return
await loadItems()
emit('changed')
}
/** 批量上报:逐行串行提交,避免并发写同一盘点单 */
async function reportDirty() {
const targets = [...dirtyRows.value]
@ -407,8 +598,8 @@ async function reportDirty() {
let success = 0
let failed = 0
try {
for (const item of targets) {
const ok = await doReport(item, true)
for (const target of targets) {
const ok = await doReport(target, true)
if (ok) success += 1
else failed += 1
}
@ -416,9 +607,9 @@ async function reportDirty() {
reporting.value = false
}
if (failed === 0) {
ElMessage.success(`已上报 ${success} 行`)
ElMessage.success(`已上报 ${success} 项`)
} else {
ElMessage.warning(`上报完成:成功 ${success} 行,失败 ${failed} 行`)
ElMessage.warning(`上报完成:成功 ${success} 项,失败 ${failed} 项`)
}
// 重新拉取明细(聚合字段由后端按作业记录重算)
await loadItems()
@ -431,7 +622,7 @@ async function reportDirty() {
async function finishCheck() {
try {
await ElMessageBox.confirm(
'完成后不再允许修改盘点记录;未盘明细将按实盘 0 处理(计入盘亏与差异)。确定完成?',
'完成后不再允许修改盘点记录;未盘商品明细将按实盘 0 处理(计入盘亏与差异行数),未盘库位明细不计差异。确定完成?',
'完成盘点',
{ confirmButtonText: '确定完成', cancelButtonText: '取消', type: 'warning' }
)
@ -449,7 +640,7 @@ async function finishCheck() {
const loss = Number(data.loss_total ?? 0)
const unchecked = Number(data.unchecked_items ?? 0)
ElMessage.success(
`盘点已完成(盘盈 ${profit} / 盘亏 ${loss}${unchecked > 0 ? `;未盘 ${unchecked} 行按 0 处理` : ''})`
`盘点已完成(盘盈 ${profit} / 盘亏 ${loss}${unchecked > 0 ? `;未盘 ${unchecked} 项按 0 处理` : ''})`
)
await loadItems()
emit('changed')
@ -559,6 +750,15 @@ watch(
}
}
/* 库位行展开区:内层商品表 */
.stock-expand {
padding: 4px 12px;
.quantity-input {
width: 110px;
}
}
.diff-text {
color: #606266;

View File

@ -191,12 +191,16 @@ export const VALUE_MAPS: Record<string, Record<string, string>> = {
partial_checked: '部分盘点',
all_checked: '已盘完'
},
/** 盘点范围 type */
/**
* 盘点范围 type
* 决定明细行形态:all/location=库位行(一行一个库位,行内按商品聚合)
* store/goods=商品行(一行一个库存商品)
*/
type: {
all: '全盘',
store: '按货主',
goods: '按商品',
location: '按库位'
all: '按库位(默认全仓)',
location: '按库位(指定库位)',
store: '按货主按商品',
goods: '按商品'
},
/** 盘点方式 mode */
mode: {
@ -217,6 +221,17 @@ export function getOptions(field: string): { label: string; value: string }[] {
return Object.entries(map).map(([value, label]) => ({ label, value }))
}
/**
* 是否为「库位类」盘点范围(all / location)
*
* 决定明细行形态与添加明细的入参:
* - true → 明细为「库位行」(scope_type=location),addDetail 传 locations(库位编码)
* - false → 明细为「商品行」(scope_type=goods),addDetail 传 stock_ids
*/
export function isLocationScopeType(type: unknown): boolean {
return ['all', 'location'].includes(String(type ?? ''))
}
/** 翻译 value → label */
export function translate(field: string, value: any): string {
const map = VALUE_MAPS[field]
@ -792,9 +807,13 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
size: 'small',
action: 'openCreateCheck'
},
/**
* 导出选中(stock.check.export):导出表格中勾选的盘点单(单次上限 50)。
* 无勾选时不置灰,点击后提示先勾选。
*/
export: {
key: 'export',
label: '导出',
label: '导出选中',
category: 'function',
type: 'primary',
plain: true,
@ -802,6 +821,21 @@ export const TOOLBAR_BUTTONS: Record<string, ToolbarButtonConfig> = {
loadingKey: 'exportLoading',
action: 'handleExport'
},
/**
* 批量删除(stock.check.batchDelete):仅「已作废」任务会被删除,其余状态后端自动跳过。
* 无勾选时置灰(disabledKey: noSelection)。
*/
batchDelete: {
key: 'batchDelete',
label: '批量删除',
category: 'function',
type: 'danger',
plain: true,
size: 'small',
loadingKey: 'batchDeleteLoading',
disabledKey: 'noSelection',
action: 'handleBatchDelete'
},
// ===== 基础操作 =====
columnConfig: {
key: 'columnConfig',
@ -899,7 +933,7 @@ const DETAIL_SECTIONS = [
const DETAIL_TABS = [
{ name: 'detail', label: '盘点单信息', componentKey: 'DetailPanel' },
{ name: 'items', label: '盘点明细', componentKey: 'CheckItemsPanel' },
{ name: 'records', label: '作业记录', componentKey: 'CheckRecordsPanel' }
{ name: 'records', label: '作业明细', componentKey: 'CheckRecordsPanel' }
]
/** created/rejected:可加明细、可提交、可取消 */
@ -966,13 +1000,6 @@ const OPERATION_BUTTONS: OperationButtonConfig[] = [
confirmType: 'warning',
confirmButtonText: '确定取消',
visibleWhen: (row) => ['created', 'submitted', 'rejected'].includes(String(row?.status))
},
{
key: 'exportCheck',
label: '导出',
actionType: 'action',
type: 'primary',
visibleWhen: () => true
}
]

View File

@ -2,11 +2,11 @@
库存盘点(storage/stockcheck)— 配置驱动页面(views/mode 模板 v2)
接口:库存盘点模块 stock.check(详见 src/api/stock.check/stock.check.ts)
- 列表/详情/新建/加明细/上报/提交/审核/完成/取消/导出+导出进度(11 个接口全部接入)
- 列表/详情/新建/加明细/上报/提交/审核/完成/取消/批量删除/导出选中+导出进度
页面结构:
┌──────────┬──────────────────────────────────────────────┐
│ ScanBox │ OrderToolbarButtonGroup(刷新/新建盘点/导出…) │
│ ScanBox │ OrderToolbarButtonGroup(刷新/新建盘点/导出选中…) │
│(单号/状态│ ┌──────────────────────────────────────────┐│
│ /货主) │ │ UpperTable(盘点单列表 + 操作列) ││
│ │ ├──────────────────────────────────────────┤│
@ -226,6 +226,7 @@
v-model:visible="pickerVisible"
:task-id="pickerTaskId"
:task-title="pickerTaskLabel"
:task-type="pickerTaskType"
@success="handleItemsAdded"
/>
@ -270,6 +271,7 @@ import {
resolveTabConfig,
getTabToolbarButtons,
isCheckApiSuccess,
isLocationScopeType,
loadStoreOptions,
type TabPageConfig,
type DetailTabConfig,
@ -279,6 +281,7 @@ import CheckFormDialog from './pages/CheckFormDialog.vue'
import CheckStockPickerDialog from './pages/CheckStockPickerDialog.vue'
import {
stockCheckAudit,
stockCheckBatchDelete,
stockCheckCancel,
stockCheckExport,
stockCheckExportTaskProgress,
@ -401,7 +404,8 @@ const buttonDisabledMap = computed<Record<string, boolean>>(() => ({
const buttonLoadingMap = computed<Record<string, boolean>>(() => ({
loading: loading.value,
exportLoading: exportLoading.value
exportLoading: exportLoading.value,
batchDeleteLoading: batchDeleteLoading.value
}))
const buttonLabelMap = computed<Record<string, string>>(() => ({
@ -439,7 +443,8 @@ const toolbarActionMap: Record<string, () => void> = {
openColumnConfigPanel: () => { upperTableRef.value?.openColumnConfig?.() },
toggleDetailVisible: () => { detailVisible.value = !detailVisible.value },
openCreateCheck: () => { createVisible.value = true },
handleExport: () => { void doExport() }
handleExport: () => { void doExport() },
handleBatchDelete: () => { void doBatchDelete() }
}
function handleToolbarButtonClick(action: string) {
@ -478,9 +483,6 @@ async function handleOperationAction(key: string, row: Record<string, any>) {
case 'cancelCheck':
await runCheckAction(() => stockCheckCancel({ id }), '盘点单已取消')
break
case 'exportCheck':
await doExport([id])
break
default:
console.warn('[stockcheck] 未处理的操作按钮:', key)
}
@ -561,21 +563,15 @@ const {
})
/**
* 提交导出任务
* @param ids 指定盘点单ID(操作列单行导出);不传则用表格勾选行
* 提交导出任务(导出表格中勾选的盘点单)
*/
async function doExport(ids?: number[]) {
let targetIds: number[] = Array.isArray(ids)
? ids.map(Number).filter((n) => Number.isFinite(n) && n > 0)
: []
async function doExport() {
const targetIds = selectedRows.value
.map((row) => Number(row.id))
.filter((n) => Number.isFinite(n) && n > 0)
if (!targetIds.length) {
targetIds = selectedRows.value
.map((row) => Number(row.id))
.filter((n) => Number.isFinite(n) && n > 0)
if (!targetIds.length) {
ElMessage.warning('请先勾选要导出的盘点单(或使用操作列的「导出」)')
return
}
ElMessage.warning('请先勾选要导出的盘点单')
return
}
if (targetIds.length > 50) {
ElMessage.warning('单次最多导出 50 个盘点单,请减少勾选数量')
@ -584,6 +580,86 @@ async function doExport(ids?: number[]) {
await submitExportTask({ ids: targetIds })
}
// ============================================================
// 批量删除(stock.check.batchDelete:仅删除「已作废(cancelled)」任务)
// ============================================================
const batchDeleteLoading = ref(false)
/**
* 批量删除盘点任务
*
* 服务端口径:仅 status=cancelled 的任务会被级联删除(作业记录 → 明细 → 主表),
* 其余状态与查不到的 ID 全部跳过并计入 skipped_ids;单次上限 200。
*/
async function doBatchDelete() {
const rows = selectedRows.value
if (!rows.length) {
ElMessage.warning('请先勾选要删除的盘点任务')
return
}
const ids = [
...new Set(
rows.map((row) => Number(row?.id)).filter((n) => Number.isFinite(n) && n > 0)
)
]
if (!ids.length) {
ElMessage.warning('未识别到有效的盘点任务ID')
return
}
if (ids.length > 200) {
ElMessage.warning('单次最多删除 200 个盘点任务,请减少勾选数量')
return
}
const cancelledRows = rows.filter((row) => String(row?.status ?? '') === 'cancelled')
const confirmText = cancelledRows.length
? `已选 ${ids.length} 个盘点任务,其中「已作废」${cancelledRows.length} 个。\n确定删除吗?仅「已作废」任务会被删除(连同其明细与作业记录),其余状态自动跳过。`
: `已选 ${ids.length} 个盘点任务,其中没有「已作废」任务,提交后将被全部跳过(不会删除任何数据)。\n是否继续?`
try {
await ElMessageBox.confirm(confirmText, '批量删除盘点任务', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
})
} catch {
return
}
batchDeleteLoading.value = true
try {
const res: any = await stockCheckBatchDelete({ ids })
if (!isCheckApiSuccess(res)) {
throw new Error(res?.message || '批量删除失败')
}
const data = res.data ?? res
const deletedCount = Number(data.deleted_count ?? 0)
const skippedCount = Number(data.skipped_count ?? 0)
if (deletedCount > 0) {
ElMessage.success(
`已删除 ${deletedCount} 个盘点任务${skippedCount ? `,跳过 ${skippedCount} 个(非已作废)` : ''}`
)
} else {
ElMessage.warning(`未删除任何任务:${skippedCount} 个任务因非「已作废」状态被跳过`)
}
selectedRows.value = []
// 当前选中行若被删除,清空详情区
const deletedIds: number[] = Array.isArray(data.deleted_ids)
? data.deleted_ids.map((id: any) => Number(id))
: []
const currentId = Number(selectedRow.value?.id)
if (currentId && deletedIds.includes(currentId)) {
selectedRow.value = null
selectedDetail.value = null
}
await loadData()
} catch (e: any) {
console.error('[stockcheck] 批量删除失败', e)
ElMessage.error(e?.message || '批量删除失败')
} finally {
batchDeleteLoading.value = false
}
}
const loadData = async () => {
const cfg = currentTabConfig.value
if (!cfg) return
@ -768,6 +844,8 @@ const createVisible = ref(false)
const pickerVisible = ref(false)
const pickerTask = ref<Record<string, any> | null>(null)
const pickerTaskId = computed(() => Number(pickerTask.value?.id) || 0)
/** 任务范围类型:all/location=库位类(添加库位);store/goods=商品类(添加商品) */
const pickerTaskType = computed(() => String(pickerTask.value?.type ?? ''))
const pickerTaskLabel = computed(() => {
const task = pickerTask.value
if (!task) return ''
@ -791,20 +869,21 @@ function handlePanelChanged() {
void reloadAndResyncDetail()
}
/** 创建成功:刷新列表,并询问是否立即添加盘点商品 */
async function handleCreateSuccess(task: { id: number; check_no: string; title: string }) {
/** 创建成功:刷新列表,并询问是否立即添加盘点商品 / 盘点库位 */
async function handleCreateSuccess(task: { id: number; check_no: string; title: string; type?: string }) {
await reloadAndResyncDetail()
if (!task?.id) return
const targetLabel = isLocationScopeType(task.type) ? '盘点库位' : '盘点商品'
try {
await ElMessageBox.confirm(
`盘点单 ${task.check_no || task.id} 已创建(空盘点单),是否立即添加盘点商品?`,
'添加盘点商品',
`盘点单 ${task.check_no || task.id} 已创建(空盘点单),是否立即添加${targetLabel}?`,
`添加${targetLabel}`,
{ confirmButtonText: '立即添加', cancelButtonText: '稍后再说', type: 'info' }
)
} catch {
return
}
openStockPicker({ id: task.id, check_no: task.check_no, title: task.title })
openStockPicker({ id: task.id, check_no: task.check_no, title: task.title, type: task.type })
}
/** 添加明细成功:刷新列表(total_items 已变化) */

View File

@ -3,7 +3,9 @@
字段说明(接口文档):
- title 盘点名称,非必填
- type 盘点范围:all 全盘(缺省)/ store 按货主 / goods 按商品 / location 按库位
- type 盘点范围:all 按库位(缺省,未传库位时后端自动拉取全仓启用库位)
/ location 按库位(指定库位)/ store 按货主按商品 / goods 按商品
—— all/location 生成「库位明细行」,store/goods 生成「商品明细行」
- mode 盘点方式:open 明盘(缺省,可见账面数量)/ blind 盲盘
- store_id 货主ID(type=store 时必填)
- check_date 盘点日期(必填,须可被 Date 解析)
@ -34,11 +36,16 @@
<el-form-item label="盘点范围" prop="type">
<el-radio-group v-model="form.type">
<el-radio value="all">全盘</el-radio>
<el-radio value="store">按货主</el-radio>
<el-radio value="all">按库位(默认全仓)</el-radio>
<el-radio value="location">按库位(指定库位)</el-radio>
<el-radio value="store">按货主按商品</el-radio>
<el-radio value="goods">按商品</el-radio>
<el-radio value="location">按库位</el-radio>
</el-radio-group>
<div class="type-tip">
{{ isLocationType
? '库位盘点:明细行为「库位」(一行一个库位,行内按商品聚合),创建后添加盘点库位。'
: '商品盘点:明细行为「商品」(一行一个库存商品),创建后从库存中挑选商品。' }}
</div>
</el-form-item>
<el-form-item v-if="form.type === 'store'" label="货主" prop="store_id">
@ -84,7 +91,7 @@
type="info"
:closable="false"
show-icon
title="创建后为「空盘点单」,需再添加盘点商品并提交审核。"
:title="createAlertText"
/>
</el-form>
@ -98,10 +105,15 @@
</template>
<script setup lang="ts">
import { reactive, ref, watch } from 'vue'
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { isCheckApiSuccess, loadStoreOptions, storeOptions } from '../config/template-config'
import {
isCheckApiSuccess,
isLocationScopeType,
loadStoreOptions,
storeOptions
} from '../config/template-config'
import {
stockCheckCreate,
type StockCheckMode,
@ -114,8 +126,8 @@ const props = defineProps<{ visible: boolean }>()
const emit = defineEmits<{
(e: 'update:visible', value: boolean): void
/** 创建成功(携创建出的盘点单关键信息) */
(e: 'success', task: { id: number; check_no: string; title: string }): void
/** 创建成功(携创建出的盘点单关键信息;type 用于决定后续添加「商品」还是「库位」) */
(e: 'success', task: { id: number; check_no: string; title: string; type: string }): void
}>()
const formRef = ref<FormInstance>()
@ -156,6 +168,18 @@ const rules: FormRules = {
]
}
const isLocationType = computed(() => isLocationScopeType(form.type))
/** 库位类任务创建后要添加的是「库位」而不是「商品」 */
const createAlertText = computed(() => {
if (!isLocationType.value) {
return '创建后为「空盘点单」,需再添加盘点商品并提交审核。'
}
return form.type === 'all'
? '创建后为「空盘点单」,需再添加盘点库位并提交审核;不选库位时由后端自动拉取全仓库启用库位生成盘点范围。'
: '创建后为「空盘点单」,需再添加盘点库位并提交审核。'
})
function handleVisibleChange(value: boolean) {
emit('update:visible', value)
}
@ -211,7 +235,8 @@ async function handleSubmit() {
const task = {
id: Number(payload.id) || 0,
check_no: String(payload.check_no ?? ''),
title: String(payload.title ?? form.title ?? '')
title: String(payload.title ?? form.title ?? ''),
type: String(payload.type ?? form.type ?? '')
}
ElMessage.success(task.check_no ? `盘点单 ${task.check_no} 创建成功` : '盘点单创建成功')
emit('update:visible', false)
@ -231,4 +256,12 @@ async function handleSubmit() {
font-size: 12px;
color: #e6a23c;
}
.type-tip {
width: 100%;
margin-top: 2px;
font-size: 12px;
line-height: 1.5;
color: #909399;
}
</style>

View File

@ -1,10 +1,12 @@
<!--
CheckStockPickerDialog — 添加盘点商品(stock.check.addDetail)
CheckStockPickerDialog — 添加盘点明细(stock.check.addDetail)
数据来源:storage.inventory.list(库存明细,汇总模式 group_by_batch=false)
行上带 stock_id(= wms_stock_warehouse.id),即 addDetail 需要的 stock_ids。
同一商品在不同库位会有多行,提交前按 stock_id 去重(后端对已存在明细幂等跳过)。
两种模式(由来源盘点单的 type 决定):
- 商品类(type=store/goods):从 storage.inventory.list 选商品 → 传 stock_ids
- 库位类(type=all/location):填写/粘贴库位编码(wms_location_space.space_code)→ 传 locations
· type=all 不填库位 = 不传 locations,由后端自动拉取全仓启用库位
响应含 invalid_stock_ids(商品)与 invalid_locations(库位)两类无效项,均需在提示中体现。
仅 created(新建)/ rejected(驳回)状态可添加,后端会校验。
-->
<template>
@ -18,6 +20,8 @@
@closed="handleClosed"
>
<div class="picker-body">
<!-- ===== 商品类任务:从库存明细挑选商品 → stock_ids ===== -->
<template v-if="!isLocationMode">
<!-- 筛选行 -->
<div class="picker-filters">
<el-input
@ -85,12 +89,46 @@
@size-change="handleSizeChange"
/>
</div>
</template>
<!-- ===== 库位类任务:填写/粘贴库位编码 → locations ===== -->
<template v-else>
<el-alert
type="info"
:closable="false"
show-icon
:title="locationAlertText"
/>
<el-input
v-model="locationText"
type="textarea"
:rows="8"
resize="none"
placeholder="每行一个库位编码,也可用逗号 / 空格分隔,如:A-01-01"
/>
<div class="location-preview">
<span class="stat-text">已识别 {{ locationCodes.length }} 个库位</span>
<el-tag
v-for="code in locationCodes.slice(0, 50)"
:key="code"
size="small"
class="location-tag"
>
{{ code }}
</el-tag>
<span v-if="locationCodes.length > 50" class="stat-text">
…等共 {{ locationCodes.length }} 个
</span>
</div>
</template>
</div>
<template #footer>
<div class="dialog-footer">
<span class="selected-tip">
已选 {{ selectedRows.length }} 行 · 去重后 {{ selectedStockIds.length }} 个商品
{{ isLocationMode
? `已填 ${locationCodes.length} 个库位`
: `已选 ${selectedRows.length} 行 · 去重后 ${selectedStockIds.length} 个商品` }}
</span>
<div class="footer-buttons">
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
@ -98,7 +136,7 @@
size="small"
type="primary"
:loading="submitting"
:disabled="!selectedStockIds.length"
:disabled="!canSubmit"
@click="handleSubmit"
>
确认添加
@ -111,11 +149,14 @@
<script setup lang="ts">
import { computed, nextTick, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { useResizeObserver } from '@vueuse/core'
import { getInventoryList } from '@/api/storage.inventory/inventory'
import { stockCheckAddDetail } from '@/api/stock.check/stock.check'
import { isCheckApiSuccess } from '../config/template-config'
import {
stockCheckAddDetail,
type StockCheckAddDetailParams
} from '@/api/stock.check/stock.check'
import { isCheckApiSuccess, isLocationScopeType } from '../config/template-config'
defineOptions({ name: 'CheckStockPickerDialog' })
@ -125,6 +166,8 @@ const props = defineProps<{
taskId?: number
/** 目标盘点单号(展示用) */
taskTitle?: string
/** 目标盘点单范围类型(all/location=库位类 → 添加库位;store/goods=商品类 → 添加商品) */
taskType?: string
}>()
const emit = defineEmits<{
@ -133,10 +176,36 @@ const emit = defineEmits<{
(e: 'success', result: { added: number; skipped: number }): void
}>()
const dialogTitle = computed(() =>
props.taskTitle ? `添加盘点商品 — ${props.taskTitle}` : '添加盘点商品'
/** 库位类任务(明细为库位行)→ 走库位编码输入模式 */
const isLocationMode = computed(() => isLocationScopeType(props.taskType))
const dialogTitle = computed(() => {
const suffix = props.taskTitle ? ` — ${props.taskTitle}` : ''
return isLocationMode.value ? `添加盘点库位${suffix}` : `添加盘点商品${suffix}`
})
// ===== 库位模式 =====
/** 库位编码输入(每行一个,或逗号/空格/顿号分隔) */
const locationText = ref('')
/** 解析后的库位编码(去重去空) */
const locationCodes = computed<string[]>(() => {
const parts = locationText.value.split(/[\s,,、;;]+/)
return [...new Set(parts.map((s) => s.trim()).filter(Boolean))]
})
const locationAlertText = computed(() =>
props.taskType === 'all'
? '按库位盘点(默认全仓):不填库位时,由后端自动拉取全仓库启用库位生成盘点范围。'
: '按库位盘点:请填写要盘点的库位编码(不存在的库位会被后端列入无效库位)。'
)
/** 库位模式:填了库位,或 all 类型(允许不填=全仓) */
const canSubmit = computed(() => {
if (isLocationMode.value) return locationCodes.value.length > 0 || props.taskType === 'all'
return selectedStockIds.value.length > 0
})
const filters = reactive({ keyword: '', batch_no: '' })
const rows = ref<Record<string, any>[]>([])
const loading = ref(false)
@ -170,6 +239,7 @@ function handleClosed() {
tableRef.value?.clearSelection?.()
selectedRows.value = []
rows.value = []
locationText.value = ''
submitting.value = false
}
@ -260,30 +330,57 @@ function handleSelectionChange(selection: Record<string, any>[]) {
async function handleSubmit() {
const taskId = Number(props.taskId)
const stockIds = selectedStockIds.value
if (!Number.isFinite(taskId) || taskId <= 0) {
ElMessage.error('缺少盘点单ID,无法添加明细')
return
}
if (!stockIds.length) {
ElMessage.warning('请先勾选要盘点的商品')
return
const payload: StockCheckAddDetailParams = { id: taskId }
if (isLocationMode.value) {
const codes = locationCodes.value
if (!codes.length) {
if (props.taskType !== 'all') {
ElMessage.warning('请填写至少一个库位编码')
return
}
// type=all:不传 locations,由后端自动拉取全仓启用库位
try {
await ElMessageBox.confirm(
'未填写库位编码,将由后端自动拉取全仓库启用库位生成盘点范围,确定继续?',
'添加盘点库位',
{ confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' }
)
} catch {
return
}
} else {
payload.locations = codes
}
} else {
const stockIds = selectedStockIds.value
if (!stockIds.length) {
ElMessage.warning('请先勾选要盘点的商品')
return
}
payload.stock_ids = stockIds
}
submitting.value = true
try {
const res: any = await stockCheckAddDetail({ id: taskId, stock_ids: stockIds })
const res: any = await stockCheckAddDetail(payload)
if (!isCheckApiSuccess(res)) {
throw new Error(res?.message || '添加盘点明细失败')
}
const data = res.data ?? res
const added = Number(data.added ?? 0)
const skipped = Number(data.skipped ?? 0)
const invalid: number[] = Array.isArray(data.invalid_stock_ids) ? data.invalid_stock_ids : []
const parts = [`新增 ${added} 行`]
if (skipped) parts.push(`跳过已存在 ${skipped} 行`)
if (invalid.length) parts.push(`无效商品 ${invalid.length} 个`)
if (invalid.length) ElMessage.warning(parts.join(','))
const invalidStocks: number[] = Array.isArray(data.invalid_stock_ids) ? data.invalid_stock_ids : []
const invalidLocations: string[] = Array.isArray(data.invalid_locations) ? data.invalid_locations : []
const parts = [`新增 ${added} 项`]
if (skipped) parts.push(`跳过已存在 ${skipped} 项`)
if (invalidStocks.length) parts.push(`无效商品 ${invalidStocks.length} 个`)
if (invalidLocations.length) parts.push(`无效库位 ${invalidLocations.length} 个`)
if (invalidStocks.length || invalidLocations.length) ElMessage.warning(parts.join(','))
else ElMessage.success(parts.join(','))
emit('update:visible', false)
emit('success', { added, skipped })
@ -305,8 +402,10 @@ watch(
pagination.total = 0
selectedRows.value = []
rows.value = []
locationText.value = ''
nextTick(() => tableRef.value?.clearSelection?.())
void loadRows()
// 库位模式不需要拉库存列表
if (!isLocationMode.value) void loadRows()
}
)
</script>
@ -347,6 +446,25 @@ watch(
color: #909399;
}
/* 库位模式:预览已识别的库位编码 */
.location-preview {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px;
max-height: 120px;
overflow-y: auto;
}
.location-tag {
margin: 0;
}
.stat-text {
font-size: 12px;
color: #909399;
}
/* 分页器:右对齐 + 「每页条数」下拉与 UpperTable 同宽 80px */
.pagination-container {
flex-shrink: 0;

View File

@ -27,7 +27,7 @@ import ApiAppFormDialog from '../pages/ApiAppFormDialog.vue'
import DeliveryPlanFormDialog from '../pages/DeliveryPlanFormDialog.vue'
import DefinitionFormDialog from '../pages/DefinitionFormDialog.vue'
import DeliveryPlanCopyDialog from '../pages/DeliveryPlanCopyDialog.vue'
import { apiAppList } from '@/api/apiapp/apiapp'
import { apiAppList, apiAppDetail } from '@/api/apiapp/apiapp'
import {
listDeliveryPlan,
listDeliveryLog,
@ -571,6 +571,15 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
slot: null,
detailLabel: '回调URL'
},
/** API应用:承接的出站回调 method 列表(空/未勾选 = 不承接任何回调) */
callback_functions: {
key: 'callback_functions',
label: '回调方法',
scanBox: null,
table: { minWidth: 180, showOverflowTooltip: true },
slot: { type: 'pre' },
detailLabel: '回调方法'
},
/** API应用:创建时间 */
created_at: {
key: 'created_at',
@ -1362,8 +1371,8 @@ export const tabPages: TabPageRawConfig[] = [
},
{
title: '网络配置',
columnCount: 2,
fieldKeys: ['callback_url', 'self_ip_whitelist']
columnCount: 3,
fieldKeys: ['callback_url', 'callback_functions', 'self_ip_whitelist']
},
{
title: '时间信息',
@ -1373,7 +1382,8 @@ export const tabPages: TabPageRawConfig[] = [
],
api: {
list: apiAppList,
detail: { source: 'list' },
// 明细改用 apiApp.detail:列表未承诺返回 callback_functions,详情才能拿到完整字段
detail: (payload: any) => apiAppDetail(Number(payload?.id ?? payload)),
parseListResponse(res) {
return { list: res?.list ?? res?.data?.list ?? [], total: res?.pagination?.total ?? res?.data?.pagination?.total ?? 0 }
},
@ -1398,6 +1408,7 @@ export const tabPages: TabPageRawConfig[] = [
app_name: 'app_name',
rate_limit: 'rate_limit',
callback_url: 'callback_url',
callback_functions: 'callback_functions',
self_ip_whitelist: 'self_ip_whitelist',
is_enabled: 'is_enabled'
}

View File

@ -1,6 +1,8 @@
<!--
ApiAppFormDialog — API 应用创建/编辑弹窗
对接接口:
- apiAppListCallbackFunctions:拉取出站回调 method 注册表(「回调方法」多选项)
- apiAppDetail:编辑时回填完整字段(含 callback_functions)
- apiAppCreate:创建 API 应用(创建成功展示 AppKey/AppSecret)
- apiAppUpdate:编辑 API 应用
-->
@ -52,6 +54,27 @@
/>
</el-form-item>
<el-form-item label="回调方法">
<el-select
v-model="formData.callback_functions"
multiple
filterable
clearable
collapse-tags
collapse-tags-tooltip
:loading="callbackLoading"
placeholder="不选择 = 不承接任何回调"
style="width: 100%"
>
<el-option
v-for="opt in callbackOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</el-form-item>
<el-form-item label="IP 白名单">
<div class="ip-whitelist">
<el-tag
@ -127,7 +150,12 @@
<script setup lang="ts">
import { computed, nextTick, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { apiAppCreate, apiAppUpdate } from '@/api/apiapp/apiapp'
import {
apiAppCreate,
apiAppDetail,
apiAppListCallbackFunctions,
apiAppUpdate
} from '@/api/apiapp/apiapp'
defineOptions({ name: 'ApiAppFormDialog' })
@ -139,6 +167,8 @@ const props = defineProps<{
rate_limit?: number
callback_url?: string
self_ip_whitelist?: string[]
/** 承接的出站回调 method 列表(行数据可能未返回,编辑时会用 apiAppDetail 纠正) */
callback_functions?: string[] | null
is_enabled?: number
}>()
@ -164,6 +194,8 @@ const formData = reactive({
app_name: '',
rate_limit: 1000,
callback_url: '',
/** 承接的出站回调 method 列表(空数组 = 不承接任何回调) */
callback_functions: [] as string[],
self_ip_whitelist: [] as string[],
is_enabled: 1
})
@ -175,15 +207,26 @@ const formRules = {
]
}
// ===== 回调方法(注册表多选)=====
// 注:以下响应式声明必须位于下方 immediate watch 之前(watch 会立即调用拉取逻辑)
type CallbackOption = { value: string; label: string }
const callbackOptions = ref<CallbackOption[]>([])
const callbackLoading = ref(false)
let callbackOptionsLoaded = false
watch(() => props.visible, (v) => {
if (v) {
createdSecret.value = null
formData.app_name = props.app_name ?? ''
formData.rate_limit = props.rate_limit ?? 1000
formData.callback_url = props.callback_url ?? ''
formData.callback_functions = toArray(props.callback_functions)
formData.self_ip_whitelist = props.self_ip_whitelist ? [...props.self_ip_whitelist] : []
formData.is_enabled = props.is_enabled ?? 1
formRef.value?.clearValidate?.()
void loadCallbackFunctions()
void fillFromDetail()
}
}, { immediate: true })
@ -231,6 +274,73 @@ function handleRemoveFormIp(idx: number) {
formData.self_ip_whitelist.splice(idx, 1)
}
// ===== 回调方法:注册表拉取与详情回填 =====
/** 兼容「JSON 字符串 / 逗号分隔字符串 / 数组 / null」的列表字段 */
function toArray(v: any): string[] {
if (Array.isArray(v)) return v.filter((x) => x !== null && x !== undefined).map((x) => String(x))
if (typeof v === 'string' && v.trim()) {
try {
const parsed = JSON.parse(v)
if (Array.isArray(parsed)) return parsed.map((x) => String(x))
} catch {
return v.split(',').map((s) => s.trim()).filter(Boolean)
}
}
return []
}
/** 注册表条目 → 下拉选项(兼容字符串数组与对象数组,对象优先取 method) */
function normalizeCallbackOption(item: any): CallbackOption | null {
if (typeof item === 'string') {
const val = item.trim()
return val ? { value: val, label: val } : null
}
const value = String(item?.method ?? item?.value ?? item?.code ?? '').trim()
if (!value) return null
const title = String(item?.title ?? item?.name ?? item?.description ?? '').trim()
return { value, label: title && title !== value ? `${value}(${title})` : value }
}
/** 拉取回调 method 注册表(注册表是代码注册的静态清单,本弹窗实例首次打开拉一次即复用) */
async function loadCallbackFunctions() {
if (callbackOptionsLoaded || callbackLoading.value) return
callbackLoading.value = true
try {
const res: any = await apiAppListCallbackFunctions()
const list = res?.list ?? res?.data?.list ?? []
callbackOptions.value = (Array.isArray(list) ? list : [])
.map(normalizeCallbackOption)
.filter((o: CallbackOption | null): o is CallbackOption => !!o)
callbackOptionsLoaded = true
} catch (e: any) {
console.warn('[ApiAppFormDialog] 拉取回调方法注册表失败', e)
} finally {
callbackLoading.value = false
}
}
/**
* 编辑时用 apiApp.detail 回填:
* 列表接口未承诺返回 callback_functions,勾选态以详情为准,避免保存时静默清空。
*/
async function fillFromDetail() {
if (!isEdit.value) return
try {
const res: any = await apiAppDetail(Number(props.id))
if (!SUCCESS_CODES.includes(res?.code)) return
const d: Record<string, any> =
res?.data && typeof res.data === 'object' ? { ...res, ...res.data } : (res ?? {})
if (d.app_name) formData.app_name = String(d.app_name)
if (d.rate_limit !== undefined && d.rate_limit !== null) formData.rate_limit = Number(d.rate_limit)
if (d.callback_url !== undefined) formData.callback_url = d.callback_url ?? ''
if (d.callback_functions !== undefined) formData.callback_functions = toArray(d.callback_functions)
if (Array.isArray(d.self_ip_whitelist)) formData.self_ip_whitelist = [...d.self_ip_whitelist]
if (d.is_enabled !== undefined && d.is_enabled !== null) formData.is_enabled = Number(d.is_enabled)
} catch (e: any) {
console.warn('[ApiAppFormDialog] 拉取应用详情失败,改用行数据回填', e)
}
}
async function handleSubmit() {
const valid = await formRef.value?.validate().catch(() => false)
if (!valid) return
@ -241,6 +351,8 @@ async function handleSubmit() {
app_name: formData.app_name,
rate_limit: formData.rate_limit,
callback_url: formData.callback_url || undefined,
// 空数组 = 不承接任何回调(编辑时用空数组覆盖以清空承接)
callback_functions: formData.callback_functions,
self_ip_whitelist: formData.self_ip_whitelist.length > 0 ? formData.self_ip_whitelist : undefined
}
if (isEdit.value) {