This commit is contained in:
yin 2026-08-22 20:20:47 +08:00
parent 154cf6081b
commit e46feaaa01
4 changed files with 1129 additions and 115 deletions

View File

@ -0,0 +1,351 @@
# returnUnpackwork 扫码指令条码功能设计
> 状态:设计稿(待评审)
> 涉及页面:`src/views/express/returnUnpackwork/index.vue`
> 目标:用扫码枪扫描「指令条码 / 运单号 / 商品条码」,**不依赖输入框焦点**自动路由并执行对应操作。
---
## 1. 需求概述
在拆包工作台引入「扫码枪全流程操作」,实现:
| # | 需求 | 确认结论 |
|---|------|---------|
| 1 | 扫描「提交确认」条码 → 自动执行提交确认 | **单次直接执行**(条码即确认,跳过二次弹窗) |
| 2 | 扫描「切换产品状态」条码 → 切换产品状态 | **语义 A**:设置默认状态(先扫状态条码,再扫商品条码入库),纯前端、无需后端 |
| 3 | 未创建拆包时,**无论焦点是否在「运单号」输入框**,扫条码即输入运单号并创建拆包 | 焦点无关 |
| 4 | 已创建拆包后,**无论焦点是否在「商品条码」输入框**,扫条码即搜索并添加商品 | 焦点无关 |
核心诉求:**扫码枪扫描结果不再依赖当前输入框焦点,统一由全局扫码路由接管。**
---
## 2. 现状与问题
现有实现(`src/views/express/returnUnpackwork/index.vue`):
- 运单号输入框 `@keyup.enter="handleCreate"`:仅焦点在运单号输入框时才触发创建。
- 商品条码输入框 `@keyup.enter`/`@change="handleBarcodeQuickAdd"`:仅焦点在商品条码输入框时才触发快速添加。
- 已有全局 `window keydown` 监听 `handleKeydown`(负责 ←/→ 切换焦点、Enter 提交确认、Esc 取消/清除)。
- 产品状态由下拉 `defaultProductStatus` 控制,仅影响**后续快速添加**的明细;明细表产品状态列为只读 tag。
- `returnUnpack.updateDetail` **不支持修改 `product_status`**(仅 quantity/remark)——这正是选择「语义 A」的原因。
**问题**:扫码枪是"键盘设备",当前行为完全依赖焦点所在输入框:
- 焦点不在对应输入框时,扫的条码会打乱到当前聚焦元素,动作不触发。
- 需求 3/4 要求彻底解决该问题。
---
## 3. 目标行为定义
统一入口后,无论焦点在哪,一次扫码按**业务状态**路由:
```
未创建拆包单
└─ 任何条码 → 当作「运单号」→ 创建拆包单
已创建拆包单(status = unpacking)
├─ 指令条码 SUBMIT → 提交确认(单次直接执行)
├─ 指令条码 NORMAL/DAMAGED → 切换默认产品状态(语义 A)
└─ 其他条码 → 当作「商品条码」→ 查询并快速添加
```
---
## 4. 总体架构
在页面内新增一层 **扫码输入路由**,置于现有事件链之前:
```mermaid
flowchart LR
A[扫码枪 / 键盘] --> B[全局 keydown 扫码缓冲<br/>识别连续快速输入]
B --> C{判定为扫码输入?}
C -- 是 --> D[routeScan 业务路由]
C -- 否手工输入 --> E[现有输入框回车<br/>/ 现有快捷键]
D --> F[创建拆包 / 指令动作 / 商品快速添加]
```
要点:
1. 全局 `keydown` 收集**扫码缓冲**,用"字符输入间隔"区分扫码枪与手工键盘。
2. 判定为扫码输入的字符**一律 `preventDefault()`**,不写入任何输入框 → 从根源避免脏数据与双触发。
3. 扫码 Enter 触发 `routeScan(barcode)` 路由。
4. 手工输入回车(焦点在输入框)仍走原输入框逻辑,与扫码互不干扰。
---
## 5. 指令条码定义
统一前缀 `UNPACK.`(与商品条码零冲突),识别时 `trim()` + 忽略大小写:
| 指令 | 条码内容 | 动作 |
|------|---------|------|
| 提交确认 | `UNPACK.SUBMIT` | 调用 `returnUnpackSubmit({ id })`,成功即重置工作台 |
| 设为正常 | `UNPACK.NORMAL` | `defaultProductStatus = 'normal'` |
| 设为破损 | `UNPACK.DAMAGED` | `defaultProductStatus = 'damaged'` |
> 集中管理:新增 `src/views/express/returnUnpackwork/scan-commands.ts`,导出指令常量与 `resolveScanCommand()` 解析函数。
### 5.1 条码制式(推荐 Code 128)
指令条码贴纸用 **Code 128** 制式生成:
| 维度 | Code 128 ✅ | EAN-13 | QR Code |
|------|-------------|--------|---------|
| 免费/专利 | 免费无专利 | 内部可用(零售厂商码需申请) | 免费 |
| 开销(贴纸尺寸) | **高密度**,短文本最紧凑 | 密度低且仅支持数字 | 点阵,占面积大 |
| 扫描性能 | **一维快速扫、识别率高** | 快速 | 需近距/对准,稍慢 |
| 字符支持 | 全 ASCII(字母+符号) | 仅数字 | 任意 |
结论:**Code 128 免费、高密度、支持全 ASCII、一维快速扫,最适合指令条码**。`UNPACK.SUBMIT / NORMAL / DAMAGED` 均为 ASCII 文本,直接 Code 128 编码即可,无需改动指令内容。
---
## 6. 扫码输入识别(全局缓冲)
在现有 `handleKeydown` 内新增扫码缓冲逻辑:
```
常量:
SCAN_INTERVAL_MS = 50 // 判定同一段扫码的最大字符间隔(可配置)
SCAN_MIN_LEN = 2 // 至少 2 个字符才判定为扫码(排除单字符回车)
状态:
scanBuffer = ''
lastScanCharTime = 0
keydown 处理(在每个分支前先执行):
if (e.key 是单个可打印字符 && 非功能键/非组合键) {
const now = Date.now()
if (now - lastScanCharTime > SCAN_INTERVAL_MS) scanBuffer = '' // 新一段输入
scanBuffer += e.key
lastScanCharTime = now
e.preventDefault() // 阻止写入输入框,杜绝脏数据
return
}
if (e.key === 'Enter' && scanBuffer.length >= SCAN_MIN_LEN
&& Date.now() - lastScanCharTime <= SCAN_INTERVAL_MS) {
const barcode = scanBuffer
scanBuffer = ''
lastScanCharTime = 0
e.preventDefault() // 阻止输入框 @keyup.enter 双触发
routeScan(barcode)
return
}
```
设计说明:
- **时间间隔判定**:人类手工打字字符间隔普遍 > 100ms,扫码枪连续输入 < 50ms,阈值 50ms 可可靠区分。
- **`preventDefault()` 阻止字符进输入框**:扫码结果只存在 `scanBuffer`,路由成功后由代码决定回填输入框还是直接执行动作。这是实现"焦点无关"的关键。
- **排除项**:功能键(F1–F12)、方向键、Enter/Esc/组合键(Ctrl/Alt 等)不进入缓冲。
- **`SCAN_MIN_LEN = 2`**:手工在输入框按单字符回车不会被误判为扫码。
---
## 7. 扫码路由 `routeScan(barcode)`
```
function routeScan(barcode) {
const id = createResult.value?.id
const record = createResult.value?.record
// 1) 未创建拆包单 → 当作运单号创建
if (!id) { handleCreate(barcode); return }
// 2) 已创建但非拆包中(completed/cancelled)→ 提示,不路由
if (record?.status !== 'unpacking') { ElMessage.warning('当前拆包单已终态'); return }
// 3) 指令条码
const cmd = resolveScanCommand(barcode)
if (cmd) {
if (cmd === 'submit') doSubmit() // 单次直接执行
else if (cmd === 'normal') setDefaultStatus('normal')
else if (cmd === 'damaged') setDefaultStatus('damaged')
return
}
// 4) 商品条码 → 复用现有快速添加
detailBarcode.value = barcode // 回填输入框做视觉反馈
handleBarcodeQuickAdd()
}
```
### 7.1 创建拆包(`handleCreate(barcode?)`)
- 改造 `handleCreate` 支持传入条码:`const code = (barcode ?? waybillCode.value).trim()`。
- 扫码路径:直接传入条码创建;创建成功后沿用现有逻辑自动 `focus` 商品条码输入框。
- 手工路径:仍读输入框 `waybillCode.value`。
### 7.2 提交确认(`doSubmit()`)
- 抽出现有 `confirmSubmit` 成功分支为 `doSubmit()`:调 `returnUnpackSubmit({ id })` → 成功 → `resetWorkState()` + `loadUnpackList()` + `focusWaybill()`。
- **扫码直接调用 `doSubmit()`,不弹二次确认**(条码即确认)。
- `submitLoading` 防重入;无拆包单/非 unpacking 时提示不执行。
### 7.3 切换默认状态(`setDefaultStatus(status)`)
- 纯前端:`defaultProductStatus.value = status` + `ElMessage` 反馈(正常=绿 / 破损=红)。
- 联动:左侧下拉框回显当前状态(与明细表 tag 配色一致)。
- 未创建拆包单时也允许设置(作为纯前端状态,为后续快速添加做准备)。
---
## 8. 手工回车与现有快捷键的协同
为避免破坏现有交互,`handleKeydown` 内分支编排顺序(自上而下):
```
1. 扫码缓冲收集 / 扫码路由(见 §6) ← 新增,最先
2. 弹窗打开时(stockPicker/quickAdd/detailForm)→ return(弹窗自处理)
3. ←/→ 切换焦点(现有逻辑,不变)
4. Enter:
a. 受控确认弹窗 → 各确认动作(现有,不变)
b. 其他弹窗 → return
c. 焦点在「运单号」输入框且未创建 → handleCreate()(现有 @keyup.enter 保留或并入)
d. 焦点在「商品条码」输入框且已创建 → handleBarcodeQuickAdd()
e. 无输入框焦点 → 提交确认(现有,不变)
5. Esc:取消/清除(现有,不变)
```
**双触发防护**(关键):
- 扫码字符已 `preventDefault` 不写入输入框,因此扫码 Enter 时输入框 `@keyup.enter` 若触发,其读取的 `v-model` 为空 → 直接 `return`,不会重复执行。
- 为稳妥,输入框 `@keyup.enter` 的 handler 开头可加守卫:`if (Date.now() - lastScanAt < 100) return`(`lastScanAt` 为扫码路由完成时刻),彻底杜绝双触发。
---
## 9. UI 改动:扫码指令展示区块
在 `express/returnUnpackwork` 页面新增「扫码指令」展示区块,让工人一眼看到可扫的指令条码、含义与当前激活状态。
### 9.1 位置与结构
左侧面板「键盘快捷键」(`.shortcut-tips`) **下方**新增独立区块 `.scan-commands-tips`,与快捷键区块同风格、以条形码图标区分:
```
┌──────────────────────────────────────────┐
│ 📟 扫码指令 [打印贴纸] │
│ 直接用扫码枪扫描下方条形码(无需聚焦输入框) │
│ │
│ ▓▓▓▓▓▓▓▓▓▓ UNPACK.SUBMIT [提交确认] │ ← 可扫条形码图(jsbarcode Code 128)
│ ▓▓▓▓▓▓▓▓▓▓ UNPACK.NORMAL [设为正常] │ ← 激活时高亮(绿)
│ ▓▓▓▓▓▓▓▓▓▓ UNPACK.DAMAGED [设为破损] │ ← 激活时高亮(红)
└──────────────────────────────────────────┘
```
### 9.2 每行结构(模板草案)
```html
<div
v-for="cmd in SCAN_COMMANDS"
:key="cmd"
class="scan-command-row"
:class="{
'is-active': cmd === 'normal' && defaultProductStatus === 'normal',
'is-active--damaged': cmd === 'damaged' && defaultProductStatus === 'damaged'
}"
>
<!-- 真实条形码图形:jsbarcode Code 128,工人可直接扫屏幕 -->
<svg :ref="barcodeRefs[cmd]" class="scan-command-barcode-img"></svg>
<div class="scan-command-info">
<div class="scan-command-info-line">
<span class="scan-command-code">{{ CMD[cmd] }}</span>
<el-button link size="small" class="scan-copy-btn" @click="copyScanCommand(CMD[cmd])">复制</el-button>
</div>
<el-tag size="small" :type="CMD_TAG_TYPE[cmd]">{{ CMD_LABEL[cmd] }}</el-tag>
</div>
</div>
```
### 9.3 视觉样式(对齐现有 shortcut-tips)
| 元素 | 设计 |
|------|------|
| 区块 `.scan-commands-tips` | `border-top: 1px dashed #e8eef7` 与快捷键区块分隔;`padding-top: 12px` |
| 标题 `.scan-commands-title` | `📟 扫码指令`,13px / 600 / `#303133`(与 `.shortcut-tips-title` 一致) |
| 副标题 `.scan-commands-sub` | "直接用扫码枪扫描下方条形码即可(无需聚焦输入框)",12px / `#909399` |
| 条形码图 `.scan-command-barcode-img` | jsbarcode 生成 **Code 128 SVG**(`height:36`),白底圆角,**可直接被扫码枪扫描屏幕**;`onMounted → renderBarcodes()` 渲染 |
| 条码文本 `.scan-command-code` | 辅助文本:等宽字体、深底浅字,便于人工对照(非可扫对象) |
| 动作标签 | `el-tag`:提交=warning / 正常=success / 破损=danger,与明细表状态列配色一致 |
| 激活态 `.is-active` | 当前默认状态对应行加高亮边框 + 浅色背景(正常=绿浅、破损=红浅),**扫码切换时实时更新** |
| 行间距 `.scan-command-row` | `margin-bottom: 10px`,行间留足空隙,**条码不挨太近**;`align-items: center` |
| 复制按钮 `.scan-copy-btn` | `el-button link size=small`,hover 显示,点击复制条码文本(用于打印贴纸) |
### 9.4 数据源与联动
- 条码文本统一从 `scan-commands.ts` 常量读取(`CMD.SUBMIT / CMD.NORMAL / CMD.DAMAGED`),与 `resolveScanCommand()` **同源**,避免硬编码漂移。
- 激活高亮绑定 `defaultProductStatus`:扫码或下拉切换状态时实时联动。
- `copyScanCommand(code)`:`navigator.clipboard.writeText(code)` 复制条码文本,便于工人用条码打印机生成贴纸。
- 页面条形码图形:`renderBarcodes()` 用 jsbarcode 按 `CMD[cmd]` 生成 **Code 128 SVG** 到对应 `svg`(`barcodeRefs` 收集),`onMounted` 后渲染 → 工人可直接扫屏幕。
### 9.5 打印条码贴纸(确认实现)
- **「打印条码贴纸」按钮**:位于扫码指令区块标题栏右侧,点击调起浏览器打印包含三条码的排版页,直接产出贴纸。
- **排版**:每条码一行 = Code 128 条码图 + 下方文字(内容 + 动作含义),A4 多行排列供裁剪。
- **条码生成**:轻量免费库 `jsbarcode` 前端生成 Code 128 SVG,无后端依赖。
- **无折叠开关**:面板空间通过精简快捷键提示释放(见 §9.7)。
### 9.6 其他 UI 改动
1. 产品状态下拉旁展示当前激活状态高亮(与 tag 配色一致)。
2. 保留运单号 / 商品条码输入框(扫码自动回填,兼顾手工输入)。
### 9.7 键盘快捷键提示精简(给扫码指令区块腾空间)
精简左侧「键盘快捷键」区低频提示,释放高度给「扫码指令」区块:
**保留**(高频/核心):
- `Enter` 运单号:创建拆包单(创建后锁定置灰)
- `Enter` 商品条码:查询并添加
- `Enter` 无表单时:提交确认
- `Esc`:取消拆包 / 清除信息
**删除**(低频/扫码工作流下少用):
- `←/→` 切换焦点(页面 + 商品选择弹窗内)
- `↑/↓` 切换商品、`Enter` 确定选中商品(弹窗内鼠标可替代)
- 整体删除「表单(商品选择弹窗内生效)」小节
---
## 10. 边界与异常
| 场景 | 处理 |
|------|------|
| 未创建拆包单时扫「提交/状态」指令 | 提交→提示无进行中单据;状态→仍可设置默认状态 |
| 已 completed/cancelled 时扫商品条码 | 提示"当前拆包单已终态",不添加 |
| 扫的条码非指令且查不到商品 | 走现有"未找到匹配的商品"提示 |
| 扫码枪快速连扫 | `submitLoading`/`quickAddLoading` 防重入 |
| 弹窗打开时扫码 | 弹窗打开时路由不生效,条码不收集(避免干扰表单) |
| 手工在输入框按单字符回车 | 不被误判为扫码(`SCAN_MIN_LEN=2`) |
| 条码含空格/小写 | `trim()` + 大小写不敏感解析 |
---
## 11. 落地清单(文件级)
1. 新建 `src/views/express/returnUnpackwork/scan-commands.ts`
- 指令常量 + `resolveScanCommand(barcode): 'submit' | 'normal' | 'damaged' | null`
2. 修改 `src/views/express/returnUnpackwork/index.vue`
- `handleKeydown` 增加扫码缓冲收集 + 路由(§6/§7)
- `handleCreate` 支持传入条码参数
- 抽出 `doSubmit()`、`setDefaultStatus()`(复用 `confirmSubmit` 成功分支)
- 输入框 `@keyup.enter` 加双触发守卫
- 新增「扫码指令」展示区块(§9:模板 + 样式 + 激活高亮 + `copyScanCommand()`)
- 「打印条码贴纸」:引入 `jsbarcode` 生成 Code 128 SVG 打印(§9.5)
- 精简「键盘快捷键」提示,删除低频项(§9.7)
3. 无需后端改动(语义 A,纯前端)
---
## 12. 决策记录与待确认项
### 已确认
- [x] 条码制式:**Code 128**(免费、高密度、全 ASCII、一维快速扫)
- [x] 指令内容:`UNPACK.SUBMIT / UNPACK.NORMAL / UNPACK.DAMAGED`
- [x] 「打印条码贴纸」:确认实现(`jsbarcode` 生成 Code 128 SVG)
- [x] 折叠开关:不需要(用快捷键提示精简释放空间,§9.7)
- [x] 条码间距:行间距加大(`margin-bottom: 10px`),条码不挨太近
### 待确认
- [ ] 扫码间隔阈值 50ms 是否合适(可调)

View File

@ -4,7 +4,13 @@
<p class="live-error-title">预览不可用</p>
<p class="live-error-sub">{{ error }}</p>
</div>
<img v-else-if="streamReady && streamSrc" :key="streamKey" :src="streamSrc" class="live-img" />
<img
v-else-if="streamReady && streamSrc"
ref="videoImgRef"
:key="streamKey"
:src="streamSrc"
class="live-img"
/>
<div v-else class="live-loading">
<span>{{ loading ? '正在连接录像机…' : '无信号' }}</span>
</div>
@ -13,7 +19,7 @@
<script setup lang="ts">
import { ref, computed, watch, onUnmounted } from 'vue'
import { getLiveStreamUrl, stopLiveStream } from '@/api/camera_server/localServerApi'
import { getLiveStreamUrl } from '@/api/camera_server/localServerApi'
import { list as serverList, detail as serverDetail } from '@/api/camera_server/camera_server'
export interface CameraLiveItem {
@ -32,8 +38,10 @@ const loading = ref(false)
const error = ref('')
const streamReady = ref(false)
const streamKey = ref(0)
const videoImgRef = ref<HTMLImageElement | null>(null)
let probeAbort: AbortController | null = null
const activeStream = ref<{ ip: string; user: string; pass: string; channel: number; port?: number } | null>(null)
/** 是否已尝试过公网 IP 回退 */
let triedPublic = false
const nvrIp = ref('')
const nvrPort = ref<number | undefined>(undefined)
@ -70,18 +78,6 @@ async function getServerInfo(id: number) {
return null
}
function currentStreamTarget() {
const row = props.camera
if (!row?.channel_id || !nvrIp.value || !nvrUser.value || !nvrPass.value) return null
return {
ip: nvrIp.value,
user: nvrUser.value,
pass: nvrPass.value,
channel: row.channel_id,
port: nvrPort.value,
}
}
async function init() {
const row = props.camera
if (!row) {
@ -132,80 +128,80 @@ async function init() {
nvrIp.value = ip
nvrPort.value = internalIp.value ? internalPort.value : publicPort.value
streamReady.value = false
loading.value = false
// 用 fetch 探测流地址,成功后才让 <img> 渲染(与 video/wms_camera 一致)
await probeStream()
}
/** fetch 探测流地址:成功才渲染 <img>;502 走公网回退;网络错误提示本地服务未启动(与 video/wms_camera 一致) */
async function probeStream() {
if (probeAbort) { probeAbort.abort(); probeAbort = null }
const url = streamSrc.value
if (!url) { loading.value = false; return }
if (!url) return
if (probeAbort) { probeAbort.abort() }
probeAbort = new AbortController()
const { signal } = probeAbort
const t = setTimeout(() => probeAbort?.abort(), 8000)
try {
const resp = await fetch(url, { signal })
clearTimeout(t)
if (!signal.aborted && resp.ok) {
const resp = await fetch(url, { signal: probeAbort.signal })
if (resp.ok) {
streamReady.value = true
} else if (resp.status === 502) {
await handleStream502()
} else {
error.value = `服务器返回错误 (${resp.status}),请检查网络或服务器配置`
loading.value = false
streamKey.value += 1
activeStream.value = currentStreamTarget()
// 探测完成,立即断开探测连接,避免与 <img> 渲染重复拉起后端 ffmpeg 进程
probeAbort?.abort()
probeAbort = null
} else if (!signal.aborted) {
await handleProbeFail('nvr')
}
} catch (e: any) {
clearTimeout(t)
if (signal.aborted) return
await handleProbeFail(e.name === 'TypeError' ? 'proxy' : 'nvr')
if (e.name === 'AbortError') return // 主动关闭,忽略
error.value = '本地视频服务未启动'
loading.value = false
}
}
async function handleProbeFail(reason: 'proxy' | 'nvr') {
/** 502 处理:内网 → 公网回退,已回退则提示失败 */
async function handleStream502() {
stopStream()
nvrIp.value = ''
nvrPort.value = undefined
streamReady.value = false
if (reason === 'proxy') {
error.value = '本地视频服务未启动'
loading.value = false
return
}
if (internalIp.value && publicIp.value && publicIp.value !== internalIp.value) {
if (nvrIp.value === internalIp.value && publicIp.value && publicIp.value !== internalIp.value && !triedPublic) {
triedPublic = true
streamReady.value = false
streamKey.value += 1
await new Promise((r) => setTimeout(r, 300))
nvrIp.value = publicIp.value
nvrPort.value = publicPort.value
streamKey.value += 1
await probeStream()
return
}
const tried = [internalIp.value, publicIp.value].filter(Boolean).join('、')
error.value = `无法连接录像机(已尝试:${tried})`
error.value = `无法连接录像机(已尝试:${tried}),请检查网络或服务器配置`
streamReady.value = false
loading.value = false
}
function stopStream() {
function reloadStream() {
if (probeAbort) { probeAbort.abort(); probeAbort = null }
if (activeStream.value) {
void stopLiveStream(activeStream.value)
activeStream.value = null
}
triedPublic = false
streamReady.value = false
streamKey.value += 1
void init()
}
// 组件卸载时显式停止流:先调用后端 stop-stream kill ffmpeg,再断开前端连接
/** 关闭连接(与 video/wms_camera 一致):abort 探测请求 + 清空 <img> 的 src 触发浏览器断开 MJPEG 长连接 */
function stopStream() {
if (probeAbort) { probeAbort.abort(); probeAbort = null }
if (videoImgRef.value) videoImgRef.value.src = ''
}
// 组件卸载时显式停止流(与 video/wms_camera 一致):abort 探测 + 清空 <img> src 断开连接
onUnmounted(() => {
stopStream()
})
function reload() {
stopStream()
void init()
reloadStream()
}
function stop() {

View File

@ -4,6 +4,10 @@
<div class="work-body">
<!-- 左侧表单列 -->
<div class="left-panel">
<div class="left-top">
<span class="left-title">拆包工作台</span>
<el-button size="small" @click="openCameraSettings">摄像头设置</el-button>
</div>
<el-form label-width="70px" size="small" class="waybill-form">
<el-form-item label="运单号">
<div class="waybill-row">
@ -13,14 +17,11 @@
placeholder="运单号"
clearable
:disabled="!!createResult?.id"
@keyup.enter="handleCreate"
@keyup.enter="() => handleCreate()"
/>
<!-- <el-button type="primary" @click="handleScan">扫描</el-button> -->
</div>
</el-form-item>
<el-form-item>
<el-button type="success" :loading="createLoading" @click="handleCreate">创建拆包</el-button>
</el-form-item>
<el-form-item v-if="createResult?.id" label="产品状态">
<el-select v-model="defaultProductStatus" size="small" class="full-width">
<el-option label="正常" value="normal" />
@ -34,8 +35,8 @@
placeholder="扫描条码(自动查询添加)"
clearable
:disabled="!createResult?.id"
@keyup.enter="handleBarcodeQuickAdd"
@change="handleBarcodeQuickAdd"
@keyup.enter="() => handleBarcodeQuickAdd()"
@change="() => handleBarcodeQuickAdd()"
/>
</el-form-item>
<el-form-item v-if="createResult?.id" label="货主">
@ -51,53 +52,69 @@
<el-option v-for="store in storeOptions" :key="store.value" :label="store.label" :value="store.value" />
</el-select>
</el-form-item>
<el-form-item v-if="createResult?.id" label="操作">
<el-form-item label="操作">
<div class="unpack-actions">
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="success" :loading="submitLoading" @click="handleSubmit">提交确认</el-button>
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="warning" :loading="cancelLoading" @click="handleCancel">取消</el-button>
<el-button size="small" type="danger" :loading="deleteLoading" @click="handleDeleteUnpack">删除</el-button>
<el-button v-if="createResult?.record?.status === 'completed' || createResult?.record?.status === 'cancelled'" size="small" @click="handleClearInfo">清除信息</el-button>
<el-button size="small" type="success" :loading="createLoading" :disabled="!!createResult?.id" @click="() => handleCreate()">创建</el-button>
<template v-if="createResult?.id">
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="success" :loading="submitLoading" @click="handleSubmit">提交</el-button>
<el-button v-if="createResult?.record?.status === 'unpacking'" size="small" type="warning" :loading="cancelLoading" @click="handleCancel">取消</el-button>
<el-button size="small" type="danger" :loading="deleteLoading" @click="handleDeleteUnpack">删除</el-button>
<el-button v-if="createResult?.record?.status === 'completed' || createResult?.record?.status === 'cancelled'" size="small" @click="handleClearInfo">清除信息</el-button>
</template>
</div>
</el-form-item>
</el-form>
<div class="shortcut-tips">
<!-- <div class="shortcut-tips">
<div class="shortcut-tips-title">⌨ 键盘快捷键</div>
<div class="shortcut-tips-sub">页面(未打开弹窗时生效)</div>
<div class="shortcut-row">
<kbd>Enter</kbd><span>运单号:创建拆包单(创建后运单号锁定置灰)</span>
<kbd>Enter</kbd><span>运单号:创建拆包单(创建后锁定置灰)</span>
</div>
<div class="shortcut-row">
<kbd>Enter</kbd><span>商品条码:查询并添加</span>
</div>
<div class="shortcut-row">
<kbd>←</kbd><kbd>→</kbd><span>切换焦点(运单号/商品条码)</span>
<kbd>Enter</kbd><span>无表单时:提交确认</span>
</div>
<div class="shortcut-row">
<kbd>Enter</kbd><kbd>空格</kbd><span>表单内:确认;无表单时:提交确认</span>
<kbd>Esc</kbd><span>取消拆包 / 清除信息</span>
</div>
<div class="shortcut-row">
<kbd>Esc</kbd><span>拆包中:取消拆包;已提交/已取消:清除信息</span>
</div> -->
<!-- 扫码指令说明区块 -->
<div class="scan-commands-tips">
<div class="scan-commands-head">
<span class="scan-commands-title">📟 扫码指令</span>
<el-button link size="small" type="primary" @click="printScanStickers">打印贴纸</el-button>
</div>
<div class="shortcut-tips-sub">表单(商品选择弹窗内生效)</div>
<div class="shortcut-row">
<kbd>←</kbd><kbd>→</kbd><span>切换焦点(搜索框/商品列表)</span>
</div>
<div class="shortcut-row">
<kbd>↑</kbd><kbd>↓</kbd><span>切换商品</span>
</div>
<div class="shortcut-row">
<kbd>Enter</kbd><span>确定选中商品</span>
<div
v-for="cmd in SCAN_COMMANDS"
:key="cmd"
class="scan-command-row"
:class="{
'is-active': cmd === 'normal' && defaultProductStatus === 'normal',
'is-active--damaged': cmd === 'damaged' && defaultProductStatus === 'damaged'
}"
>
<div class="scan-command-head">
<el-tag size="small" :type="CMD_TAG_TYPE[cmd]">{{ CMD_LABEL[cmd] }}</el-tag>
<span v-if="isActiveCmd(cmd)" class="scan-command-current" title="当前默认状态">●</span>
<el-button link size="small" class="scan-copy-btn" @click="copyScanCommand(CMD[cmd])">复制</el-button>
</div>
<svg :ref="barcodeRefs[cmd]" class="scan-command-barcode-img"></svg>
<div class="scan-command-code">{{ CMD[cmd] }}</div>
</div>
</div>
</div>
<!-- 右侧区域 -->
<div class="right-area">
<div class="right-top">
<!-- <div class="right-top">
<el-button size="small" @click="openCameraSettings">摄像头设置</el-button>
<!-- <el-button size="small" type="primary" :disabled="!createResult?.id" @click="openAddDetail">添加明细</el-button> -->
</div>
<el-button size="small" type="primary" :disabled="!createResult?.id" @click="openAddDetail">添加明细</el-button>
</div> -->
<div class="split-stack" ref="splitStackRef">
<div class="upper-wrapper" :style="upperPaneStyle">
<div class="create-result">
<div class="create-result-header">
<span class="create-result-title">开单结果</span>
@ -123,6 +140,19 @@
<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">
<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>
</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="sku_property" label="规格" min-width="100" show-overflow-tooltip />
@ -132,6 +162,61 @@
</div>
<el-empty v-else description="点击「创建拆包」后显示开单结果" :image-size="60" />
</div>
</div>
<div
class="pane-resizer"
title="拖动调整开单结果与明细区域高度"
@mousedown="beginSplitDrag"
/>
<div class="lower-wrapper" :style="lowerPaneStyle">
<!-- 拆包订单明细(order.detail) -->
<!-- <div class="order-detail-panel">
<div class="order-detail-header">
<span class="order-detail-title">📦 拆包订单明细</span>
<el-button
v-if="createResult?.id"
link
size="small"
type="primary"
:loading="orderDetailLoading"
@click="loadOrderDetail"
>刷新</el-button>
</div>
<div v-loading="orderDetailLoading" class="order-detail-body">
<el-empty v-if="!createResult?.id" description="创建拆包后显示订单明细" :image-size="50" />
<template v-else>
<el-descriptions v-if="orderHeader" :column="2" size="small" border>
<el-descriptions-item label="订单号">{{ orderHeader.order_no ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="货主">{{ orderHeader.store_name ?? orderHeader.shop_nick ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="物流">{{ orderHeader.logistics_name ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="商品种类">{{ orderDetailItems.length }}</el-descriptions-item>
<el-descriptions-item label="运单号">{{ currentWaybill() || '-' }}</el-descriptions-item>
<el-descriptions-item label="下单时间">{{ orderHeader.created_at ?? orderHeader.order_time ?? '-' }}</el-descriptions-item>
</el-descriptions>
<div class="order-detail-items-title">商品明细({{ orderDetailItems.length }})</div>
<el-table
:data="orderDetailItems"
size="small"
border
class="order-detail-table"
empty-text="暂无商品明细"
max-height="200"
>
<el-table-column prop="item_code" label="商品编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="sku_property" label="规格" min-width="90" show-overflow-tooltip />
<el-table-column label="数量" width="70" align="center">
<template #default="{ row }">{{ row.quantity ?? row.plan_qty ?? 0 }}</template>
</el-table-column>
<el-table-column label="条码" min-width="110" show-overflow-tooltip>
<template #default="{ row }">{{ rowBarcode(row) }}</template>
</el-table-column>
</el-table>
</template>
</div>
</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" />
@ -189,6 +274,8 @@
@current-change="handleDetailPageChange"
/>
</div>
</div>
</div>
<!-- <div class="unpack-list-area">
<div class="unpack-list-header">
<span class="unpack-list-title">拆包单列表</span>
@ -409,8 +496,13 @@ import {
} from '@/api/returnunpack'
import { list as cameraList } from '@/api/camera/camera'
import CameraLivePreview, { type CameraLiveItem } from './CameraLivePreview.vue'
import JsBarcode from 'jsbarcode'
import { CMD, CMD_LABEL, CMD_TAG_TYPE, SCAN_COMMANDS, resolveScanCommand } from './scan-commands'
import StockPickerDialog from '@/views/express/returnUnpack/components/StockPickerDialog.vue'
import { queryStockProducts, mapStockPickerItem, getStockStoreId } from '@/views/order/orderManagement/utils/stock-picker-helpers'
import { orderDetail, orderList } from '@/api/order.index/orderindex'
import { parseOrderDetailPayload, normalizeOrderDetailItems } from '@/views/order/orderManagement/utils/order-index-helpers'
import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane'
type CameraRow = CameraLiveItem & { id: number }
@ -443,6 +535,14 @@ const quickAddLoading = ref(false)
const quickAddPickerVisible = ref(false)
const quickAddKeyword = ref('')
// 上下分栏拖动:调整「开单结果」与「明细表格」区域高度(与 storage/receiving 一致)
const {
splitStackRef,
beginSplitDrag,
lowerPaneStyle,
upperPaneStyle,
} = useVerticalSplitPane({ defaultLowerPercent: 40 })
// 货主选择(来源:returnUnpack.create 返回 + 条码查询商品返回)
const selectedStoreId = ref<number | null>(null)
const storeOptions = ref<Array<{ label: string; value: number }>>([])
@ -609,7 +709,11 @@ function handleScan() {
ElMessage.info('请使用扫码枪扫描运单号')
}
async function handleCreate() {
async function handleCreate(barcode?: string) {
// 防双触发:仅非扫码路径(输入框 @keyup.enter)在扫码刚完成后拦截
if (barcode == null && Date.now() - lastScanAt < 100) return
// 扫码路由传入条码时回填输入框做视觉反馈
if (barcode != null) waybillCode.value = barcode
const code = waybillCode.value.trim()
if (!code) {
ElMessage.warning('请输入或扫描运单号')
@ -637,6 +741,7 @@ async function handleCreate() {
// 保留输入的运单号显示在锁定的输入框中(创建后运单号置灰不可改)
loadUnpackList()
loadDetailList()
loadOrderDetail()
focusTarget.value = 'barcode'
nextTick(() => {
detailBarcodeRef.value?.focus()
@ -787,7 +892,9 @@ async function handleBarcodeSearch() {
}
}
async function handleBarcodeQuickAdd() {
async function handleBarcodeQuickAdd(fromScan = false) {
// 防双触发:仅非扫码路径(输入框 @keyup.enter/@change)在扫码刚完成后拦截
if (!fromScan && Date.now() - lastScanAt < 100) return
const barcode = String(detailBarcode.value ?? '').trim()
if (!barcode || quickAddLoading.value) return
if (!createResult.value?.id) {
@ -900,6 +1007,79 @@ function handleQuickAddSelected(item: any) {
quickAddDetail(item)
}
// ==================== 拆包订单明细(order.detail) ====================
/** 当前拆包单的运单号(原退回运单,用于反查原订单商品明细) */
function currentWaybill(): string {
return String(createResult.value?.record?.waybill_code ?? '').trim()
}
const orderDetailData = ref<any>(null) // order.detail 原始 payload data
const orderDetailItems = ref<any[]>([]) // 商品明细
const orderDetailLoading = ref(false)
/** 订单头信息(order.detail 返回的 order / detail) */
const orderHeader = computed(() => {
const data = orderDetailData.value
if (!data) return null
return data.order || data.detail || null
})
/** 商品明细行条码展示 */
function rowBarcode(row: any): string {
const arr = row?.barcodes
if (Array.isArray(arr) && arr.length) {
return arr.map((b: any) => b?.barcode ?? b).filter(Boolean).join(' / ')
}
return row?.barcode ?? '-'
}
/** 加载拆包单原运单号的订单明细 + 商品明细(先用 order.detail) */
async function loadOrderDetail() {
const waybill = currentWaybill()
if (!waybill) {
orderDetailData.value = null
orderDetailItems.value = []
return
}
orderDetailLoading.value = true
try {
// 1) 按运单号反查原订单 ID(order.list 运单号筛选)
const listRes: any = await orderList({
where: { waybill_codes: [waybill] },
pagination: { page: 1, pageSize: 1 },
})
if (!isOk(listRes)) {
orderDetailData.value = null
orderDetailItems.value = []
return
}
const list = listRes.data?.list ?? listRes.list ?? []
const orderRow = list[0]
const orderId = orderRow?.id ?? orderRow?.order_id
if (orderId == null) {
orderDetailData.value = null
orderDetailItems.value = []
return
}
// 2) 按订单 ID 查明细(order.detail)
const res: any = await orderDetail({ id: orderId, ids: [orderId], tableType: 'order' })
if (isOk(res)) {
const data = parseOrderDetailPayload(res)
orderDetailData.value = data
orderDetailItems.value = normalizeOrderDetailItems(data)
} else {
orderDetailData.value = null
orderDetailItems.value = []
}
} catch {
orderDetailData.value = null
orderDetailItems.value = []
} finally {
orderDetailLoading.value = false
}
}
// ==================== 拆包单列表 / 详情 / 明细分页 ====================
async function loadDetailList() {
@ -987,6 +1167,7 @@ async function selectUnpack(row: any) {
}
detailPagination.currentPage = 1
loadDetailList()
loadOrderDetail()
} else {
ElMessage.error(res?.message || '获取拆包单详情失败')
}
@ -1023,6 +1204,8 @@ function resetWorkState() {
selectedStoreId.value = null
storeOptions.value = []
defaultProductStatus.value = 'normal'
orderDetailData.value = null
orderDetailItems.value = []
focusTarget.value = 'waybill'
}
@ -1047,23 +1230,43 @@ function handleSubmit() {
submitConfirmVisible.value = true
}
/** 确认提交拆包 */
async function confirmSubmit() {
/** 提交拆包核心(弹窗确认与扫码指令共用) */
async function doSubmitCore(): Promise<boolean> {
const id = createResult.value?.id
if (!id) return false
const res: any = await returnUnpackSubmit({ id })
if (isOk(res)) {
ElMessage.success('提交成功')
// 提交后自动清除信息,恢复创建页面
resetWorkState()
loadUnpackList()
focusWaybill()
return true
}
ElMessage.error(res?.message || '提交失败')
return false
}
/** 扫码指令:提交确认(条码即确认,单次直接执行,不弹二次确认) */
function doSubmit() {
const id = createResult.value?.id
const record = createResult.value?.record
if (!id || submitLoading.value) return
if (record?.status !== 'unpacking') {
ElMessage.warning('当前无拆包中单据')
return
}
submitLoading.value = true
doSubmitCore().finally(() => { submitLoading.value = false })
}
/** 确认提交拆包(弹窗路径,复用 doSubmitCore) */
async function confirmSubmit() {
if (submitLoading.value) return
submitLoading.value = true
try {
const res: any = await returnUnpackSubmit({ id })
if (isOk(res)) {
ElMessage.success('提交成功')
submitConfirmVisible.value = false
// 提交后自动清除信息,恢复创建页面
resetWorkState()
loadUnpackList()
focusWaybill()
} else {
ElMessage.error(res?.message || '提交失败')
}
const ok = await doSubmitCore()
if (ok) submitConfirmVisible.value = false
} catch {
// 请求层已提示错误
} finally {
@ -1078,22 +1281,42 @@ function handleCancel() {
cancelConfirmVisible.value = true
}
/** 确认取消拆包 */
async function confirmCancel() {
/** 取消拆包核心(弹窗确认与扫码指令共用) */
async function doCancelCore(): Promise<boolean> {
const id = createResult.value?.id
if (!id) return false
const res: any = await returnUnpackCancel({ id })
if (isOk(res)) {
ElMessage.success('已取消拆包单')
// 取消后自动清除信息,恢复创建页面
resetWorkState()
loadUnpackList()
return true
}
ElMessage.error(res?.message || '取消拆包失败')
return false
}
/** 扫码指令:取消拆包(条码即确认,单次直接执行,不弹二次确认) */
function doCancel() {
const id = createResult.value?.id
const record = createResult.value?.record
if (!id || cancelLoading.value) return
if (record?.status !== 'unpacking') {
ElMessage.warning('当前无拆包中单据')
return
}
cancelLoading.value = true
doCancelCore().finally(() => { cancelLoading.value = false })
}
/** 确认取消拆包(弹窗路径,复用 doCancelCore) */
async function confirmCancel() {
if (cancelLoading.value) return
cancelLoading.value = true
try {
const res: any = await returnUnpackCancel({ id })
if (isOk(res)) {
ElMessage.success('已取消拆包单')
cancelConfirmVisible.value = false
// 取消后自动清除信息,恢复创建页面
resetWorkState()
loadUnpackList()
} else {
ElMessage.error(res?.message || '取消拆包失败')
}
const ok = await doCancelCore()
if (ok) cancelConfirmVisible.value = false
} catch {
// 请求层已提示错误
} finally {
@ -1130,6 +1353,151 @@ async function confirmDelete() {
}
}
// ==================== 扫码指令(全局扫码缓冲与路由) ====================
// 扫码枪 = 键盘设备。识别"一段连续快速输入 + 回车"作为一次扫码,
// 用段间隔/总时长容忍不同扫码枪速度,扫码字符进输入框可见、路由前回滚。
const SCAN_SEGMENT_GAP_MS = 300 // 字符间隔超过该值视为新的一段输入(兼容不同扫码枪速度)
const SCAN_SEGMENT_MAX_MS = 1500 // 一段输入总时长超过该值不视为扫码(区分手工慢输入)
const SCAN_MIN_LEN = 2 // 至少 2 个字符才判定为扫码(排除单字符回车)
let scanBuffer = ''
let scanSegmentStart = 0 // 当前段开始时间戳
let lastScanAt = 0
let scanStartSnapshot: { waybill: string; barcode: string } | null = null
/** 是否扫码枪可输出字符(单个可打印 ASCII,排除功能键/方向键/组合键) */
function isScanPrintableChar(e: KeyboardEvent): boolean {
if (e.ctrlKey || e.metaKey || e.altKey) return false
if (e.key.length !== 1) return false
const c = e.key.charCodeAt(0)
return c >= 32 && c <= 126
}
/** 扫码业务路由:未创建→指令单独处理/运单号创建;已创建→指令 / 商品快速添加 */
function routeScan(barcode: string) {
const id = createResult.value?.id
const record = createResult.value?.record
const cmd = resolveScanCommand(barcode)
// 1) 未创建拆包单
if (!id) {
if (cmd === 'submit' || cmd === 'cancel') {
ElMessage.warning('当前无拆包中单据')
} else if (cmd) {
// NORMAL/DAMAGED:仍可设置默认状态(为后续拆包做准备)
setDefaultStatus(cmd)
} else {
// 其余当作运单号创建
handleCreate(barcode)
}
return
}
// 2) 已创建但非拆包中 → 提示
if (record?.status !== 'unpacking') {
ElMessage.warning('当前拆包单已终态,无法扫码操作')
return
}
// 3) 指令条码
if (cmd) {
if (cmd === 'submit') {
doSubmit()
} else if (cmd === 'cancel') {
doCancel()
} else {
setDefaultStatus(cmd)
}
return
}
// 4) 商品条码 → 复用快速添加(回填输入框做视觉反馈)
detailBarcode.value = barcode
void handleBarcodeQuickAdd(true)
}
/** 切换默认产品状态(语义 A:先扫状态条码,再扫商品条码入库) */
function setDefaultStatus(status: 'normal' | 'damaged') {
defaultProductStatus.value = status
ElMessage.success(status === 'normal' ? '已切换为正常' : '已切换为破损')
}
/** 复制指令条码文本(便于生成打印贴纸) */
async function copyScanCommand(code: string) {
try {
await navigator.clipboard.writeText(code)
ElMessage.success(`已复制:${code}`)
} catch {
ElMessage.warning('复制失败,请手动复制')
}
}
/** 页面展示的指令条形码:jsbarcode 生成 Code 128 图形,工人可直接扫屏幕 */
const barcodeEls: Record<string, SVGElement | null> = {}
const barcodeRefs: Record<string, (el: any) => void> = {}
SCAN_COMMANDS.forEach((cmd) => {
barcodeRefs[cmd] = (el: any) => { barcodeEls[cmd] = el ?? null }
})
function renderBarcodes() {
SCAN_COMMANDS.forEach((cmd) => {
const el = barcodeEls[cmd]
if (!el) return
try {
JsBarcode(el, CMD[cmd], { format: 'CODE128', displayValue: false, height: 42, width: 1.6, margin: 3 })
// 补 viewBox:jsbarcode 的 width/height 属性带 px 单位,需转数值;
// 否则 CSS 固定尺寸缩放时条码超出视口被裁剪(遮挡)。
const w = parseFloat(el.getAttribute('width') || '0')
const h = parseFloat(el.getAttribute('height') || '0')
if (w > 0 && h > 0) el.setAttribute('viewBox', `0 0 ${w} ${h}`)
} catch {
// 个别浏览器生成失败忽略
}
})
}
/** 是否为当前激活的状态指令(正常/破损默认状态) */
function isActiveCmd(cmd: string): boolean {
return (cmd === 'normal' && defaultProductStatus.value === 'normal')
|| (cmd === 'damaged' && defaultProductStatus.value === 'damaged')
}
/** 打印条码贴纸:生成包含全部指令条码(Code 128)的打印页 */
function printScanStickers() {
const win = window.open('', '_blank', 'width=800,height=620')
if (!win) {
ElMessage.warning('请允许浏览器弹出窗口以打印贴纸')
return
}
const stickers = SCAN_COMMANDS.map((cmd) => {
const code = CMD[cmd]
const label = CMD_LABEL[cmd]
return `<div class="sticker">
<svg id="bc-${cmd}" class="sticker-barcode"></svg>
<div class="sticker-code">${code}</div>
<div class="sticker-label">${label}</div>
</div>`
}).join('')
win.document.open()
win.document.write(`<!doctype html><html><head><meta charset="utf-8"><title>扫码指令贴纸</title>
<style>
body { font-family: 'Microsoft YaHei', sans-serif; margin: 16px; color: #303133; }
.sticker { display: inline-block; border: 1px dashed #dcdfe6; border-radius: 8px; padding: 12px 18px; margin: 10px; text-align: center; }
.sticker-code { font-family: Consolas, Monaco, monospace; font-size: 15px; font-weight: 600; margin-top: 8px; }
.sticker-label { font-size: 13px; color: #606266; margin-top: 4px; }
@media print { body { margin: 0; } .sticker { page-break-inside: avoid; } }
</style></head><body>${stickers}</body></html>`)
win.document.close()
SCAN_COMMANDS.forEach((cmd) => {
const el = win.document.getElementById(`bc-${cmd}`)
if (el) {
try {
JsBarcode(el, CMD[cmd], { format: 'CODE128', displayValue: false, height: 44, margin: 4 })
} catch {
// 个别浏览器生成失败忽略
}
}
})
win.focus()
setTimeout(() => { win.print() }, 250)
}
// ==================== 键盘快捷键 ====================
// 快捷键分为「页面部分」与「表单部分」:
// - 页面部分(未打开弹窗时):←/→ 在 运单号/商品条码 间切换焦点,回车提交,Esc 清除已终态信息
@ -1149,6 +1517,50 @@ function handleKeydown(e: KeyboardEvent) {
return
}
// ===== 扫码缓冲收集(§6):识别一段快速连续输入 + 回车 =====
// 受控确认弹窗 / 摄像头弹窗打开时不收集扫码(避免干扰,Enter 仍走下方确认逻辑)
const scanCollectDisabled = cameraSettingsVisible.value
|| cancelConfirmVisible.value || submitConfirmVisible.value
|| deleteConfirmVisible.value || removeDetailConfirmVisible.value
if (!scanCollectDisabled) {
if (isScanPrintableChar(e)) {
const now = Date.now()
if (now - scanSegmentStart > SCAN_SEGMENT_GAP_MS) {
// 新的一段输入:记录快照(扫码字符会进入输入框,路由前回滚)
scanBuffer = e.key
scanSegmentStart = now
scanStartSnapshot = { waybill: waybillCode.value, barcode: detailBarcode.value }
} else {
// 同一段内累积
scanBuffer += e.key
}
return
}
if (e.key === 'Enter') {
// 一段连续输入 + 回车 → 判定为扫码(整段总时长在阈值内)
if (scanBuffer.length >= SCAN_MIN_LEN
&& Date.now() - scanSegmentStart <= SCAN_SEGMENT_MAX_MS) {
const barcode = scanBuffer
scanBuffer = ''
scanSegmentStart = 0
lastScanAt = Date.now()
e.preventDefault()
// 回滚扫码期间写入输入框的内容,恢复扫码前快照
if (scanStartSnapshot) {
waybillCode.value = scanStartSnapshot.waybill
detailBarcode.value = scanStartSnapshot.barcode
scanStartSnapshot = null
}
routeScan(barcode)
return
}
// 非扫码回车:重置缓冲,交给下方原有 Enter 逻辑(输入框 @keyup.enter)
scanBuffer = ''
scanSegmentStart = 0
scanStartSnapshot = null
}
}
// ===== 扫码缓冲结束 =====
// 左/右方向键:在 运单号 ↔ 商品条码 间切换焦点(明细表内备注/数量编辑不触发)
if (e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
if (tag === 'TEXTAREA' || isNumberInput || inDetailTable) return
@ -1217,6 +1629,7 @@ onMounted(async () => {
restoreCameraSelection()
window.addEventListener('keydown', handleKeydown)
nextTick(() => {
renderBarcodes()
focusTarget.value = 'waybill'
waybillInputRef.value?.focus()
})
@ -1377,6 +1790,20 @@ async function confirmRemoveDetail() {
width: 100%;
}
/* 左侧顶部:标题 + 摄像头设置 */
.left-top {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
}
.left-title {
font-size: 14px;
font-weight: 600;
color: #303133;
}
/* 键盘快捷键说明 */
.shortcut-tips {
border-top: 1px dashed #e8eef7;
@ -1422,6 +1849,105 @@ async function confirmRemoveDetail() {
line-height: 1.4;
}
/* 扫码指令说明区块 */
.scan-commands-tips {
border-top: 1px dashed #e8eef7;
padding-top: 12px;
}
.scan-commands-head {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
}
.scan-commands-title {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.scan-commands-sub {
font-size: 12px;
color: #909399;
margin-bottom: 10px;
line-height: 1.5;
}
/* 单列排列 */
.scan-command-row {
position: relative;
display: flex;
flex-direction: column;
gap: 5px;
padding: 8px 10px;
margin-bottom: 12px;
border: 1px solid #ebeef5;
border-radius: 8px;
background: #fff;
}
/* 激活状态:左上角色条指示 */
.scan-command-row.is-active::before,
.scan-command-row.is-active--damaged::before {
content: '';
position: absolute;
left: 0;
top: 8px;
bottom: 8px;
width: 3px;
border-radius: 3px;
}
.scan-command-row.is-active::before {
background: #67c23a;
}
.scan-command-row.is-active--damaged::before {
background: #f56c6c;
}
.scan-command-head {
display: flex;
align-items: center;
gap: 6px;
}
.scan-copy-btn {
margin-left: auto;
flex: 0 0 auto;
}
.scan-command-barcode-img {
width: 100%;
max-width: 200px;
height: 42px;
margin: 0 auto;
background: #fff;
border: 1px solid #ebeef5;
border-radius: 6px;
}
.scan-command-code {
font-family: Consolas, Monaco, monospace;
font-size: 11px;
font-weight: 600;
color: #606266;
text-align: center;
}
.scan-command-current {
font-size: 11px;
font-weight: 600;
color: #67c23a;
white-space: nowrap;
}
.scan-command-row.is-active--damaged .scan-command-current {
color: #f56c6c;
}
.waybill-row {
display: flex;
gap: 8px;
@ -1436,6 +1962,44 @@ async function confirmRemoveDetail() {
min-width: 0;
}
/* 上下分栏(与 storage/receiving 一致):开单结果在上、明细表格在下,可拖动调整高度 */
.split-stack {
flex: 1;
min-height: 0;
display: flex;
flex-direction: column;
overflow: hidden;
}
.split-stack .pane-resizer {
flex: 0 0 6px;
min-height: 6px;
background: #e4e7ed;
cursor: row-resize;
flex-shrink: 0;
position: relative;
z-index: 2;
}
.split-stack .pane-resizer:hover {
background: #dcdfe6;
}
.upper-wrapper {
flex: 1 1 auto;
min-height: 0;
overflow: hidden;
display: flex;
flex-direction: column;
}
.lower-wrapper {
min-height: 0;
overflow: hidden;
display: flex;
flex-direction: column;
}
.right-top {
flex: 0 0 auto;
display: flex;
@ -1457,14 +2021,18 @@ async function confirmRemoveDetail() {
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
}
/* 开单结果区域 */
/* 开单结果区域:占满上部分区,拖动把手时与明细表格一起按比例伸缩 */
.create-result {
flex: 0 0 auto;
flex: 1 1 0;
min-height: 0;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
padding: 10px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
display: flex;
flex-direction: column;
overflow: hidden;
}
.create-result-header {
@ -1485,14 +2053,67 @@ async function confirmRemoveDetail() {
color: #303133;
}
/* 拆包订单明细面板 */
.order-detail-panel {
flex: 0 0 auto;
display: flex;
flex-direction: column;
gap: 8px;
background: #fff;
border: 1px solid #e8eef7;
border-radius: 8px;
padding: 10px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
max-height: 320px;
}
.order-detail-header {
display: flex;
align-items: center;
justify-content: space-between;
}
.order-detail-title {
font-size: 14px;
font-weight: 600;
color: #303133;
}
.order-detail-body {
min-height: 0;
overflow: auto;
display: flex;
flex-direction: column;
gap: 8px;
}
.order-detail-items-title {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.order-detail-table {
width: 100%;
}
.unpack-actions {
display: flex;
gap: 8px;
flex-wrap: wrap;
gap: 4px;
flex-wrap: nowrap;
width: 100%;
}
/* 一行 4 个按钮均分整个输入框宽度:保留按钮自身内边距,清除默认外边距 */
.unpack-actions :deep(.el-button) {
flex: 1 1 0;
min-width: 0;
margin: 0;
}
.create-result-body {
max-height: 220px;
flex: 1;
min-height: 0;
overflow: auto;
}

View File

@ -0,0 +1,46 @@
/**
* 扫码指令条码定义(returnUnpackwork 页面共用)
*
* 制式:Code 128(免费、高密度、全 ASCII、一维快速扫)
* 内容统一前缀 UNPACK.,与商品条码(纯数字)零冲突;
* 识别时 trim + 忽略大小写。
*/
export type ScanCommand = 'submit' | 'normal' | 'damaged' | 'cancel'
/** 指令条码内容:条码 → 动作(精简为简单单词,识别忽略大小写) */
export const CMD: Record<ScanCommand, string> = {
submit: 'SUBMIT',
normal: 'NORMAL',
damaged: 'DAMAGED',
cancel: 'CANCEL',
}
/** 指令动作中文名(页面展示 / 打印贴纸) */
export const CMD_LABEL: Record<ScanCommand, string> = {
submit: '提交确认',
normal: '设为正常',
damaged: '设为破损',
cancel: '取消拆包',
}
/** 指令标签类型(element-plus el-tag type,与明细表状态配色一致) */
export const CMD_TAG_TYPE: Record<ScanCommand, 'warning' | 'success' | 'danger' | 'info'> = {
submit: 'warning',
normal: 'success',
damaged: 'danger',
cancel: 'info',
}
/** 全部指令(按展示顺序) */
export const SCAN_COMMANDS: ScanCommand[] = ['submit', 'normal', 'damaged', 'cancel']
/** 解析条码是否为指令条码(trim + 忽略大小写),非指令返回 null */
export function resolveScanCommand(barcode: string): ScanCommand | null {
const code = String(barcode ?? '').trim().toUpperCase()
if (!code) return null
for (const cmd of SCAN_COMMANDS) {
if (code === CMD[cmd]) return cmd
}
return null
}