feat: 优化序列号相关字段的展示与交互逻辑
- 调整InboundEntry组件中序列号字段的显示名称和值展示 - 修改Station组件中接驳台数据的请求处理逻辑,适配返回格式 - 更新ProductType页面的序列号字段展示和表单选项,优化用户理解 - 更新各系统的入口脚本文件
This commit is contained in:
@@ -24,9 +24,9 @@
|
||||
<el-table-column label="类型" width="100">
|
||||
<template #default="{row}">{{ row.manageMode === 1 ? '结构件' : row.manageMode === 2 ? '电气件' : (row.manageMode === 3 ? '其他' : '-') }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序列号件" width="100">
|
||||
<template #default="{row}">{{ row.snMode === 1 ? '序列号件' : row.snMode === 2 ? '批次件' : '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序列号" width="100" align="center">
|
||||
<template #default="{row}"><el-tag size="small" :type="row.snMode === 1 ? 'warning' : 'success'">{{ row.snMode === 1 ? '是' : row.snMode === 2 ? '否' : '-' }}</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="isActive" label="启用" width="80">
|
||||
<template #default="{row}"><el-tag :type="row.isActive?'success':'info'">{{ row.isActive?'是':'否' }}</el-tag></template>
|
||||
</el-table-column>
|
||||
@@ -70,11 +70,11 @@
|
||||
<el-option :value="3" label="其他" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="序列号件" required>
|
||||
<el-form-item label="序列号" required>
|
||||
<el-select v-model="dialog.snMode" style="width:100%" placeholder="请选择">
|
||||
<el-option :value="0" label="请选择" disabled />
|
||||
<el-option :value="1" label="序列号件" />
|
||||
<el-option :value="2" label="批次件" />
|
||||
<el-option :value="1" label="是(序列号件·逐件录SN)" />
|
||||
<el-option :value="2" label="否(批次件·按数量)" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="启用"><el-switch v-model="dialog.isActive" /></el-form-item>
|
||||
@@ -167,7 +167,7 @@ async function save() {
|
||||
if (!trim(dialog.unit)) return ElMessage.warning('单位为必填项')
|
||||
if (!dialog.id && !trim(dialog.code)) return ElMessage.warning('图号为必填项(创建后不可改)')
|
||||
if (![1, 2, 3].includes(dialog.manageMode)) return ElMessage.warning('请选择类型')
|
||||
if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号件(序列号件/批次件)')
|
||||
if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择是否有序列号(是=序列号件 / 否=批次件)')
|
||||
const body = {
|
||||
name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), description: dialog.description,
|
||||
manageMode: dialog.manageMode, snMode: dialog.snMode, isActive: dialog.isActive
|
||||
|
||||
@@ -120,9 +120,11 @@ const flows = ref([])
|
||||
const dockByStation = ref({})
|
||||
|
||||
async function loadDocks() {
|
||||
const data = await request.get('/docks', { params: { page: 1, size: 200 } })
|
||||
// GET /docks 返回裸数组(接驳台全量,非分页包裹),直接取数组本身
|
||||
const data = await request.get('/docks')
|
||||
const list = Array.isArray(data) ? data : (data?.list || [])
|
||||
const map = {}
|
||||
for (const d of data?.list || []) {
|
||||
for (const d of list) {
|
||||
const no = Number(d.stationNo) || 0
|
||||
if (no <= 0) continue
|
||||
;(map[no] = map[no] || []).push(d.dockCode)
|
||||
|
||||
Reference in New Issue
Block a user