diff --git a/src/views/express/returnUnpack/components/StockPickerDialog.vue b/src/views/express/returnUnpack/components/StockPickerDialog.vue
index cb733ef3..2051e679 100644
--- a/src/views/express/returnUnpack/components/StockPickerDialog.vue
+++ b/src/views/express/returnUnpack/components/StockPickerDialog.vue
@@ -2,7 +2,7 @@
-
+
+
+
+
+ +{{ row.images.length - 3 }}
+
+ —
+
+
+
+ {{ row.store_name || '—' }}
+
{{ currentRow ? `已选:${formatRowLabel(currentRow)}` : '未选择商品' }}
@@ -64,6 +85,10 @@ export type StockPickerItem = {
item_name: string
barcode: string
store_id?: number
+ /** 货主名称(store_stock.store_remask / store_name 等) */
+ store_name?: string
+ /** 商品图片地址列表 */
+ images?: string[]
}
const PICKER_LIST_PAGE_SIZE = 50
@@ -98,6 +123,46 @@ watch(visible, (opened) => {
})
})
+/** 商品图片列表(兼容 images / image_url 及 store_stock / stock / goods 嵌套) */
+function extractImages(mapped: any, row: any): string[] {
+ const candidates = [
+ mapped?.images,
+ mapped?.image_url,
+ row?.images,
+ row?.image_url,
+ row?.store_stock?.images,
+ row?.store_stock?.image_url,
+ row?.stock?.images,
+ row?.goods?.images,
+ ]
+ for (const candidate of candidates) {
+ if (Array.isArray(candidate)) {
+ const urls = candidate
+ .map((v: any) => String(v ?? '').trim())
+ .filter(Boolean)
+ if (urls.length) return urls
+ }
+ }
+ return []
+}
+
+/** 货主名称(优先 store_stock.store_remask,其次 store_name / store_remask) */
+function extractStoreName(mapped: any, row: any): string {
+ const candidates = [
+ row?.store_stock?.store_remask,
+ row?.store_stock?.store_name,
+ mapped?.store_name,
+ mapped?.store_remask,
+ row?.store_name,
+ row?.store_remask,
+ ]
+ for (const candidate of candidates) {
+ const text = String(candidate ?? '').trim()
+ if (text) return text
+ }
+ return ''
+}
+
function mapRow(row: any): StockPickerItem | null {
const mapped = mapStockPickerItem(row)
const id = Number(mapped.item_id)
@@ -109,6 +174,8 @@ function mapRow(row: any): StockPickerItem | null {
item_name: String(mapped.item_name ?? ''),
barcode: String(mapped.barcode ?? ''),
store_id: Number.isFinite(storeId) && storeId > 0 ? storeId : undefined,
+ store_name: extractStoreName(mapped, row),
+ images: extractImages(mapped, row),
}
}
@@ -295,4 +362,30 @@ onUnmounted(() => {
font-size: 13px;
color: #606266;
}
+
+.picker-images {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 4px;
+ flex-wrap: nowrap;
+}
+
+.picker-image-thumb {
+ width: 28px;
+ height: 28px;
+ border-radius: 3px;
+ flex-shrink: 0;
+ cursor: zoom-in;
+}
+
+.picker-image-more {
+ font-size: 12px;
+ color: #909399;
+ flex-shrink: 0;
+}
+
+.picker-image-empty {
+ color: #c0c4cc;
+}
diff --git a/src/views/express/returnUnpackwork/index.vue b/src/views/express/returnUnpackwork/index.vue
index 84311081..e86a680e 100644
--- a/src/views/express/returnUnpackwork/index.vue
+++ b/src/views/express/returnUnpackwork/index.vue
@@ -274,9 +274,22 @@
-
+
- handleAutoSave(row)" />
+
@@ -462,6 +475,23 @@
+
+
+
+
+ 取消
+ 保存
+
+
+
300ms 重新开段):间隙中断代表手工输入,回车时不按扫码处理 */
+let scanHasMultiSegment = false
/** 是否扫码枪可输出字符(单个可打印 ASCII,排除功能键/方向键/组合键) */
function isScanPrintableChar(e: KeyboardEvent): boolean {
@@ -1661,6 +1693,8 @@ function handleKeydown(e: KeyboardEvent) {
const now = Date.now()
if (now - scanSegmentStart > SCAN_SEGMENT_GAP_MS) {
// 新的一段输入:记录快照(扫码字符会进入输入框,路由前回滚)
+ // 已有累积缓冲却被重新开段 = 存在停顿,视为手工输入(扫码枪不会中途停顿)
+ if (scanBuffer) scanHasMultiSegment = true
scanBuffer = e.key
scanSegmentStart = now
scanStartSnapshot = { waybill: waybillCode.value, barcode: detailBarcode.value }
@@ -1671,12 +1705,14 @@ function handleKeydown(e: KeyboardEvent) {
return
}
if (e.key === 'Enter') {
- // 一段连续输入 + 回车 → 判定为扫码(整段总时长在阈值内)
- if (scanBuffer.length >= SCAN_MIN_LEN
- && Date.now() - scanSegmentStart <= SCAN_SEGMENT_MAX_MS) {
+ // 一段连续输入 + 回车 → 判定为扫码(整段总时长在阈值内,且中途无停顿)
+ const scanBufferLength = scanBuffer.length
+ const scanBufferFresh = Date.now() - scanSegmentStart <= SCAN_SEGMENT_MAX_MS
+ if (scanBufferLength >= SCAN_MIN_LEN && scanBufferFresh && !scanHasMultiSegment) {
const barcode = scanBuffer
scanBuffer = ''
scanSegmentStart = 0
+ scanHasMultiSegment = false
lastScanAt = Date.now()
e.preventDefault()
// 回滚扫码期间写入输入框的内容,恢复扫码前快照
@@ -1691,6 +1727,7 @@ function handleKeydown(e: KeyboardEvent) {
// 非扫码回车:重置缓冲,交给下方原有 Enter 逻辑(输入框 @keyup.enter)
scanBuffer = ''
scanSegmentStart = 0
+ scanHasMultiSegment = false
scanStartSnapshot = null
}
}
@@ -1832,6 +1869,91 @@ function isDetailModified(row: any): boolean {
return quantityChanged || remarkChanged
}
+// ==================== 备注下拉选项(localStorage 持久化) ====================
+const REMARK_OPTIONS_STORAGE_KEY = 'returnUnpack:remarkOptions'
+/** 下拉中「添加备注选项」的占位值(仅用于触发弹窗,不写入数据) */
+const REMARK_ADD_OPTION_VALUE = '__add_remark_option__'
+const remarkAddVisible = ref(false)
+const remarkDraft = ref('')
+/** 待应用新备注的目标明细行及弹窗打开前的原备注 */
+const remarkPendingRow = ref(null)
+const remarkPrevValue = ref('')
+
+const remarkOptions = ref(loadRemarkOptions())
+
+function loadRemarkOptions(): string[] {
+ try {
+ const raw = localStorage.getItem(REMARK_OPTIONS_STORAGE_KEY)
+ if (!raw) return []
+ const parsed = JSON.parse(raw)
+ if (!Array.isArray(parsed)) return []
+ return parsed
+ .map((v: any) => String(v ?? '').trim())
+ .filter(Boolean)
+ } catch {
+ return []
+ }
+}
+
+function persistRemarkOptions() {
+ try {
+ localStorage.setItem(REMARK_OPTIONS_STORAGE_KEY, JSON.stringify(remarkOptions.value))
+ } catch {
+ // 存储失败忽略
+ }
+}
+
+/** 新增备注选项(去重),返回规范化后的值 */
+function addRemarkOption(text: string): string {
+ const value = String(text ?? '').trim()
+ if (!value) return ''
+ if (!remarkOptions.value.some((o) => o === value)) {
+ remarkOptions.value.push(value)
+ persistRemarkOptions()
+ }
+ return value
+}
+
+/** 备注下拉变更:拦截「添加备注选项」,其余值自动入库 localStorage 并保存明细 */
+function handleRemarkChange(row: any, value: string) {
+ if (value === REMARK_ADD_OPTION_VALUE) {
+ remarkPendingRow.value = row
+ remarkPrevValue.value = String(row._lastRemark ?? row.remark ?? '')
+ remarkDraft.value = ''
+ remarkAddVisible.value = true
+ // 回退占位值,避免脏值写入
+ row.remark = remarkPrevValue.value
+ return
+ }
+ row._lastRemark = value || ''
+ if (value) addRemarkOption(value)
+ handleAutoSave(row)
+}
+
+/** 弹窗确定:新增备注选项并应用到目标明细行 */
+function confirmAddRemarkOption() {
+ const value = String(remarkDraft.value ?? '').trim()
+ if (!value) {
+ ElMessage.warning('请输入备注内容')
+ return
+ }
+ if (value.length > 500) {
+ ElMessage.warning('备注最长 500 字符')
+ return
+ }
+ addRemarkOption(value)
+ const row = remarkPendingRow.value
+ if (row) {
+ row.remark = value
+ row._lastRemark = value
+ handleAutoSave(row)
+ }
+ remarkAddVisible.value = false
+ remarkDraft.value = ''
+ remarkPendingRow.value = null
+ remarkPrevValue.value = ''
+}
+
function handleAutoSave(row: any) {
if (!isDetailModified(row)) return
handleSaveDetail(row)
@@ -2411,6 +2533,14 @@ async function confirmRemoveDetail() {
width: 100%;
}
+.remark-select {
+ width: 100%;
+}
+
+.remark-add-option {
+ color: #409eff;
+}
+
.detail-pagination {
margin-top: 8px;
justify-content: flex-end;