feat(returns): 拆包误触恢复、语音播报优化与语音总开关、失败状态行

* 新增 core/unpack-session.js 内存会话快照,切页误触返回不丢拆包作业(校验后端状态后回填)
* 语音:showToast 支持 voiceText 短句播报;voice 队列加去重/冷却/上限/过期与短句音频缓存
* 顶栏新增「语音开/语音关」全局按钮(storage 持久化,紧急插播不受限)
* 退件页失败原因改为常驻状态行 + 3s toast,消除布局跳动
* 修复 stock.warehouse.search 响应解析空值兜底
This commit is contained in:
zm2000 2026-11-02 18:18:38 +08:00
parent 0a8fe53561
commit faee2b5ac6
7 changed files with 632 additions and 42 deletions

View File

@ -171,12 +171,14 @@ export function pickApiData(res: unknown): any {
export function parseStockWarehouseSearch(res: unknown): { list: any[]; total: number } {
if (!isReturnUnpackOk(res)) return { list: [], total: 0 }
const payload = pickApiData(res)
// 顶层响应体(res 非对象时用空对象兜底,避免属性访问报错)
const body = (res && typeof res === 'object' ? res : {}) as Record<string, any>
let list: any[] = []
if (Array.isArray(payload?.list)) list = payload.list
else if (Array.isArray(payload)) list = payload
else if (Array.isArray(res?.list)) list = (res as any).list
else if (Array.isArray(res?.data)) list = (res as any).data
const total = Number(payload?.total ?? (res as any)?.total ?? list.length)
else if (Array.isArray(body.list)) list = body.list
else if (Array.isArray(body.data)) list = body.data
const total = Number(payload?.total ?? body.total ?? list.length)
return { list, total: Number.isFinite(total) ? total : list.length }
}

View File

@ -15,6 +15,14 @@
</view>
<view class="top-nav-right" @click.stop>
<view
class="top-nav-voice"
:class="voiceEnabled ? 'top-nav-voice--on' : 'top-nav-voice--off'"
@click="toggleVoice"
>
<text class="top-nav-voice-text">{{ voiceEnabled ? '语音开' : '语音关' }}</text>
</view>
<view v-if="canBroadcast" class="top-nav-broadcast" @click="handleBroadcast">
<text class="top-nav-broadcast-text">广播</text>
</view>
@ -51,6 +59,8 @@
<script>
import { changeUserRole, fetchUserInfo, logout } from '@/api/index'
import { getNoticeCenter } from '@/core/notice'
import { clearActiveUnpackSession } from '@/core/unpack-session'
import { isVoiceEnabled, setVoiceEnabled } from '@/core/voice'
export default {
name: 'TopNav',
@ -92,6 +102,8 @@ export default {
return {
activeIndex: 0,
showMinePopup: false,
// 语音播报总开关(全局持久化,顶栏一键静音)
voiceEnabled: true,
isNavigating: false,
lastMenuClickAt: 0,
routeSyncTimer: null,
@ -155,6 +167,9 @@ export default {
},
created() {
this.syncActiveIndex()
this.voiceEnabled = isVoiceEnabled()
// 其它页面(如退件页设备设置)改了开关时同步顶栏状态
uni.$on('voice:changed', this.handleVoiceChanged)
if (this.userInfo) {
this.currentUser = this.userInfo
} else if (this.fetchUser) {
@ -175,6 +190,7 @@ export default {
}
},
beforeDestroy() {
uni.$off('voice:changed', this.handleVoiceChanged)
if (this.routeSyncTimer) {
clearInterval(this.routeSyncTimer)
this.routeSyncTimer = null
@ -414,6 +430,24 @@ export default {
})
})
},
/** 语音开关切换(全局持久化;开启时能听到确认,关闭时已静音只看屏幕) */
toggleVoice() {
const next = !this.voiceEnabled
this.voiceEnabled = next
setVoiceEnabled(next)
uni.showToast({
title: next ? '语音播报已开启' : '语音播报已关闭',
icon: 'none',
voiceText: next ? '已开启语音' : '语音已关闭',
})
uni.$emit('voice:changed', next)
},
/** 其它入口切换语音后的同步(避免两处状态不一致) */
handleVoiceChanged(enabled) {
this.voiceEnabled = !!enabled
},
finishLogout() {
// 先停广播接收并清游标,避免换账号后补发上一个人的消息
try {
@ -421,6 +455,8 @@ export default {
} catch (e) {
// 忽略
}
// 退件页拆包会话是内存快照,退出登录必须清掉,避免下一位操作员恢复上一位的拆包单
clearActiveUnpackSession()
uni.removeStorageSync('token')
uni.removeStorageSync('workbench_token')
uni.removeStorageSync('workbench_id')
@ -492,6 +528,44 @@ export default {
align-items: center;
}
/* 语音开关:开启=白底蓝字(一眼看出有声),关闭=半透明描边灰字 */
.top-nav-voice {
height: 0.36rem;
line-height: 0.36rem;
padding: 0 0.14rem;
margin-right: 0.16rem;
border: 0.02rem solid rgba(255, 255, 255, 0.85);
border-radius: 0.07rem;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
}
.top-nav-voice-text {
font-size: 0.2rem;
line-height: 0.36rem;
color: var(--wms-white);
}
.top-nav-voice--on {
background-color: rgba(255, 255, 255, 0.95);
border-color: var(--wms-white);
}
.top-nav-voice--on .top-nav-voice-text {
color: var(--wms-primary);
font-weight: 600;
}
.top-nav-voice--off {
border-color: rgba(255, 255, 255, 0.5);
}
.top-nav-voice--off .top-nav-voice-text {
color: rgba(255, 255, 255, 0.65);
}
/* 广播入口:白描边按钮(APP-PLUS 的 view 不受 uni-button 内置样式影响) */
.top-nav-broadcast {
height: 0.36rem;

View File

@ -0,0 +1,37 @@
/**
* 退件拆包会话(内存单例,不做持久化)。
*
* 背景:布局壳在 App 端没有 keep-alive(见 pages/index/index.vue),
* 切到称重/复核菜单会把退件页组件卸载;操作员误触切回后页面是空白初始态,
* 只能重扫运单号(create 幂等)才能继续,体验与业务风险都不好。
*
* 这里只把「当前拆包单的界面状态」快照放在 JS 运行时内存里:
* - 覆盖误触切页再回来的场景(同一会话内,组件销毁但模块仍在);
* - 不跨 App 重启、不跨退出登录(换人时 token 变化,页面校验 owner 后丢弃);
* - 页面挂载时同步回填,随后仍会向后端校验主表状态并刷新明细,以后端为准。
*
* 白名单原则:只存展示/续录所需的业务字段,不存加载锁、队列、弹窗可见性,
* 避免恢复出「保存中/删除中」导致按钮死锁。
*/
/** 当前会话快照 */
let activeSession = null
/** 读取会话快照(无则返回 null) */
export function getActiveUnpackSession() {
return activeSession
}
/**
* 写入会话快照。
* @param {{ owner?: string, id?: number }} snapshot 必须带有效拆包单 id,否则视为清空
*/
export function setActiveUnpackSession(snapshot) {
const id = snapshot && Number(snapshot.id)
activeSession = snapshot && Number.isInteger(id) && id > 0 ? snapshot : null
}
/** 清空会话快照(提交/删除/清除信息/换人时调用) */
export function clearActiveUnpackSession() {
activeSession = null
}

View File

@ -5,6 +5,41 @@
const VOICE_API = 'http://tbdata.gztbyc.com/voice/'
const VOICE_BASE = 'http://tbdata.gztbyc.com'
// 语音总开关(全局持久化):'on' 播报 / 'off' 静音,缺省视为开启
const VOICE_ENABLED_KEY = 'voiceEnabled'
// 同文案冷却:刚播过的同一句在该时长内不再重复(防连续误扫同一提示反复念)
const TEXT_COOLDOWN_MS = 3000
// 待播队列上限:拥塞(弱网/连续提示)时丢最旧的待播条目,最新状态更重要
const QUEUE_LIMIT = 5
// 文本提示过期:排队超过该时长就不再播(避免播出十几秒前的旧状态)
const TEXT_EXPIRE_MS = 5000
/** 语音是否开启(未设置默认开启;只有明确写 off/false/0 才静音) */
export function isVoiceEnabled() {
try {
const raw = uni.getStorageSync(VOICE_ENABLED_KEY)
if (raw === '' || raw == null) {
return true
}
if (raw === false || raw === 0) {
return false
}
const text = String(raw).trim().toLowerCase()
return !(text === 'false' || text === '0' || text === 'off' || text === 'no')
} catch (e) {
return true
}
}
/** 设置语音开关(持久化,影响全站普通播报;紧急插播不受限) */
export function setVoiceEnabled(enabled) {
try {
uni.setStorageSync(VOICE_ENABLED_KEY, enabled ? 'on' : 'off')
} catch (e) {
// 存储失败忽略(本次会话内由页面自身状态兜底)
}
}
let instance = null
class Voice {
@ -19,6 +54,14 @@ class Voice {
// 打断计数:interrupt() 自增。旧音频的异步回调(请求返回/onCanplay/兜底定时器)
// 携带旧 token,比对不一致直接丢弃,避免打断后旧回调把新队列又推进一格
this.token = 0
// 当前正在播报的文本:与队列去重配合,连续扫码时同一句提示不堆积
this.currentText = ''
// 短句音频本地缓存(ttsText -> 本地临时文件路径):同一句第二次起直接播本地,
// 省掉一次 TTS 请求 + 下载,高频短句(如「成功」)延迟从数百毫秒降到几乎无感
this.audioCache = new Map()
this.audioCacheLimit = 30
// 文本 → 上次开始播放的时间戳(同文案冷却用)
this.lastPlayedAt = new Map()
}
/** 仅播放语音(不弹 toast,避免与全局 showToast 拦截器互相递归);多条按 FIFO 串行 */
@ -26,6 +69,10 @@ class Voice {
if (!msg) {
return
}
// 语音开关关闭时普通播报全部不播(紧急插播 playUrgent 不受限)
if (!isVoiceEnabled()) {
return
}
this.enqueue({ kind: 'tts', text: String(msg) })
}
@ -34,6 +81,9 @@ class Voice {
if (!url) {
return
}
if (!isVoiceEnabled()) {
return
}
this.enqueue({ kind: 'audio', url: String(url) })
}
@ -55,11 +105,32 @@ class Voice {
/** 入队;urgent=true 时插队首并打断当前播放 */
enqueue(item, urgent = false) {
const now = Date.now()
// 相同文本去重:连续扫码/高频提示时,队列里已排着同一句就不再追加,
// 否则每次都要走「请求 TTS + 下载 + 播放」,声音会越来越滞后于现场操作
if (!urgent && item && item.kind === 'tts' && item.text) {
const text = String(item.text)
if (this.playing && this.currentText === text) return
const pendingSame = this.queue.some((q) => q && q.kind === 'tts' && String(q.text || '') === text)
if (pendingSame) return
// 同文案冷却:刚播完不久又来了同一句(典型:连续误扫同一拦截码)→ 不重复念
const lastAt = this.lastPlayedAt.get(text)
if (lastAt && now - lastAt < TEXT_COOLDOWN_MS) return
}
item.createdAt = now
if (urgent) {
// 紧急插播:先腾出位置(丢队尾的最新待播),再把本条插到队首,避免自己刚插入就被上限裁掉
while (this.queue.length >= QUEUE_LIMIT) {
this.queue.pop()
}
this.queue.unshift(item)
this.interrupt()
} else {
this.queue.push(item)
// 队列上限:拥塞时丢最旧的待播条目(最新状态的提示更重要)
while (this.queue.length > QUEUE_LIMIT) {
this.queue.shift()
}
}
this.scheduleNext()
}
@ -67,6 +138,7 @@ class Voice {
/** 打断当前播放(不影响队列里其它条目,由 scheduleNext 继续取) */
interrupt() {
this.token++
this.currentText = ''
if (this.finishTimer) {
clearTimeout(this.finishTimer)
this.finishTimer = null
@ -98,6 +170,11 @@ class Voice {
if (!item) {
return
}
// 过期丢弃:拥塞/弱网时排队超时的旧文本提示不再播(原声广播不设过期)
if (item.kind !== 'audio' && item.createdAt && Date.now() - item.createdAt > TEXT_EXPIRE_MS) {
this.scheduleNext()
return
}
this.playing = true
const token = this.token
// 播完/失败统一走 done:期间被 interrupt() 打断(token 变化)则丢弃,
@ -130,9 +207,27 @@ class Voice {
done()
return
}
this.currentText = text
this.recordPlayed(text)
// 末字补句号(两个以加长停顿)+ 下载到本地再播:与打包页 speakViaHttp 行为一致,
// 避免部分 Android 设备播放远程 MP3 时解码丢尾帧导致末字截断
// 部分 Android 设备播放远程 MP3 时解码丢尾帧导致末字截断,故下载到本地再播
const ttsText = text + '。。'
// 命中缓存:直接播本地文件(命中即刷新顺序,配合容量上限做近似 LRU)
const cached = this.audioCache.get(ttsText)
if (cached) {
this.audioCache.delete(ttsText)
this.audioCache.set(ttsText, cached)
// 本地临时文件可能被系统清理:回退远程地址再播一次,仍失败才删缓存
this.playVoiceAudio(cached.localSrc, done, () => {
if (cached.remoteSrc) {
this.playVoiceAudio(cached.remoteSrc, done, () => this.audioCache.delete(ttsText))
} else {
this.audioCache.delete(ttsText)
done()
}
})
return
}
uni.request({
url: VOICE_API + encodeURIComponent(ttsText),
method: 'GET',
@ -148,7 +243,10 @@ class Voice {
}
const src = VOICE_BASE + res.data.audio
this.downloadVoiceAudio(src)
.then((localSrc) => this.playVoiceAudio(localSrc, done))
.then((localSrc) => {
this.cacheAudio(ttsText, { localSrc, remoteSrc: src })
this.playVoiceAudio(localSrc, done, () => this.playVoiceAudio(src, done))
})
.catch(() => this.playVoiceAudio(src, done))
},
fail: (err) => {
@ -158,9 +256,38 @@ class Voice {
})
}
/** 记录文本开始播放时间(同文案冷却),顺带清理过期记录避免内存增长 */
recordPlayed(text) {
const now = Date.now()
this.lastPlayedAt.set(text, now)
if (this.lastPlayedAt.size > 60) {
this.lastPlayedAt.forEach((at, key) => {
if (now - at > TEXT_COOLDOWN_MS) {
this.lastPlayedAt.delete(key)
}
})
}
}
/** 缓存短句音频(本地路径 + 远程地址,供本地失效时回退);超出容量丢弃最早缓存的一条 */
cacheAudio(ttsText, payload) {
if (!ttsText || !payload || !payload.localSrc) {
return
}
if (this.audioCache.has(ttsText)) {
this.audioCache.delete(ttsText)
}
this.audioCache.set(ttsText, payload)
while (this.audioCache.size > this.audioCacheLimit) {
const oldest = this.audioCache.keys().next().value
this.audioCache.delete(oldest)
}
}
/** 一条播完(成功/失败/兜底超时)后继续下一条 */
onPlayFinish() {
this.playing = false
this.currentText = ''
if (this.finishTimer) {
clearTimeout(this.finishTimer)
this.finishTimer = null
@ -190,7 +317,7 @@ class Voice {
}
/** 每次新建音频实例:等缓冲就绪再播放,500ms 兜底;播完回调 onFinish 以串行下一条 */
playVoiceAudio(src, onFinish) {
playVoiceAudio(src, onFinish, onFail) {
try {
if (this.audio) {
try {
@ -228,6 +355,11 @@ class Voice {
}
audio.onError((e) => {
console.log('[voice] audio error:', e)
if (typeof onFail === 'function') {
// 调用方已接管失败后的回退播放,由回退链路负责 finish,避免队列提前推进
onFail()
return
}
finish()
})
audio.onEnded(() => {

View File

@ -59,10 +59,19 @@ uni.showToast = function (options) {
} catch (error) {
// toast 异常时保持原行为
}
// silentVoice: true 表示调用方已主动语音播报(如打包页 speak),此处不再重复播报
if (title && !(isObj && options.silentVoice)) {
// 语音规则(优先级从高到低):
// 1) silentVoice: true → 完全静音(屏幕提示保留)
// 2) voiceText: '短句' → 屏幕显示 title 详情,语音只播 voiceText
// 3) 默认 → 播报 title
// 长句/后端原文整句念会听不清且拖慢队列,高频提示建议用 voiceText 收短
if (isObj && options.silentVoice) {
return result
}
const voiceText = isObj && options.voiceText != null ? String(options.voiceText) : ''
const speakText = voiceText || title
if (speakText) {
try {
getVoice().play(title)
getVoice().play(speakText)
} catch (error) {
console.log('[voice] play fail:', error)
}

View File

@ -379,6 +379,7 @@ import ScanDiagPanel from '@/components/scan-diag-panel.vue'
import NoticeBanner from '@/components/notice-banner.vue'
import NoticeSendDialog from '@/components/notice-send-dialog.vue'
import { getNoticeCenter } from '@/core/notice'
import { clearActiveUnpackSession } from '@/core/unpack-session'
import {
diagAnomaly,
diagBegin,
@ -3591,6 +3592,8 @@ export default {
icon: 'none',
})
}
// 退出工作台模式同样清掉退件拆包会话内存快照(避免换人后恢复上一位的拆包单)
clearActiveUnpackSession()
const wbToken = uni.getStorageSync('workbench_token')
const mainToken = uni.getStorageSync('token')
// 清理工作台会话与操作员缓存

View File

@ -2,6 +2,21 @@
<view class="page returns-page">
<top-nav v-if="!embedded" />
<view class="page-main">
<!-- 作业状态行:始终渲染固定高度(空态显示作业提示),避免失败提示出现/消失时左右面板跳动;
错误文案单行省略,点击展开全文,点 × 清除 -->
<view
class="rp-error-bar"
:class="[
errorNoticeText ? 'rp-error-bar--error' : 'rp-error-bar--idle',
{ 'rp-error-bar--expanded': errorNoticeExpanded }
]"
@click="handleErrorNoticeTap"
>
<view class="rp-error-bar-text">
<text>{{ errorNoticeText || idleNoticeText }}</text>
</view>
<view v-if="errorNoticeText" class="rp-error-bar-close" @click.stop="clearErrorNotice">×</view>
</view>
<view class="rp-layout">
<!-- 左侧:拆包操作表单 -->
<view class="rp-left">
@ -499,6 +514,7 @@ import {
returnUnpackRemoveDetail,
returnUnpackSubmit,
returnUnpackDelete,
returnUnpackDetail,
returnUnpackDetailList,
stockWarehouseSearch,
fetchOrderListByWaybill,
@ -520,6 +536,11 @@ import {
} from '@/api/camera'
import { registerScanReceiver, unregisterScanReceiver, setScanPaused, setScanMinLength, startScanSelfHeal, stopScanSelfHeal } from '@/core/scan'
import { setActiveView } from '@/core/active-view'
import {
clearActiveUnpackSession,
getActiveUnpackSession,
setActiveUnpackSession,
} from '@/core/unpack-session'
import { createHikvisionSnapshotPoller } from '@/core/camera-live'
import ScanDiagPanel from '@/components/scan-diag-panel.vue'
import { diagBegin, diagDrop, diagNote, diagPersistNow, diagSetContext } from '@/core/scan-diag'
@ -558,6 +579,11 @@ const SCAN_MIN_LENGTH_DEFAULT = 5
// 明细分页(前端切片,全量一次取回)
const DETAIL_PAGE_SIZE = 10
// 切页返回时的会话恢复:先用内存快照同步回填,再静默向后端校验
const RESTORE_TIMEOUT_MS = 8000
// 恢复门禁兜底时长:弱网/请求卡住时也不能长期挡住扫码
const RESTORE_GATE_MS = 6000
// ==================== 摄像头(与散单 Web 端 returnUnpackwork 一致) ====================
const CAMERA_STORAGE_KEY = 'returnUnpackWork:selectedCameraIds'
const ACTIVE_CAMERA_STORAGE_KEY = 'returnUnpackWork:activeCameraId'
@ -631,6 +657,10 @@ export default {
// 操作
submitLoading: false,
deleteLoading: false,
// 失败/拦截原因的常驻提示条内容(完整文案,直到下次成功操作或手动关闭)
errorNoticeText: '',
// 提示条是否展开(默认单行省略,点击看全文;用户主动展开引起的跳动可接受)
errorNoticeExpanded: false,
// 通用确认弹窗(替代 uni.showModal:移除明细 / 提交 / 删除拆包共用)
confirmVisible: false,
@ -690,6 +720,9 @@ export default {
// 扫码捕获状态
pageActive: false,
modalBusy: false,
// 会话恢复校验中(内存回填完成、等待后端确认):期间丢弃扫码,
// 避免拿离开前的过期明细去累加/移除
recovering: false,
// 诊断面板(隐藏入口:3 秒内连点标题 5 次)
diagPanelVisible: false,
diagTitleTapAt: 0,
@ -712,6 +745,12 @@ export default {
? '条码无法扫描?手动输入条码'
: '面单无法扫描?手动输入运单号'
},
/** 状态行空态文案(提示条始终渲染,保证高度固定不跳动) */
idleNoticeText() {
return this.createResult && this.createResult.id
? '拆包中:扫描商品条码录入明细'
: '就绪:扫描运单号开始拆包'
},
/** 当前拆包单运单号(用于反查原订单) */
currentWaybill() {
return String(
@ -858,12 +897,14 @@ export default {
},
},
created() {
// 恢复令牌:递增即作废进行中的会话恢复校验(提交流程/页面卸载都会递增)
this._restoreToken = 0
this.loadRemarkOptions()
this.initCameraState()
this.bindKeyboardListener()
},
onLoad() {
// 页面数据不跨会话持久化:每次进入从空白开始
// 拆包单不做跨会话持久化(不落 storage);切页返回的误触恢复由内存会话快照承担
},
onShow() {
this.pageActive = true
@ -892,6 +933,9 @@ export default {
},
onUnload() {
this.pageActive = false
// 独立访问(非布局壳)时同样快照会话,避免离开页面就丢作业
this.persistUnpackSession()
this._restoreToken += 1
diagNote('lifecycle', { hook: 'onUnload' })
this.unregisterScanCapture()
this.clearScanTimers()
@ -928,6 +972,9 @@ export default {
// 嵌入模式(布局壳内组件):App 端无 keep-alive,activated/deactivated 不触发,
// 需在 mounted/beforeUnmount 兜底注册/注销扫码捕获,避免退件页嵌入时无法扫码。
mounted() {
// App 端无 keep-alive(切菜单会卸载本组件):先用内存会话回填,
// 避免误触切页再回来时拆包作业变成空白初始态
this.restoreUnpackSession()
if (!this.embedded) {
return
}
@ -943,6 +990,10 @@ export default {
// #endif
},
beforeUnmount() {
// 卸载前快照当前拆包会话(提交/删除/清除信息已走 resetWorkState 清空,不会残留)
this.persistUnpackSession()
// 作废进行中的恢复校验,避免卸载后回写状态
this._restoreToken += 1
this.teardownImageViewer()
this.unbindKeyboardListener()
if (!this.embedded) {
@ -958,8 +1009,44 @@ export default {
methods: {
// ==================== 通用 ====================
toast(title) {
uni.showToast({ title: String(title || ''), icon: 'none' })
/**
* 通用提示:
* - 第二参传 true 或 { silentVoice: true }:完全静音(只显示不播报);
* - 第二参传 { voiceText: '短句' }:屏幕显示 title 详情,语音只播固定短句;
* - 不传:默认播报 title。
* 高频提示建议给 voiceText,避免长句/后端原文听不清且拖慢语音队列。
*/
toast(title, options) {
const opts = typeof options === 'boolean' ? { silentVoice: options } : options || {}
uni.showToast({ title: String(title || ''), icon: 'none', ...opts })
},
/**
* 失败/拦截提示:页面常驻提示条(完整原因,不会被下一次扫码顶掉)
* + toast(3s、短语音)。适合后端返回的长业务原因、拦截类提示。
*/
fail(title, voiceText) {
this.showErrorNotice(title)
this.toast(title, { voiceText: voiceText || '失败', duration: 3000 })
},
/** 写入常驻提示条(空字符串等同清除) */
showErrorNotice(text) {
this.errorNoticeText = String(text || '').trim()
// 新提示默认单行,避免上一次展开状态把新文案整段摊开改变布局
this.errorNoticeExpanded = false
},
/** 清除常驻提示条(成功操作后 / 用户手动关闭) */
clearErrorNotice() {
this.errorNoticeText = ''
this.errorNoticeExpanded = false
},
/** 点击提示条:有错误文案时展开/收起全文(空态不响应) */
handleErrorNoticeTap() {
if (!this.errorNoticeText) return
this.errorNoticeExpanded = !this.errorNoticeExpanded
},
isUnpacking() {
@ -1456,11 +1543,16 @@ export default {
/** 扫码/输入统一路由:指令条码 → 动作;普通码 → 运单创建或商品快速添加 */
routeScan(cmd, barcode) {
if (this.recovering) {
// 会话恢复校验中:明细可能与后端不一致,先丢弃扫码(通常几百毫秒)
diagDrop('restore-pending', { code: String(barcode || ''), source: 'routeScan' })
return
}
const hasOrder = !!(this.createResult && this.createResult.id)
// 1) 未创建拆包单
if (!hasOrder) {
if (cmd === 'submit' || cmd === 'delete') {
this.toast('当前无拆包单,无法扫码操作')
this.fail('当前无拆包单,无法扫码操作', '没有拆包单')
} else if (cmd) {
// NORMAL/DAMAGED:仍可设置默认状态(为后续拆包做准备)
this.setDefaultStatus(cmd)
@ -1478,7 +1570,7 @@ export default {
}
// 3) 已创建但非拆包中
if (!this.isUnpacking()) {
this.toast('当前拆包单已终态,无法扫码操作')
this.fail('当前拆包单已终态,无法扫码操作', '拆包单已结束')
return
}
// 4) 指令条码
@ -1499,7 +1591,8 @@ export default {
setDefaultStatus(status) {
if (status !== 'normal' && status !== 'damaged') return
this.defaultProductStatus = status
this.toast(status === 'normal' ? '已切换为正常' : '已切换为破损')
// 状态切换是高频操作,只做屏幕提示不播报
this.toast(status === 'normal' ? '已切换为正常' : '已切换为破损', true)
},
// ==================== 创建拆包单 ====================
@ -1508,7 +1601,7 @@ export default {
if (this.createLoading) return
const code = String(this.waybillCode || '').trim()
if (!code) {
this.toast('请输入或扫描运单号')
this.fail('请输入或扫描运单号', '请扫运单号')
return
}
// 输入框路径(手动输入 + 回车):若内容是扫码指令则走指令路由
@ -1538,6 +1631,8 @@ export default {
}
this.defaultProductStatus = 'normal'
this.scanQty = 1
// 开单成功:清掉上一条失败/拦截提示
this.clearErrorNotice()
this.detailPage = 1
this.lastScannedBarcode = ''
this.orderDetailItems = []
@ -1547,7 +1642,8 @@ export default {
'拆包单ID': data.id,
'拆包状态': (this.createResult.record && this.createResult.record.status) || '',
})
uni.showToast({ title: `拆包单创建成功,ID ${data.id}`, icon: 'none' })
// 屏幕保留拆包单 ID;语音只播固定短句,避免逐位读数字拉长播报
uni.showToast({ title: `拆包单创建成功,ID ${data.id}`, icon: 'none', voiceText: '开单成功' })
this.pushOsdText()
this.loadDetailList()
this.loadOrderDetailFallback()
@ -1556,11 +1652,11 @@ export default {
this.requestScanFocus()
// #endif
} else {
this.toast(returnUnpackErrMsg(res, '创建拆包失败'))
this.fail(returnUnpackErrMsg(res, '创建拆包失败'), '开单失败')
}
} catch (e) {
console.error('[returns] create error', e)
this.toast('网络异常,创建拆包失败')
this.fail('网络异常,创建拆包失败', '网络失败')
} finally {
this.createLoading = false
}
@ -1599,12 +1695,12 @@ export default {
const barcode = String(this.detailBarcode || '').trim()
if (!barcode) return
if (!this.currentUnpackId()) {
this.toast('请先创建拆包单')
this.fail('请先创建拆包单', '没有拆包单')
return
}
// 已创建但非拆包中:终态不可再录入
if (!this.isUnpacking()) {
this.toast('当前拆包单已终态,无法扫码操作')
this.fail('当前拆包单已终态,无法扫码操作', '拆包单已结束')
return
}
// 输入框路径:内容为扫码指令时走指令路由
@ -1654,7 +1750,7 @@ export default {
}
} catch (e) {
console.error('[returns] stock search error', e)
this.toast('商品查询失败')
this.fail('商品查询失败', '查询失败')
} finally {
this.quickAddLoading = false
}
@ -1721,6 +1817,7 @@ export default {
})
if (isReturnUnpackOk(res)) {
this.lastScannedBarcode = scannedBarcode
this.clearErrorNotice()
// 本地乐观更新:连续快扫下一笔能立即看到新数量,避免累加重复使用旧值
existing.quantity = newQty
existing._originalQuantity = newQty
@ -1734,10 +1831,12 @@ export default {
uni.showToast({
title: stockId != null ? `相同商品数量已累加 ${qty}` : `相同条码数量已累加 ${qty}`,
icon: 'none',
// 数量变化留在屏幕;语音统一用固定的「成功」短句,避免逐次读长句
voiceText: '成功',
})
this.loadDetailList()
} else {
this.toast(returnUnpackErrMsg(res, '明细累加失败'))
this.fail(returnUnpackErrMsg(res, '明细累加失败'), '添加失败')
}
return
}
@ -1750,6 +1849,7 @@ export default {
})
if (isReturnUnpackOk(res)) {
this.lastScannedBarcode = scannedBarcode
this.clearErrorNotice()
this.pushOsdText()
// 本地乐观插入:连续扫同一商品时,下一笔直接命中累加而不是再新增一行;新扫描的排第一行
const data = pickApiData(res)
@ -1766,17 +1866,20 @@ export default {
_originalQuantity: qty,
_originalRemark: '',
})
uni.showToast({
title: stockId == null ? '未找到匹配商品,已按未识别商品登记' : '明细添加成功',
icon: 'none',
})
if (stockId == null) {
// 未识别商品属需要现场注意的分支:屏幕常驻提示条 + 语音只播「未识别」
this.fail('未找到匹配商品,已按未识别商品登记', '未识别')
} else {
// 高频成功提示:屏幕显示详情,语音只播固定短句
this.toast('明细添加成功', { voiceText: '成功' })
}
this.loadDetailList()
} else {
this.toast(returnUnpackErrMsg(res, '明细添加失败'))
this.fail(returnUnpackErrMsg(res, '明细添加失败'), '添加失败')
}
} catch (e) {
console.error('[returns] add detail error', e)
this.toast('网络异常,明细添加失败')
this.fail('网络异常,明细添加失败', '网络失败')
} finally {
this.scanQty = 1
this.afterQuickAdd()
@ -1972,14 +2075,16 @@ export default {
remark: String(row.remark ?? '').trim(),
})
if (isReturnUnpackOk(res)) {
this.toast('明细保存成功')
// 数量/备注自动保存是高频操作:只做屏幕提示不播报
this.clearErrorNotice()
this.toast('明细保存成功', true)
this.loadDetailList()
} else {
this.toast(returnUnpackErrMsg(res, '明细保存失败'))
this.fail(returnUnpackErrMsg(res, '明细保存失败'), '保存失败')
}
} catch (e) {
console.error('[returns] save detail error', e)
this.toast('网络异常,明细保存失败')
this.fail('网络异常,明细保存失败', '网络失败')
} finally {
this.savingDetailId = null
}
@ -2680,14 +2785,15 @@ export default {
try {
const res = await returnUnpackRemoveDetail({ id: unpackId, detail_id: row.id })
if (isReturnUnpackOk(res)) {
this.toast('明细移除成功')
this.clearErrorNotice()
this.toast('明细移除成功', { voiceText: '已移除' })
this.loadDetailList()
} else {
this.toast(returnUnpackErrMsg(res, '明细移除失败'))
this.fail(returnUnpackErrMsg(res, '明细移除失败'), '移除失败')
}
} catch (e) {
console.error('[returns] remove detail error', e)
this.toast('网络异常,明细移除失败')
this.fail('网络异常,明细移除失败', '网络失败')
} finally {
this.removingDetailId = null
}
@ -2695,7 +2801,167 @@ export default {
// ==================== 拆包单操作 ====================
/** 会话归属:用于丢弃「换人后」残留的内存快照(不落盘、不打印 token) */
currentSessionOwner() {
try {
return String(uni.getStorageSync('token') || uni.getStorageSync('workbench_token') || '')
} catch (e) {
return ''
}
},
/**
* 卸载前把当前拆包会话存进内存单例(白名单字段)。
* 不存:加载锁、扫码队列、弹窗可见性、预览流实例等临时态。
*/
persistUnpackSession() {
// 恢复未完成时不覆盖旧快照,避免把半恢复状态写回
if (this.recovering) return
const owner = this.currentSessionOwner()
if (!owner) {
// 退出登录时 token 已清,此时卸载不再留快照(防止换人后恢复上一位操作员的拆包单)
clearActiveUnpackSession()
return
}
const id = this.currentUnpackId()
if (!id || !this.isUnpacking()) {
clearActiveUnpackSession()
return
}
setActiveUnpackSession({
owner,
id: Number(id),
// 浅拷贝:卸载后未完成的异步回调可能继续改写原对象,快照与运行实例解耦
createResult: this.createResult ? { ...this.createResult } : null,
detailList: (this.detailList || []).map((row) => ({ ...row })),
waybillCode: this.waybillCode,
orderDetailItems: (this.orderDetailItems || []).map((row) => ({ ...row })),
defaultProductStatus: this.defaultProductStatus,
lastScannedBarcode: this.lastScannedBarcode,
detailPage: this.detailPage,
})
},
/** 挂载时同步回填内存快照;返回是否命中恢复 */
restoreUnpackSession() {
this._restoreToken += 1
const token = this._restoreToken
if (this.createResult && this.createResult.id) return false
const session = getActiveUnpackSession()
if (!session || !session.id) return false
const owner = this.currentSessionOwner()
if (!owner || session.owner !== owner) {
// 无登录态或会话不属于当前身份(退出后换人/重新登录):直接丢弃
clearActiveUnpackSession()
return false
}
this.createResult =
session.createResult || {
id: session.id,
record: {},
is_original_return: false,
store_remark: '',
order_items: null,
}
this.detailList = Array.isArray(session.detailList) ? session.detailList : []
this.waybillCode = session.waybillCode || ''
this.orderDetailItems = Array.isArray(session.orderDetailItems) ? session.orderDetailItems : []
this.defaultProductStatus = session.defaultProductStatus === 'damaged' ? 'damaged' : 'normal'
this.lastScannedBarcode = session.lastScannedBarcode || ''
this.detailPage = Number(session.detailPage) > 0 ? Number(session.detailPage) : 1
// 数量不恢复:每次录入后本就会归 1,避免带着上次的数量误录多件
this.scanQty = 1
this.recovering = true
const record = this.createResult.record || {}
diagSetContext({
'当前运单': record.waybill_code || this.waybillCode || '',
'拆包单ID': this.createResult.id,
'拆包状态': record.status || '',
})
diagNote('restore-session', { id: this.createResult.id, status: record.status || '' })
this.verifyRestoredUnpack(this.createResult.id, token)
return true
},
/**
* 恢复后的静默校验(以后端为准):
* 1) 主表已删除/无权限 → 清空并提示重扫;
* 2) 期间被他人提交/作废 → 清空并提示,禁止往终态单里继续录入;
* 3) 仍为拆包中 → 用后端主表数据覆盖本地记录,并重新拉一次明细纠正过期行;
* 4) 网络异常 → 保留内存快照(误触场景下比空白安全),下次操作由后端兜底。
*/
async verifyRestoredUnpack(id, token) {
const release = () => {
if (token === this._restoreToken) this.recovering = false
}
const gateTimer = setTimeout(release, RESTORE_GATE_MS)
try {
const res = await returnUnpackDetail({ id }, { timeout: RESTORE_TIMEOUT_MS })
if (token !== this._restoreToken) return
if (!isReturnUnpackOk(res)) {
this.resetWorkState()
this.fail('上次拆包单已失效,请重新扫描运单号', '拆包单已失效')
return
}
const data = pickApiData(res) || {}
// 主表记录形态容错:{ record: {...} } 包裹 / 直接平铺主表 / 仅单对象
const record =
data.record && typeof data.record === 'object'
? data.record
: data.status != null || data.waybill_code != null || data.unpack_no != null
? data
: null
const status = String((record && record.status) || (this.createResult && this.createResult.record && this.createResult.record.status) || '')
if (status && status !== 'unpacking') {
this.resetWorkState()
this.fail(
status === 'completed' ? '该拆包单已完成,已清空' : '该拆包单已结束,已清空',
'拆包单已结束'
)
return
}
if (record) {
this.createResult = {
...this.createResult,
id: data.id != null ? data.id : id,
record,
is_original_return:
data.is_original_return != null
? !!data.is_original_return
: !!(this.createResult && this.createResult.is_original_return),
store_remark:
data.store_remark != null ? data.store_remark : (this.createResult && this.createResult.store_remark) || '',
order_items: data.order_items !== undefined ? data.order_items : (this.createResult && this.createResult.order_items),
}
diagSetContext({
'当前运单': record.waybill_code || this.waybillCode || '',
'拆包单ID': this.createResult.id,
'拆包状态': record.status || '',
})
}
// 明细以后端为准(离开期间可能被其它端增删改)
await this.loadDetailList()
if (token !== this._restoreToken) return
// 摄像头字幕只在开单/加明细/清空时推送,恢复后补推一次,避免画面仍是上一次的字幕
this.pushOsdText()
// 原单对照缓存缺失时兜底(内部已有「已有数据不重复请求」守卫)
this.loadOrderDetailFallback()
diagNote('restore-verified', { id, status })
} catch (e) {
console.warn('[returns] restore verify error', e)
diagNote('restore-verify-error', { message: String((e && e.message) || e) })
} finally {
clearTimeout(gateTimer)
release()
}
},
resetWorkState() {
// 作废进行中的恢复校验 + 清空内存会话(提交/删除/清除信息都走这里)
this._restoreToken += 1
this.recovering = false
this.clearErrorNotice()
clearActiveUnpackSession()
this.createResult = null
this.detailList = []
this.detailPage = 1
@ -2737,11 +3003,11 @@ export default {
if (!id) return false
const res = await returnUnpackSubmit({ id })
if (isReturnUnpackOk(res)) {
this.toast('提交成功')
this.toast('提交成功', { voiceText: '已提交' })
this.resetWorkState()
return true
}
this.toast(returnUnpackErrMsg(res, '提交失败'))
this.fail(returnUnpackErrMsg(res, '提交失败'), '提交失败')
return false
},
@ -2752,7 +3018,7 @@ export default {
this.doSubmitCore()
.catch((e) => {
console.error('[returns] submit error', e)
this.toast('网络异常,提交失败')
this.fail('网络异常,提交失败', '网络失败')
})
.finally(() => {
this.submitLoading = false
@ -2767,7 +3033,7 @@ export default {
await this.doSubmitCore()
} catch (e) {
console.error('[returns] submit error', e)
this.toast('网络异常,提交失败')
this.fail('网络异常,提交失败', '网络失败')
} finally {
this.submitLoading = false
}
@ -2799,14 +3065,14 @@ export default {
try {
const res = await returnUnpackDelete({ id })
if (isReturnUnpackOk(res)) {
this.toast('删除成功')
this.toast('删除成功', { voiceText: '已删除' })
this.resetWorkState()
} else {
this.toast(returnUnpackErrMsg(res, '删除失败'))
this.fail(returnUnpackErrMsg(res, '删除失败'), '删除失败')
}
} catch (e) {
console.error('[returns] delete error', e)
this.toast('网络异常,删除失败')
this.fail('网络异常,删除失败', '网络失败')
} finally {
this.deleteLoading = false
}
@ -2949,6 +3215,73 @@ export default {
display: flex;
}
/* ==================== 作业状态行(失败/拦截原因常驻) ==================== */
.rp-error-bar {
flex-shrink: 0;
display: flex;
align-items: center;
/* 固定高度:空态/错误态高度一致,出现与消失都不会推动左右面板 */
height: 0.36rem;
margin-bottom: 0.1rem;
padding: 0 0.12rem;
border: 1px solid var(--wms-border-light);
border-radius: var(--wms-radius-sm);
box-sizing: border-box;
}
.rp-error-bar--idle {
background-color: var(--wms-bg-subtle);
}
.rp-error-bar--error {
background-color: #fef0f0;
border-color: var(--wms-danger);
}
.rp-error-bar-text {
flex: 1;
min-width: 0;
font-size: var(--wms-font-sm);
line-height: 0.24rem;
color: var(--wms-text-muted);
/* 单行省略:长文案保持固定高度;点击提示条展开可看全文 */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
}
.rp-error-bar--error .rp-error-bar-text {
color: var(--wms-danger-strong);
}
/* 展开态:高度自适应、文本换行完整显示(用户主动点击触发) */
.rp-error-bar--expanded {
height: auto;
min-height: 0.36rem;
padding-top: 0.06rem;
padding-bottom: 0.06rem;
align-items: flex-start;
}
.rp-error-bar--expanded .rp-error-bar-text {
white-space: normal;
overflow: visible;
text-overflow: clip;
}
/* 关闭按钮用 view 画,避开 uni-button 内置样式(真机 button 背景/字色会被覆盖) */
.rp-error-bar-close {
flex: 0 0 0.3rem;
height: 0.26rem;
line-height: 0.26rem;
margin-left: 0.08rem;
text-align: center;
font-size: 0.24rem;
color: var(--wms-danger-strong);
}
/* ==================== 左侧面板 ==================== */
.rp-left {