diff --git a/src/api/index.ts b/src/api/index.ts index e7aaf01..40c9f6d 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -210,3 +210,21 @@ export function finishPack(token: string, options?: RequestOptions) { ...options, }) } + +/** + * 称重-按运单号查询订单(index.toOrder) + * 与散单 Web / WMS_PDA 端称重页一致:入参运单号,返回订单 ID(order_id)与波次信息(waves)。 + */ +export function fetchOrderByWaybill( + waybillCode: string, + options?: RequestOptions +) { + return request( + 'index.toOrder', + { + ...workerPayload, + waybill_code: waybillCode, + }, + options + ) +} diff --git a/src/api/order.ts b/src/api/order.ts index b07a3e4..418ab88 100644 --- a/src/api/order.ts +++ b/src/api/order.ts @@ -438,3 +438,25 @@ export function bindExpressPackageMaterialByWaybill( options ) } + +/** + * 称重-按订单 ID 查询订单详情(order.detail,dispatch 视图) + * 与 WMS_PDA 称重页一致:返回 detail(订单头:wave_no / pick_status / recheck_status / + * pack_status / items_weight)、items(商品明细)、expresses(运单列表,含 waybill_code 与 + * weighing_weight)。 + * @param orderId 订单 ID(index.toOrder 返回的 order_id) + */ +export function fetchOrderDetailForWeigh( + orderId: number | string, + options?: RequestOptions +) { + return request( + 'order.detail', + { + ...workerPayload, + order_id: orderId, + tableType: 'dispatch', + }, + options + ) +} diff --git a/src/core/scan.js b/src/core/scan.js index 131be9e..832555d 100644 --- a/src/core/scan.js +++ b/src/core/scan.js @@ -82,6 +82,10 @@ let plusShiftPrev = false let plusLetterCase = 'auto' let plusLetterCaseLag = 1 let plusKeyEventType = null +// 按键去重(替代事件类型锁定):同一键 keydown/keyup 成对到达只处理一次 +let prevPlusKeyCode = 0 +let prevPlusKeyType = '' +let prevPlusKeyAt = 0 function debug(...args) { if (receiver && typeof receiver.onScanDebug === 'function') { @@ -362,13 +366,8 @@ function isPlusEnterKey(keyCode, text) { function handlePlusKeyEvent(event, type) { const keyCode = Number((event && event.keyCode) || 0) - const gap = markKeyArrival('plus', { keyCode, type }) - // 空闲后重新锁定实际生效的事件类型:自愈「锁错就永久静默」 - if (plusKeyEventType && gap > IDLE_LOCK_RESET_MS) { - const locked = plusKeyEventType - plusKeyEventType = null - diagHeal('event-type-lock-idle-reset', { scope: receiverScope(), locked, gapMs: gap }) - } + const now = Date.now() + markKeyArrival('plus', { keyCode, type }) if (!receiver || paused) { diagDrop(receiver ? 'paused' : 'no-receiver', { scope: receiverScope(), @@ -401,21 +400,21 @@ function handlePlusKeyEvent(event, type) { return } - // 锁定实际生效的事件类型,避免 keydown/keyup 都触发时把一个键记两次 - if (!plusKeyEventType) { - plusKeyEventType = type - } - if (plusKeyEventType !== type) { - // 这一类丢弃最致命(整串码会丢),必须带上已收到的内容 - diagDrop('event-type-locked', { + // 去重:同一键的 keydown/keyup 成对到达(type 不同 + keyCode 相同 + 间隔 <20ms)只处理一次。 + // 不再锁定单一事件类型:真机 keydown/keyup 触发不稳定,锁错会丢字符, + // 导致「广播扫描还没扫完就发送、首扫不完整」 + if (prevPlusKeyCode === keyCode && prevPlusKeyType !== type && now - prevPlusKeyAt < 20) { + diagDrop('plus-dedup', { scope: receiverScope(), keyCode, type, - locked: plusKeyEventType, dropped: bufferTail(), }) return } + prevPlusKeyCode = keyCode + prevPlusKeyType = type + prevPlusKeyAt = now if (text) { const now = Date.now() @@ -467,6 +466,9 @@ function removePlusListener() { // #endif plusAttached = false plusKeyEventType = null + prevPlusKeyCode = 0 + prevPlusKeyType = '' + prevPlusKeyAt = 0 plusShiftDown = false plusShiftPrev = false diagSetGates({ plusAttached: false }) @@ -522,6 +524,9 @@ export function setScanPaused(value) { resetBuffer() } else { plusKeyEventType = null + prevPlusKeyCode = 0 + prevPlusKeyType = '' + prevPlusKeyAt = 0 } } @@ -550,7 +555,7 @@ export function getScanDiagState() { paused, receiver: !!receiver, plusAttached, - eventTypeLock: plusKeyEventType, + eventTypeLock: 'keycode-dedup', minLength, bufferLength: buffer.length, lastKeyAgoMs: lastAnyKeyAt ? Date.now() - lastAnyKeyAt : null, @@ -580,7 +585,7 @@ export function startScanSelfHeal(intervalMs) { paused, receiver: !!receiver, plusAttached, - eventTypeLock: plusKeyEventType || 'none', + eventTypeLock: 'keycode-dedup', idleSec: lastAnyKeyAt ? Math.round((now - lastAnyKeyAt) / 1000) : 'never', }, // 真机:Window 焦点 / 输入法状态(决定按键能否到达 WebView),H5 返回空对象 diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue index e4eb9e2..582e9c7 100644 --- a/src/pages/order/index.vue +++ b/src/pages/order/index.vue @@ -423,37 +423,37 @@ 复核流程 - 先打印后复核 - 先复核后打印 - 不打印 + 先打印后复核 + 先复核后打印 + 不打印 称重模式 - 称重 - 不称重 + 称重 + 不称重 绑定包材 - 开启 - 关闭 + 开启 + 关闭 包材软键盘 - 激活 - 不激活 + 激活 + 不激活 发货模式 - 自动发货 - 手动发货 + 自动发货 + 手动发货 @@ -5912,7 +5912,6 @@ export default { display: flex; align-items: center; justify-content: space-between; - gap: 0.15rem; padding: 0.15rem 0.04rem; border-bottom: 0.01rem solid #f0f2f6; } @@ -5931,23 +5930,27 @@ export default { display: flex; align-items: center; flex-wrap: wrap; + /* 按钮间隔走 gap(真机已实测可用) */ + gap: 0.2rem; + margin-left: 0.15rem; } .setting-seg-item { - margin-right: 0.08rem; + display: flex; + align-items: center; + justify-content: center; padding: 0.05rem 0.25rem; font-size: 0.21rem; color: var(--wms-text-secondary); - background-color: var(--wms-card-bg); - border: 0.01rem solid var(--wms-border-alt); + /* 未选中态用浅灰底(而非白底):真机 rem 缩放后边框几乎不可见、白底与弹窗同色, + 按钮之间会“糊成一片”看不出间隔;浅灰底让每个按钮边界清晰可见 */ + background-color: var(--wms-bg-subtle); + border: 0.01rem solid var(--wms-border); border-radius: 0.07rem; cursor: pointer; user-select: none; white-space: nowrap; -} - -.setting-seg-item:last-child { - margin-right: 0; + box-sizing: border-box; } .setting-seg-item--on { diff --git a/src/pages/weighing/index.vue b/src/pages/weighing/index.vue index 9878305..a7ff428 100644 --- a/src/pages/weighing/index.vue +++ b/src/pages/weighing/index.vue @@ -2,18 +2,150 @@ - - - 称重 - 称重模块页面(待对接业务接口) + + + + + 快递号 + + + ✕ + + + + + + {{ querying ? '查询中…' : '请输入快递号查询' }} + + + + + + + + + + 扫描记录 + + + 暂无扫描记录 + + + {{ record.text }} + {{ record.time }} + + + + + @@ -69,36 +670,380 @@ export default { } .page-main { - overflow-y: auto; + overflow: hidden; /* 页边距收窄到一半(12.5px),与订单复核页一致 */ padding-left: 0.125rem; padding-right: 0.125rem; padding-bottom: 0.125rem; } -.dynamic-view--catch-weight { +.weigh-container { width: 100%; + height: 100%; + min-height: 0; + display: flex; + flex-direction: row; + overflow: hidden; } -.module-card { +.weigh-left { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + overflow: hidden; +} + +.weigh-right { + flex-shrink: 0; + width: 3.8rem; + margin-left: 0.15rem; + display: flex; + flex-direction: column; +} + +.tool-btn { + height: 0.36rem; + line-height: 0.36rem; + padding: 0 0.15rem; + margin: 0; + font-size: 0.18rem; + border: 0.01rem solid var(--wms-border-alt); + border-radius: 0.07rem; + background-color: var(--wms-card-bg); + color: var(--wms-text); +} + +.tool-btn--confirm { + background-color: #34c759; + border-color: #34c759; + color: var(--wms-white); +} + +.tool-btn--blue { + background-color: var(--wms-primary); + border-color: var(--wms-primary); + color: var(--wms-white); +} + +.tool-btn[disabled] { + color: var(--wms-text-secondary); + background-color: #f2f2f2; + border-color: var(--wms-border-alt); + cursor: not-allowed; +} + +/* ==================== 搜索栏 ==================== */ +.search-card { + display: flex; + align-items: center; + margin-bottom: 0.1rem; + padding: 0.1rem 0.15rem; + background-color: var(--wms-card-bg); + border-radius: 0.07rem; +} + +.search-card-label { + flex-shrink: 0; + margin-right: 0.15rem; + font-size: 0.2rem; + font-weight: 600; + color: var(--wms-text); +} + +.search-input-wrap { + flex: 1; + min-width: 0; + margin-right: 0.15rem; + position: relative; + display: flex; + align-items: center; +} + +.search-input { + flex: 1; + min-width: 0; + height: 0.36rem; + line-height: 0.36rem; + border: 0.01rem solid #e5e5e5; + border-radius: 0.07rem; + padding: 0 0.4rem 0 0.15rem; + font-size: 0.2rem; background-color: var(--wms-card-bg); - border-radius: 0.13rem; - padding: 0.25rem; box-sizing: border-box; } -.module-card-title { - display: block; - font-size: 0.22rem; - color: var(--wms-text); - font-weight: 600; +.search-clear { + position: absolute; + right: 0.08rem; + width: 0.28rem; + height: 0.28rem; + line-height: 0.28rem; + text-align: center; + font-size: 0.18rem; + color: var(--wms-text-placeholder); + cursor: pointer; + user-select: none; +} + +.search-input-placeholder { + font-size: 0.17rem; + color: var(--wms-text-placeholder); +} + +/* ==================== 空状态 ==================== */ +.empty-panel { + flex: 1; + display: flex; + align-items: center; + justify-content: center; + min-height: 1.2rem; + box-sizing: border-box; + border: 0.01rem solid #e6ebf5; + border-radius: 0.07rem; + background-color: var(--wms-card-bg); + color: var(--wms-text-placeholder); + font-size: 0.2rem; +} + +/* ==================== 卡片通用 ==================== */ +.card { + background-color: var(--wms-card-bg); + border-radius: 0.07rem; + margin-bottom: 0.1rem; + padding: 0.15rem; + box-sizing: border-box; +} + +.card-head { + display: flex; + align-items: center; + justify-content: space-between; margin-bottom: 0.1rem; } -.module-card-desc { - display: block; +.card-title { + font-size: 0.21rem; + font-weight: 600; + color: var(--wms-text); +} + +/* 订单类型标签 */ +.order-type-tag { + padding: 0.03rem 0.15rem; + font-size: 0.17rem; + border-radius: 0.07rem; +} + +.order-type-tag--group { + color: var(--wms-primary); + background-color: #eaf2ff; +} + +.order-type-tag--single { + color: var(--wms-warning); + background-color: #fff3e6; +} + +/* ==================== 订单信息栅格 ==================== */ +.info-grid { + display: flex; + flex-wrap: wrap; +} + +.info-row { + display: flex; + align-items: center; + box-sizing: border-box; + padding: 0.08rem 0; +} + +.info-row:nth-child(odd) { + width: 60%; +} + +.info-row:nth-child(even) { + width: 40%; +} + +.info-label { + flex-shrink: 0; + width: 1.2rem; font-size: 0.18rem; - color: #888; - line-height: 1.5; + color: var(--wms-text-muted); +} + +.info-value { + flex: 1; + min-width: 0; + font-size: 0.22rem; + color: var(--wms-text); + word-break: break-all; +} + +.info-value--ok { + color: var(--wms-success); +} + +.info-value--warn { + color: var(--wms-warning); +} + +/* ==================== 称重卡片 ==================== */ +.weigh-unit-hint { + font-size: 0.16rem; + color: #000000; +} + +.weigh-stepper { + display: flex; + align-items: center; + margin-bottom: 0.3rem; +} + +.weigh-required { + flex-shrink: 0; + margin-right: 0.05rem; + color: var(--wms-danger-strong); + font-size: 0.21rem; + line-height: 1; +} + +.weigh-input-label { + flex-shrink: 0; + margin-right: 0.15rem; + font-size: 0.2rem; + color: var(--wms-text); +} + +.weigh-step-btn { + flex-shrink: 0; + height: 0.36rem; + padding: 0 0.15rem; + margin-right: 0.05rem; + display: flex; + align-items: center; + justify-content: center; + border: 0.01rem solid var(--wms-border-alt); + border-radius: 0.07rem; + background-color: var(--wms-card-bg); + color: var(--wms-text); + font-size: 0.25rem; + user-select: none; +} + +.weigh-stepper > .weigh-step-btn:last-child { + margin-right: 0; +} + +.weigh-step-btn:active { + background-color: #f0f2f5; +} + +.weigh-input { + flex: 1; + min-width: 0; + height: 0.36rem; + line-height: 0.36rem; + margin-right: 0.05rem; + text-align: center; + border: 0.01rem solid var(--wms-border-alt); + border-radius: 0.07rem; + font-size: 0.3rem; + color: var(--wms-text); + background-color: var(--wms-card-bg); + box-sizing: border-box; +} + +.weigh-input-placeholder { + font-size: 0.2rem; + color: var(--wms-text-placeholder); +} + +.weigh-actions { + display: flex; + align-items: center; + justify-content: flex-end; +} + +.weigh-actions > * { + margin-left: 0.15rem; +} + +.weigh-actions > *:first-child { + margin-left: 0; +} + +/* ==================== 扫描记录(参考打包模式页面) ==================== */ +.scan-record-card { + flex: 1; + min-height: 0; + margin-bottom: 0; + padding: 0; + overflow: hidden; + display: flex; + flex-direction: column; +} + +.scan-record-head { + flex-shrink: 0; + background-color: var(--wms-primary); + padding: 0.08rem 0.15rem; +} + +.scan-record-title { + font-size: 0.22rem; + font-weight: 600; + color: var(--wms-white); +} + +.scan-record-body { + flex: 1; + min-height: 0; + display: flex; + flex-direction: column; +} + +.scan-record-empty { + flex: 1; + min-height: 1.2rem; + display: flex; + align-items: center; + justify-content: center; + font-size: 0.2rem; + color: #bbb; +} + +.scan-record-scroll { + flex: 1; + min-height: 0; +} + +.scan-record-item { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.08rem 0.15rem; + border-bottom: 0.01rem solid #f4f4f4; +} + +.scan-record-item--even { + background-color: #e6effd; +} + +.scan-record-text { + flex: 1; + min-width: 0; + font-size: 0.22rem; + color: var(--wms-text); + text-align: left; + word-break: break-all; +} + +.scan-record-time { + flex-shrink: 0; + margin-left: 0.15rem; + font-size: 0.17rem; + color: #aaa; }