This commit is contained in:
zlwu committed 2026-06-25 12:41:07 +08:00
1 parent 66609c0e21
commit 0b50eff3d8
93 files changed
+40172 -30060

No files matched your search

@@ -135,7 +135,7 @@
<div class="shelf-cells">
<div
class="shelf-cell shelf-cell--add"
title="在此行前面增加格子"
title="在此行末尾增加格子"
@click="handleAddSlotInRow(ri)"
>
<span class="add-icon">+</span>
@@ -215,11 +215,11 @@
<el-form-item label="节点名称" prop="nodeName">
<el-input v-model="nodeFormData.nodeName" placeholder="请输入节点名称" />
</el-form-item>
<el-form-item prop="nodeCode">
<el-form-item>
<template #label>
节点编号<span class="form-label-tip">单段字母或数字,不含连字符</span>
节点编号<span class="form-label-tip">可选</span>
</template>
<el-input v-model="nodeFormData.nodeCode" placeholder="如 1、03、A" />
<el-input v-model="nodeFormData.nodeCode" placeholder="可不填" />
</el-form-item>
<el-form-item label="节点类型">
<el-select v-model="nodeFormData.nodeType" placeholder="请选择节点类型">
@@ -278,15 +278,17 @@
<el-form
ref="slotFormRef"
:model="slotFormData"
:rules="slotFormRules"
label-position="top"
class="storage-dialog-form"
scroll-to-error
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
>
<div class="form-grid-2">
<el-form-item label="本地编码(行-列)" prop="slotCode">
<el-input v-model="slotFormData.slotCode" placeholder="如 1-3" />
<el-form-item>
<template #label>
本地编码(序号)<span class="form-label-tip">可选</span>
</template>
<el-input v-model="slotFormData.slotCode" placeholder="可不填" />
</el-form-item>
<el-form-item label="格子状态">
<el-select v-model="slotFormData.slotStatus" placeholder="请选择状态">
@@ -357,9 +359,9 @@
将生成 <strong>{{ batchForm.rows * batchForm.cols }}</strong> 个格子({{
batchForm.rows
}}
行 × {{ batchForm.cols }} 列)
行 × {{ batchForm.cols }} 列),本地序号从 <strong>1</strong> 起依次编号
<template v-if="batchPreviewCode">
,示例编号:<strong>{{ batchPreviewCode }}</strong>
,示例完整编号:<strong>{{ batchPreviewCode }}</strong>
</template>
</div>
</div>
@@ -625,22 +627,24 @@
<el-form
ref="occupancySlotFormRef"
:model="occupancySlotFormData"
:rules="occupancySlotFormRules"
label-position="top"
class="storage-dialog-form"
scroll-to-error
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
>
<div class="form-grid-2">
<el-form-item label="完整编号" class="form-col-span-2">
<div class="form-grid-3">
<el-form-item label="完整编号">
<el-input
:model-value="currentSlot?.fullSlotCode || '—'"
readonly
placeholder="保存后自动生成"
/>
</el-form-item>
<el-form-item label="本地编码(行-列)" prop="slotCode">
<el-input v-model="occupancySlotFormData.slotCode" placeholder="如 1-3" />
<el-form-item>
<template #label>
本地编码(序号)<span class="form-label-tip">可选</span>
</template>
<el-input v-model="occupancySlotFormData.slotCode" placeholder="可不填" />
</el-form-item>
<el-form-item label="格子状态">
<el-select v-model="occupancySlotFormData.slotStatus" placeholder="请选择状态">
@@ -734,7 +738,13 @@
fetchRemoveOccupancy
} from '@/api/admin'
import { buildTreePathLabelFromFlat } from '@/utils/tree-path'
import { buildNodeCodePathFromFlat } from '@/utils/storage-slot-options'
import {
buildNodeCodePathFromFlat,
decodeSlotLayoutOrder,
getStorageSlotOrderNum,
parseLegacyRowColSlotCode,
SLOT_LAYOUT_ROW_STRIDE
} from '@/utils/storage-slot-options'
defineOptions({ name: 'StorageFacility' })
@@ -877,7 +887,7 @@
}
}
// ==================== 货架行计算(按 slotCode 中的行号分组) ====================
// ==================== 货架行计算(按 order_num 布局分组) ====================
const batchForm = reactive({
rows: 4,
cols: 6
@@ -886,23 +896,51 @@
const batchPreviewCode = computed(() => {
if (!selectedNode.value?.id) return ''
const path = buildNodeCodePathFromFlat(selectedNode.value.id, flatList.value)
if (!path) return ''
return `${path}-1-1`
const total = Number(batchForm.rows) * Number(batchForm.cols)
const local = total <= 1 ? '1' : `1…${total}`
return path ? `${path}-${local}` : local
})
/** 解析 slotCode "{prefix}{row}-{col}" 格式,提取行号和列号 */
const parseSlotCode = (code: string): { prefix: string; row: number; col: number } | null => {
const match = code.match(/^(.*?)(\d+)-(\d+)$/)
if (!match) return null
return { prefix: match[1], row: parseInt(match[2], 10), col: parseInt(match[3], 10) }
}
const sortSlotsForShelf = (slots: any[]) =>
[...slots].sort((a, b) => {
const oa = getStorageSlotOrderNum(a)
const ob = getStorageSlotOrderNum(b)
if (oa !== ob) return oa - ob
const na = parseInt(String(a.slotCode || ''), 10) || 0
const nb = parseInt(String(b.slotCode || ''), 10) || 0
return na - nb
})
const shelfRows = computed(() => {
const sorted = sortSlotsForShelf(slotList.value)
const hasLayoutOrder = sorted.some((slot) => getStorageSlotOrderNum(slot) >= SLOT_LAYOUT_ROW_STRIDE)
if (hasLayoutOrder) {
const rowMap = new Map<number, any[]>()
for (const slot of sorted) {
const { row } = decodeSlotLayoutOrder(getStorageSlotOrderNum(slot))
if (!rowMap.has(row)) rowMap.set(row, [])
rowMap.get(row)!.push(slot)
}
return [...rowMap.entries()]
.sort(([a], [b]) => a - b)
.map(([rowNum, cells], index) => ({
label: String(index + 1),
rowNum,
prefix: '',
cells: cells.sort(
(a, b) =>
decodeSlotLayoutOrder(getStorageSlotOrderNum(a)).col -
decodeSlotLayoutOrder(getStorageSlotOrderNum(b)).col
)
}))
}
// 兼容旧版「行-列」本地编码
const rowMap = new Map<number, { prefix: string; cells: any[] }>()
const ungrouped: any[] = []
for (const slot of slotList.value) {
const parsed = parseSlotCode(slot.slotCode || '')
for (const slot of sorted) {
const parsed = parseLegacyRowColSlotCode(slot.slotCode || '')
if (parsed) {
if (!rowMap.has(parsed.row)) {
rowMap.set(parsed.row, { prefix: parsed.prefix, cells: [] })
@@ -913,14 +951,11 @@
}
}
// 按行号排序,每个行内按列号排序
const result: { label: string; cells: any[]; rowNum: number; prefix: string }[] = []
const sortedEntries = [...rowMap.entries()].sort(([a], [b]) => a - b)
for (const [rowNum, data] of sortedEntries) {
for (const [rowNum, data] of [...rowMap.entries()].sort(([a], [b]) => a - b)) {
data.cells.sort((a, b) => {
const pa = parseSlotCode(a.slotCode || '')
const pb = parseSlotCode(b.slotCode || '')
const pa = parseLegacyRowColSlotCode(a.slotCode || '')
const pb = parseLegacyRowColSlotCode(b.slotCode || '')
return (pa?.col ?? 0) - (pb?.col ?? 0)
})
result.push({
@@ -931,7 +966,6 @@
})
}
// 无法解析编码的格子归入末尾
if (ungrouped.length > 0) {
result.push({
label: String(result.length + 1),
@@ -962,22 +996,8 @@
remark: ''
})
const validateNodeCode = (_rule: unknown, value: string, callback: (err?: Error) => void) => {
const v = (value || '').trim()
if (!v) {
callback(new Error('请输入节点编号'))
return
}
if (!/^[A-Za-z0-9]+$/.test(v)) {
callback(new Error('编号只能包含字母和数字,不能含连字符'))
return
}
callback()
}
const nodeFormRules = {
nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
nodeCode: [{ required: true, validator: validateNodeCode, trigger: 'blur' }]
nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }]
}
const handleAddRoot = () => {
@@ -1106,10 +1126,6 @@
remark: ''
})
const slotFormRules = {
slotCode: [{ required: true, message: '请输入格子编码', trigger: 'blur' }]
}
const handleEditSlot = (row: any) => {
isSlotEdit.value = true
slotDialogTitle.value = '编辑格子'
@@ -1218,25 +1234,17 @@
// ==================== 单独新增行/格子 ====================
const addSlotLoading = ref(false)
/** 在指定行前面追加一个格子 */
/** 在指定行末尾追加一个格子 */
const handleAddSlotInRow = async (rowIndex: number) => {
if (!selectedNode.value?.id || addSlotLoading.value) return
const row = shelfRows.value[rowIndex]
if (!row) return
// 计算该行下一个列号
let nextCol = 1
for (const cell of row.cells) {
const parsed = parseSlotCode(cell.slotCode || '')
if (parsed && parsed.col >= nextCol) nextCol = parsed.col + 1
}
const slotCode = `${row.rowNum}-${nextCol}`
addSlotLoading.value = true
try {
await fetchCreateStorageSlot({
facilityNodeId: selectedNode.value.id,
slotCode,
atRowNum: row.rowNum,
slotStatus: '空'
})
ElMessage.success('新增格子成功')
@@ -1356,9 +1364,6 @@
slotStatus: '空',
remark: ''
})
const occupancySlotFormRules = {
slotCode: [{ required: true, message: '请输入格子编码', trigger: 'blur' }]
}
const handleOccupancySlotSave = async () => {
await occupancySlotFormRef.value?.validate?.()