This commit is contained in:
liufumingren 2026-09-15 09:04:56 +08:00
commit 4ecf3c32b8
26 changed files with 2156 additions and 267 deletions

View File

@ -0,0 +1,291 @@
# 命名规范与 TS1261(文件名大小写)修复指南
> **给 AI 助手的执行说明**
> 本文档用于修复本仓库在 Windows 上因「目录/文件名大小写不一致」导致的 `TS1261 / TS1149` 类型检查失败。
> 第 4 节是**执行步骤**,第 5 节是**可直接运行的审计脚本**,第 6 节是**验收标准**,第 7 节是**禁止事项(务必先读)**。
> 所有命令均为 PowerShell(Windows)。执行前请先读完第 2、3 节理解原理,避免"反向修复"。
---
## 1. 项目命名规范(硬性约定)
| 范围 | 规范 | 示例 |
| --- | --- | --- |
| `src/api/` 的**一级目录名** | **必须全小写**,与 API 模块文档的 `folder` 字段完全一致 | `storewarehouse.warehouse`、`storewarehouse.store`、`storage.inventory`、`order.wave` |
| `src/api/` 目录名 | 允许小写字母、数字、`.`、`_`;**禁止驼峰** | ✅ `order.deliveryorder` ❌ `order.deliveryOrder` |
| `src/api/` 下的文件名 | 可以用驼峰(这是正常的) | `storeWarehouse.ts`、`inventory.ts` |
| 其它目录(`src/views`、`src/components` …) | 以 **git 索引为准**,磁盘必须与索引完全一致(索引里有驼峰目录是正常的,如 `src/views/Externalwarehouse`) | — |
| 代码里的 `import` 路径 | **大小写必须与磁盘(= git 索引)完全一致,逐字符匹配** | ✅ `@/api/storewarehouse.warehouse/storeWarehouse` |
| Git 配置 | 仓库级 `core.ignorecase` 必须为 `false` | `git config core.ignorecase false` |
**判断"谁是对的"的唯一依据 = git 索引**:
```powershell
git ls-tree --name-only HEAD:src/api # 看提交树里的真实目录名(权威)
git ls-files src/api # 看索引里的路径
```
不要用「我本机磁盘是这样的」来当依据 —— Windows 磁盘改名对 git 可能不可见(见第 2 节)。
---
## 2. 为什么会报 TS1261(原理)
报错原文形如:
```
error TS1261: Already included file name 'D:/repo/src/api/storeWarehouse.warehouse/storeWarehouse.ts'
differs from file name 'D:/repo/src/api/storewarehouse.warehouse/storeWarehouse.ts' only in casing.
The file is in the program because:
Imported via '@/api/storeWarehouse.warehouse/storeWarehouse' from file '.../shipperSigning/index.vue'
Matched by include pattern 'src/**/*' in 'tsconfig.app.json'
```
三个条件叠加导致:
1. **Windows 文件系统不区分大小写**,因此 `storewarehouse.warehouse` 和 `storeWarehouse.warehouse` 在磁盘上"看起来"是同一个目录,很容易被改名而没人发现。
2. `tsconfig.app.json` 使用 `"include": ["env.d.ts", "src/**/*", "src/**/*.vue"]` —— glob 是按**磁盘上的真实大小写**把文件收进编译程序的。
3. TypeScript 的 `forceConsistentCasingInFileNames`(TS 5 起默认 `true`)会把"同一个文件以两种大小写被收录"判定为错误 → **TS1261 / TS1149**。
**关键推论**:
> 同一个文件,只要 **import 里的大小写** 与 **磁盘上的真实大小写** 不一致,就必然报 TS1261。
> 磁盘与 git 索引不一致时,改 import 只能让「本机通过」,代价是其它所有机器失败。
### 2.1 为什么 git 没记录这次改名
仓库级配置 `core.ignorecase = true`(Windows 上 git 的默认值)。
* 它让 git 认为文件系统大小写不敏感,于是**只改大小写的改名对 git 完全不可见**(`git status`、`git mv`、`git add` 都不反映)。
* 结果:某台机器把磁盘目录改成了驼峰,**只有它本机变了**;git 索引/提交树里仍然是原来的小写目录。
* 于是出现"镜像互坑":谁把 import 改成自己磁盘的样子,就把对方弄挂。
| 磁盘目录名 | 小写 import | 驼峰 import |
| --- | --- | --- |
| `storewarehouse.warehouse`(git 索引真值 / 所有正常克隆) | ✅ 通过 | ❌ TS1261 |
| `storeWarehouse.warehouse`(被改过名的机器) | ❌ TS1261 | ✅ 通过 |
---
## 3. 本次案例的事实核对(2026-09 实测,可直接采信)
| 项目 | 结论 |
| --- | --- |
| git 索引中 `src/api` 一级目录名 | **全部小写,无任何大写字母**(共 60 个一级目录) |
| `src/api/storewarehouse.warehouse` | 该目录在 git 索引 / 提交树中**始终是全小写**(`7afc669`、`9532289`、`cc9c0f7` 三个提交树一致) |
| 提交 `cc9c0f7` | 把两个页面的 import 从 `@/api/storewarehouse.warehouse/…` 改成 `@/api/storeWarehouse.warehouse/…`;`git ls-tree cc9c0f7:src/api/storeWarehouse.warehouse` → `fatal: Not a valid object name`(该路径在仓库中**不存在**) |
| 隔离实测(临时 worktree 检出 `cc9c0f7` + 独立 `vue-tsc --build --force`) | ❌ ExitCode=2,报 TS1261 |
| 隔离实测(把 import 回退为小写,即 `9532289` 状态) | ✅ ExitCode=0 |
**结论:真值是小写。`cc9c0f7` 是反向修复,需要用「磁盘改名」而不是「改 import」来修复。**
涉及的两个文件(import 行):
* `src/views/Externalwarehouse/shipperSigning/index.vue`
* `src/views/store/shipperSigning/index.vue`
正确写法:
```ts
import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse'
import { storeWarehouseUnbind, storeWarehouseRename, storeWarehouseConfirmSign } from '@/api/storewarehouse.store/storeWarehouse'
```
---
## 4. 修复步骤(在「命名有问题的设备」上执行)
### Step 0 — 保护本地工作
先把未提交的本地改动提交到自己的分支,或者 `git stash`。
> ⚠️ **在磁盘改名完成之前,绝对不要执行 `git add -A` / `git add .` / 提交**。否则错误的大小写会被写进 git 索引并推到远端,问题会扩散给所有人。
```powershell
git status --short
```
### Step 1 — 定位所有不一致(先看清单,再动手)
先执行第 5 节的**审计脚本**,得到"索引名 vs 磁盘真实名"的不一致清单。
快速检测(把 git 临时切换成大小写敏感模式,不一致会显示成**成对**的 ` D …` + `?? …`):
```powershell
git -c core.ignorecase=false -c core.quotepath=false status --porcelain
```
* 输出为空 → 磁盘与索引一致,跳到 Step 5。
* 有输出 → 继续 Step 2,逐个改名。
### Step 2 — 改磁盘目录名(Windows 只改大小写**必须两步**)
Windows 上直接 `Rename-Item a b`(仅大小写不同)会认为"名字没变"而失败,必须借道一个临时名:
```powershell
# 目标:把 src\api 下被改成驼峰的目录改回索引里的小写名
Set-Location <仓库根目录>\src\api
Rename-Item -LiteralPath storeWarehouse.warehouse -NewName storeWarehouse.warehouse.__casefix
Rename-Item -LiteralPath storeWarehouse.warehouse.__casefix -NewName storewarehouse.warehouse
```
* 新名字**必须逐字符等于 git 索引里的名字**(本仓库 = 全小写)。
* 目录内文件不用动(文件名的所属层级不变)。
* 因为索引里本来就是小写,所以**不需要也不应该** `git mv`,改完 git 不会有任何 diff(这是正常的、期望的结果)。
确认磁盘真实名(**必须用精确正则**):
```powershell
cmd /c dir /b src\api | Select-String -CaseSensitive -Pattern "^storewarehouse|^storeWarehouse"
```
期望:只有 `storewarehouse.store` 和 `storewarehouse.warehouse`;`^storeWarehouse` 一行都没有。
### Step 3 — 让 git 以后能发现这类问题
```powershell
git config core.ignorecase false # 仓库级配置,每台设备都要各自执行一次
```
### Step 4 — 复核
```powershell
git status --short # 期望:干净,或只剩你自己的业务改动;不应再出现成对的 删除+未跟踪
```
如仍有成对条目,回到 Step 2 继续改名,直到干净。
### Step 5 — 拉取并验收
```powershell
git pull
# 自检 1:不应存在任何 "@/" 开头的驼峰 api 目录引用(期望:无输出)
git grep -n -E "@/api/[A-Z]" -- "src/**"
# 自检 2:确认 api 引用与磁盘一致(期望:输出的目录名都是全小写)
git grep -n -E "@/api/[a-zA-Z]" -- "src/**" | Select-Object -First 20
# 自检 3:类型检查
npm run type-check # 期望:ExitCode=0,无 TS1261
```
### Step 6 — 兜底方案(最省事,推荐在无本地独有改动时使用)
如果该设备本地没有独有改动(改动已推送或已丢弃),**直接删除目录重新 clone** 最稳:磁盘布局会按 git 索引一次性还原成正确大小写,不需要逐个改名。
```powershell
git push <自己的分支> # 如有本地提交
# 然后重命名/删除旧目录,重新 git clone,再 npm install
```
---
## 5. 审计脚本(只读,不修改任何文件)
保存为 `audit-case.ps1`,在**仓库根目录**执行:`powershell -ExecutionPolicy Bypass -File .\audit-case.ps1`
* 输出 `OK: disk names match git index exactly ...` 表示大小写完全一致。
* 对本仓库实测输出:`OK: disk names match git index exactly (checked 624 ASCII paths, skipped 14 non-ASCII paths)`。
* 脚本刻意只用 ASCII 输出(中文在 GBK 终端下会乱码),并跳过含中文的路径(`docs/*.md` 等永远不会被 import,与 TS1261 无关)。
```powershell
# ===== 大小写一致性审计:对比 git 索引路径 与 磁盘真实路径 =====
# 只读操作,不修改任何文件。
$root = (git rev-parse --show-toplevel).Trim()
Set-Location $root
$listingCache = @{}
function Get-Listing([string]$dir) {
if (-not $listingCache.ContainsKey($dir)) {
$listingCache[$dir] = @(Get-ChildItem -LiteralPath $dir -Force -ErrorAction SilentlyContinue)
}
return $listingCache[$dir]
}
# 必须加 core.quotepath=false,否则含中文的路径会被 git 转义成 "\350\..."
$files = @(git -c core.quotepath=false ls-files)
$bad = [System.Collections.Generic.List[string]]::new()
$skipped = 0
foreach ($f in $files) {
if ($f -notmatch '^[\x20-\x7E]+$') { $skipped++; continue }
$segs = $f -split '/'
$cur = $root
for ($i = 0; $i -lt $segs.Count; $i++) {
$name = $segs[$i]
$items = Get-Listing $cur
$exact = $items | Where-Object { $_.Name -ceq $name } | Select-Object -First 1
if ($exact) { $cur = $exact.FullName; continue }
# 磁盘上找不到「逐字符相同」的名字,但可能存在「仅大小写不同」的名字
$ci = $items | Where-Object { $_.Name -ieq $name } | Select-Object -First 1
if ($ci) {
$bad.Add("index: " + (($segs[0..$i]) -join '/') + " disk: " + $ci.Name + " (parent: " + $cur + ")")
} else {
$bad.Add("in index but missing on disk: " + (($segs[0..$i]) -join '/'))
}
break
}
}
$bad = $bad | Sort-Object -Unique
if ($bad.Count -eq 0) {
Write-Host ("OK: disk names match git index exactly (checked " + ($files.Count - $skipped) + " ASCII paths, skipped " + $skipped + " non-ASCII paths)")
} else {
Write-Host ("Found " + $bad.Count + " case mismatch(es), rename the disk entry to the index name:")
$bad | ForEach-Object { Write-Host (" " + $_) }
}
```
**成对改名的辅助写法**(对审计结果里每一条 `index: xxx disk: XXX`):
```powershell
$parent = "<父目录,来自审计输出的 (parent: …)>"
$diskName = "<磁盘上的真实名,来自审计输出的 disk:XXX>"
$indexName = "<索引里的名字,来自审计输出的 index:xxx 最后一段>"
Set-Location $parent
Rename-Item -LiteralPath $diskName -NewName ($diskName + ".__casefix")
Rename-Item -LiteralPath ($diskName + ".__casefix") -NewName $indexName
```
---
## 6. 验收标准(全部满足才算修复完成)
1. `git -c core.ignorecase=false -c core.quotepath=false status --porcelain` 输出为空(或只剩自己的业务改动)。
2. 第 5 节审计脚本输出以 `OK:` 开头(且 `Found` 计数为 0)。
3. `git grep -n -E "@/api/[A-Z]" -- "src/**"` 无输出。
4. `npm run type-check` → `ExitCode=0`,无 `TS1261` / `TS1149`。
5. `git config --get core.ignorecase` → `false`。
---
## 7. 禁止事项与常见坑
| 禁止 / 注意 | 说明 |
| --- | --- |
| ❌ 用「改 import 大小写」去适配自己本机的磁盘 | 这是本次问题的根源(提交 `cc9c0f7`)。真值在 git 索引里,不要在本地反向同步 |
| ❌ 在磁盘改名完成前执行 `git add -A` | 会把错误大小写写进索引并推到远端 |
| ❌ 单步 `Rename-Item a b`(仅大小写差异) | Windows 上会失败/无效,必须借道 `.__casefix` 再改回来 |
| ❌ 用 `Select-String -Pattern "store"` 判断目录大小写 | `storeWarehouse` 里也含 `store`,区分不出来。必须用 `-CaseSensitive -Pattern "^storewarehouse"` / `"^storeWarehouse"` |
| ❌ 用 `findstr /i`、`grep -i` 判断大小写 | 同上,必须区分大小写 |
| ❌ PowerShell `Remove-Item <junction> -Recurse` | 5.1 下可能递归删除**链接目标**的内容;删 junction 请用 `cmd /c rmdir "<path>"`(不带 `/s`) |
| ⚠️ 用 junction 把 `node_modules` 链接进临时 git worktree,再 `git worktree remove --force` | git 会递归进 junction,**删除主工作区 `node_modules` 里排序靠前的条目**(`.bin`、`.package-lock.json`、`.modules.yaml` 等)。正确清理顺序:先 `cmd /c rmdir "<tmp>\node_modules"`,再 `Remove-Item <tmp> -Recurse -Force`,最后 `git worktree prune`;万一已误删,主工作区 `npm install` 可恢复 |
| ⚠️ `core.ignorecase=false` 的执行时机 | 必须在磁盘改名**之后**再开启。若磁盘仍是驼峰就开启,`git status` 会立刻出现大量成对的「删除 + 未跟踪」,此时**不要** `git add` |
| ⚠️ `git grep` 与 `Select-String` 的默认行为 | `git grep` 默认区分大小写;PowerShell `Select-String` 默认**不区分**,需要 `-CaseSensitive` |
---
## 8. 相关提交与文件索引
| 对象 | 说明 |
| --- | --- |
| `cc9c0f7` | ❌ 反向修复:把 2 处 import 改成驼峰 `@/api/storeWarehouse.warehouse/…`,在所有磁盘为小写的机器上复现 TS1261 |
| `9532289` | `cc9c0f7` 的父提交,import 为正确的小写 |
| `7afc669` | 更早的提交,同样是小写 |
| `src/views/Externalwarehouse/shipperSigning/index.vue` | import 行约 143 行 |
| `src/views/store/shipperSigning/index.vue` | import 行约 195 / 196 行 |
| `tsconfig.app.json` | `include: ["env.d.ts", "src/**/*", "src/**/*.vue"]`,TS1261 的触发条件之一 |
| `package.json` | `type-check` = `vue-tsc --build` |

View File

@ -271,24 +271,39 @@ export function getEntryDetailStore(data: GetEntryDetailParams): Promise<GetEntr
})
}
/** storage.entry.cancel 请求参数:id / ids 至少传一个;entryOrderCode 优先于 id/ids */
export type CancelEntryParams = {
/** 入库单ID,兼容旧调用;与 ids 二选一。若同时传入 ids,以 ids 为准 */
id?: number
/** 入库单ID数组,用于批量作废;必须为非空数组 */
/** 入库单ID数组(number[]),用于批量作废;必须为非空数组,批量场景建议使用 ids,优先于 id */
ids?: number[]
/** 入库单号(可选,内部复用口径):传入时按 entry_order_code 定位(条件含 warehouse_id + is_enabled=1 + deleted_at=null),优先于 id/ids;供奇门/openapi 外部渠道复用,系统方法入口可继续使用 id/ids,行为与文案不变 */
entryOrderCode?: string
/** entryOrderCode 的兼容别名(与 entryOrderCode 等价) */
entry_order_code?: string
}
/** storage.entry.cancel 响应:单条作废返回 id,批量作废返回已成功作废的 ids */
export type CancelEntryResponse = {
code?: number
message?: string
/** 单条作废时返回的入库单ID */
id?: number
/** 批量作废时返回的已成功作废入库单ID数组 */
ids?: number[]
/** 兼容包装层 */
data?: {
id?: number
ids?: number[]
}
}
/**
* 作废入库单(单条或批量)
* - 仅 CREATED(已创建待审核)/ PENDING(已审核)可作废
* - COMPLETED(已完成)与 sync_status=SUCCESS(已完成回传)不允许作废
* - QM 来源入库单作废前先发送奇门取消同步(服务端处理)
*/
export function cancelEntry(data: CancelEntryParams): Promise<CancelEntryResponse> {
return request({
url: '/system',

View File

@ -45,6 +45,88 @@ export function getInventoryListByStockId(data: { stock_id: number; group_by_spa
} as any)
}
/** storage.inventory.listBySpaceId 请求参数 */
export type InventoryListBySpaceIdParams = {
/** 库位ID(wms_location_space.id,必填) */
space_id: number
}
/** storage.inventory.listBySpaceId 响应 data.space(库位信息) */
export type InventorySpaceInfo = {
/** 库位ID */
id?: number
/** 所属仓库ID */
warehouse_id?: number
/** 库位编码 */
space_code?: string
/** 自定义名称 */
custom_name?: string
/** 库位状态 */
space_status?: number | string
[key: string]: unknown
}
/** storage.inventory.listBySpaceId 响应 data.list 列表项(按商品 stock_id 汇总为一条) */
export type InventorySpaceStockItem = {
warehouse_id?: number
store_id?: number
space_id?: number
stock_id?: number
/** 汇总数量 */
quantity?: number
/** 汇总锁定数量 */
locked_quantity?: number
/** 汇总拦截锁定数量 */
intercept_locked_quantity?: number
/** 汇总可用数量 */
available_quantity?: number
/** 批次数 */
batch_count?: number
/** 最早入库时间(空为 '') */
first_inbound_time?: string
/** 最晚入库时间(空为 '') */
last_inbound_time?: string
/** 库位编码 */
space_code?: string
/** 库位名称(custom_name 优先,否则 space_code) */
space_name?: string
/** 货主名称(当前仓库签约表 store_remask,未命中为 null) */
store_name?: string | null
/** stock_warehouse 通用商品属性对象(未命中为 null):id/item_code/item_name/sku_property/quantity/locked_quantity/is_batch_mgmt/is_shelf_life_mgmt/is_images/need_recheck/store_id/packing_requirements/stock_unit/barcodes/image_url */
stock?: Record<string, any> | null
[key: string]: unknown
}
/** storage.inventory.listBySpaceId 响应 */
export type InventoryListBySpaceIdResponse = {
code?: number
message?: string
data?: {
space?: InventorySpaceInfo
list?: InventorySpaceStockItem[]
}
}
/**
* 按库位查询库存商品列表
* - 入参 space_id 必填;先校验该库位归属当前登录仓库(库位不存在返回 404,存在但不属于本仓库返回 400)
* - 返回该库位下有量库存(quantity > 0)的商品列表,按商品(stock_id)汇总为一条
* - 该库位无有量库存时 list 为空数组
*/
export function getInventoryListBySpaceId(data: InventoryListBySpaceIdParams): Promise<InventoryListBySpaceIdResponse> {
return request({
url: '/system',
method: 'post',
params: {
method: 'storage.inventory.listBySpaceId',
v,
timestamp: new Date().getTime()
},
data,
isSystemApi: true
} as any)
}
export function quickPutaway(data: { receiving_id: number; id?: number }): Promise<any> {
const body: Record<string, unknown> = { ...data }
if (body.receiving_id === undefined && body.id != null) {

View File

@ -149,15 +149,26 @@ export type StockoutConfirmParams = {
export type StockoutConfirmResponse = {
id: number
stockout_order_code: string
/** 确认后状态(COMPLETED) */
order_status: string
/** 物流公司名称(当前实现固定返回字符串 OTHER) */
logisticsName: string
/** 运单号(取自表中 express_code 字段) */
/** 快递公司编码(取自 wms_order_stockout.express_code):**历史遗留命名,实际语义是快递公司编码而非运单号**(运单号见 waybill_codes) */
expressCode: string
/** 运单号列表(取自表中 express_codes 字段) */
expressCodes?: string[]
/** 当前实现取自已废弃字段 wms_order_stockout.express_codes(通常为 null):**运单号请以 waybill_codes 为准**,本字段待代码侧收敛,不应作为展示/回写依据 */
expressCodes?: string[] | null
/** 外部回传结果:success=通知成功,failure=通知失败(确认本身不受影响);字段名为历史遗留,API/WMS 来源同样复用该字段 */
qimenSync: string
/** 外部回传失败时的错误信息 */
qimenSyncMessage?: string
}
/** 直出确认出库单:不改变内部库存,按出库单明细计划数量(plan_qty)直接确认,状态推进到 COMPLETED。要求 express_code 已填写 */
/**
* 直出确认出库单:不改变内部库存,按出库单明细计划数量(plan_qty)直接确认,成功后状态推进到 COMPLETED 并释放创建时占用的库存锁定(QM_STOCKOUT)
* - 运单号以 `waybill_codes`(复数,支持一单多运单)为准;单数 `waybill_code` 已弃用,仅在复数缺失时对存量单兼容回退
* - 出站回传按 source_type 分流:QM→奇门;API→OpenAPI 回调;WMS 等内部来源直接视为成功
* - 回传结果见响应 `qimenSync`:failure 时确认仍成功(order_status=COMPLETED),仅 sync_status 标记 FAILED 可重试
*/
export const stockoutConfirm = (data: StockoutConfirmParams) => {
return request({
url: `/system`,
@ -173,22 +184,34 @@ export const stockoutConfirm = (data: StockoutConfirmParams) => {
// ── storage.stockout.updateExpress ──
/** storage.stockout.updateExpress 请求参数(未传入的字段不会更新;三个字段都未传时后端返回「没有需要更新的字段」) */
export type StockoutUpdateExpressParams = {
/** 出库单ID(必填) */
id: number
<<<<<<< HEAD
/** 快递公司编码(非运单号,如 SF/STO/ZT);传入后自动解析 express_name,传空值置 NULL */
express_code?: string
/** 运单号(单个);storage.stockout.confirm 前必须已填写该字段 */
waybill_code?: string
/** 运单号列表(JSON 数组或 null,支持多包裹场景);非数组返回 400 */
waybill_codes?: string[] | null
=======
/** 快递公司编码(**非运单号**,如 SF/STO/ZT):传入后后端自动解析 express_name,传空值则 express_code/express_name 置 NULL */
express_code?: string
/** 运单号列表(JSON 数组或 null,支持一单多运单);回传与确认校验以此为准,传空数组或 null 表示清空;非数组返回 400 */
waybill_codes?: string[] | null
/** 【已弃用】单数运单号:仅作 waybill_codes 首个的镜像,勿单独使用 */
waybill_code?: string
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
}
/** storage.stockout.updateExpress 响应 */
export type StockoutUpdateExpressResponse = {
id: number
stockout_order_code: string
/** 更新后的快递公司编码 */
express_code?: string
<<<<<<< HEAD
/** 由 express_code 解析出的快递公司名称 */
express_name?: string
/** 更新后的运单号 */
@ -200,6 +223,20 @@ export type StockoutUpdateExpressResponse = {
/**
* 更新出库单的快递公司与运单号(express_code / waybill_code / waybill_codes),用于在确认前填写运单信息。
* 未传入的字段不更新,三个字段都未传时返回「没有需要更新的字段」;已废弃字段 express_codes 不在本接口读写范围内。
=======
/** 由 express_code 解析出的快递公司名称(未匹配到为空串) */
express_name?: string
/** 更新后的运单号列表(以此为准) */
waybill_codes?: string[]
/** 【已弃用】单数列镜像值(等于 waybill_codes 首个) */
waybill_code?: string
}
/**
* 更新出库单的快递公司与运单号(确认前填写运单信息)
* - `express_code` 是**快递公司编码**,不是运单号
* - 运单号统一走 `waybill_codes`(复数数组);`waybill_code` 已弃用,`express_codes` 已废弃(不在本接口读写范围内)
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
*/
export const stockoutUpdateExpress = (data: StockoutUpdateExpressParams) => {
return request({

99
src/utils/barcode.ts Normal file
View File

@ -0,0 +1,99 @@
/**
* 条码/编码类字段的统一归一化工具。
*
* 背景:后端同一语义字段在不同接口返回结构不一致,常见形态有:
* - `["abc", "def"]` 字符串数组
* - `[{ id: 1, barcode: "abc" }]` 对象数组(如 `stock.barcodes`)
* - `'["abc","def"]'` JSON 字符串
* - `"abc|def"` 分隔符拼接字符串
* 若直接 `String(item)` 强转,对象会被渲染成 `[object Object]`,故统一由此处理。
*/
/** 对象型条码项中可能承载条码文本的字段(按优先级) */
const BARCODE_TEXT_KEYS = ['barcode', 'barcode_no', 'bar_code', 'code', 'value', 'name', 'label'] as const
/** 从单个条码项提取文本:兼容字符串/数字/对象,无法提取时返回空串 */
export function pickBarcodeText(item: unknown): string {
if (item === null || item === undefined) return ''
if (typeof item === 'string' || typeof item === 'number') return String(item).trim()
if (typeof item === 'object') {
const record = item as Record<string, unknown>
for (const key of BARCODE_TEXT_KEYS) {
const value = record[key]
if (value === null || value === undefined) continue
// 仅接受基础类型,避免嵌套对象再次产生 [object Object]
if (typeof value === 'object') continue
const text = String(value).trim()
if (text) return text
}
return ''
}
return ''
}
export interface NormalizeBarcodeOptions {
/** 字符串形态是否按分隔符拆分(默认 true,如 "a|b" → ["a", "b"]) */
splitText?: boolean
/** 字符串拆分使用的分隔符(默认 ['|', ',']) */
separators?: string[]
}
function normalizeBarcodeArray(list: unknown[]): string[] {
const result: string[] = []
for (const item of list) {
if (Array.isArray(item)) {
result.push(...normalizeBarcodeArray(item))
continue
}
const text = pickBarcodeText(item)
if (text) result.push(text)
}
return result
}
/**
* 归一化条码列表并过滤空值;支持数组(字符串/对象/嵌套数组)、JSON 字符串数组、
* 以及分隔符拼接的字符串。无法提取到条码的项会被丢弃(不会产生 `[object Object]`)。
*/
export function normalizeBarcodeList(value: unknown, options: NormalizeBarcodeOptions = {}): string[] {
const { splitText = true, separators = ['|', ','] } = options
if (value === null || value === undefined) return []
if (Array.isArray(value)) return normalizeBarcodeArray(value)
if (typeof value === 'object') {
const text = pickBarcodeText(value)
return text ? [text] : []
}
const raw = String(value).trim()
if (!raw || raw === '[]' || raw === '[""]' || raw === '[ ]') return []
// JSON 字符串形态:["a","b"] / [{"barcode":"a"}]
if (raw.startsWith('[') && raw.endsWith(']')) {
try {
const parsed = JSON.parse(raw)
if (Array.isArray(parsed)) return normalizeBarcodeArray(parsed)
} catch {
// 非合法 JSON,按普通文本继续处理
}
}
if (!splitText || !separators.length) return [raw]
const parts = separators.reduce<string[]>(
(acc, separator) => acc.flatMap((part) => (separator ? part.split(separator) : [part])),
[raw]
)
return parts.map((part) => part.trim()).filter(Boolean)
}
/** 条码展示文本:按分隔符连接,无有效条码时返回 fallback */
export function formatBarcodeText(
value: unknown,
options: NormalizeBarcodeOptions & { separator?: string; fallback?: string } = {}
): string {
const { separator = '|', fallback = '--' } = options
const items = normalizeBarcodeList(value, options)
return items.length ? items.join(separator) : fallback
}

View File

@ -140,7 +140,7 @@
import { ref, reactive, onMounted } from 'vue'
import { ElMessage } from 'element-plus'
import { Search, Refresh } from '@element-plus/icons-vue'
import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse'
import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'

View File

@ -1,63 +1,342 @@
<template>
<el-table :data="list" size="small" border class="detail-table" empty-text="暂无明细">
<el-table-column prop="id" label="明细ID" width="80" />
<el-table-column label="商品图片" width="90">
<template #default="{ row }">
<el-image
v-if="stockImage(row)"
:src="stockImage(row)"
:preview-src-list="stockImages(row)"
preview-teleported
fit="cover"
class="stock-thumb"
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column label="规格" min-width="100" show-overflow-tooltip>
<template #default="{ row }">{{ row.spec || row.stock?.sku_property || row.stockWarehouse?.sku_property || '-' }}</template>
</el-table-column>
<el-table-column label="SKU" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ stockSku(row) }}</template>
</el-table-column>
<el-table-column label="条码" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ stockBarcodes(row) }}</template>
</el-table-column>
<el-table-column prop="barcode" label="扫描条码" min-width="130" show-overflow-tooltip />
<el-table-column label="库存单位" width="90">
<template #default="{ row }">{{ row.stock?.stock_unit || row.stockWarehouse?.stock_unit || '-' }}</template>
</el-table-column>
<el-table-column prop="stock_id" label="商品ID" width="90">
<template #default="{ row }">{{ row.stock_id ?? '-' }}</template>
</el-table-column>
<el-table-column prop="is_recognized" label="识别" width="80">
<template #default="{ row }">
<span :class="getStatusTextClass(row.is_recognized ? 'success' : 'info')">
{{ row.is_recognized ? '已识别' : '未识别' }}
<div class="unpack-detail-compare">
<!-- 对照工具条:图例 + 统计(仅有原订单商品时显示) -->
<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">
<span class="compare-stat">
原订单 <b>{{ compareSummary.orderTypes }}</b> 类 / <b>{{ compareSummary.orderQty }}</b> 件
</span>
</template>
</el-table-column>
<el-table-column prop="product_status" label="产品状态" width="90">
<template #default="{ row }">
<span :class="getStatusTextClass(row.product_status === 'damaged' ? 'danger' : 'success')">
{{ row.product_status === 'damaged' ? '破损' : '正常' }}
<span class="compare-stat">
已扫描 <b>{{ compareSummary.unpackTypes }}</b> 类 / <b>{{ compareSummary.unpackQty }}</b> 件
</span>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" width="70" />
<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
<el-table-column label="录入时间" min-width="150">
<template #default="{ row }">{{ formatDetailTime(row.created_at) }}</template>
</el-table-column>
</el-table>
</div>
</div>
<el-table
:data="pagedRows"
size="small"
border
class="detail-table detail-compare-table"
:row-class-name="rowClassName"
empty-text="暂无明细"
>
<!-- 左侧:原订单商品(开单查到) -->
<el-table-column
v-if="hasOrderItems"
label="原订单商品"
align="center"
label-class-name="compare-group-label--order"
>
<el-table-column label="商品图片" width="90" 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="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.code || '—' }}</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.name || '—' }}</template>
</el-table-column>
<el-table-column label="规格" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.__order?.spec || '—' }}</template>
</el-table-column>
<el-table-column label="订单数量" width="90" align="right">
<template #default="{ row }">{{ row.__order ? row.__order.qty : '—' }}</template>
</el-table-column>
</el-table-column>
<!-- 右侧:扫描添加的商品(拆包),同一个商品与左侧同行显示 -->
<el-table-column label="扫描添加的商品(拆包)" align="center">
<el-table-column label="商品图片" width="90" align="center" class-name="compare-divider-left">
<template #default="{ row }">
<el-image
v-if="row.__unpack && stockImage(row)"
:src="stockImage(row)"
:preview-src-list="stockImages(row)"
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="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.code || '—' }}</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.name || '—' }}</template>
</el-table-column>
<el-table-column label="规格" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.__unpack?.spec || '—' }}</template>
</el-table-column>
<el-table-column label="数量" width="110">
<template #default="{ row }">
<div v-if="row.__unpack" class="compare-qty-cell">
<span class="compare-qty-value">{{ row.quantity ?? '-' }}</span>
<span
v-if="row.__diff != null && row.__diff !== 0"
class="compare-qty-diff"
:class="row.__diff > 0 ? 'compare-qty-diff--over' : 'compare-qty-diff--short'"
:title="row.__diff > 0 ? '比订单多拆' : '比订单少拆'"
>
{{ formatDiff(row.__diff) }}
</span>
</div>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="明细ID" width="80">
<template #default="{ row }">{{ unpackCell(row, row.id) }}</template>
</el-table-column>
<el-table-column label="SKU" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ unpackCell(row, stockSku(row)) }}</template>
</el-table-column>
<el-table-column label="条码" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ unpackCell(row, stockBarcodes(row)) }}</template>
</el-table-column>
<el-table-column label="扫描条码" min-width="130" show-overflow-tooltip>
<template #default="{ row }">{{ unpackCell(row, row.barcode) }}</template>
</el-table-column>
<el-table-column label="库存单位" width="90">
<template #default="{ row }">{{ unpackCell(row, row.stock?.stock_unit || row.stockWarehouse?.stock_unit) }}</template>
</el-table-column>
<el-table-column label="商品ID" width="90">
<template #default="{ row }">{{ unpackCell(row, row.stock_id) }}</template>
</el-table-column>
<el-table-column label="识别" width="80">
<template #default="{ row }">
<span v-if="row.__unpack" :class="getStatusTextClass(row.is_recognized ? 'success' : 'info')">
{{ row.is_recognized ? '已识别' : '未识别' }}
</span>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="产品状态" width="90">
<template #default="{ row }">
<span
v-if="row.__unpack"
:class="getStatusTextClass(row.product_status === 'damaged' ? 'danger' : 'success')"
>
{{ row.product_status === 'damaged' ? '破损' : '正常' }}
</span>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="备注" min-width="120" show-overflow-tooltip>
<template #default="{ row }">{{ unpackCell(row, row.remark) }}</template>
</el-table-column>
<el-table-column label="录入时间" min-width="150">
<template #default="{ row }">{{ unpackCell(row, formatDetailTime(row.created_at)) }}</template>
</el-table-column>
</el-table-column>
</el-table>
<el-pagination
v-if="rows.length > pageSize"
class="detail-pagination"
layout="prev, pager, next, total"
:current-page="page"
:page-size="pageSize"
:total="rows.length"
@current-change="handlePageChange"
/>
</div>
</template>
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
defineProps<{ list: any[] }>()
const props = withDefaults(
defineProps<{
/** 明细分页数据(扫描添加的商品) */
list: any[]
/** 原订单商品明细(原单退回时由拆包单详情接口返回;为空则不显示左侧对照) */
orderItems?: any[]
}>(),
{ orderItems: () => [] }
)
// ==================== 商品对照(原订单商品 vs 扫描添加的商品) ====================
// 与 express/returnUnpackWork 保持一致:按商品编码 item_code 匹配,
// 左侧展示原订单商品,右侧展示扫描添加的商品,同一个商品占同一行;
// 原订单里有、尚未扫码的商品以灰底行补在末尾,便于看出还差什么。
// 对照行在前端分页(未扫码行排在末尾,落在最后一页)。
const pageSize = 20
const page = ref(1)
const orderItemsForCompare = computed<any[]>(() =>
Array.isArray(props.orderItems) ? props.orderItems : []
)
/** 是否有可比对的原订单商品(非原单退回时为 false,表格只显示右侧) */
const hasOrderItems = computed(() => orderItemsForCompare.value.length > 0)
/** 原订单商品行归一化 */
function normalizeOrderItem(row: any): { code: string; name: string; spec: string; qty: number } {
const raw = (row ?? {}) as Record<string, any>
const code = String(raw.item_code ?? raw.warehouse_item_code ?? '').trim()
const name = String(raw.item_name ?? raw.warehouse_item_name ?? '').trim()
const spec = String(raw.sku_property ?? raw.spec ?? '').trim()
const qty = Number(raw.quantity ?? raw.plan_qty ?? 0)
return { code, name: name || code, spec, qty: Number.isFinite(qty) ? qty : 0 }
}
/** 拆包明细行归一化(识别命中时商品信息挂在 stock / stockWarehouse 上) */
function normalizeUnpackItem(row: any): { code: string; name: string; spec: string; qty: number } {
const raw = (row ?? {}) as Record<string, any>
const code = String(raw.item_code ?? raw.stock?.item_code ?? raw.stockWarehouse?.item_code ?? '').trim()
const name = String(raw.item_name ?? raw.stock?.item_name ?? raw.stockWarehouse?.item_name ?? '').trim()
const spec = String(raw.spec ?? raw.stock?.sku_property ?? raw.stockWarehouse?.sku_property ?? '').trim()
const qty = Number(raw.quantity ?? 0)
return { code, name: name || code, spec, qty: Number.isFinite(qty) ? qty : 0 }
}
/** 原订单商品按商品编码索引(同编码多行合并数量) */
const orderItemByCode = computed(() => {
const map = new Map<string, { name: string; spec: string; qty: number; images: string[] }>()
for (const raw of orderItemsForCompare.value) {
const item = normalizeOrderItem(raw)
if (!item.code) continue
const images = Array.isArray(raw?.image_url) ? raw.image_url.filter((url: any) => url) : []
const existed = map.get(item.code)
if (existed) {
existed.qty += item.qty
if (!existed.images.length) existed.images = images
} else {
map.set(item.code, { name: item.name, spec: item.spec, qty: item.qty, images })
}
}
return map
})
/**
* 对照行:每行同时携带左侧 `__order`(原订单商品)与右侧 `__unpack`(扫描添加的商品);
* `__orderOnly` 标记「原订单有、尚未扫码」的行;`__diff` = 扫描数量 − 订单数量。
*/
const rows = computed<any[]>(() => {
const orderMap = orderItemByCode.value
const details = props.list ?? []
const scannedCodes = new Set<string>()
const result: any[] = details.map((row) => {
const unpack = normalizeUnpackItem(row)
if (unpack.code) scannedCodes.add(unpack.code)
const order = unpack.code ? orderMap.get(unpack.code) : undefined
return {
...row,
__orderOnly: false,
__order: order
? { code: unpack.code, name: order.name, spec: order.spec, qty: order.qty, images: order.images }
: null,
__unpack: unpack,
__diff: order ? unpack.qty - order.qty : null,
}
})
// 原订单里有、尚未扫码的商品:补在末尾(左侧有值,右侧为空)
for (const [code, order] of orderMap) {
if (scannedCodes.has(code)) continue
result.push({
__orderOnly: true,
__order: { code, name: order.name, spec: order.spec, qty: order.qty, images: order.images },
__unpack: null,
__diff: -order.qty,
})
}
return result
})
/** 前端分页切片 */
const pagedRows = computed(() => {
const start = (page.value - 1) * pageSize
return rows.value.slice(start, start + pageSize)
})
watch(rows, (list) => {
const maxPage = Math.max(1, Math.ceil(list.length / pageSize))
if (page.value > maxPage) page.value = maxPage
})
// 切换拆包单(明细数据整体替换)时回到第一页
watch(
() => props.list,
() => {
page.value = 1
}
)
function handlePageChange(next: number) {
page.value = next
}
/** 对照统计:商品类型数 / 数量合计 + 各对照状态行数 */
const compareSummary = computed(() => {
const orderItems = orderItemsForCompare.value.map((row) => normalizeOrderItem(row))
const unpackItems = (props.list ?? []).map((row) => normalizeUnpackItem(row))
const orderCodes = new Set(orderItems.map((item) => item.code).filter(Boolean))
const unpackCodes = new Set(unpackItems.map((item) => item.code).filter(Boolean))
let matched = 0
let qtyDiff = 0
let orderOnly = 0
let unpackOnly = 0
for (const row of rows.value) {
if (row.__orderOnly) {
orderOnly += 1
} else if (row.__diff == null) {
unpackOnly += 1
} else if (row.__diff === 0) {
matched += 1
} else {
qtyDiff += 1
}
}
return {
orderTypes: orderCodes.size || orderItems.length,
orderQty: orderItems.reduce((acc, item) => acc + item.qty, 0),
unpackTypes: unpackCodes.size || unpackItems.length,
unpackQty: unpackItems.reduce((acc, item) => acc + item.qty, 0),
matched,
qtyDiff,
orderOnly,
unpackOnly,
}
})
/** 差异展示:正数=多拆、负数=少拆 */
function formatDiff(diff: number | null | undefined): string {
if (diff == null || !Number.isFinite(diff)) return ''
return diff > 0 ? `+${diff}` : String(diff)
}
/** 原订单里有、尚未扫码的行:整行灰底 */
function rowClassName({ row }: { row: any }): string {
return row?.__orderOnly ? 'detail-row--order-only' : ''
}
/** 右侧单元格取值:未扫码行(无拆包商品)统一显示 — */
function unpackCell(row: any, value: any): string {
if (!row?.__unpack) return '—'
return value === null || value === undefined || value === '' ? '-' : String(value)
}
function stockImage(row: any): string {
return row?.stock?.image_url?.[0] ?? row?.stockWarehouse?.image_url?.[0] ?? ''
@ -98,4 +377,136 @@ function formatDetailTime(v: any): string {
height: 48px;
border-radius: 4px;
}
/* ==================== 商品对照(原订单商品 vs 扫描添加的商品) ==================== */
/* 对照工具条:图例 + 统计 */
.detail-compare-bar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px 12px;
flex-wrap: wrap;
margin-bottom: 8px;
}
.compare-legend {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
font-size: 12px;
color: #606266;
}
.legend-item {
display: inline-flex;
align-items: center;
padding: 1px 8px;
border-radius: 10px;
line-height: 18px;
&--matched {
background: #f0f9eb;
border: 1px solid #e1f3d8;
color: #67c23a;
}
&--qty_diff {
background: #fdf6ec;
border: 1px solid #faecd8;
color: #e6a23c;
}
&--order_only {
background: #fef0f0;
border: 1px solid #fde2e2;
color: #f56c6c;
}
&--unpack_only {
background: #ecf5ff;
border: 1px solid #d9ecff;
color: #409eff;
}
}
.compare-toolbar {
display: flex;
align-items: center;
gap: 12px;
flex-wrap: wrap;
}
.compare-stat {
font-size: 12px;
color: #606266;
b {
color: #303133;
}
}
/* 左侧原订单商品 / 右侧扫描添加的商品:分组表头底色 + 中缝分隔 */
.detail-compare-table :deep(.compare-group-label--order),
.detail-compare-table :deep(.el-table__header tr:first-child th) {
background: #f5f7fa;
color: #606266;
font-weight: 600;
}
.detail-compare-table :deep(td.compare-divider-left) {
border-left: 2px solid #c0c4cc;
}
/* 右侧「数量」单元格:数量 + 差异标记 */
.compare-qty-cell {
display: flex;
align-items: center;
gap: 4px;
}
.compare-qty-value {
flex: 1;
min-width: 0;
}
.compare-qty-diff {
flex: 0 0 auto;
padding: 0 4px;
border-radius: 3px;
font-size: 11px;
font-weight: 600;
}
.compare-qty-diff--over {
background: #fdf6ec;
border: 1px solid #faecd8;
color: #e6a23c;
}
.compare-qty-diff--short {
background: #fef0f0;
border: 1px solid #fde2e2;
color: #f56c6c;
}
/* 原订单里有、尚未扫码的行:整行灰底 */
.detail-table :deep(.detail-row--order-only) {
--el-table-tr-bg-color: #f5f7fa;
color: #909399;
td.el-table__cell {
background: #f5f7fa;
}
}
/* 该行某一侧没有商品时的占位符 */
.compare-cell-empty {
color: #c0c4cc;
}
.detail-pagination {
margin-top: 8px;
justify-content: flex-end;
}
</style>

View File

@ -82,11 +82,29 @@
</template>
<template #column-videos="{ row }">
<VideoButton
v-if="Array.isArray(row.videos) && row.videos.length"
:videos="row.videos"
@click="openVideoList(row)"
/>
<!-- 视频状态:细节 / 全景 两个机位按钮,点击直接播放对应录像 -->
<div v-if="Array.isArray(row.videos) && row.videos.length" class="unpack-video-actions">
<el-button
size="small"
type="primary"
plain
:disabled="!findUnpackVideo(row, '细节')"
:title="unpackVideoTitle(row, '细节')"
@click.stop="playUnpackVideo(row, '细节')"
>
细节
</el-button>
<el-button
size="small"
type="success"
plain
:disabled="!findUnpackVideo(row, '全景')"
:title="unpackVideoTitle(row, '全景')"
@click.stop="playUnpackVideo(row, '全景')"
>
全景
</el-button>
</div>
<span v-else>-</span>
</template>
@ -193,14 +211,14 @@
</el-descriptions>
<!-- 原单商品明细 -->
<template v-if="detailOrder?.items?.length">
<!-- <template v-if="detailOrder?.items?.length">
<div class="detail-list-header">
<span class="detail-list-title">原单商品明细({{ detailOrder.items.length }})</span>
</div>
<div class="order-items-table-wrap">
<unpack-order-items-table :list="detailOrder.items" />
</div>
</template>
</template> -->
</template>
<el-empty v-else description="暂无详情数据" :image-size="60" />
</div>
@ -208,16 +226,8 @@
<!-- 明细分页 -->
<div v-else-if="detailActiveTab === 'detailList'" class="detail-page detail-scroll">
<div v-loading="detailListLoading" class="detail-list-pane">
<unpack-detail-table :list="detailList" />
<el-pagination
v-if="detailPagination.total > detailPagination.pageSize"
class="detail-pagination"
layout="prev, pager, next, total"
:current-page="detailPagination.currentPage"
:page-size="detailPagination.pageSize"
:total="detailPagination.total"
@current-change="handleDetailListPageChange"
/>
<!-- 原订单商品与扫描添加的商品左右对照,分页由明细组件内部处理 -->
<unpack-detail-table :list="detailList" :order-items="detailOrderItems" />
</div>
</div>
@ -266,14 +276,7 @@
</div>
</div>
<!-- 拆包录像列表弹窗 -->
<VideoListDialog
v-model:visible="videoListVisible"
:videos="currentVideos"
@play="handlePlayVideo"
/>
<!-- 录像播放弹窗 -->
<!-- 录像播放弹窗(由「视频状态」列的细节/全景按钮直接唤起,不再经录像列表挑选) -->
<VideoPlayerDialog
v-model:visible="playerVisible"
:video="playingVideo"
@ -318,8 +321,7 @@ import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/Ord
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import UnpackDetailTable from './components/UnpackDetailTable.vue'
import UnpackOrderItemsTable from './components/UnpackOrderItemsTable.vue'
import VideoButton, { type VideoItem } from './components/VideoButton.vue'
import VideoListDialog from './components/VideoListDialog.vue'
import type { VideoItem } from './components/VideoButton.vue'
import VideoPlayerDialog from './components/VideoPlayerDialog.vue'
import { useAsyncExportTask } from '@/composables/useAsyncExportTask'
import AsyncExportProgressDialog from '@/components/AsyncExportProgressDialog.vue'
@ -754,10 +756,11 @@ const detailActiveTab = ref('detail')
const detailRecord = ref<any>(null)
const detailOrder = ref<any>(null)
// Tab2(returnUnpack.detailList)分页明细状态
// Tab2(returnUnpack.detailList)明细状态(对照需全量明细,分页在明细组件内部)
const detailListLoading = ref(false)
const detailList = ref<any[]>([])
const detailPagination = reactive({ currentPage: 1, pageSize: 20, total: 0 })
/** 原订单商品(原单退回时由详情接口返回),供明细组件做左右对照 */
const detailOrderItems = computed<any[]>(() => detailOrder.value?.items ?? [])
// Tab3(returnUnpack.videoList)分页录像状态
const videoListLoading = ref(false)
@ -772,8 +775,6 @@ async function handleViewDetail(row: any) {
detailRecord.value = null
detailOrder.value = null
detailList.value = []
detailPagination.currentPage = 1
detailPagination.total = 0
videoListRows.value = []
videoPagination.currentPage = 1
videoPagination.total = 0
@ -797,43 +798,35 @@ async function handleViewDetail(row: any) {
// Tab 切换:切到「明细分页」时按分页加载明细,切到「拆包录像」时按分页加载录像
async function handleDetailTabChange(name: string | number) {
if (name === 'detailList' && detailRecord.value) {
await loadDetailListPage(detailPagination.currentPage || 1)
await loadDetailList()
} else if (name === 'videoList' && detailRecord.value) {
await loadVideoListPage(videoPagination.currentPage || 1)
}
}
async function loadDetailListPage(page: number) {
/** 明细一次取回全量(左右对照需要完整明细,分页由明细组件在前端切片) */
async function loadDetailList() {
if (!detailRecord.value) return
detailListLoading.value = true
try {
const res: any = await returnUnpackDetailList({
pagination: { page, pageSize: detailPagination.pageSize },
pagination: { page: 1, pageSize: 999 },
where: { unpack_id: detailRecord.value.id },
})
if (isOk(res)) {
const data = res.data ?? res
detailList.value = data.list ?? []
const total = data.pagination?.total ?? 0
detailPagination.currentPage = page
detailPagination.total = total
} else {
detailList.value = []
detailPagination.total = 0
ElMessage.error(res?.message || '获取明细分页失败')
ElMessage.error(res?.message || '获取明细失败')
}
} catch {
detailList.value = []
detailPagination.total = 0
} finally {
detailListLoading.value = false
}
}
function handleDetailListPageChange(page: number) {
loadDetailListPage(page)
}
async function loadVideoListPage(page: number) {
if (!detailRecord.value) return
videoListLoading.value = true
@ -863,19 +856,41 @@ async function loadVideoListPage(page: number) {
// ==================== 录像播放 ====================
const videoListVisible = ref(false)
const playerVisible = ref(false)
const currentVideos = ref<VideoItem[]>([])
const playingVideo = ref<VideoItem | null>(null)
function openVideoList(row: any) {
currentVideos.value = Array.isArray(row.videos) ? row.videos : []
if (currentVideos.value.length === 0) return
videoListVisible.value = true
/** 录像机位:按摄像头名称关键字区分「细节」/「全景」 */
type UnpackVideoScene = '细节' | '全景'
/** 从行的录像列表中找出指定机位的可播放录像 */
function findUnpackVideo(row: any, scene: UnpackVideoScene): VideoItem | null {
const videos: any[] = Array.isArray(row?.videos) ? row.videos : []
const matched = videos.find(
(video: any) => video?.video_url && String(video?.camera_name ?? '').includes(scene)
)
return (matched as VideoItem) ?? null
}
/** 「视频状态」列按钮提示:可播放 / 录像不可播放 / 无该机位录像 */
function unpackVideoTitle(row: any, scene: UnpackVideoScene): string {
const video = findUnpackVideo(row, scene)
if (video) return `播放${scene}机位录像:${video.camera_name || `录像 ${video.id}`}`
const videos: any[] = Array.isArray(row?.videos) ? row.videos : []
const hasScene = videos.some((item: any) => String(item?.camera_name ?? '').includes(scene))
return hasScene ? `${scene}机位录像不可播放` : `无${scene}机位录像`
}
/** 点击「细节」/「全景」直接播放对应机位录像 */
function playUnpackVideo(row: any, scene: UnpackVideoScene) {
const video = findUnpackVideo(row, scene)
if (!video) {
ElMessage.warning(`未找到可播放的${scene}机位录像`)
return
}
handlePlayVideo(video)
}
function handlePlayVideo(video: VideoItem) {
videoListVisible.value = false
playingVideo.value = video
playerVisible.value = true
}
@ -973,6 +988,13 @@ onMounted(() => {
flex-wrap: wrap;
}
/* 「视频状态」列:细节 / 全景 直接播放按钮 */
.unpack-video-actions {
display: inline-flex;
align-items: center;
gap: 6px;
}
.detail-video-unavailable {
font-size: 12px;
color: #f56c6c;

View File

@ -80,7 +80,7 @@ export const returnUnpackColumns = [
{ prop: 'is_original_return', label: '原单退回', width: '100' },
{ prop: 'has_video', label: '视频', width: '90' },
{ prop: 'video_enable', label: '视频可用', width: '100' },
{ prop: 'videos', label: '视频状态', minWidth: '150' },
{ prop: 'videos', label: '视频状态', minWidth: '170' },
{ prop: 'operation', label: '操作', width: '110', fixed: 'right' },
{ prop: 'created_at', label: '创建时间', width: '170', sortable: 'custom' },
]

View File

@ -161,7 +161,7 @@
<el-descriptions-item label="货主备注">{{ createResult.store_remark || '-' }}</el-descriptions-item>
</el-descriptions>
<div v-if="createResult.is_original_return && createResult.order_items?.length" class="order-items-block">
<!-- <div v-if="createResult.is_original_return && createResult.order_items?.length" class="order-items-block">
<div class="order-items-title">原订单商品</div>
<el-table :data="createResult.order_items" size="small" border>
<el-table-column label="图片" width="90">
@ -182,7 +182,7 @@
<el-table-column prop="sku_property" label="规格" min-width="100" show-overflow-tooltip />
<el-table-column prop="quantity" label="数量" width="80" />
</el-table>
</div>
</div> -->
</div>
<el-empty v-else description="点击「创建拆包」后显示开单结果" :image-size="60" />
</div>
@ -242,77 +242,177 @@
</div> -->
<div class="right-body">
<el-table :data="detailList" v-loading="detailListLoading" size="small" border class="detail-table" empty-text="暂无明细">
<el-table-column prop="id" label="明细ID" width="80" />
<el-table-column label="商品图片" width="90">
<template #default="{ row }">
<el-image
v-if="detailImage(row)"
:src="detailImage(row)"
:preview-src-list="detailImages(row)"
preview-teleported
fit="cover"
class="stock-thumb"
/>
<span v-else>-</span>
</template>
<!-- 商品对照(订单商品 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">
<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>
<el-table
v-loading="detailListLoading"
:data="pagedDetailRows"
:row-class-name="detailRowClassName"
size="small"
border
class="detail-table detail-compare-table"
empty-text="暂无明细"
>
<!-- 左侧:原订单商品(开单查到) -->
<el-table-column
v-if="hasOrderItems"
label="原订单商品"
align="center"
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>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="barcode" label="条码" min-width="120" show-overflow-tooltip />
<el-table-column label="SKU" min-width="120" show-overflow-tooltip>
<template #default="{ row }">
{{ row.stock_id ?? row.sku ?? row.stockWarehouse?.sku ?? row.product_snapshot?.sku ?? '-' }}
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" width="130">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="1" :max="999999" size="small" class="inline-number" @change="() => handleAutoSave(row)" @keyup.enter="() => handleAutoSave(row)" />
</template>
</el-table-column>
<el-table-column prop="product_status" label="产品状态" width="100">
<template #default="{ row }">
<el-tag :type="row.product_status === 'damaged' ? 'danger' : 'success'" size="small">
{{ row.product_status === 'damaged' ? '破损' : '正常' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="170">
<template #default="{ row }">
<el-select
v-model="row.remark"
size="small"
clearable
filterable
allow-create
default-first-option
placeholder="选择或输入备注"
class="remark-select"
@change="handleRemarkChange(row, $event)"
>
<el-option v-for="opt in remarkOptions" :key="opt" :label="opt" :value="opt">
<span class="remark-option-content">
<span class="remark-option-label">{{ opt }}</span>
<span
class="remark-option-delete"
title="删除该备注选项"
@mousedown.stop.prevent
@click.stop.prevent="removeRemarkOption(opt)"
>×</span>
<!-- 右侧:扫描添加的商品(拆包),同一个商品与左侧同行显示 -->
<el-table-column label="扫描添加的商品(拆包)" align="center">
<el-table-column label="图片" width="70" align="center" 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"
/>
<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">
<template #default="{ row }">
<div v-if="row.__unpack" class="compare-qty-cell">
<el-input-number
v-model="row.quantity"
:min="1"
:max="999999"
size="small"
class="inline-number"
@change="() => handleAutoSave(row)"
@keyup.enter="() => handleAutoSave(row)"
/>
<span
v-if="row.__diff != null && row.__diff !== 0"
class="compare-qty-diff"
:class="row.__diff > 0 ? 'compare-qty-diff--over' : 'compare-qty-diff--short'"
:title="row.__diff > 0 ? '比订单多拆' : '比订单少拆'"
>
{{ formatDiff(row.__diff) }}
</span>
</el-option>
<el-option :value="REMARK_ADD_OPTION_VALUE" label="+ 添加备注选项" class="remark-add-option" />
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="90" fixed="right">
<template #default="{ row }">
<el-button size="small" type="danger" link @click="handleRemoveDetail(row)">移除</el-button>
</template>
</div>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="产品状态" width="90">
<template #default="{ row }">
<el-tag
v-if="row.__unpack"
:type="row.product_status === 'damaged' ? 'danger' : 'success'"
size="small"
>
{{ row.product_status === 'damaged' ? '破损' : '正常' }}
</el-tag>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="备注" min-width="150">
<template #default="{ row }">
<el-select
v-if="row.__unpack"
v-model="row.remark"
size="small"
clearable
filterable
allow-create
default-first-option
placeholder="选择或输入备注"
class="remark-select"
@change="handleRemarkChange(row, $event)"
>
<el-option v-for="opt in remarkOptions" :key="opt" :label="opt" :value="opt">
<span class="remark-option-content">
<span class="remark-option-label">{{ opt }}</span>
<span
class="remark-option-delete"
title="删除该备注选项"
@mousedown.stop.prevent
@click.stop.prevent="removeRemarkOption(opt)"
>×</span>
</span>
</el-option>
<el-option :value="REMARK_ADD_OPTION_VALUE" label="+ 添加备注选项" class="remark-add-option" />
</el-select>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button
v-if="row.__unpack"
size="small"
type="danger"
link
@click="handleRemoveDetail(row)"
>移除</el-button>
<span v-else class="compare-cell-empty">—</span>
</template>
</el-table-column>
</el-table-column>
</el-table>
<el-pagination
v-if="detailPagination.total > detailPagination.pageSize"
v-if="detailTableRows.length > detailPagination.pageSize"
class="detail-pagination"
layout="prev, pager, next, total"
:current-page="detailPagination.currentPage"
@ -1252,6 +1352,9 @@ async function loadOrderDetail() {
// ==================== 拆包单列表 / 详情 / 明细分页 ====================
/** 明细一次取回的条数(对照需全量明细;列表分页在前端切片) */
const DETAIL_FETCH_PAGE_SIZE = 999
async function loadDetailList() {
const id = createResult.value?.id
if (!id) {
@ -1261,8 +1364,9 @@ async function loadDetailList() {
}
detailListLoading.value = true
try {
// 对照需要完整明细(订单数量 vs 已拆数量),故一次取回全量,分页在前端切片
const res: any = await returnUnpackDetailList({
pagination: { page: detailPagination.currentPage, pageSize: detailPagination.pageSize },
pagination: { page: 1, pageSize: DETAIL_FETCH_PAGE_SIZE },
where: { unpack_id: id },
})
if (isOk(res)) {
@ -1272,24 +1376,176 @@ async function loadDetailList() {
_originalQuantity: row.quantity,
_originalRemark: row.remark ?? '',
}))
detailPagination.total = data.pagination?.total ?? data.total ?? 0
} else {
detailList.value = []
detailPagination.total = 0
}
} catch {
detailList.value = []
detailPagination.total = 0
} finally {
detailListLoading.value = false
}
}
/** 分页切换(数据一次全量取回,分页在前端切片,无需重新请求) */
function handleDetailPageChange(page: number) {
detailPagination.currentPage = page
loadDetailList()
}
// ==================== 商品对照(原订单商品 vs 扫描添加的商品) ====================
// 参照 storage/entry「货单绑定到入库单」的对照思路:按商品编码 item_code 匹配,
// 左边展示原订单商品(开单查到),右边展示扫描添加的商品(拆包),同一商品占同一行;
// 订单里有、尚未扫码的商品以灰底行补在末尾,便于看出还差什么。
/** 是否有可比对的订单商品(非原单退回或未查到订单明细时为 false,表格只显示右侧) */
const hasOrderItems = computed(() => orderItemsForCompare.value.length > 0)
/** 对照用「订单商品」:优先开单结果 order_items,为空回退 order.detail 反查结果 */
const orderItemsForCompare = computed<any[]>(() => {
const fromCreate = createResult.value?.order_items
if (Array.isArray(fromCreate) && fromCreate.length) return fromCreate
return Array.isArray(orderDetailItems.value) ? orderDetailItems.value : []
})
/** 订单商品行归一化(兼容 order_items 与 order.detail 两种明细结构) */
function normalizeOrderCompareItem(row: any): { code: string; name: string; spec: string; qty: number } {
const raw = (row ?? {}) as Record<string, any>
const code = String(raw.item_code ?? raw.warehouse_item_code ?? '').trim()
const name = String(raw.item_name ?? raw.warehouse_item_name ?? '').trim()
const spec = String(raw.sku_property ?? raw.spec ?? '').trim()
const qty = Number(raw.quantity ?? raw.plan_qty ?? 0)
return { code, name: name || code, spec, qty: Number.isFinite(qty) ? qty : 0 }
}
/** 拆包明细行归一化(识别命中时商品信息挂在 stock / stockWarehouse 上) */
function normalizeUnpackCompareItem(row: any): { code: string; name: string; spec: string; qty: number } {
const raw = (row ?? {}) as Record<string, any>
const code = String(raw.item_code ?? raw.stock?.item_code ?? raw.stockWarehouse?.item_code ?? '').trim()
const name = String(raw.item_name ?? raw.stock?.item_name ?? raw.stockWarehouse?.item_name ?? '').trim()
const spec = String(raw.spec ?? raw.stock?.sku_property ?? raw.stockWarehouse?.sku_property ?? '').trim()
const qty = Number(raw.quantity ?? 0)
return { code, name: name || code, spec, qty: Number.isFinite(qty) ? qty : 0 }
}
/** 订单商品按商品编码索引(同编码多行合并数量),用于给明细行回填订单数量 */
const orderItemByCode = computed(() => {
const map = new Map<string, { name: string; spec: string; qty: number; images: string[] }>()
for (const rawItem of orderItemsForCompare.value ?? []) {
const item = normalizeOrderCompareItem(rawItem)
if (!item.code) continue
const images = Array.isArray(rawItem?.image_url) ? rawItem.image_url.filter((url: any) => url) : []
const existed = map.get(item.code)
if (existed) {
existed.qty += item.qty
if (!existed.images.length) existed.images = images
} else {
map.set(item.code, { name: item.name, spec: item.spec, qty: item.qty, images })
}
}
return map
})
/**
* 对照行数据:每行同时携带左侧 `__order`(原订单商品)与右侧 `__unpack`(扫描添加的商品),
* 按商品编码匹配的同一商品落在同一行;
* `__orderOnly` 标记「开单查到但尚未扫码」的行;`__diff` = 扫描数量 − 订单数量。
*/
const detailTableRows = computed<any[]>(() => {
const orderMap = orderItemByCode.value
const details = detailList.value ?? []
const scannedCodes = new Set<string>()
const rows: any[] = details.map((row) => {
const unpack = normalizeUnpackCompareItem(row)
if (unpack.code) scannedCodes.add(unpack.code)
const order = unpack.code ? orderMap.get(unpack.code) : undefined
return {
...row,
__orderOnly: false,
__order: order
? { code: unpack.code, name: order.name, spec: order.spec, qty: order.qty, images: order.images }
: null,
__unpack: unpack,
__diff: order ? unpack.qty - order.qty : null,
}
})
// 开单查到、但尚未扫码的商品:补在末尾(左侧有值,右侧为空)
for (const [code, order] of orderMap) {
if (scannedCodes.has(code)) continue
rows.push({
__orderOnly: true,
id: null,
__order: { code, name: order.name, spec: order.spec, qty: order.qty, images: order.images },
__unpack: null,
quantity: null,
__diff: -order.qty,
})
}
return rows
})
/** 前端分页切片(全量数据一次取回,切换页不再请求) */
const pagedDetailRows = computed(() => {
const start = (detailPagination.currentPage - 1) * detailPagination.pageSize
return detailTableRows.value.slice(start, start + detailPagination.pageSize)
})
watch(
detailTableRows,
(rows) => {
detailPagination.total = rows.length
const maxPage = Math.max(1, Math.ceil(rows.length / detailPagination.pageSize))
if (detailPagination.currentPage > maxPage) detailPagination.currentPage = maxPage
},
{ immediate: true }
)
/** 差异展示:正数=多拆、负数=少拆;null 表示订单中无此商品 */
function formatDiff(diff: number | null | undefined): string {
if (diff == null || !Number.isFinite(diff)) return ''
return diff > 0 ? `+${diff}` : String(diff)
}
/** 开单查到、但尚未扫码的订单商品行:整行灰底 */
function detailRowClassName({ row }: { row: any }): string {
return row?.__orderOnly ? 'detail-row--order-only' : ''
}
/** 对照统计:商品类型数 / 数量合计 + 各对照状态行数 */
const compareSummary = computed(() => {
const orderItems = (orderItemsForCompare.value ?? []).map((row) => normalizeOrderCompareItem(row))
const unpackItems = (detailList.value ?? []).map((row) => normalizeUnpackCompareItem(row))
const orderCodes = new Set(orderItems.map((item) => item.code).filter(Boolean))
const unpackCodes = new Set(unpackItems.map((item) => item.code).filter(Boolean))
let matched = 0
let qtyDiff = 0
let orderOnly = 0
let unpackOnly = 0
for (const row of detailTableRows.value) {
if (row.__orderOnly) {
orderOnly += 1
} else if (row.__diff == null) {
unpackOnly += 1
} else if (row.__diff === 0) {
matched += 1
} else {
qtyDiff += 1
}
}
return {
orderTypes: orderCodes.size || orderItems.length,
orderQty: orderItems.reduce((acc, item) => acc + item.qty, 0),
unpackTypes: unpackCodes.size || unpackItems.length,
unpackQty: unpackItems.reduce((acc, item) => acc + item.qty, 0),
matched,
qtyDiff,
orderOnly,
unpackOnly,
}
})
async function loadUnpackList() {
unpackListLoading.value = true
try {
@ -2445,6 +2701,136 @@ async function confirmRemoveDetail() {
margin-bottom: 6px;
}
/* ==================== 商品对照(订单商品 vs 已拆商品) ==================== */
/* 对照工具条:图例 + 统计 + 刷新 */
.detail-compare-bar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px 12px;
flex-wrap: wrap;
margin-bottom: 8px;
}
.compare-toolbar {
display: flex;
align-items: center;
gap: 12px;
flex-wrap: wrap;
}
.compare-stat {
font-size: 12px;
color: #606266;
b {
color: #303133;
}
}
/* 图例:一致 / 数量差异 / 仅订单 / 仅拆包 */
.compare-legend {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
font-size: 12px;
color: #606266;
}
.legend-item {
display: inline-flex;
align-items: center;
padding: 1px 8px;
border-radius: 10px;
line-height: 18px;
&--matched {
background: #f0f9eb;
border: 1px solid #e1f3d8;
color: #67c23a;
}
&--qty_diff {
background: #fdf6ec;
border: 1px solid #faecd8;
color: #e6a23c;
}
&--order_only {
background: #fef0f0;
border: 1px solid #fde2e2;
color: #f56c6c;
}
&--unpack_only {
background: #ecf5ff;
border: 1px solid #d9ecff;
color: #409eff;
}
}
/* 左侧原订单商品 / 右侧扫描添加的商品:分组表头底色 + 中缝分隔 */
.detail-compare-table :deep(.compare-group-label--order),
.detail-compare-table :deep(.el-table__header tr:first-child th) {
background: #f5f7fa;
color: #606266;
font-weight: 600;
}
/* 左右两组之间的分隔线(右侧组首列) */
.detail-compare-table :deep(td.compare-divider-left) {
border-left: 2px solid #c0c4cc;
}
/* 右侧「拆包数量」单元格:可编辑数量 + 差异标记 */
.compare-qty-cell {
display: flex;
align-items: center;
gap: 4px;
.inline-number {
flex: 1;
min-width: 0;
}
}
.compare-qty-diff {
flex: 0 0 auto;
padding: 0 4px;
border-radius: 3px;
font-size: 11px;
font-weight: 600;
}
.compare-qty-diff--over {
background: #fdf6ec;
border: 1px solid #faecd8;
color: #e6a23c;
}
.compare-qty-diff--short {
background: #fef0f0;
border: 1px solid #fde2e2;
color: #f56c6c;
}
/* 开单查到但尚未扫码的订单商品行:整行灰底 */
.detail-table :deep(.detail-row--order-only) {
--el-table-tr-bg-color: #f5f7fa;
color: #909399;
td.el-table__cell {
background: #f5f7fa;
}
}
/* 该行某一侧没有商品时的占位符 */
.compare-cell-empty {
color: #c0c4cc;
}
/* 摄像头设置弹窗 */
.camera-settings-body {
min-height: 200px;

View File

@ -1,5 +1,6 @@
import { warehouseSearch } from '@/api/stock/stock'
import { mapComboGoodsItemsFromRecord } from '@/views/stock/combo_stock/combo-stock-config'
import { normalizeBarcodeList, pickBarcodeText } from '@/utils/barcode'
export type WarehouseSearchMode = 'combo'
@ -315,7 +316,7 @@ export function getStockBarcodes(row: any): string[] {
]
for (const candidate of arrayCandidates) {
if (!Array.isArray(candidate)) continue
const values = candidate.map((value) => String(value ?? '').trim()).filter(Boolean)
const values = normalizeBarcodeList(candidate, { splitText: false })
if (values.length) return values
}
@ -326,7 +327,7 @@ export function getStockBarcodes(row: any): string[] {
row?.goods?.barcode
]
for (const candidate of singleCandidates) {
const text = String(candidate ?? '').trim()
const text = pickBarcodeText(candidate)
if (text) return [text]
}
return []

View File

@ -242,6 +242,7 @@ import {
} from '@/api/order.recheckorder/recheckOrder'
import { orderUpdateExpressWeighingWeight } from '@/api/order.index/orderindex'
import { isOrderIndexApiSuccess } from '@/views/order/orderManagement/utils/order-index-helpers'
import { normalizeBarcodeList, pickBarcodeText } from '@/utils/barcode'
const SCAN_PARAM_KEYS: (keyof RecheckScanOrderParams)[] = [
'keyword',
@ -583,16 +584,18 @@ function playBeep(type: 'success' | 'warning' | 'complete') {
/** 在 itemsRows 中按 barcodes 数组精确匹配条码 */
function findItemIndexByBarcode(items: any[], code: string): number {
return items.findIndex((item: any) => {
const barcodes = item.barcodes || (item.barcode ? [item.barcode] : [])
return barcodes.some((bc: string) => bc === code)
const barcodes = normalizeBarcodeList(item.barcodes, { splitText: false })
if (!barcodes.length && item.barcode) barcodes.push(pickBarcodeText(item.barcode))
return barcodes.some((bc) => bc === code)
})
}
/** 在 stock 中按 barcodes 数组精确匹配 */
function findStockIndexByBarcode(stock: any[], code: string): number {
return stock.findIndex((s: any) => {
const barcodes = s.barcodes || (s.barcode ? [s.barcode] : [])
return barcodes.some((bc: string) => String(bc).trim() === code)
const barcodes = normalizeBarcodeList(s.barcodes, { splitText: false })
if (!barcodes.length && s.barcode) barcodes.push(pickBarcodeText(s.barcode))
return barcodes.some((bc) => bc === code)
})
}
@ -1335,8 +1338,8 @@ const itemsRows = computed(() => {
scanned_qty: Number(item._scanned_qty ?? 0),
plan_qty: String(item.plan_qty ?? '—'),
name: String(item.item_name || '—').trim(),
barcode: String((item.barcodes?.[0] || item.barcode || item.item_code || '—')).trim(),
barcodes: Array.isArray(item.barcodes) ? item.barcodes.map((b: any) => String(b).trim()).filter(Boolean) : [],
barcode: pickBarcodeText(item.barcodes?.[0]) || String(item.barcode || item.item_code || '—').trim(),
barcodes: normalizeBarcodeList(item.barcodes, { splitText: false }),
has_shared_barcode: !!item.has_shared_barcode,
spec: String(item.sku_property || '').trim(),
packing_requirements: String(item.packing_requirements || '').trim(),

View File

@ -80,7 +80,7 @@
</el-table-column>
<el-table-column prop="barcodes" label="条码" width="150" show-overflow-tooltip>
<template #default="{ row }">
{{ row.barcodes ? row.barcodes.join("|") : '--' }}
{{ formatBarcodeText(row.barcodes) }}
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="150" show-overflow-tooltip />
@ -112,6 +112,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import { Search, Delete, RefreshLeft, Refresh } from '@element-plus/icons-vue'
import * as stockApi from '@/api/stock/stock'
import { parseTime } from '@/utils/index'
import { formatBarcodeText } from '@/utils/barcode'
const props = defineProps({
drawerVisible: {

View File

@ -2,6 +2,7 @@
scanWorkflowField,
type ToolbarButtonConfig
} from '@/views/order/orderManagement/config/order-common-config'
import { formatBarcodeText } from '@/utils/barcode'
/** ScanBox 筛选字段分组(商品模块专用,保留供其他场景复用) */
export const STOCK_SCAN_FIELD_GROUPS = {
@ -71,7 +72,7 @@ export const stockColumns = [
width: '120',
// 超长条码(多个条码以 | 拼接)超过 30 字符时收起,提供「展开 / 收起」
textCollapse: 30,
formatter: (row: any) => row.barcodes ? row.barcodes.join("|") : '--'
formatter: (row: any) => formatBarcodeText(row.barcodes)
},
{
prop: 'images',

View File

@ -1201,18 +1201,48 @@ async function confirmBatchCancel() {
ElMessage.warning('请先选择要作废的入库单')
return
}
// storage.entry.cancel 最新口径:仅「已创建(CREATED)」「待入库(PENDING)」可作废,其余状态先在前端剔除
const cancellableRows = selectionRows.value.filter((row: any) => isPendingEntryOrderStatus(row.order_status))
const blockedCount = selectionRows.value.length - cancellableRows.length
if (!cancellableRows.length) {
ElMessage.warning('所选入库单均不可作废(仅「已创建」「待入库」状态可作废)')
return
}
// 批量统一走 ids(number[],必须为非空数组,优先于 id);去重并剔除无效 ID
const ids = Array.from(
new Set(
cancellableRows
.map((row: any) => Number(row.id))
.filter((id: number) => Number.isInteger(id) && id > 0)
)
)
if (!ids.length) {
ElMessage.warning('所选入库单缺少有效ID,无法作废')
return
}
const skippedTip = blockedCount ? `;另有 ${blockedCount} 个非「已创建/待入库」状态将被跳过` : ''
try {
await ElMessageBox.confirm(`确定要批量作废 ${selectionRows.value.length} 个入库单吗?`, '确认', { type: 'warning' })
await ElMessageBox.confirm(`确定要作废选中的 ${ids.length} 个入库单吗?${skippedTip}`, '确认', { type: 'warning' })
loading.value = true
// 提取所有选中的入库单 ID
const ids = selectionRows.value.map(row => row.id)
// 调用 cancelEntry 接口,传入 ID 数组
// storage.entry.cancel 入参:批量作废统一传 ids(number[],非空数组;ids 优先于 id)
const res = await entryApi.cancelEntry({ ids })
// 响应:单条作废返回 id,批量作废返回已成功作废的 ids
const cancelledIds = Array.isArray(res?.ids)
? res.ids
: Array.isArray(res?.data?.ids)
? res.data.ids
: []
if (res && res.code === 200) {
ElMessage.success('批量作废成功')
ElMessage.success(cancelledIds.length ? `已作废 ${cancelledIds.length} 个入库单` : '作废成功')
if (selectedEntryId.value !== null && cancelledIds.includes(Number(selectedEntryId.value))) {
selectedEntryId.value = null
}
loadData() // 刷新列表
} else {
ElMessage.error(res?.message || '作废失败')

View File

@ -0,0 +1,302 @@
<template>
<el-dialog
v-model="visible"
title="库位商品查询"
width="1000px"
align-center
append-to-body
destroy-on-close
@closed="handleClosed"
>
<div class="space-stock-toolbar">
<el-autocomplete
v-model="keyword"
class="space-keyword"
size="small"
clearable
value-key="label"
:trigger-on-focus="false"
:fetch-suggestions="fetchSpaceSuggestions"
placeholder="扫码/输入库位编码、名称或库位ID"
@select="handleSpaceSelect"
@keyup.enter="handleQuery"
/>
<el-button size="small" type="primary" :loading="loading" @click="handleQuery">查询</el-button>
<el-button size="small" :loading="loading" :disabled="!currentSpaceId" @click="loadBySpaceId(currentSpaceId as number)">
刷新
</el-button>
</div>
<div class="space-meta">
<el-descriptions :column="4" size="small" border>
<el-descriptions-item label="库位ID">{{ formatInventoryOptionalText(spaceInfo?.id) }}</el-descriptions-item>
<el-descriptions-item label="库位编码">{{ formatInventoryOptionalText(spaceInfo?.space_code) }}</el-descriptions-item>
<el-descriptions-item label="库位名称">{{ formatInventoryOptionalText(spaceInfo?.custom_name) }}</el-descriptions-item>
<el-descriptions-item label="库位状态">{{ formatInventoryOptionalText(spaceInfo?.space_status) }}</el-descriptions-item>
</el-descriptions>
<div class="space-summary">
<span>商品种类:{{ list.length }}</span>
<span>总数量:{{ summary.quantity }}</span>
<span>可用数量:{{ summary.available }}</span>
<span>锁定数量:{{ summary.locked }}</span>
<span>拦截锁定:{{ summary.intercept }}</span>
</div>
</div>
<el-table
:data="list"
border
stripe
size="small"
height="360"
v-loading="loading"
empty-text="该库位暂无有量库存"
>
<el-table-column
v-for="col in spaceStockColumns"
:key="col.prop"
:prop="col.prop"
:label="col.label"
:width="col.width"
:formatter="(row: any) => formatCell(col.prop, row)"
show-overflow-tooltip
/>
</el-table>
<template #footer>
<el-button @click="visible = false">关闭</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import * as inventoryApi from '@/api/storage.inventory/inventory'
import * as indexApi from '@/api/index/index'
import {
formatInventoryBarcodes,
formatInventoryOptionalText,
spaceStockColumns
} from '../inventory-config'
const visible = defineModel<boolean>({ default: false })
const props = defineProps<{
/** 打开时预填的库位ID(可选) */
spaceId?: number | string | null
/** 打开时预填的库位关键字(可选,spaceId 缺失时用于解析) */
spaceKeyword?: string | null
}>()
const loading = ref(false)
const keyword = ref('')
const currentSpaceId = ref<number | null>(null)
const spaceInfo = ref<Record<string, any> | null>(null)
const list = ref<any[]>([])
const spaceOptions = ref<Array<Record<string, any>>>([])
/** el-autocomplete 选中后紧接的 Enter 不再重复按关键字解析 */
let skipNextEnter = false
const summary = reactive({
quantity: 0,
available: 0,
locked: 0,
intercept: 0
})
/** 单行取值:条码走统一格式化,其余空值统一显示 -- */
function formatCell(prop: string, row: any): string {
if (row === null || row === undefined) return '--'
if (prop === 'barcodes') return formatInventoryBarcodes(row.stock?.barcodes)
return formatInventoryOptionalText(row[prop])
}
function spaceOptionLabel(space: Record<string, any>): string {
const code = String(space.space_code ?? '').trim()
const name = String(space.custom_name ?? '').trim()
if (code && name) return `${code}(${name})`
return code || name || String(space.id ?? '')
}
function pickSpaceList(res: any): Array<Record<string, any>> {
const data = res && (res.data || res.list || res)
if (Array.isArray(data)) return data
if (Array.isArray(data?.list)) return data.list
return []
}
async function fetchSpaceSuggestions(queryString: string, cb: (arg: any[]) => void) {
const text = String(queryString ?? '').trim()
if (!text) {
cb([])
return
}
try {
const res: any = await indexApi.searchSpace({ keyword: text, page: 1, pageSize: 20 })
spaceOptions.value = pickSpaceList(res)
cb(
spaceOptions.value.map((space) => ({
...space,
label: spaceOptionLabel(space)
}))
)
} catch {
cb([])
}
}
function handleSpaceSelect(item: any) {
const id = Number(item?.id)
if (!Number.isInteger(id) || id <= 0) return
skipNextEnter = true
currentSpaceId.value = id
keyword.value = String(item?.label ?? '')
spaceInfo.value = null
void loadBySpaceId(id)
}
/** 解析输入的关键字(库位编码/名称/ID)并查询 */
async function handleQuery() {
if (skipNextEnter) {
skipNextEnter = false
return
}
const text = String(keyword.value ?? '').trim()
if (!text) {
ElMessage.warning('请输入或扫码库位')
return
}
loading.value = true
try {
const res: any = await indexApi.searchSpace({ keyword: text, page: 1, pageSize: 20 })
const matched = pickSpaceList(res)
const first = matched[0]
const id = Number(first?.id)
if (first && Number.isInteger(id) && id > 0) {
currentSpaceId.value = id
keyword.value = spaceOptionLabel(first)
spaceInfo.value = null
await loadBySpaceId(id)
return
}
// 未匹配到库位:数字输入直接按库位ID尝试
const numericId = Number(text)
if (Number.isInteger(numericId) && numericId > 0) {
currentSpaceId.value = numericId
spaceInfo.value = null
await loadBySpaceId(numericId)
return
}
currentSpaceId.value = null
spaceInfo.value = null
list.value = []
resetSummary()
ElMessage.warning('未找到匹配的库位')
} catch (e) {
console.error('库位解析失败', e)
ElMessage.error('库位查询失败')
} finally {
loading.value = false
}
}
async function loadBySpaceId(spaceId: number) {
if (!Number.isInteger(spaceId) || spaceId <= 0) return
loading.value = true
try {
const res: any = await inventoryApi.getInventoryListBySpaceId({ space_id: spaceId })
if (res && (res.code === 200 || res.code === 1 || res.flag === 'success')) {
const data = res.data || res
const space = data.space || null
spaceInfo.value = space
currentSpaceId.value = Number(space?.id ?? spaceId)
if (space) keyword.value = spaceOptionLabel(space)
const rows = Array.isArray(data.list) ? data.list : []
list.value = rows.map((item: any) => ({
...item,
store_name: item.store_name || item.stock?.store_name || '',
stock_unit: item.stock?.stock_unit,
sku_property: item.stock?.sku_property
}))
resetSummary()
list.value.forEach((row: any) => {
summary.quantity += Number(row.quantity || 0)
summary.available += Number(row.available_quantity || 0)
summary.locked += Number(row.locked_quantity || 0)
summary.intercept += Number(row.intercept_locked_quantity || 0)
})
} else {
list.value = []
resetSummary()
}
} catch (e) {
console.error('按库位查询库存失败', e)
ElMessage.error('按库位查询库存失败')
list.value = []
resetSummary()
} finally {
loading.value = false
}
}
function resetSummary() {
summary.quantity = 0
summary.available = 0
summary.locked = 0
summary.intercept = 0
}
function handleClosed() {
list.value = []
spaceInfo.value = null
currentSpaceId.value = null
resetSummary()
}
watch(
visible,
(opened) => {
if (!opened) return
const id = Number(props.spaceId)
if (Number.isInteger(id) && id > 0) {
currentSpaceId.value = id
keyword.value = String(props.spaceKeyword ?? id)
spaceInfo.value = null
void loadBySpaceId(id)
return
}
keyword.value = String(props.spaceKeyword ?? '')
if (keyword.value) {
void handleQuery()
}
},
{ immediate: true }
)
</script>
<style scoped lang="scss">
.space-stock-toolbar {
display: flex;
align-items: center;
gap: 8px;
margin-bottom: 10px;
.space-keyword {
width: 340px;
}
}
.space-meta {
margin-bottom: 10px;
.space-summary {
display: flex;
flex-wrap: wrap;
gap: 16px;
margin-top: 8px;
font-size: 12px;
color: #606266;
}
}
</style>

View File

@ -9,6 +9,14 @@
>
<span class="transfer-btn-wrap">
<el-button
v-if="!groupByBatch"
size="small"
:loading="loading"
@click="loadData"
>
刷新
</el-button>
<el-button
v-if="!isSpaceView"
size="small"
type="primary"
@ -44,14 +52,7 @@
<el-radio-button value="detail">按明细</el-radio-button>
<el-radio-button value="space">按库位汇总</el-radio-button>
</el-radio-group>
<el-button
v-if="!groupByBatch"
size="small"
:loading="loading"
@click="loadData"
>
刷新
</el-button>
</div>
<el-dialog
v-model="dialogVisible"

View File

@ -100,6 +100,18 @@
<div style="text-align:center">{{ row.batch_count || 0 }}</div>
</template>
<template #column-space_code="{ row }">
<el-link
v-if="getRowSpaceId(row)"
type="primary"
:underline="false"
@click.stop="openSpaceStock(row)"
>
{{ row.space_code }}
</el-link>
<span v-else>{{ row.space_code }}</span>
</template>
<template #empty>
<div class="empty-tip">暂无入库单</div>
</template>
@ -142,6 +154,12 @@
</div>
</div>
<SpaceStockDialog
v-model="spaceStockVisible"
:space-id="spaceStockSpaceId"
:space-keyword="spaceStockKeyword"
/>
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="库存导出进度"
@ -186,6 +204,7 @@ import {
import entrydetail from './component/panelstockdetail.vue'
import log from './component/log.vue'
import SpaceStockDialog from './component/SpaceStockDialog.vue'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
import { useSettingsStore } from '@/stores/modules/settings'
@ -341,6 +360,7 @@ const toolbarActionMap: Record<string, () => void> = {
openColumnConfigPanel: () => openColumnConfigPanel(),
toggleDetailVisible: () => toggleDetailVisible(),
handleImport: () => handleImport(),
openSpaceStock: () => openSpaceStock(),
confirmBatchCancel: () => { void confirmBatchCancel() }
}
@ -587,6 +607,25 @@ function handleCreateEntry() {
ElMessage.info('新建入库单')
}
// ── 库位商品查询(storage.inventory.listBySpaceId)──
const spaceStockVisible = ref(false)
const spaceStockSpaceId = ref<number | null>(null)
const spaceStockKeyword = ref('')
/** 取行上的库位ID(汇总模式多库位时可能为空) */
function getRowSpaceId(row: any): number | null {
const id = Number(row?.space_id)
return Number.isInteger(id) && id > 0 ? id : null
}
/** 打开库位商品弹窗;不传行则由用户在弹窗内扫码/输入库位 */
function openSpaceStock(row?: any) {
const id = row ? getRowSpaceId(row) : null
spaceStockSpaceId.value = id
spaceStockKeyword.value = id ? String(row?.space_code ?? '') : ''
spaceStockVisible.value = true
}
async function confirmBatchCancel() {
if (!selectionRows.value.length) {

View File

@ -1,6 +1,7 @@
import { stockQueryScanField } from '@/views/order/orderManagement/config/order-common-config'
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
import { normalizeBarcodeList } from '@/utils/barcode'
/** 库存列表主工具栏按钮(action 与 inventory/index.vue 内 toolbarActionMap 键一致)
* 排序与样式分类对齐 storage/receiving:
@ -37,6 +38,13 @@ export const inventoryToolbarButtons: ToolbarButtonConfig[] = [
size: 'small',
action: 'handleImport'
},
{
key: 'spaceStock',
label: '库位商品',
category: 'action',
size: 'small',
action: 'openSpaceStock'
},
{
key: 'batchCancel',
label: '批量作废',
@ -105,39 +113,9 @@ export function formatInventorySpaceLabel(space?: Record<string, any> | null, fa
return name || fallback
}
/** 解析商品条码并过滤空值 */
/** 解析商品条码并过滤空值(兼容字符串数组与 `{ id, barcode }` 对象数组) */
export function normalizeInventoryBarcodesList(value: unknown): string[] {
if (value === null || value === undefined || value === '') return []
if (Array.isArray(value)) {
return value
.map((item) => String(item ?? '').trim())
.filter(Boolean)
}
if (typeof value === 'string') {
const text = value.trim()
if (!text || text === '[""]' || text === '[]') return []
if (text.startsWith('[') && text.endsWith(']')) {
try {
const parsed = JSON.parse(text)
if (Array.isArray(parsed)) {
return parsed
.map((item) => String(item ?? '').trim())
.filter(Boolean)
}
} catch {
// ignore invalid json
}
}
if (text.includes('|')) {
return text.split('|').map((item) => item.trim()).filter(Boolean)
}
return [text]
}
const text = String(value).trim()
return text ? [text] : []
return normalizeBarcodeList(value, { separators: ['|'] })
}
/** 商品条码展示:数组用 | 连接,忽略空条码 */
@ -226,6 +204,24 @@ export const productstockColums = [
{ prop: 'last_inbound_time', label: '最后入库时间', width: '160' },
]
/** 库位商品弹窗表格列(storage.inventory.listBySpaceId 响应 data.list,按 stock_id 汇总) */
export const spaceStockColumns = [
{ prop: 'stock_id', label: '商品ID', width: '100' },
{ prop: 'item_code', label: '商品编码', width: '150' },
{ prop: 'item_name', label: '商品名称', width: '200' },
{ prop: 'barcodes', label: '商品条码', width: '150' },
{ prop: 'sku_property', label: '规格', width: '140' },
{ prop: 'stock_unit', label: '单位', width: '80' },
{ prop: 'store_name', label: '货主', width: '120' },
{ prop: 'quantity', label: '总数量', width: '100' },
{ prop: 'available_quantity', label: '可用数量', width: '100' },
{ prop: 'locked_quantity', label: '锁定数量', width: '100' },
{ prop: 'intercept_locked_quantity', label: '拦截锁定', width: '100' },
{ prop: 'batch_count', label: '批次数', width: '80' },
{ prop: 'first_inbound_time', label: '最早入库时间', width: '160' },
{ prop: 'last_inbound_time', label: '最晚入库时间', width: '160' }
]
export const productstockDetail = [
{ prop: 'id', label: 'ID', width: '80' },
{ prop: 'sku_code', label: '商品编码', width: '150' },

View File

@ -2,8 +2,8 @@
<div class="transaction-detail">
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="交易类型">
<span :class="getStatusTextClass(row?.transaction_type === 'INBOUND' ? 'success' : 'danger')">
{{ row?.transaction_type === 'INBOUND' ? '入库' : '出库' }}
<span :class="getStatusTextClass(getTransactionTypeTagType(row?.transaction_type))">
{{ getTransactionTypeText(row?.transaction_type) }}
</span>
</el-descriptions-item>
<el-descriptions-item label="商品ID">{{ row?.stock_id ?? '—' }}</el-descriptions-item>
@ -22,7 +22,7 @@
<script setup lang="ts">
import { getStatusTextClass } from '@/views/order/orderManagement/config/order-common-config'
import { formatDateTime, getOrderTypeLabel } from '../log-config'
import { formatDateTime, getOrderTypeLabel, getTransactionTypeText, getTransactionTypeTagType } from '../log-config'
defineProps<{
id?: string | number | null

View File

@ -117,9 +117,8 @@ import {
logToolbarButtons,
formatDateTime,
formatTransactionData,
inventoryTypeConfig,
transactionTypeConfig,
getOrderTypeLabel,
getInventoryTypeText,
getTransactionTypeText,
getTransactionTypeTagType
} from './log-config'
@ -427,13 +426,14 @@ async function handleExport(mode: 'waybill' | 'item' = 'waybill') {
item.space_id,
item.warehouse_id,
item.store_id,
transactionTypeConfig[item.transaction_type as keyof typeof transactionTypeConfig]?.text || item.transaction_type,
inventoryTypeConfig[item.inventory_type as keyof typeof inventoryTypeConfig]?.text || item.inventory_type,
item.order_type,
// 枚举列统一导出中文翻译(交易类型 / 库存类型 / 订单类型)
getTransactionTypeText(item.transaction_type),
getInventoryTypeText(item.inventory_type),
getOrderTypeLabel(item.order_type),
item.quantity,
item.record_count || 1,
item.first_created_at || item.created_at,
item.last_created_at || item.created_at,
formatDateTime(item.first_created_at || item.created_at),
formatDateTime(item.last_created_at || item.created_at),
item.operator_name || '-'
])
@ -457,9 +457,10 @@ async function handleExport(mode: 'waybill' | 'item' = 'waybill') {
item.space_id,
item.warehouse_id,
item.store_id,
transactionTypeConfig[item.transaction_type as keyof typeof transactionTypeConfig]?.text || item.transaction_type,
inventoryTypeConfig[item.inventory_type as keyof typeof inventoryTypeConfig]?.text || item.inventory_type,
item.order_type,
// 枚举列统一导出中文翻译(交易类型 / 库存类型 / 订单类型)
getTransactionTypeText(item.transaction_type),
getInventoryTypeText(item.inventory_type),
getOrderTypeLabel(item.order_type),
item.order_no || '',
item.batch_no || item.batch?.batch_no || '',
item.quantity,

View File

@ -86,10 +86,13 @@ export function formatDateTime(dateStr: string): string {
}
}
// 交易类型配置
// 交易类型配置(text:中文翻译;tagType:文本颜色)
export const transactionTypeConfig = {
INBOUND: { text: '入库', tagType: 'success' },
OUTBOUND: { text: '出库', tagType: 'danger' },
TRANSFER_IN: { text: '移入', tagType: 'primary' },
TRANSFER_OUT: { text: '移出', tagType: 'warning' },
LOCK: { text: '锁定', tagType: 'info' },
UNLOCK: { text: '解锁', tagType: 'warning' }
}
@ -129,16 +132,36 @@ export function getOrderTypeLabel(type: string): string {
return orderTypeConfig[type] || type || '—'
}
// 交易类型展示:文本 + tag 颜色(兼容 INBOUND/OUTBOUND/UNLOCK 等)
export function getTransactionTypeText(value: unknown): string {
/** 库存类型展示文本(兼容后端小写/带空格的枚举值) */
export function getInventoryTypeText(value: unknown): string {
if (value === undefined || value === null || value === '') return '—'
return transactionTypeConfig[value as keyof typeof transactionTypeConfig]?.text ?? String(value)
const key = String(value).trim()
const hit = inventoryTypeConfig[key as keyof typeof inventoryTypeConfig]?.text
if (hit) return hit
const upper = key.toUpperCase()
return inventoryTypeConfig[upper as keyof typeof inventoryTypeConfig]?.text ?? key
}
export function getTransactionTypeTagType(value: unknown): 'success' | 'warning' | 'danger' {
if (value === 'INBOUND') return 'success'
if (value === 'OUTBOUND') return 'danger'
return 'warning'
// 交易类型展示:文本 + tag 颜色(兼容 INBOUND/OUTBOUND/TRANSFER_IN/TRANSFER_OUT/LOCK/UNLOCK)
export function getTransactionTypeText(value: unknown): string {
if (value === undefined || value === null || value === '') return '—'
const key = String(value).trim()
const hit = transactionTypeConfig[key as keyof typeof transactionTypeConfig]?.text
if (hit) return hit
// 兼容后端小写/带空格的枚举值
const upper = key.toUpperCase()
return transactionTypeConfig[upper as keyof typeof transactionTypeConfig]?.text ?? key
}
/** 交易类型文本颜色:取自 transactionTypeConfig.tagType,未命中回退 warning */
export function getTransactionTypeTagType(value: unknown): string {
const key = String(value ?? '').trim()
const upper = key.toUpperCase()
return (
transactionTypeConfig[key as keyof typeof transactionTypeConfig]?.tagType ??
transactionTypeConfig[upper as keyof typeof transactionTypeConfig]?.tagType ??
'warning'
)
}
// 出入库记录列表列(列字段与 storage.transaction.list 实际返回逐条明细对齐)

View File

@ -4,7 +4,6 @@
<el-button
type="primary"
size="small"
:icon="Refresh"
@click="fetchStockoutLogs"
title="刷新"
:loading="loading"

View File

@ -393,7 +393,11 @@
<el-dialog
v-model="updateExpressDialogVisible"
<<<<<<< HEAD
title="更新快递与运单号"
=======
title="更新快递公司与运单号"
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
width="520px"
align-center
append-to-body
@ -419,12 +423,20 @@
<el-form-item label="快递公司">
<el-select
v-model="updateExpressForm.express_code"
<<<<<<< HEAD
placeholder="快递公司编码(如 SF/STO/ZT),清空则置空"
=======
placeholder="选择快递公司编码(如 SF/STO/ZT)"
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
clearable
filterable
allow-create
default-first-option
<<<<<<< HEAD
style="width:100%"
=======
style="width: 100%"
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
>
<el-option
v-for="opt in updateInfoExpressOptions"
@ -433,17 +445,26 @@
:value="opt.value"
/>
</el-select>
<<<<<<< HEAD
</el-form-item>
<el-form-item label="运单号">
<el-input v-model="updateExpressForm.waybill_code" placeholder="运单号(单个)" clearable />
=======
<div class="update-express-tip">传编码即可,后端自动解析快递名称;清空表示置空</div>
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
</el-form-item>
<el-form-item label="运单号列表">
<el-form-item label="运单号">
<el-input
v-model="updateExpressForm.waybill_codes"
type="textarea"
:rows="3"
<<<<<<< HEAD
placeholder="多包裹运单号,用逗号或换行分隔(可选)"
=======
placeholder="支持一单多运单,多个运单号用逗号、分号或换行分隔(可选)"
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
/>
<div class="update-express-tip">清空后提交空数组,将清空原有运单号</div>
</el-form-item>
</el-form>
</div>
@ -470,7 +491,11 @@ import { safeInvoke } from '@/utils/safe-invoke'
import * as XLSX from 'xlsx'
import * as indexApi from '@/api/index/index'
import * as stockoutApi from '@/api/storage.stockout/stockout' //现有的对应API
<<<<<<< HEAD
import type { StockoutToOrderParams, StockoutUpdateExpressParams, StockoutUpdateInfoParams } from '@/api/storage.stockout/stockout'
=======
import type { StockoutToOrderParams, StockoutUpdateInfoParams, StockoutUpdateExpressParams, StockoutConfirmResponse } from '@/api/storage.stockout/stockout'
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
import {
availableFields,
entryColums,
@ -479,6 +504,9 @@ import {
stockoutToolbarButtons,
formatStockoutData,
formatStockoutListItems,
normalizeStockoutWaybillCodes,
splitStockoutWaybillCodes,
isSameStockoutWaybillCodes,
} from './stockout-config'
import stockoutdetail from './component/stockoutdetail.vue'
@ -799,16 +827,26 @@ async function handleSingleRowCancel(row: any) {
}
}
<<<<<<< HEAD
// ── 更新快递与运单号(storage.stockout.updateExpress)──
=======
// ── 更新快递公司与运单号(storage.stockout.updateExpress)──
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
const updateExpressDialogVisible = ref(false)
const updateExpressLoading = ref(false)
const updateExpressTargetRow = ref<any>(null)
const updateExpressForm = reactive({
<<<<<<< HEAD
/** 快递公司编码(如 SF/STO/ZT),非运单号 */
express_code: '',
/** 运单号(单个) */
waybill_code: '',
/** 运单号列表(多包裹,文本按逗号/换行分隔) */
=======
/** 快递公司编码(express_code,非运单号) */
express_code: '',
/** 运单号多行文本,提交时拆分为 waybill_codes 数组 */
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
waybill_codes: ''
})
/** 弹窗打开时的快递公司编码,用于判断是否需要提交 express_code(支持传空值置 NULL) */
@ -836,11 +874,16 @@ function openUpdateExpressDialog() {
}
const row = rows[0]
updateExpressTargetRow.value = row
// 快递公司编码回填;运单号以 waybill_codes 为准(兼容单数 waybill_code)
updateExpressForm.express_code = String(row?.express_code ?? '')
<<<<<<< HEAD
updateExpressOriginalExpressCode = updateExpressForm.express_code
updateExpressForm.waybill_code = String(row?.waybill_code ?? '')
updateExpressForm.waybill_codes = normalizeWaybillCodes(row?.waybill_codes).join('\n')
// 快递公司下拉复用「修改出库单信息」的 index.getExpressList 选项,首次打开时加载
=======
updateExpressForm.waybill_codes = normalizeStockoutWaybillCodes(row).join('\n')
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
if (!updateInfoExpressOptions.value.length) void loadUpdateInfoSelectOptions()
updateExpressDialogVisible.value = true
}
@ -849,6 +892,7 @@ async function handleUpdateExpressSubmit() {
const row = updateExpressTargetRow.value
if (!row) return
<<<<<<< HEAD
const payload: StockoutUpdateExpressParams = { id: row.id }
// express_code 是快递公司编码:传空值可将 express_code / express_name 置 NULL,
// 因此仅在值发生变化时提交,避免误清空
@ -860,6 +904,26 @@ async function handleUpdateExpressSubmit() {
if (waybillCodes.length) payload.waybill_codes = waybillCodes
if (payload.express_code === undefined && !payload.waybill_code && !payload.waybill_codes) {
=======
// 未传入的字段不会被更新;与原值不同才提交(空值表示清空)
const payload: StockoutUpdateExpressParams = { id: Number(row.id) }
let changed = false
const expressCode = updateExpressForm.express_code.trim()
if (expressCode !== String(row?.express_code ?? '').trim()) {
payload.express_code = expressCode
changed = true
}
// 运单号统一提交 waybill_codes 数组(非数组会 400);空数组表示清空
const waybillCodes = [...new Set(splitStockoutWaybillCodes(updateExpressForm.waybill_codes))]
if (!isSameStockoutWaybillCodes(waybillCodes, normalizeStockoutWaybillCodes(row))) {
payload.waybill_codes = waybillCodes
changed = true
}
if (!changed) {
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
ElMessage.warning('没有需要更新的字段')
return
}
@ -868,6 +932,7 @@ async function handleUpdateExpressSubmit() {
try {
const res: any = await stockoutApi.stockoutUpdateExpress(payload)
if (res && (res.code === 1 || res.code === 200 || res.code === 20000 || res.flag === 'success')) {
<<<<<<< HEAD
const data = res?.data || res
// 用响应同步当前行展示(列表字段与接口字段同名)
if (data?.express_code !== undefined) row.express_code = data.express_code
@ -875,6 +940,14 @@ async function handleUpdateExpressSubmit() {
if (data?.waybill_code !== undefined) row.waybill_code = data.waybill_code
if (data?.waybill_codes !== undefined) row.waybill_codes = data.waybill_codes
ElMessage.success('快递与运单号更新成功')
=======
const data = res.data ?? res
const expressName = String(data?.express_name ?? '').trim()
const codeCount = Array.isArray(data?.waybill_codes) ? data.waybill_codes.length : 0
ElMessage.success(
`更新成功${expressName ? `:${expressName}` : ''}${codeCount ? `(${codeCount} 个运单号)` : ''}`
)
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
updateExpressDialogVisible.value = false
loadData()
} else {
@ -1109,6 +1182,9 @@ async function fetchPrintData(row: any, _index: number) {
const pad = (n: number) => String(n).padStart(2, '0')
const nowStr = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
// 运单号:以 waybill_codes(复数)为准,兼容单数 waybill_code 与已废弃的 express_codes
const waybillCodes = normalizeStockoutWaybillCodes(row, { includeLegacy: true })
// 单据头:优先对齐出库单A5模板字段名(field_code),兼容列表字段名与 order 字段名
const formData: any = {
// 模板字段(供 getPreviewValue 按 field_code 取用)
@ -1127,10 +1203,17 @@ async function fetchPrintData(row: any, _index: number) {
// 其余单据信息
stockout_order_code: row.stockout_order_code || '',
express_code: row.express_code || '',
<<<<<<< HEAD
waybill_code: row.waybill_code || '',
waybill_codes: row.waybill_codes || '',
// 旧字段(已废弃),保留以兼容历史模板
express_codes: row.express_codes || '',
=======
// 运单号:模板字段名 express_codes 保留以兼容旧模板,取值以 waybill_codes 口径为准
express_codes: waybillCodes.join(','),
waybill_code: waybillCodes[0] || '',
waybill_codes: waybillCodes.join(','),
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
order_type: row.order_type || '',
source_type: row.source_type || '',
order_status: row.order_status || '',
@ -1148,6 +1231,9 @@ async function fetchPrintData(row: any, _index: number) {
if (res && (res.code === 200 || res.code === 1 || res.flag === 'success')) {
const payload = res.data || res
const order = payload.order || {}
const orderWaybillCodes = order && Object.keys(order).length
? normalizeStockoutWaybillCodes(order, { includeLegacy: true })
: []
const rows = Array.isArray(payload.list)
? payload.list
: Array.isArray(payload.items)
@ -1175,9 +1261,15 @@ async function fetchPrintData(row: any, _index: number) {
create_at: pick(['create_at', 'created_at'], formData.create_at),
stockout_order_code: order.stockout_order_code || formData.stockout_order_code,
express_code: order.express_code ?? formData.express_code,
<<<<<<< HEAD
waybill_code: order.waybill_code ?? formData.waybill_code,
waybill_codes: order.waybill_codes ?? formData.waybill_codes,
express_codes: order.express_codes ?? formData.express_codes,
=======
express_codes: orderWaybillCodes.length ? orderWaybillCodes.join(',') : formData.express_codes,
waybill_code: orderWaybillCodes[0] || formData.waybill_code,
waybill_codes: orderWaybillCodes.length ? orderWaybillCodes.join(',') : formData.waybill_codes,
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
order_type: order.order_type ?? formData.order_type,
source_type: order.source_type ?? formData.source_type,
order_status: order.order_status ?? formData.order_status,
@ -1296,10 +1388,20 @@ async function handleSingleRowStockout(row: any) {
try {
const res: any = await stockoutApi.stockoutConfirm({ id: row.id })
if (res && (res.code === 1 || res.code === 200 || res.code === 20000 || res.flag === 'success')) {
const data = res?.data || res
if (data?.expressCode) {
row.express_code = data.expressCode
const data: StockoutConfirmResponse = res?.data || res
// expressCode 是快递公司编码(历史遗留命名,不是运单号)
if (data?.expressCode) row.express_code = data.expressCode
if (data?.order_status) row.order_status = data.order_status
// expressCodes 已废弃(取自已废弃列 express_codes,通常为 null),运单号以 waybill_codes 为准,不再回写
// qimenSync 为外部回传结果:确认本身已成功(状态已推进 COMPLETED),回传失败仅提示,可由后端重试
if (String(data?.qimenSync ?? '').toLowerCase() === 'failure') {
ElMessage.warning(
`出库已确认,但外部回传失败:${data?.qimenSyncMessage || '未知原因'}(状态已变更为已完成,可稍后重试回传)`
)
} else {
ElMessage.success('出库成功')
}
<<<<<<< HEAD
if (data?.expressCodes) {
row.express_codes = data.expressCodes
}
@ -1310,6 +1412,8 @@ async function handleSingleRowStockout(row: any) {
row.waybill_codes = data.waybillCodes
}
ElMessage.success('出库成功')
=======
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
loadData()
} else {
ElMessage.error(res?.message || '出库失败')
@ -1440,4 +1544,11 @@ function handleImport() {
text-align: center;
font-size: 14px;
}
.update-express-tip {
margin-top: 4px;
font-size: 12px;
line-height: 18px;
color: #909399;
}
</style>

View File

@ -44,7 +44,7 @@ export const stockoutToolbarButtons: ToolbarButtonConfig[] = [
// },
{
key: 'updateExpress',
label: '更新运单号',
label: '更新快递/运单号',
category: 'action',
size: 'small',
disabledKey: 'hasNoSelection',
@ -159,6 +159,7 @@ export function formatDateTime(dateStr: string): string {
}
}
<<<<<<< HEAD
// 运单号列:优先 waybill_code / waybill_codes(当前接口字段),兼容旧字段 express_codes(数组或分隔字符串),去重后展示
export function formatExpressCodes(row: any): string {
const flatten = (v: any): string[] => {
@ -173,6 +174,43 @@ export function formatExpressCodes(row: any): string {
}
const codes = [...flatten(row?.waybill_code), ...flatten(row?.waybill_codes), ...flatten(row?.express_codes)]
const unique = [...new Set(codes)]
=======
/** 运单号拆分:支持数组、以及逗号/分号/顿号/换行分隔的字符串 */
export function splitStockoutWaybillCodes(value: unknown): string[] {
if (value === null || value === undefined || value === '') return []
if (Array.isArray(value)) {
return value.map(item => String(item ?? '').trim()).filter(Boolean)
}
return String(value)
.split(/[,;,;\n]+/)
.map(s => s.trim())
.filter(Boolean)
}
/**
* 出库单当前运单号列表:以 `waybill_codes`(复数)为准,兼容单数 `waybill_code`;
* 已废弃的 `express_codes` 仅在 includeLegacy 时作为展示兜底
*/
export function normalizeStockoutWaybillCodes(row: any, options: { includeLegacy?: boolean } = {}): string[] {
const sources = options.includeLegacy
? [row?.waybill_codes, row?.waybill_code, row?.express_codes]
: [row?.waybill_codes, row?.waybill_code]
const codes: string[] = []
for (const source of sources) codes.push(...splitStockoutWaybillCodes(source))
return [...new Set(codes)]
}
/** 两个运单号数组是否等价(忽略顺序与重复) */
export function isSameStockoutWaybillCodes(a: string[], b: string[]): boolean {
const left = [...new Set(a)].sort()
const right = [...new Set(b)].sort()
return left.length === right.length && left.every((code, index) => code === right[index])
}
// 运单号列:以 waybill_codes 为准,回退单数 waybill_code / 旧 express_codes(数组或分隔字符串),去重后展示
export function formatExpressCodes(row: any): string {
const unique = normalizeStockoutWaybillCodes(row, { includeLegacy: true })
>>>>>>> f4db2401638744bb2c1a5d132f23f0f470b76598
if (!unique.length) return '--'
const escapeHtml = (s: string) =>
s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;')

View File

@ -192,7 +192,7 @@
<script setup lang="ts">
import { ref, reactive, onMounted, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse'
import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse'
import { storeWarehouseUnbind, storeWarehouseRename, storeWarehouseConfirmSign } from '@/api/storewarehouse.store/storeWarehouse'
import ScanBox from '@/components/ScanBox/index.vue'
import UpperTable from '@/components/UpperTable/index.vue'