feat: 拆包选择商品弹窗增加图片组预览及货主名称,商品行备注改为可持久化下拉并修复输入误判扫码
This commit is contained in:
parent
2dcf4de60a
commit
9c31a5353e
@ -2,7 +2,7 @@
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
title="选择商品"
|
||||
width="760px"
|
||||
width="860px"
|
||||
align-center
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
@ -35,7 +35,28 @@
|
||||
<el-table-column prop="item_code" label="商品编码" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="item_name" label="商品名称" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="barcode" label="条码" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="store_id" label="货主ID" width="90" />
|
||||
<el-table-column label="图片" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<div v-if="row.images && row.images.length" class="picker-images">
|
||||
<el-image
|
||||
v-for="(url, idx) in row.images.slice(0, 3)"
|
||||
:key="url + idx"
|
||||
:src="url"
|
||||
:preview-src-list="row.images"
|
||||
:initial-index="idx"
|
||||
fit="cover"
|
||||
class="picker-image-thumb"
|
||||
preview-teleported
|
||||
hide-on-click-modal
|
||||
/>
|
||||
<span v-if="row.images.length > 3" class="picker-image-more">+{{ row.images.length - 3 }}</span>
|
||||
</div>
|
||||
<span v-else class="picker-image-empty">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="store_name" label="货主" min-width="110" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.store_name || '—' }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<div class="picker-meta">{{ currentRow ? `已选:${formatRowLabel(currentRow)}` : '未选择商品' }}</div>
|
||||
@ -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;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -274,9 +274,22 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="备注" min-width="140">
|
||||
<el-table-column prop="remark" label="备注" min-width="170">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.remark" size="small" placeholder="备注" @change="() => handleAutoSave(row)" />
|
||||
<el-select
|
||||
v-model="row.remark"
|
||||
size="small"
|
||||
clearable
|
||||
filterable
|
||||
allow-create
|
||||
default-first-option
|
||||
placeholder="选择或输入备注"
|
||||
class="remark-select"
|
||||
@change="(v) => handleRemarkChange(row, v)"
|
||||
>
|
||||
<el-option v-for="opt in remarkOptions" :key="opt" :label="opt" :value="opt" />
|
||||
<el-option :value="REMARK_ADD_OPTION_VALUE" label="+ 添加备注选项" class="remark-add-option" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" fixed="right">
|
||||
@ -462,6 +475,23 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 添加备注选项弹窗 -->
|
||||
<el-dialog v-model="remarkAddVisible" title="添加备注选项" width="420px" align-center append-to-body>
|
||||
<el-input
|
||||
v-model="remarkDraft"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
maxlength="500"
|
||||
show-word-limit
|
||||
placeholder="输入新的备注内容,保存后进入下拉选项并应用到当前商品行"
|
||||
@keyup.enter.ctrl="confirmAddRemarkOption"
|
||||
/>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="remarkAddVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" @click="confirmAddRemarkOption">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 商品选择弹窗 -->
|
||||
<StockPickerDialog
|
||||
v-model="stockPickerVisible"
|
||||
@ -1489,6 +1519,8 @@ let scanBuffer = ''
|
||||
let scanSegmentStart = 0 // 当前段开始时间戳
|
||||
let lastScanAt = 0
|
||||
let scanStartSnapshot: { waybill: string; barcode: string } | null = null
|
||||
/** 是否出现过输入间隙(>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<any>(null)
|
||||
const remarkPrevValue = ref('')
|
||||
|
||||
const remarkOptions = ref<string[]>(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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user