From 2cf3806edf4dac06c44f6fa2f164aa5725a1593f Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Tue, 29 Sep 2026 18:15:06 +0800 Subject: [PATCH] 1 --- src/api/stock.check/stock.check.ts | 745 ++++++++++++ src/lang/en-US.ts | 1 + src/lang/zh-CN.ts | 1 + src/router/map.ts | 1 + src/views/stock/stock/component/storage.vue | 38 +- .../inventory/component/panelstockdetail.vue | 28 + .../components/ColumnCellRenderer.vue | 74 ++ .../components/OperationCellRenderer.vue | 189 +++ .../storage/stockcheck/components/TabArea.vue | 132 +++ .../config/components/CheckItemsPanel.vue | 595 ++++++++++ .../config/components/CheckRecordsPanel.vue | 327 ++++++ .../config/components/DetailPanel.vue | 193 +++ .../stockcheck/config/components/LogPanel.vue | 273 +++++ .../stockcheck/config/template-config.ts | 1043 +++++++++++++++++ src/views/storage/stockcheck/index.vue | 912 ++++++++++++++ .../stockcheck/pages/CheckFormDialog.vue | 234 ++++ .../pages/CheckStockPickerDialog.vue | 383 ++++++ .../stockcheck/pages/ExampleFormDialog.vue | 107 ++ 18 files changed, 5275 insertions(+), 1 deletion(-) create mode 100644 src/api/stock.check/stock.check.ts create mode 100644 src/views/storage/stockcheck/components/ColumnCellRenderer.vue create mode 100644 src/views/storage/stockcheck/components/OperationCellRenderer.vue create mode 100644 src/views/storage/stockcheck/components/TabArea.vue create mode 100644 src/views/storage/stockcheck/config/components/CheckItemsPanel.vue create mode 100644 src/views/storage/stockcheck/config/components/CheckRecordsPanel.vue create mode 100644 src/views/storage/stockcheck/config/components/DetailPanel.vue create mode 100644 src/views/storage/stockcheck/config/components/LogPanel.vue create mode 100644 src/views/storage/stockcheck/config/template-config.ts create mode 100644 src/views/storage/stockcheck/index.vue create mode 100644 src/views/storage/stockcheck/pages/CheckFormDialog.vue create mode 100644 src/views/storage/stockcheck/pages/CheckStockPickerDialog.vue create mode 100644 src/views/storage/stockcheck/pages/ExampleFormDialog.vue diff --git a/src/api/stock.check/stock.check.ts b/src/api/stock.check/stock.check.ts new file mode 100644 index 00000000..3518c38a --- /dev/null +++ b/src/api/stock.check/stock.check.ts @@ -0,0 +1,745 @@ +import request from '@/utils/request' + +const v = '1.0' + +/** + * 库存盘点(module folder = stock.check)接口封装。 + * + * 状态机(主表 status): + * created ──submit──> submitted ──audit(approve)──> approved ──report(首次)──> checking ──finish──> completed + * │ │ (终态:completed / cancelled) + * │ └──audit(reject)──> rejected ──addDetail 可再改──┐ + * └──cancel──> cancelled(终态) │ + * ↑──────────────── submit 仅 created/rejected ──────────────────────────┘ + * + * 仓库隔离:所有接口的 warehouse_id 均由服务端从登录上下文(ctx.user.store_id)注入,前端**禁止传入**。 + * + * 盘点作业记录(wms_stock_check_record): + * report 为**覆盖式**上报——同明细 + 同库位编码重复上报时更新已有记录(不新增), + * 由唯一索引 uk_detail_location(detail_id, location_code) 保证并发安全; + * 未传/为空的库位归入「无库位」分组(库中 location_code 存**空串** '',同分组同样覆盖更新), + * 而 recordList 返回时把空串归一为 **null**(对外口径); + * 一个明细可以有多个库位的记录,明细行上的 checked_quantity/diff_quantity 均为记录聚合值; + * recordList / recordDelete 用于查看与删除作业记录,删除不影响主表状态。 + * 未盘明细 = 无作业记录的明细(finish 时按实盘 0 处理,计入盘亏与差异行数)。 + */ + +/** 盘点主表状态 */ +export type StockCheckStatus = + | 'created' // 新建(可加明细) + | 'submitted' // 已提交待审核 + | 'rejected' // 审核驳回(可再改明细再提交) + | 'approved' // 审核通过,待盘点作业 + | 'checking' // 盘点中 + | 'completed' // 已完成(终态) + | 'cancelled' // 已取消(终态) + +/** 明细盘点进度(主表 detail_status) */ +export type StockCheckDetailStatus = 'none_checked' | 'partial_checked' | 'all_checked' + +/** 盘点范围类型 */ +export type StockCheckType = + | 'all' // 全盘(缺省) + | 'store' // 按货主 + | 'goods' // 按商品 + | 'location' // 按库位 + +/** 盘点方式 */ +export type StockCheckMode = + | 'open' // 明盘(可见账面数量,缺省) + | 'blind' // 盲盘(不可见账面数量) + +/** 审核动作 */ +export type StockCheckAuditAction = 'approve' | 'reject' + +/** 盘点主表行(create 响应 / list rows / detail.check 同构) */ +export type StockCheckTask = { + id: number + /** 盘点单号(PD+YYYYMMDD+6 位序号,按仓库隔离) */ + check_no: string + /** 盘点名称/主题 */ + title: string + type: StockCheckType + mode: StockCheckMode + /** 货主ID(type=store 按货主盘点时有值) */ + store_id?: number | null + status: StockCheckStatus + detail_status: StockCheckDetailStatus + /** 盘点日期 */ + check_date?: string | null + /** 实际开始时间(开始盘点作业后回填) */ + start_time?: string | null + /** 实际结束时间(完成盘点后回填) */ + end_time?: string | null + creator_id: number + /** 创建人名称快照 */ + creator_name: string + /** 明细行数 */ + total_items: number + /** 已盘行数 */ + checked_items: number + /** 差异行数 */ + diff_items: number + remark: string + created_at?: string + updated_at?: string + [key: string]: unknown +} + +/** 盘点作业记录(wms_stock_check_record):同一明细 + 同一库位一条,重复上报为覆盖更新 */ +export type StockCheckRecord = { + id: number + check_id: number + warehouse_id?: number + /** 盘点明细ID */ + detail_id: number + /** 商品库存ID(wms_stock_warehouse.id) */ + stock_id: number + location_id?: number | null + /** + * 库位编码;「无库位」分组的记录:库中存**空串**,但 recordList/detail 返回时归一为 **null** + * (故前端按 falsy 判断即可,空串与 null 均表示无库位) + */ + location_code?: string | null + /** 本库位实盘数量 */ + quantity: number + checker_id?: number | null + checker_name?: string | null + checked_at?: string | null + remark?: string | null + created_at?: string + updated_at?: string + [key: string]: unknown +} + +/** 明细的库位聚合(stock.check.detail 的 rows[].locations) */ +export type StockCheckDetailLocation = { + location_id?: number | null + /** 库位编码;「无库位」分组为空串或 null */ + location_code?: string | null + /** 该库位下作业记录数量合计 */ + quantity: number +} + +/** + * 盘点明细行(stock.check.detail 返回):商品快照 + 已盘聚合字段 + 作业记录 + * + * 注意:实盘数量/差异已不是单值,而是按作业记录聚合的 checked_quantity / diff_quantity; + * 库位为多个(location_codes 数组 + locations 按库位聚合;无库位分组的编码为空串/null)。 + */ +export type StockCheckDetailRow = { + id: number + check_id: number + warehouse_id?: number + /** 商品库存ID(wms_stock_warehouse.id) */ + stock_id: number + item_code?: string + item_name?: string + spec?: string + batch_no?: string + /** 账面数量(快照) */ + system_quantity?: number + /** 已盘数量 = 该明细作业记录 quantity 合计(无作业记录时为 null) */ + checked_quantity?: number | null + /** 差异数量 = 已盘数量 - 账面快照(无作业记录时为 null) */ + diff_quantity?: number | null + /** 是否有差异:0|1(无作业记录时为 null) */ + is_diff?: boolean | number | null + /** 明细状态:checked=有作业记录 / unchecked=未盘 */ + status?: 'checked' | 'unchecked' | string + /** 已盘库位编码数组(去重;无库位分组的编码为空串/null) */ + location_codes?: string[] + /** 盘点人数组(去重) */ + checkers?: string[] + /** 最近上报时间 */ + last_checked_at?: string | null + /** 该明细的全部作业记录(无记录时为空数组) */ + records?: StockCheckRecord[] + /** 按库位聚合(无记录时为空数组) */ + locations?: StockCheckDetailLocation[] + remark?: string | null + created_at?: string + updated_at?: string + [key: string]: unknown +} + +// ============ stock.check.create ============ + +/** stock.check.create 请求参数(warehouse_id 服务端注入,禁止前端传;check_date 必填) */ +export type StockCheckCreateParams = { + /** 盘点名称/主题 */ + title?: string + /** 盘点范围类型,缺省 all */ + type?: StockCheckType + /** 盘点方式,缺省 open;blind=盲盘(前端不可见账面数量) */ + mode?: StockCheckMode + /** 货主ID(type=store 时必填) */ + store_id?: number + /** 盘点日期(必填,须可被 Date 解析) */ + check_date: string + remark?: string +} + +/** stock.check.create:创建盘点任务(空任务,status=created、detail_status=none_checked) */ +export function stockCheckCreate( + data: StockCheckCreateParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.create', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.list ============ + +/** stock.check.list 的 where 条件 */ +export type StockCheckListWhere = { + /** 状态筛选(单值或数组):created/submitted/rejected/approved/checking/completed/cancelled */ + status?: StockCheckStatus | StockCheckStatus[] + /** 货主筛选 */ + store_id?: number + /** 关键字:对盘点单号/标题模糊匹配 */ + keyword?: string +} + +/** stock.check.list 请求参数 */ +export type StockCheckListParams = { + /** 分页参数,默认 page=1、pageSize=20,pageSize 上限 200 */ + pagination?: { page?: number; pageSize?: number } + where?: StockCheckListWhere +} + +/** stock.check.list 响应 */ +export type StockCheckListResponse = { + rows: StockCheckTask[] + total: number + page: number + pageSize: number +} + +/** stock.check.list:盘点任务列表(按登录仓库限定数据范围,服务端分页) */ +export function stockCheckList( + data: StockCheckListParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.list', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.addDetail ============ + +/** stock.check.addDetail 请求参数 */ +export type StockCheckAddDetailParams = { + /** 盘点任务ID */ + id: number + /** 商品库存ID列表(wms_stock_warehouse.id) */ + stock_ids: number[] +} + +/** stock.check.addDetail 响应 */ +export type StockCheckAddDetailResponse = { + /** 本次新增明细数 */ + added: number + /** 已存在被跳过(幂等)的 stock_id 数 */ + skipped: number + /** 无效商品库存ID列表(不存在或不属于当前仓库) */ + invalid_stock_ids: number[] + /** 重算后的明细总行数 */ + total_items: number +} + +/** stock.check.addDetail:添加盘点明细(仅 created/rejected 允许;同 stock_id 幂等跳过) */ +export function stockCheckAddDetail( + data: StockCheckAddDetailParams +): Promise< + StockCheckAddDetailResponse & { code?: number; message?: string; data?: Partial } +> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.addDetail', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.detailDelete ============ + +/** stock.check.detailDelete 请求参数 */ +export type StockCheckDetailDeleteParams = { + /** 盘点任务ID */ + id: number + /** 盘点明细ID(与 detailId 二选一,detail_id 优先) */ + detail_id?: number + /** 盘点明细ID(驼峰别名,兼容写法) */ + detailId?: number +} + +/** stock.check.detailDelete 响应 */ +export type StockCheckDetailDeleteResponse = { + /** 被删除的盘点明细ID */ + detail_id: number + /** 是否删除成功 */ + deleted: boolean + /** 删除后重算的主表明细总行数 */ + total_items: number +} + +/** + * stock.check.detailDelete:删除盘点明细(从任务中移除某个商品) + * + * - 仅主表状态 created/rejected 允许删除 + * - 该明细若存在作业记录(wms_stock_check_record)会防御性一并删除 + * (正常流程 created/rejected 状态不应有记录) + * - 删除后服务端重算主表 total_items + */ +export function stockCheckDetailDelete( + data: StockCheckDetailDeleteParams +): Promise< + StockCheckDetailDeleteResponse & { + code?: number + message?: string + data?: Partial + } +> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.detailDelete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.detail ============ + +/** stock.check.detail 请求参数 */ +export type StockCheckDetailParams = { + /** 盘点任务ID */ + id: number +} + +/** stock.check.detail 响应 */ +export type StockCheckDetailResponse = { + /** 盘点主表信息 */ + check: StockCheckTask + /** 全部明细行 */ + rows: StockCheckDetailRow[] + /** 明细总条数 */ + total: number +} + +/** stock.check.detail:拉取盘点任务主表 + 全部明细行(不分页) */ +export function stockCheckDetail( + data: StockCheckDetailParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.detail', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.report ============ + +/** stock.check.report 请求参数(覆盖式:同明细 + 同库位重复上报为更新) */ +export type StockCheckReportParams = { + /** 盘点任务ID */ + id: number + /** 盘点明细ID */ + detail_id: number + /** + * 库位编码(可空):未传或为空串均写入「无库位」分组(库中 location_code 存空串); + * 匹配 space_code 时回填 location_id + */ + location?: string + /** 实盘数量(不小于 0 的整数) */ + quantity: number +} + +/** stock.check.report 响应 */ +export type StockCheckReportResponse = { + /** 新增或更新的作业记录(wms_stock_check_record 行) */ + record: StockCheckRecord + /** 盘点明细ID */ + detail_id: number + /** 本次上报模式:created=首次上报新增记录 / updated=同明细+同库位覆盖更新 */ + mode: 'created' | 'updated' | string + total_items: number + /** 已盘行数(存在作业记录的明细数) */ + checked_items: number + /** 差异行数(实盘合计与账面快照不一致的明细数) */ + diff_items: number + detail_status: StockCheckDetailStatus +} + +/** + * stock.check.report:盘点作业**覆盖式**上报(同明细 + 同库位重复上报更新已有记录)。 + * 仅 approved/checking 允许;主表 approved 首次上报自动转 checking。 + */ +export function stockCheckReport( + data: StockCheckReportParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.report', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.recordList ============ + +/** stock.check.recordList 请求参数(id 与 detail_id 至少传一个) */ +export type StockCheckRecordListParams = { + /** 盘点任务ID(可选) */ + id?: number + /** 盘点明细ID(可选;传了只查该明细的作业记录) */ + detail_id?: number + /** 分页参数,默认 page=1、pageSize=20,pageSize 上限 200 */ + pagination?: { page?: number; pageSize?: number } +} + +/** stock.check.recordList 响应行:作业记录全字段 + 商品快照列 */ +export type StockCheckRecordListRow = StockCheckRecord & { + item_code?: string + item_name?: string +} + +/** stock.check.recordList 响应 */ +export type StockCheckRecordListResponse = { + rows: StockCheckRecordListRow[] + total: number + page: number + pageSize: number +} + +/** stock.check.recordList:盘点作业记录列表(按记录 id 倒序,服务端分页) */ +export function stockCheckRecordList( + data: StockCheckRecordListParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.recordList', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.recordDelete ============ + +/** stock.check.recordDelete 请求参数(record_id 优先,recordId 为兼容别名) */ +export type StockCheckRecordDeleteParams = { + /** 盘点任务ID */ + id: number + /** 作业记录ID(wms_stock_check_record.id) */ + record_id?: number + /** 作业记录ID(驼峰别名) */ + recordId?: number +} + +/** stock.check.recordDelete 响应(删除后重算的进度;主表状态不回退) */ +export type StockCheckRecordDeleteResponse = { + /** 被删除的作业记录ID */ + record_id: number + /** 是否删除成功 */ + deleted: boolean + total_items: number + checked_items: number + diff_items: number + detail_status: StockCheckDetailStatus +} + +/** stock.check.recordDelete:删除盘点作业记录(仅 approved/checking;记录删光后该明细回到未盘口径) */ +export function stockCheckRecordDelete( + data: StockCheckRecordDeleteParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.recordDelete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.finish ============ + +/** stock.check.finish 请求参数 */ +export type StockCheckFinishParams = { + /** 盘点任务ID */ + id: number +} + +/** stock.check.finish 响应(含差异汇总与未盘明细数) */ +export type StockCheckFinishResponse = { + id: number + /** 完成后的主表状态(completed) */ + status: StockCheckStatus + total_items: number + /** 已盘行数(存在作业记录的明细数) */ + checked_items: number + /** 未盘明细数(无作业记录的明细数,完成时按实盘 0 处理计为盘亏) */ + unchecked_items: number + /** 差异行数(含未盘明细按实盘 0 计算的差异) */ + diff_items: number + /** 盘盈合计(作业记录数量合计大于账面快照的差异合计) */ + profit_total: number + /** 盘亏合计(实盘小于账面快照的差异绝对值合计,含未盘明细的账面快照数) */ + loss_total: number +} + +/** + * stock.check.finish:完成盘点作业(**允许部分未盘完成**)。 + * 仅 approved/checking 允许;未盘明细按实盘 0 处理(差异 = -账面快照,计入盘亏与差异行数)。 + */ +export function stockCheckFinish( + data: StockCheckFinishParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.finish', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.submit ============ + +/** stock.check.submit 请求参数 */ +export type StockCheckSubmitParams = { + /** 盘点任务ID */ + id: number +} + +/** stock.check.submit 响应 */ +export type StockCheckSubmitResponse = { + id: number + /** 提交后的主表状态(submitted) */ + status: StockCheckStatus +} + +/** stock.check.submit:提交审核(仅 created/rejected 允许;校验 total_items>0) */ +export function stockCheckSubmit( + data: StockCheckSubmitParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.submit', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.cancel ============ + +/** stock.check.cancel 请求参数 */ +export type StockCheckCancelParams = { + /** 盘点任务ID */ + id: number +} + +/** stock.check.cancel 响应 */ +export type StockCheckCancelResponse = { + id: number + /** 取消后的主表状态(cancelled 终态) */ + status: StockCheckStatus +} + +/** stock.check.cancel:取消盘点任务(仅 created/submitted/rejected 允许) */ +export function stockCheckCancel( + data: StockCheckCancelParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.cancel', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.audit ============ + +/** stock.check.audit 请求参数 */ +export type StockCheckAuditParams = { + /** 盘点任务ID */ + id: number + /** 审核动作:approve=通过 / reject=驳回 */ + action: StockCheckAuditAction + /** 驳回原因(写入备注,可选;缺省保留原备注) */ + reason?: string +} + +/** stock.check.audit 响应 */ +export type StockCheckAuditResponse = { + id: number + /** 审核后的主表状态:approved(通过)/ rejected(驳回) */ + status: StockCheckStatus +} + +/** stock.check.audit:审核盘点任务(仅 submitted 允许) */ +export function stockCheckAudit( + data: StockCheckAuditParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.audit', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.export ============ + +/** stock.check.export 请求参数(ids 与 task_ids 二选一,ids 优先;单次最多 50 个盘点任务) */ +export type StockCheckExportParams = { + /** 盘点任务ID数组(兼容单值) */ + ids?: number[] | number + /** 盘点任务ID数组(ids 的别名) */ + task_ids?: number[] | number +} + +/** stock.check.export / exportTaskProgress 响应(提交与进度同构,进度额外含 download_url) */ +export type StockCheckExportResponse = { + /** 导出任务ID(格式 stock_check_export_{warehouseId}_{时间戳}_{随机串}) */ + task_id: string + /** 任务状态:submitted/running/success/failed/not_found */ + status: string + /** 进度百分比(0-100) */ + progress: number + /** 当前已处理明细数 */ + current_count: number + /** 明细总行数 */ + total_count: number + message: string + /** 任务成功时的结果对象(含 filename/fileKey/url/cdnUrl/cosUrl) */ + result?: Record | null + error: string + /** 最近一次状态更新时间戳(毫秒) */ + update_time: number +} + +/** + * stock.check.export:提交盘点任务导出任务(异步)。 + * 每个盘点任务一个 Sheet(Sheet 名=盘点单号);单次最多 50 个盘点任务。 + */ +export function stockCheckExport( + data: StockCheckExportParams = {} +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.export', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +// ============ stock.check.exportTaskProgress ============ + +/** stock.check.exportTaskProgress 请求参数(task_id 与 taskId 二选一) */ +export type StockCheckExportTaskProgressParams = { + /** 任务ID(下划线写法) */ + task_id?: string + /** 任务ID(驼峰写法) */ + taskId?: string +} + +/** stock.check.exportTaskProgress 响应 */ +export type StockCheckExportTaskProgressResponse = StockCheckExportResponse & { + /** 完成后可直接下载的文件地址(从 result 兜底提取);未完成或未找到时为空字符串 */ + download_url: string +} + +/** + * stock.check.exportTaskProgress:查询盘点导出进度。 + * 任务不存在时**正常返回**(status=not_found),不视为错误;任务缓存 TTL 1800 秒。 + */ +export function stockCheckExportTaskProgress( + data: StockCheckExportTaskProgressParams +): Promise< + StockCheckExportTaskProgressResponse & { + code?: number + message?: string + data?: Partial + } +> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'stock.check.exportTaskProgress', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index a2aa1c8b..be1c50a9 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -86,6 +86,7 @@ export default { 'afterSalelist':'AfterSale List', 'inbox_auto_reply':'Inbox Auto Reply', 'InboxAutoReply':'Inbox Auto Reply', + 'StockCheck':'Stock Check', }, "login": { "title": "Login", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index eef61231..25c13a36 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -89,6 +89,7 @@ export default { 'afterSalelist':'售后列表', 'inbox_auto_reply':'回信规则配置', 'InboxAutoReply':'回信规则配置', + 'StockCheck':'库存盘点', }, "login": { "title": "登录", diff --git a/src/router/map.ts b/src/router/map.ts index 422c2f98..3514ddec 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -89,4 +89,5 @@ export const componentMap: Record = { 'afterSale/afterSalelist': () => import('@/views/afterSale/list/index.vue'), 'afterSale/detail/index': () => import('@/views/afterSale/detail/index.vue'), 'afterSale/typelist/index': () => import('@/views/afterSale/typelist/index.vue'), + 'storage/stockcheck/index': () => import('@/views/storage/stockcheck/index.vue'), }; \ No newline at end of file diff --git a/src/views/stock/stock/component/storage.vue b/src/views/stock/stock/component/storage.vue index d7ffa175..a3a126dc 100644 --- a/src/views/stock/stock/component/storage.vue +++ b/src/views/stock/stock/component/storage.vue @@ -22,6 +22,15 @@ > 刷新 + + + {{ quantityVisible ? '隐藏数量' : '显示数量' }} + @@ -62,7 +71,12 @@ prop="quantity" label="数量" width="80" - /> + > + + + + + + ([]) const stockItem = ref(null) +/** 「数量」数值是否可见:默认隐藏(只遮挡数值,列仍在;不影响数据与分页/刷新) */ +const quantityVisible = ref(false) +/** 隐藏时的占位符 */ +const QUANTITY_MASK = '***' + +/** + * 实物数 = 可用数量 + 锁定数量 + * 可用数量缺失/为 0 时按「数量 - 锁定数量」兜底(与主列表「可用库存」列口径一致) + */ +function resolvePhysicalQuantity(row: any): number { + const quantity = Number(row?.quantity ?? 0) || 0 + const locked = Number(row?.locked_quantity ?? 0) || 0 + const available = Number(row?.available_quantity || Math.max(0, quantity - locked)) || 0 + return available + locked +} + const pagination = reactive({ page: 1, pageSize: 20, diff --git a/src/views/storage/inventory/component/panelstockdetail.vue b/src/views/storage/inventory/component/panelstockdetail.vue index 86384aa2..1afab5b0 100644 --- a/src/views/storage/inventory/component/panelstockdetail.vue +++ b/src/views/storage/inventory/component/panelstockdetail.vue @@ -66,6 +66,15 @@
+ + + {{ quantityVisible ? '隐藏数量' : '显示数量' }} + {{ row[col.prop] || '--' }} + + +