提交
This commit is contained in:
@@ -18,6 +18,7 @@ const fileTypeOptions = [
|
||||
{ value: 'PROCESS_CARD', label: '流程卡' },
|
||||
{ value: 'PACKAGE_PHOTO', label: '包装照片' },
|
||||
{ value: 'EXCEL_IMPORT', label: 'Excel导入' },
|
||||
{ value: 'IMAGE', label: '图片' },
|
||||
{ value: 'OTHER', label: '其他' }
|
||||
]
|
||||
const bizTypeOptions = [
|
||||
|
||||
@@ -8,6 +8,7 @@ import { can } from '../utils/perm'
|
||||
import { confirmAction } from '../utils/confirm'
|
||||
import { exportXlsxFetch } from '../utils/export'
|
||||
import { getToken } from '../utils/auth'
|
||||
import { InfoFilled } from '@element-plus/icons-vue'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import AttachmentPanel from '../components/AttachmentPanel.vue'
|
||||
import { helpZone, helpMaterial } from '../help'
|
||||
@@ -203,13 +204,13 @@ async function saveNode() {
|
||||
|
||||
/* ---------- 区域维护:位置号批量生成 ---------- */
|
||||
const batchDialog = ref(false)
|
||||
const batchForm = reactive({ zoneCode: '', shelfNo: '', layerNo: '', posStart: 1, posEnd: 1 })
|
||||
const batchForm = reactive({ zoneCode: '', shelfNo: '', layerNo: '', count: 1 })
|
||||
const batchPreview = ref([])
|
||||
const batchPreviewing = ref(false)
|
||||
const batchSubmitting = ref(false)
|
||||
|
||||
function openBatchGen() {
|
||||
Object.assign(batchForm, { zoneCode: '', shelfNo: '', layerNo: '', posStart: 1, posEnd: 1 })
|
||||
Object.assign(batchForm, { zoneCode: '', shelfNo: '', layerNo: '', count: 1 })
|
||||
bShelf.value = []; bLayer.value = []
|
||||
batchPreview.value = []
|
||||
batchDialog.value = true
|
||||
@@ -223,14 +224,17 @@ async function onBatchRegionChange() {
|
||||
// 选定货架后加载该货架下已存在的层(只能选具体层,批量生成只生成位置、不创建父级层)
|
||||
async function onBatchShelfChange() {
|
||||
batchForm.layerNo = ''
|
||||
await loadLayerOpts(bLayer, batchForm.zoneCode, batchForm.shelfNo)
|
||||
}
|
||||
async function previewBatch() {
|
||||
if (!batchForm.zoneCode || !batchForm.shelfNo) { ElMessage.warning('请选择区域与货架'); return }
|
||||
if (!batchForm.layerNo) { ElMessage.warning('请选择具体的层'); return }
|
||||
if (!batchForm.layerNo) { ElMessage.warning('请填写层号'); return }
|
||||
if (!batchForm.count || batchForm.count < 1) { ElMessage.warning('请填写生成数量(≥1)'); return }
|
||||
batchPreviewing.value = true
|
||||
try {
|
||||
const data = await request.post('/zone/batch-generate', { ...batchForm, preview: true })
|
||||
const data = await request.post('/zone/batch-generate', {
|
||||
zoneCode: batchForm.zoneCode, shelfNo: batchForm.shelfNo,
|
||||
layerNo: (batchForm.layerNo || '').toUpperCase(), count: batchForm.count, level: 4, preview: true
|
||||
})
|
||||
batchPreview.value = data?.list || []
|
||||
} finally {
|
||||
batchPreviewing.value = false
|
||||
@@ -242,11 +246,12 @@ async function submitBatch() {
|
||||
batchSubmitting.value = true
|
||||
try {
|
||||
const data = await request.post('/zone/batch-generate', {
|
||||
...batchForm, preview: false,
|
||||
zoneCode: batchForm.zoneCode, shelfNo: batchForm.shelfNo,
|
||||
layerNo: (batchForm.layerNo || '').toUpperCase(), count: batchForm.count, level: 4, preview: false,
|
||||
// 提交时带上预览表里(可能被手改过的)位置名称,后端优先采用
|
||||
positions: batchPreview.value.map((x) => ({ positionNo: x.positionNo, positionName: x.positionName }))
|
||||
})
|
||||
ElMessage.success(`已生成 ${data?.created || 0} 个位置,跳过已存在 ${data?.skipped || 0} 个`)
|
||||
ElMessage.success(`生成 ${data?.created || 0} 个,跳过 ${data?.skipped || 0} 个`)
|
||||
batchDialog.value = false
|
||||
zoneTabLoaded[4] = false
|
||||
if (activeZoneTab.value === 4) await loadNodes(4)
|
||||
@@ -340,6 +345,18 @@ async function toggleMatStatus(row) {
|
||||
} catch { /* request 层已提示 */ }
|
||||
}
|
||||
|
||||
// C4 反向:手动重推单条到 MES(对齐 MES 物料同步失败标记设计,不做自动重推)
|
||||
const retryingId = ref(null)
|
||||
async function retrySync(row) {
|
||||
retryingId.value = row.id
|
||||
try {
|
||||
await request.post('/material/retry-sync', { id: row.id })
|
||||
ElMessage.success(`已重推 ${row.code} 到 MES`)
|
||||
loadMaterials()
|
||||
} catch { /* request 层已提示 */ }
|
||||
finally { retryingId.value = null }
|
||||
}
|
||||
|
||||
async function loadMaterials() {
|
||||
materialLoading.value = true
|
||||
try {
|
||||
@@ -534,6 +551,29 @@ function pickMaterialFile() {
|
||||
matFileRef.value?.click()
|
||||
}
|
||||
|
||||
// 导入模板下载(2026-10-21):与导入同权限(material:import),GET /api/material/import-template
|
||||
async function downloadMaterialTemplate() {
|
||||
try {
|
||||
const res = await fetch('/api/material/import-template', {
|
||||
headers: { Authorization: 'Bearer ' + getToken() }
|
||||
})
|
||||
if (!res.ok) {
|
||||
const body = await res.json().catch(() => null)
|
||||
ElMessage.error('模板下载失败:' + (body?.message || `服务器错误(${res.status})`))
|
||||
return
|
||||
}
|
||||
const blob = await res.blob()
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = '物料档案导入模板.xlsx'
|
||||
a.click()
|
||||
URL.revokeObjectURL(url)
|
||||
} catch {
|
||||
ElMessage.error('模板下载失败:网络异常,请稍后重试')
|
||||
}
|
||||
}
|
||||
|
||||
async function onMaterialFile(e) {
|
||||
const file = e.target.files?.[0]
|
||||
e.target.value = '' // 允许重复选择同一文件
|
||||
@@ -779,7 +819,8 @@ async function onMaterialFile(e) {
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table :data="nodeState[4].list" border size="small" v-loading="nodeState[4].loading" row-key="id" empty-text="暂无位置号">
|
||||
<el-table-column label="区域" min-width="110"><template #default="{ row }">{{ row.zoneName || row.zoneCode || '-' }}</template></el-table-column>
|
||||
<el-table-column prop="zoneCode" label="区域编码" width="110" align="center"><template #default="{ row }">{{ row.zoneCode || '-' }}</template></el-table-column>
|
||||
<el-table-column label="区域名称" min-width="120"><template #default="{ row }">{{ row.zoneName || '-' }}</template></el-table-column>
|
||||
<el-table-column label="货架号" width="90" align="center"><template #default="{ row }">{{ row.shelfNo || '-' }}</template></el-table-column>
|
||||
<el-table-column label="层" width="70" align="center"><template #default="{ row }">{{ row.layerNo || '-' }}</template></el-table-column>
|
||||
<el-table-column prop="code" label="位置号" width="90" align="center" />
|
||||
@@ -853,16 +894,14 @@ async function onMaterialFile(e) {
|
||||
<el-option v-for="s in bShelf" :key="s.code" :value="s.code" :label="s.code" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="层" required>
|
||||
<el-select v-model="batchForm.layerNo" placeholder="请选择具体的层" filterable :disabled="!batchForm.shelfNo" style="width:100%" @visible-change="(v) => onDropdownOpen(v, () => loadLayerOpts(bLayer, batchForm.zoneCode, batchForm.shelfNo))">
|
||||
<el-option v-for="l in bLayer" :key="l.code" :value="l.code" :label="'层 '+l.code" />
|
||||
</el-select>
|
||||
<div style="color:#909399;font-size:12px;margin-top:4px">只能选择已存在的层;批量生成只在该层下生成位置号,不会创建父级层。</div>
|
||||
<el-form-item label="层号" required>
|
||||
<el-input v-model="batchForm.layerNo" placeholder="如 A、L1、2(字母或数字均可)" clearable style="width:220px"
|
||||
@input="batchForm.layerNo = (batchForm.layerNo || '').toUpperCase()" />
|
||||
<div style="color:#909399;font-size:12px;margin-top:4px">层号放开:可填字母或数字(如 A、L1、2);该层若不存在将自动创建。</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="位置范围">
|
||||
<el-input-number v-model="batchForm.posStart" :min="0" :step="1" step-strictly controls-position="right" style="width:120px" />
|
||||
<span style="margin:0 8px">至</span>
|
||||
<el-input-number v-model="batchForm.posEnd" :min="0" :step="1" step-strictly controls-position="right" style="width:120px" />
|
||||
<el-form-item label="生成数量" required>
|
||||
<el-input-number v-model="batchForm.count" :min="1" :max="2000" :step="1" step-strictly controls-position="right" style="width:160px" />
|
||||
<span style="margin-left:10px;color:#909399;font-size:12px">从「该层已存在的最大位置号 +1」起连续生成</span>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="batchPreviewing" @click="previewBatch">预览</el-button>
|
||||
@@ -870,7 +909,7 @@ async function onMaterialFile(e) {
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table v-if="batchPreview.length" :data="batchPreview" border size="small" max-height="300">
|
||||
<el-table-column prop="layerNo" label="层" width="80" align="center" />
|
||||
<el-table-column prop="layerNo" label="层号" width="90" align="center" />
|
||||
<el-table-column prop="positionNo" label="位置号" width="100" align="center" />
|
||||
<el-table-column label="位置名称" min-width="200">
|
||||
<template #default="{ row }">
|
||||
@@ -977,9 +1016,36 @@ async function onMaterialFile(e) {
|
||||
<el-button v-if="can('material:create')" type="success" @click="openMatCreate">新增物料档案</el-button>
|
||||
<el-button v-if="can('material:import')" type="warning" :loading="matImporting" @click="pickMaterialFile">导入</el-button>
|
||||
<el-button v-if="can('material:export')" :loading="matExporting" @click="exportMaterials">导出</el-button>
|
||||
<el-tooltip v-if="can('material:import')" content="Excel 首行表头按名称识别(列顺序可变、可含多余列):图号 | 名称 | 规格 | 单位 | 类型(结构件/电气件/其他) | 物料类别(原材料/成品/其他,可选;半成品不是物料类别) | 说明(除「说明」「物料类别」外均为必填)">
|
||||
<el-link type="info" :underline="false" style="margin-left:4px">导入说明</el-link>
|
||||
</el-tooltip>
|
||||
<el-popover v-if="can('material:import')" placement="bottom-start" :width="680" trigger="hover">
|
||||
<template #reference>
|
||||
<el-icon style="margin-left:6px;cursor:pointer;color:#909399;font-size:17px;vertical-align:middle"><InfoFilled /></el-icon>
|
||||
</template>
|
||||
<div style="max-height:62vh;overflow:auto">
|
||||
<div style="font-weight:600;margin-bottom:6px">一、字段说明(Excel 首行表头按名称识别,列顺序可变、可含多余列)</div>
|
||||
<table style="width:100%;border-collapse:collapse;font-size:12px" border>
|
||||
<thead><tr style="background:#f5f7fa"><th>列</th><th>字段</th><th>必填</th><th>格式</th><th>说明</th></tr></thead>
|
||||
<tbody>
|
||||
<tr><td style="text-align:center">1</td><td>图号</td><td style="text-align:center">是</td><td>字符串,唯一</td><td>物料唯一标识,不可重复</td></tr>
|
||||
<tr><td style="text-align:center">2</td><td>名称</td><td style="text-align:center">是</td><td>字符串</td><td>物料名称</td></tr>
|
||||
<tr><td style="text-align:center">3</td><td>规格</td><td style="text-align:center">是</td><td>字符串</td><td>规格型号</td></tr>
|
||||
<tr><td style="text-align:center">4</td><td>单位</td><td style="text-align:center">是</td><td>字符串</td><td>如「个」「件」「套」</td></tr>
|
||||
<tr><td style="text-align:center">5</td><td>类型</td><td style="text-align:center">是</td><td>结构件/电气件/其他</td><td>决定出入库按数量还是按序列号记账</td></tr>
|
||||
<tr><td style="text-align:center">6</td><td>物料类别</td><td style="text-align:center">否</td><td>原材料/成品</td><td>留空默认原材料(半成品不是物料类别)</td></tr>
|
||||
<tr><td style="text-align:center">7</td><td>说明</td><td style="text-align:center">否</td><td>字符串</td><td>备注</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div style="font-weight:600;margin:10px 0 4px">二、常见错误</div>
|
||||
<div style="font-size:12px;color:#606266;line-height:1.9">
|
||||
· 图号重复:系统中已存在相同图号,该行被拒绝<br/>
|
||||
· 类型不在枚举内:必须填「结构件」「电气件」「其他」之一(兼容 1/2/3)<br/>
|
||||
· 物料类别不在枚举内:只能填「原材料」或「成品」<br/>
|
||||
· 必填列为空:该行被拒绝;任一行出错则整批回退,一行不写
|
||||
</div>
|
||||
<div style="font-weight:600;margin:10px 0 4px">三、下载模板</div>
|
||||
<el-button size="small" type="primary" @click="downloadMaterialTemplate">下载模板</el-button>
|
||||
<span style="font-size:12px;color:#909399;margin-left:8px">建议先下载模板,按模板格式填写后导入</span>
|
||||
</div>
|
||||
</el-popover>
|
||||
<input ref="matFileRef" type="file" accept=".xlsx,.xls" style="display:none" @change="onMaterialFile" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -1022,10 +1088,17 @@ async function onMaterialFile(e) {
|
||||
<el-table-column label="创建时间" width="155" align="center">
|
||||
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="170" align="center" fixed="right">
|
||||
<el-table-column label="同步状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.syncPending" type="danger" size="small">同步失败</el-tag>
|
||||
<el-tag v-else type="success" size="small">正常</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="200" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="can('material:edit')" type="primary" size="small" @click="openMatEdit(row)">编辑</el-button>
|
||||
<el-button link type="primary" size="small" @click="openMatAttach(row)">附件</el-button>
|
||||
<el-button v-if="can('material:edit') && row.syncPending" link type="danger" size="small" :loading="retryingId === row.id" @click="retrySync(row)">重推</el-button>
|
||||
<el-popconfirm :title="row.isActive !== false ? '确认停用该物料?' : '确认启用该物料?'" @confirm="toggleMatStatus(row)">
|
||||
<template #reference>
|
||||
<el-button link :type="row.isActive !== false ? 'warning' : 'success'" size="small">{{ row.isActive !== false ? '停用' : '启用' }}</el-button>
|
||||
|
||||
@@ -127,7 +127,7 @@ function openDlg() {
|
||||
dlgVisible.value = true
|
||||
}
|
||||
async function submit() {
|
||||
if (!form.stationNo || !form.orderNo) return ElMessage.warning('工位号与工单号必填')
|
||||
if (!form.stationNo || !form.orderNo) return ElMessage.warning('工位号与产品工号必填')
|
||||
if (!form.materialCode.trim()) return ElMessage.warning('物料编码必填')
|
||||
if (!form.qty || form.qty <= 0) return ElMessage.warning('退回数量须大于 0')
|
||||
if (!form.reason.trim()) return ElMessage.warning('质量原因必填')
|
||||
@@ -171,8 +171,8 @@ onMounted(() => {
|
||||
<!-- 筛选 + 操作(查询/重置统一) -->
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="search">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="filters.orderNo" placeholder="工单号" clearable style="width:160px" @keyup.enter="search" />
|
||||
<el-form-item label="产品工号">
|
||||
<el-input v-model="filters.orderNo" placeholder="产品工号" clearable style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码">
|
||||
<el-input v-model="filters.materialCode" placeholder="图号/物料编码(不区分大小写)" clearable style="width:190px" @keyup.enter="search" />
|
||||
@@ -193,7 +193,7 @@ onMounted(() => {
|
||||
<el-card shadow="never">
|
||||
<el-table :data="list" border size="small" v-loading="loading" empty-text="暂无生产退不良记录">
|
||||
<el-table-column prop="returnNo" label="退不良单号" min-width="160" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="140" />
|
||||
<el-table-column prop="orderNo" label="产品工号" min-width="140" />
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="materialCode" label="物料编码" min-width="150" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="140">
|
||||
@@ -236,8 +236,8 @@ onMounted(() => {
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="关联工单号" required>
|
||||
<el-input v-model="form.orderNo" placeholder="MES 工单号(溯源)" />
|
||||
<el-form-item label="关联产品工号" required>
|
||||
<el-input v-model="form.orderNo" placeholder="MES 产品工号(溯源)" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
<el-option v-for="f in EVENT_FAMILIES" :key="f.value" :label="f.label" :value="f.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="对象类型">
|
||||
<el-select v-model="filters.entityType" clearable style="width:150px" placeholder="全部">
|
||||
<el-option v-for="e in ENTITY_TYPES" :key="e.value" :label="e.label" :value="e.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isAdmin" label="操作人">
|
||||
<el-input v-model="filters.operator" clearable style="width:130px" placeholder="用户名"
|
||||
@keyup.enter="onSearch" />
|
||||
@@ -65,14 +70,14 @@ import { helpEventLog } from '../help'
|
||||
// 事件类型按"族前缀"归类(写点处 eventType 形如 user.create / inbound.create …)
|
||||
// 登录/退出(auth.*)不属于操作日志,后端已排除、本页也不提供该筛选项
|
||||
const EVENT_FAMILIES = [
|
||||
{ label: '账号管理', value: 'user.' },
|
||||
{ label: '角色管理', value: 'role.' },
|
||||
{ label: '权限初始化', value: 'rbac.' },
|
||||
{ label: '账号', value: 'user.' },
|
||||
{ label: '角色', value: 'role.' },
|
||||
{ label: '权限', value: 'rbac.' },
|
||||
{ label: '物料档案', value: 'material.' },
|
||||
{ label: '区域维护', value: 'zone.' },
|
||||
{ label: '入库', value: 'inbound.' },
|
||||
{ label: '出库', value: 'outbound.' },
|
||||
{ label: '质量检验', value: 'inspection.' },
|
||||
{ label: '检验', value: 'inspection.' },
|
||||
{ label: '库存盘点', value: 'stocktake.' },
|
||||
{ label: '半成品', value: 'semi.' },
|
||||
{ label: '成品入库', value: 'finished.' },
|
||||
@@ -97,6 +102,29 @@ const ENTITY_LABEL = {
|
||||
disk: '磁盘', log: '日志文件'
|
||||
}
|
||||
|
||||
// 对象类型筛选选项(与后端 entityType 写入值一致)
|
||||
const ENTITY_TYPES = [
|
||||
{ label: '账号', value: 'user' },
|
||||
{ label: '角色', value: 'role' },
|
||||
{ label: '权限', value: 'rbac' },
|
||||
{ label: '物料', value: 'material' },
|
||||
{ label: '区域', value: 'zone' },
|
||||
{ label: '入库', value: 'inbound' },
|
||||
{ label: '出库', value: 'outbound' },
|
||||
{ label: '检验', value: 'inspection' },
|
||||
{ label: '盘点', value: 'stocktake' },
|
||||
{ label: '半成品', value: 'semi' },
|
||||
{ label: '成品', value: 'finished' },
|
||||
{ label: '附件', value: 'attachment' },
|
||||
{ label: 'AGV任务', value: 'agv_task' },
|
||||
{ label: '叫料单', value: 'material_request' },
|
||||
{ label: '工单物料台账', value: 'order_material_ledger' },
|
||||
{ label: '退库单', value: 'return_order' },
|
||||
{ label: '库存', value: 'inventory' },
|
||||
{ label: '磁盘', value: 'disk' },
|
||||
{ label: '日志文件', value: 'log' }
|
||||
]
|
||||
|
||||
function familyName(evt) {
|
||||
const k = Object.keys(FAMILY_LABEL).find((p) => evt && evt.startsWith(p))
|
||||
return k ? FAMILY_LABEL[k] : (evt || '-')
|
||||
@@ -115,7 +143,7 @@ function entityIdLabel(row) {
|
||||
return v || '-'
|
||||
}
|
||||
|
||||
const filters = reactive({ eventType: '', operator: '' })
|
||||
const filters = reactive({ eventType: '', entityType: '', operator: '' })
|
||||
// 仅 admin 可按操作人筛选/查看全部;普通用户后端强制只返回自己的日志
|
||||
const isAdmin = computed(() => getUser()?.role === 'admin')
|
||||
const range = ref(null) // [开始,结束] YYYY-MM-DD
|
||||
@@ -135,6 +163,7 @@ async function load() {
|
||||
try {
|
||||
const params = { page: page.current, pageSize: page.size }
|
||||
if (filters.eventType) params.eventType = filters.eventType
|
||||
if (filters.entityType) params.entityType = filters.entityType
|
||||
if (filters.operator) params.operator = filters.operator
|
||||
if (range.value && range.value.length === 2) {
|
||||
params.from = toUnix(range.value[0])
|
||||
@@ -154,6 +183,7 @@ function onSearch() {
|
||||
}
|
||||
function onReset() {
|
||||
filters.eventType = ''
|
||||
filters.entityType = ''
|
||||
filters.operator = ''
|
||||
range.value = null
|
||||
page.current = 1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup>
|
||||
// 手工成品入库(方案A 定稿:完工检合格才入成品库)
|
||||
// 成品入库双通道之一:库房对完工检合格的成品手工建档入库(另一通道为 MES 完工检合格自动回流内部接口)。
|
||||
// 独立页面实现:字段口径=成品入库九字段(SN/图号/归属/产品状态/相关标准/试验记录单号/记录员/记录日期/工单号),
|
||||
// 独立页面实现:字段口径=成品入库九字段(SN/图号/归属/产品状态/相关标准/试验记录单号/记录员/记录日期/产品工号),
|
||||
// 复用全项目公共组件(MaterialSelect / PageHelp),提交成功后暂存附件随 SN 上传(照入库附件上传模式)。
|
||||
defineOptions({ name: 'FinishedInbound' })
|
||||
import { onMounted, reactive, ref } from 'vue'
|
||||
@@ -30,7 +30,7 @@ const form = reactive(newForm())
|
||||
const staged = ref([]) // 暂存附件(提交成功后随 SN 上传,bizType=finished)
|
||||
const submitting = ref(false)
|
||||
|
||||
// 选产品编码(物料档案远程搜索)自动带出名称,可手改
|
||||
// 选产品序号(物料档案远程搜索)自动带出名称,可手改
|
||||
function onMaterialChange(m) {
|
||||
form.productName = m?.name || ''
|
||||
}
|
||||
@@ -55,7 +55,7 @@ async function uploadStaged(sn) {
|
||||
async function submit() {
|
||||
const sn = form.sn.trim()
|
||||
if (!sn) { ElMessage.warning('请扫描或输入 SN'); return }
|
||||
if (!form.productCode) { ElMessage.warning('请选择产品编码(物料档案)'); return }
|
||||
if (!form.productCode) { ElMessage.warning('请选择产品序号(物料档案)'); return }
|
||||
if (!form.productStatus) { ElMessage.warning('请选择产品状态(已通过/部分通过/返修)'); return }
|
||||
if (!form.recordedBy.trim()) { ElMessage.warning('请填写记录员'); return }
|
||||
if ((form.ownershipType === 'workorder' || form.ownershipType === 'project') && !form.ownershipNo.trim()) {
|
||||
@@ -148,12 +148,12 @@ onMounted(loadList)
|
||||
<el-input v-model="form.sn" autofocus clearable
|
||||
placeholder="扫描或输入成品 SN(扫码枪回车即填),全局唯一" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品编码">
|
||||
<el-form-item label="产品序号">
|
||||
<MaterialSelect v-model="form.productCode" :item-type="3" placeholder="远程搜索成品档案(编码/名称)"
|
||||
@item-change="onMaterialChange" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称">
|
||||
<el-input v-model="form.productName" placeholder="选产品编码后自动带出,可修改" clearable />
|
||||
<el-input v-model="form.productName" placeholder="选产品序号后自动带出,可修改" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="归属">
|
||||
<div style="display:flex;gap:8px;width:100%">
|
||||
@@ -213,7 +213,7 @@ onMounted(loadList)
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="sn" label="SN" min-width="160" />
|
||||
<el-table-column prop="materialCode" label="产品编码" min-width="120" />
|
||||
<el-table-column prop="materialCode" label="产品序号" min-width="120" />
|
||||
<el-table-column prop="materialName" label="产品名称" min-width="110">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -3,10 +3,12 @@ defineOptions({ name: 'Inbound' })
|
||||
import { onActivated, onMounted, reactive, ref } from 'vue'
|
||||
import { useRoute, useRouter } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { InfoFilled } from '@element-plus/icons-vue'
|
||||
import request from '../utils/request'
|
||||
import { fmtTime } from '../utils/format'
|
||||
import { exportXlsxFetch } from '../utils/export'
|
||||
import { can } from '../utils/perm'
|
||||
import { getToken } from '../utils/auth'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
import AttachmentPanel from '../components/AttachmentPanel.vue'
|
||||
import InboundEntry from '../components/InboundEntry.vue'
|
||||
@@ -61,6 +63,29 @@ async function importExcel(mode, which) {
|
||||
}
|
||||
}
|
||||
|
||||
// 导入模板下载(2026-10-21):GET /api/inbound/import-template?mode=batch|sn,批次号由系统自动生成,模板不含该列
|
||||
async function downloadInboundTemplate(mode) {
|
||||
try {
|
||||
const res = await fetch(`/api/inbound/import-template?mode=${mode}`, {
|
||||
headers: { Authorization: 'Bearer ' + getToken() }
|
||||
})
|
||||
if (!res.ok) {
|
||||
const body = await res.json().catch(() => null)
|
||||
ElMessage.error('模板下载失败:' + (body?.message || `服务器错误(${res.status})`))
|
||||
return
|
||||
}
|
||||
const blob = await res.blob()
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = mode === 'sn' ? '入库序列号导入模板.xlsx' : '入库批次导入模板.xlsx'
|
||||
a.click()
|
||||
URL.revokeObjectURL(url)
|
||||
} catch {
|
||||
ElMessage.error('模板下载失败:网络异常,请稍后重试')
|
||||
}
|
||||
}
|
||||
|
||||
/* ===================== 入库记录(统一主表 + 抽屉明细,不分页内嵌子表) ===================== */
|
||||
// 查询条件
|
||||
const filters = reactive({ inboundNo: '', materialCode: '', manageMode: '', materialName: '', voided: '', inspectionNo: '', ownershipNo: '', productWorkNo: '' })
|
||||
@@ -272,15 +297,78 @@ onActivated(() => {
|
||||
<!-- ============ Tab 批量导入(按序列号:序列号=否 / 序列号=是) ============ -->
|
||||
<el-tab-pane label="批量导入" name="excel" lazy>
|
||||
<el-card shadow="never">
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:12px"
|
||||
title="导入与物料「类型」页签无关:按物料档案「序列号」(按序列号=是/否分流)分流——序列号=否 走批次模板、序列号=是 走 SN 模板;任一行错误则整体回退" />
|
||||
<div style="display:flex;align-items:center;margin-bottom:12px">
|
||||
<span style="font-weight:600">Excel 批量导入(任一行错误则整体回退,一行不写)</span>
|
||||
<el-popover placement="bottom-start" :width="720" trigger="hover">
|
||||
<template #reference>
|
||||
<el-icon style="margin-left:6px;cursor:pointer;color:#909399;font-size:17px"><InfoFilled /></el-icon>
|
||||
</template>
|
||||
<div style="max-height:62vh;overflow:auto">
|
||||
<div style="font-weight:600;margin-bottom:4px">一、导入模式</div>
|
||||
<div style="font-size:12px;color:#606266;line-height:1.9">
|
||||
· 按批次导入:适用于序列号=否(按批次记账)的物料(如结构件)<br/>
|
||||
· 按序列号导入:适用于序列号=是(按 SN 记账)的物料(如电气件)<br/>
|
||||
系统按物料档案「序列号」自动校验分流,与「类型」页签无关;模式选错整批拒绝。
|
||||
</div>
|
||||
<div style="font-weight:600;margin:10px 0 4px">二、字段说明——按批次导入(首行表头忽略)</div>
|
||||
<table style="width:100%;border-collapse:collapse;font-size:12px" border>
|
||||
<thead><tr style="background:#f5f7fa"><th>列</th><th>字段</th><th>必填</th><th>格式</th><th>说明</th></tr></thead>
|
||||
<tbody>
|
||||
<tr><td style="text-align:center">1</td><td>图号</td><td style="text-align:center">是</td><td>字符串</td><td>物料必须已在物料档案中存在</td></tr>
|
||||
<tr><td style="text-align:center">2</td><td>数量</td><td style="text-align:center">是</td><td>整数 ≥ 1</td><td>本批数量</td></tr>
|
||||
<tr><td style="text-align:center">3</td><td>生产日期</td><td style="text-align:center">否</td><td>YYYY-MM-DD</td><td>可空</td></tr>
|
||||
<tr><td style="text-align:center">4</td><td>供应商</td><td style="text-align:center">否</td><td>字符串</td><td></td></tr>
|
||||
<tr><td style="text-align:center">5</td><td>区域</td><td style="text-align:center">是</td><td>字符串</td><td>库位区域编码,须已在区域维护中建立</td></tr>
|
||||
<tr><td style="text-align:center">6</td><td>架</td><td style="text-align:center">是</td><td>字符串</td><td>货架号(与层、位一起构成完整货位)</td></tr>
|
||||
<tr><td style="text-align:center">7</td><td>层</td><td style="text-align:center">是</td><td>字符串</td><td>层号</td></tr>
|
||||
<tr><td style="text-align:center">8</td><td>位</td><td style="text-align:center">是</td><td>字符串</td><td>位置号</td></tr>
|
||||
<tr><td style="text-align:center">9</td><td>备注</td><td style="text-align:center">否</td><td>字符串</td><td></td></tr>
|
||||
<tr><td style="text-align:center">10</td><td>检测单号</td><td style="text-align:center">是</td><td>字符串</td><td>纸面检验单号</td></tr>
|
||||
<tr><td style="text-align:center">11</td><td>产品工号</td><td style="text-align:center">否</td><td>字符串</td><td>关联工单,可空</td></tr>
|
||||
<tr><td style="text-align:center">12</td><td>归属类型</td><td style="text-align:center">是</td><td>workorder/project/other</td><td>其他值按 other 处理</td></tr>
|
||||
<tr><td style="text-align:center">13</td><td>归属编号</td><td style="text-align:center">条件必填</td><td>字符串</td><td>归属类型为 workorder 或 project 时必填</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div style="font-size:12px;color:#909399;margin-top:4px">批次号由系统自动生成,无需填写、模板中也没有该列。</div>
|
||||
<div style="font-weight:600;margin:10px 0 4px">三、字段说明——按序列号导入(首行表头忽略)</div>
|
||||
<table style="width:100%;border-collapse:collapse;font-size:12px" border>
|
||||
<thead><tr style="background:#f5f7fa"><th>列</th><th>字段</th><th>必填</th><th>格式</th><th>说明</th></tr></thead>
|
||||
<tbody>
|
||||
<tr><td style="text-align:center">1</td><td>图号</td><td style="text-align:center">是</td><td>字符串</td><td>物料必须已在物料档案中存在</td></tr>
|
||||
<tr><td style="text-align:center">2</td><td>序列号</td><td style="text-align:center">是</td><td>字符串</td><td>单件序列号,文件内不可重复,且不可与库存中已存在的重复</td></tr>
|
||||
<tr><td style="text-align:center">3</td><td>区域</td><td style="text-align:center">是</td><td>字符串</td><td>库位区域编码,须已在区域维护中建立</td></tr>
|
||||
<tr><td style="text-align:center">4</td><td>生产日期</td><td style="text-align:center">否</td><td>YYYY-MM-DD</td><td></td></tr>
|
||||
<tr><td style="text-align:center">5</td><td>供应商</td><td style="text-align:center">否</td><td>字符串</td><td></td></tr>
|
||||
<tr><td style="text-align:center">6</td><td>架</td><td style="text-align:center">是</td><td>字符串</td><td>货架号</td></tr>
|
||||
<tr><td style="text-align:center">7</td><td>层</td><td style="text-align:center">是</td><td>字符串</td><td>层号</td></tr>
|
||||
<tr><td style="text-align:center">8</td><td>位</td><td style="text-align:center">是</td><td>字符串</td><td>位置号</td></tr>
|
||||
<tr><td style="text-align:center">9</td><td>备注</td><td style="text-align:center">否</td><td>字符串</td><td></td></tr>
|
||||
<tr><td style="text-align:center">10</td><td>检测单号</td><td style="text-align:center">是</td><td>字符串</td><td></td></tr>
|
||||
<tr><td style="text-align:center">11</td><td>产品工号</td><td style="text-align:center">否</td><td>字符串</td><td>关联工单,可空</td></tr>
|
||||
<tr><td style="text-align:center">12</td><td>归属类型</td><td style="text-align:center">是</td><td>workorder/project/other</td><td>其他值按 other 处理</td></tr>
|
||||
<tr><td style="text-align:center">13</td><td>归属编号</td><td style="text-align:center">条件必填</td><td>字符串</td><td>归属类型为 workorder 或 project 时必填</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div style="font-weight:600;margin:10px 0 4px">四、常见错误</div>
|
||||
<div style="font-size:12px;color:#606266;line-height:1.9">
|
||||
· 图号不存在:物料必须先在物料档案建档<br/>
|
||||
· 序列号重复:文件内重复,或库存中已存在同号<br/>
|
||||
· 区域编码不存在:需先在区域维护中建立<br/>
|
||||
· 货位不完整:架/层/位任一为空(必填)<br/>
|
||||
· 检测单号为空:必填<br/>
|
||||
· 归属类型为 workorder/project 但归属编号为空:必须补充<br/>
|
||||
· 任意一行出错:整批全部回滚,不部分导入
|
||||
</div>
|
||||
<div style="font-weight:600;margin:10px 0 4px">五、下载模板</div>
|
||||
<el-button size="small" type="primary" @click="downloadInboundTemplate('batch')">下载批次导入模板</el-button>
|
||||
<el-button size="small" type="primary" plain @click="downloadInboundTemplate('sn')">下载序列号导入模板</el-button>
|
||||
</div>
|
||||
</el-popover>
|
||||
</div>
|
||||
<el-row :gutter="24">
|
||||
<el-col :span="12">
|
||||
<div>
|
||||
<div style="font-weight:600;margin-bottom:6px">序列号=否 导入(按批次记账的物料)</div>
|
||||
<div style="margin-bottom:8px;color:#909399;font-size:12px">
|
||||
列头顺序(首行忽略)<b>图号 | 批次号(可空自动生成) | 数量 | 生产日期 | 供应商 | 区域 | 架 | 层 | 位 | 备注 | 检测单号 | 产品工号 | 归属类型 | 归属编号</b>(架/层/位/备注/检测单号/产品工号/归属 可缺列,缺则留空)
|
||||
</div>
|
||||
<el-upload ref="batchUploadRef" :auto-upload="false" accept=".xlsx" :limit="1" drag
|
||||
:on-exceed="(f) => onExceed(f, 'batch')">
|
||||
<div class="dropzone">将批次模板(序列号=否).xlsx 拖到此处,或点击选择</div>
|
||||
@@ -292,9 +380,6 @@ onActivated(() => {
|
||||
<el-col :span="12">
|
||||
<div>
|
||||
<div style="font-weight:600;margin-bottom:6px">序列号=是 导入(按 SN 逐件登记的物料)</div>
|
||||
<div style="margin-bottom:8px;color:#909399;font-size:12px">
|
||||
列头顺序(首行忽略)<b>图号 | SN | 区域 | 生产日期 | 供应商 | 架 | 层 | 位 | 备注 | 检测单号 | 产品工号 | 归属类型 | 归属编号</b>(架/层/位/备注/检测单号/产品工号/归属 可缺列,缺则留空)
|
||||
</div>
|
||||
<el-upload ref="snUploadRef" :auto-upload="false" accept=".xlsx" :limit="1" drag
|
||||
:on-exceed="(f) => onExceed(f, 'sn')">
|
||||
<div class="dropzone">将 SN 模板(序列号=是).xlsx 拖到此处,或点击选择</div>
|
||||
@@ -374,9 +459,6 @@ onActivated(() => {
|
||||
<el-table-column label="数量" width="90" align="center">
|
||||
<template #default="{ row }">{{ row.quantity ?? '' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="batchNo" label="批次号" min-width="150">
|
||||
<template #default="{ row }">{{ row.batchNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="zoneCode" label="区域" width="90" align="center">
|
||||
<template #default="{ row }">{{ row.zoneCode || '-' }}</template>
|
||||
</el-table-column>
|
||||
@@ -467,6 +549,9 @@ onActivated(() => {
|
||||
<el-table :data="detailDrawer.list" border size="small" v-loading="detailDrawer.loading"
|
||||
empty-text="暂无明细">
|
||||
<el-table-column label="批次号" min-width="180">
|
||||
<template #header>
|
||||
批次号 <span style="color:#909399;font-size:12px">(系统内部编号)</span>
|
||||
</template>
|
||||
<template #default="{ row }">{{ row.batchNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="SN 序列号" min-width="190">
|
||||
|
||||
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { getRealName } from '../utils/auth'
|
||||
import { fmtTime } from '../utils/format'
|
||||
import { fmtTime, fmtDateOnly, friendlyBatchLabel } from '../utils/format'
|
||||
import { exportXlsxFetch } from '../utils/export'
|
||||
import { can } from '../utils/perm'
|
||||
import PageHelp from '../components/PageHelp.vue'
|
||||
@@ -72,7 +72,25 @@ async function loadPicker(kw = '') {
|
||||
else if (targetType.value === 'ELEC') params.manageMode = '2' // 电气件
|
||||
else if (targetType.value === 'OTHER') params.manageMode = '3' // 其他(辅料/工装/试验设备)
|
||||
const data = await request.get('/stock/details', { params })
|
||||
pickerOptions.value = data?.list || []
|
||||
const list = data?.list || []
|
||||
// 批次行改友好显示(2026-10-21 批次号收口):{图号} · {入库日期}入库 · 可用{数量}件 · {供应商},同物料同日多批加「第N批」;
|
||||
// 批次号仅作 value,界面不出现。SN 行保持原样
|
||||
const dayCount = {}
|
||||
const daySeen = {}
|
||||
for (const o of list) {
|
||||
if (Number(o.snMode) !== 1 && o.batchNo) {
|
||||
const k = `${o.materialCode || ''}|${fmtDateOnly(o.createdAt)}`
|
||||
dayCount[k] = (dayCount[k] || 0) + 1
|
||||
}
|
||||
}
|
||||
for (const o of list) {
|
||||
if (Number(o.snMode) !== 1 && o.batchNo) {
|
||||
const k = `${o.materialCode || ''}|${fmtDateOnly(o.createdAt)}`
|
||||
daySeen[k] = (daySeen[k] || 0) + 1
|
||||
o.fbLabel = `${o.materialCode || ''} · ${friendlyBatchLabel(o, dayCount[k] > 1 ? daySeen[k] : 0)}`
|
||||
}
|
||||
}
|
||||
pickerOptions.value = list
|
||||
} catch (e) {
|
||||
pickerOptions.value = []
|
||||
} finally {
|
||||
@@ -84,8 +102,9 @@ function pickerId(opt) {
|
||||
return Number(opt.snMode) === 1 ? opt.snCode : opt.batchNo // 列表混排批次/SN 行,按行 sn_mode 取标识
|
||||
}
|
||||
function pickerLabel(opt) {
|
||||
if (opt.fbLabel) return opt.fbLabel // 批次行:友好标签(图号·入库日期·可用数量·供应商),批次号不显示
|
||||
const id = pickerId(opt)
|
||||
return `${opt.materialCode || ''}|${id || ''}` // 下拉已按 qualityStatus=未检 过滤,无需再展示质量后缀
|
||||
return `${opt.materialCode || ''}|${id || ''}` // SN 行;下拉已按 qualityStatus=未检 过滤,无需再展示质量后缀
|
||||
}
|
||||
|
||||
function addItem(targetId, qty, materialCode = '', materialName = '', inboundNo = '', snMode = null) {
|
||||
@@ -288,7 +307,7 @@ async function submitInspection() {
|
||||
}
|
||||
|
||||
/* ===================== 待检清单(按入库单分组,§B2/E2) ===================== */
|
||||
const pendingFilters = reactive({ materialCode: '', inboundType: '', manageMode: '' })
|
||||
const pendingFilters = reactive({ materialCode: '', inboundNo: '', materialName: '', inboundType: '', dateFrom: '', dateTo: '' })
|
||||
const pendingLoading = ref(false)
|
||||
const pendingRows = ref([])
|
||||
const pendingTotal = ref(0)
|
||||
@@ -350,7 +369,11 @@ function loadPending() {
|
||||
try {
|
||||
const params = {
|
||||
materialCode: pendingFilters.materialCode.trim(),
|
||||
inboundNo: pendingFilters.inboundNo.trim(),
|
||||
materialName: pendingFilters.materialName.trim(),
|
||||
inboundType: pendingFilters.inboundType,
|
||||
dateFrom: pendingFilters.dateFrom,
|
||||
dateTo: pendingFilters.dateTo,
|
||||
manageMode: pendingFilters.manageMode,
|
||||
page: pendingPage.current,
|
||||
pageSize: pendingPage.size
|
||||
@@ -370,7 +393,7 @@ function searchPending() {
|
||||
}
|
||||
|
||||
function resetPending() {
|
||||
Object.assign(pendingFilters, { materialCode: '', inboundType: '', manageMode: '' })
|
||||
Object.assign(pendingFilters, { materialCode: '', inboundNo: '', materialName: '', inboundType: '', dateFrom: '', dateTo: '' })
|
||||
pendingPage.current = 1
|
||||
loadPending()
|
||||
}
|
||||
@@ -558,6 +581,17 @@ onMounted(() => {
|
||||
<el-form-item label="图号">
|
||||
<el-input v-model="pendingFilters.materialCode" placeholder="图号(模糊)" clearable style="width:150px" @keyup.enter="searchPending" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库单号">
|
||||
<el-input v-model="pendingFilters.inboundNo" placeholder="入库单号(模糊)" clearable style="width:150px" @keyup.enter="searchPending" />
|
||||
</el-form-item>
|
||||
<el-form-item label="名称">
|
||||
<el-input v-model="pendingFilters.materialName" placeholder="物料名称(模糊)" clearable style="width:140px" @keyup.enter="searchPending" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库时间">
|
||||
<el-date-picker v-model="pendingFilters.dateFrom" type="date" value-format="YYYY-MM-DD" placeholder="开始" style="width:130px" @change="searchPending" />
|
||||
<span style="margin:0 4px;color:#909399">~</span>
|
||||
<el-date-picker v-model="pendingFilters.dateTo" type="date" value-format="YYYY-MM-DD" placeholder="结束" style="width:130px" @change="searchPending" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库类型">
|
||||
<el-select v-model="pendingFilters.inboundType" placeholder="全部" clearable style="width:130px" @change="searchPending">
|
||||
<el-option label="采购入库" value="purchase" />
|
||||
@@ -590,6 +624,9 @@ onMounted(() => {
|
||||
<el-table-column prop="materialName" label="名称" min-width="120">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="序列号" width="80" align="center">
|
||||
<template #default="{ row }">{{ snModeText(row.snMode) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未检数量" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.unInspectedQty }}</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -4,7 +4,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
import { getRealName } from '../utils/auth'
|
||||
import { fmtTime } from '../utils/format'
|
||||
import { fmtTime, fmtDateOnly, friendlyBatchLabel } from '../utils/format'
|
||||
import { exportXlsxFetch } from '../utils/export'
|
||||
import { can } from '../utils/perm'
|
||||
import { confirmAction } from '../utils/confirm'
|
||||
@@ -24,7 +24,7 @@ const CATEGORY_OPTIONS = [
|
||||
{ value: 'deliver', label: '发货' },
|
||||
{ value: 'other', label: '其他' }
|
||||
]
|
||||
// 归属口径(需求22):合同号/科技项目号/其他,默认其他;合同号是独立维度标签,非 MES 工单号
|
||||
// 归属口径(需求22):合同号/科技项目号/其他,默认其他;合同号是独立维度标签,非 MES 产品工号
|
||||
const OWNERSHIP_OPTIONS = [
|
||||
{ value: 'workorder', label: '合同号' },
|
||||
{ value: 'project', label: '科技项目号' },
|
||||
@@ -83,10 +83,24 @@ async function loadBatchOptions(code) {
|
||||
if (!code) { batchOptions.value = []; return }
|
||||
try {
|
||||
const stock = await request.get('/stock/details', { params: { materialCode: code, snMode: 2, page: 1, pageSize: 200 } })
|
||||
batchOptions.value = (stock?.list || [])
|
||||
const rows = (stock?.list || [])
|
||||
.map(b => ({ ...b, avail: (b.quantity || 0) - (b.lockedQty || 0) }))
|
||||
.filter(b => b.avail > 0)
|
||||
.sort((a, b) => String(a.batchNo).localeCompare(String(b.batchNo)))
|
||||
// 选批显示改友好标签(2026-10-21 批次号收口):{入库日期}入库 · 可用{数量}件 · {供应商},同日多批加「第N批」;
|
||||
// 批次号仅作 value 传后端,界面不出现
|
||||
const dayCount = {}
|
||||
const daySeen = {}
|
||||
for (const b of rows) {
|
||||
const d = fmtDateOnly(b.createdAt)
|
||||
dayCount[d] = (dayCount[d] || 0) + 1
|
||||
}
|
||||
for (const b of rows) {
|
||||
const d = fmtDateOnly(b.createdAt)
|
||||
daySeen[d] = (daySeen[d] || 0) + 1
|
||||
b.label = friendlyBatchLabel(b, dayCount[d] > 1 ? daySeen[d] : 0)
|
||||
}
|
||||
batchOptions.value = rows
|
||||
if (batchOptions.value.length && !genForm.batchNo) genForm.batchNo = batchOptions.value[0].batchNo
|
||||
} catch { batchOptions.value = [] }
|
||||
}
|
||||
@@ -353,11 +367,11 @@ onMounted(loadDicts)
|
||||
</el-form-item>
|
||||
|
||||
<template v-if="genForm.mode === 1">
|
||||
<el-form-item label="批次号">
|
||||
<el-form-item label="出库批次">
|
||||
<el-select v-model="genForm.batchNo" filterable clearable
|
||||
placeholder="从该物料可用批次中选择(默认带出 FIFO 首个)" style="width:100%">
|
||||
<el-option v-for="b in batchOptions" :key="b.batchNo" :value="b.batchNo"
|
||||
:label="`${b.batchNo}(可用 ${b.avail}|${b.qualityStatus || '未检'}${b.zoneCode ? '|' + b.zoneCode : ''})`" />
|
||||
:label="b.label" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="数量" required>
|
||||
@@ -455,7 +469,7 @@ onMounted(loadDicts)
|
||||
<el-input v-model="recFilters.boxNo" placeholder="按箱号查询" clearable style="width:160px" @keyup.enter="searchRec" />
|
||||
</el-form-item>
|
||||
<el-form-item label="归属单号">
|
||||
<el-input v-model="recFilters.ownershipNo" placeholder="工单号/科技项目号" clearable style="width:160px" @keyup.enter="searchRec" />
|
||||
<el-input v-model="recFilters.ownershipNo" placeholder="产品工号/科技项目号" clearable style="width:160px" @keyup.enter="searchRec" />
|
||||
</el-form-item>
|
||||
<el-form-item label="检测单号">
|
||||
<el-input v-model="recFilters.inspectionNo" placeholder="检测单号(模糊)" clearable style="width:180px" @keyup.enter="searchRec" />
|
||||
@@ -490,7 +504,7 @@ onMounted(loadDicts)
|
||||
<el-tag :type="row.status === '已送达' ? 'success' : 'info'" size="small">{{ row.status || '已出库' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="130">
|
||||
<el-table-column prop="orderNo" label="产品工号" min-width="130">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出库类别" width="100" align="center">
|
||||
@@ -500,9 +514,6 @@ onMounted(loadDicts)
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="materialCode" label="物料" min-width="120" />
|
||||
<el-table-column prop="batchNo" label="批次号" min-width="110">
|
||||
<template #default="{ row }">{{ row.batchNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="库位" min-width="120" align="center">
|
||||
<template #default="{ row }">{{ row.zoneCode ? row.zoneCode + ' ' + locText(row) : '-' }}</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -185,7 +185,7 @@ onMounted(load)
|
||||
</template>
|
||||
<el-table :data="rows" border v-loading="loading" empty-text="暂无退库单">
|
||||
<el-table-column prop="returnNo" label="退库单号" min-width="170" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="130">
|
||||
<el-table-column prop="orderNo" label="产品工号" min-width="130">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="stationNo" label="退库工位" width="90" align="center">
|
||||
|
||||
@@ -10,6 +10,7 @@ import PageHelp from '../components/PageHelp.vue'
|
||||
import { helpRole } from '../help'
|
||||
|
||||
const loading = ref(false)
|
||||
const keyword = ref('')
|
||||
const list = ref([])
|
||||
const perms = ref([]) // 全部权限(MENU + BUTTON)
|
||||
const treeRef = ref()
|
||||
@@ -43,23 +44,10 @@ const permTree = computed(() => {
|
||||
return nodes
|
||||
})
|
||||
|
||||
const filters = reactive({ keyword: '' })
|
||||
|
||||
function doSearch() {
|
||||
loadRoles()
|
||||
}
|
||||
|
||||
function resetFilters() {
|
||||
filters.keyword = ''
|
||||
loadRoles()
|
||||
}
|
||||
|
||||
async function loadRoles() {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await request.get('/roles', {
|
||||
params: { keyword: filters.keyword || undefined }
|
||||
})
|
||||
const data = await request.get('/roles', { params: { keyword: keyword.value.trim() || undefined } })
|
||||
list.value = data?.list || []
|
||||
} finally {
|
||||
loading.value = false
|
||||
@@ -190,19 +178,17 @@ function permSummary(arr) {
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card shadow="never" class="mb12">
|
||||
<el-form inline @submit.prevent="loadRoles">
|
||||
<el-card shadow="never">
|
||||
<el-form inline style="margin-bottom:12px" @submit.prevent="loadRoles">
|
||||
<el-form-item label="名称/编码">
|
||||
<el-input v-model="filters.keyword" placeholder="角色名称或编码(不区分大小写)" clearable style="width:220px" @keyup.enter="doSearch" @clear="doSearch" />
|
||||
<el-input v-model="keyword" placeholder="角色名称或编码(不区分大小写)" clearable style="width:220px"
|
||||
@keyup.enter="loadRoles" @clear="loadRoles" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="doSearch">查询</el-button>
|
||||
<el-button @click="resetFilters">重置</el-button>
|
||||
<el-button type="primary" :loading="loading" @click="loadRoles">查询</el-button>
|
||||
<el-button @click="keyword=''; loadRoles()">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
<el-card shadow="never">
|
||||
<el-table :data="list" border size="small" v-loading="loading" empty-text="暂无角色">
|
||||
<el-table-column prop="id" label="ID" width="64" align="center" />
|
||||
<el-table-column prop="code" label="编码" min-width="110" />
|
||||
|
||||
@@ -27,7 +27,7 @@ const todayStr = new Date().toLocaleDateString('sv-SE')
|
||||
function newInForm() {
|
||||
return {
|
||||
materialCode: '', zoneCode: '', orderNo: '', completedText: '',
|
||||
// 归属:与入库管理同口径——必选(无「无」选项),选其他可不填编号,工单号/科技项目号必填编号
|
||||
// 归属:与入库管理同口径——必选(无「无」选项),选其他可不填编号,产品工号/科技项目号必填编号
|
||||
ownershipType: '', ownershipNo: '',
|
||||
productStatus: '', relatedStandard: '', testRecordNo: '',
|
||||
recordedBy: operator, recordedAt: todayStr
|
||||
@@ -62,7 +62,7 @@ async function submitInbound(cat) {
|
||||
ElMessage.warning('请扫码录入 SN(回车追加)')
|
||||
return
|
||||
}
|
||||
// 归属必选(与入库管理同口径,不再有「无」);选其他可不填编号,工单号/科技项目号必须填编号
|
||||
// 归属必选(与入库管理同口径,不再有「无」);选其他可不填编号,产品工号/科技项目号必须填编号
|
||||
if (!f.ownershipType) {
|
||||
ElMessage.warning('请选择归属(合同号 / 科技项目号 / 其他)')
|
||||
return
|
||||
@@ -105,7 +105,7 @@ async function submitInbound(cat) {
|
||||
}
|
||||
}
|
||||
|
||||
// A2 半成品入库归属继承产线工单:填工单号后只读带出合同号(归属),无需手选
|
||||
// A2 半成品入库归属继承产线工单:填产品工号后只读带出合同号(归属),无需手选
|
||||
async function resolveOwnership(cat) {
|
||||
const f = inForms[cat]
|
||||
if (!f.orderNo.trim()) {
|
||||
@@ -243,8 +243,8 @@ onMounted(() => {
|
||||
<el-form-item label="已完成至工位">
|
||||
<el-input v-model="inForms[2].completedText" placeholder="如:工位5(可空=未报工)" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="inForms[2].orderNo" placeholder="来源工单号(填后自动带出合同号)" clearable
|
||||
<el-form-item label="产品工号">
|
||||
<el-input v-model="inForms[2].orderNo" placeholder="来源产品工号(填后自动带出合同号)" clearable
|
||||
@blur="resolveOwnership(2)" @clear="resolveOwnership(2)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="归属">
|
||||
@@ -255,7 +255,7 @@ onMounted(() => {
|
||||
<el-option value="project" label="科技项目号" />
|
||||
<el-option value="other" label="其他" />
|
||||
</el-select>
|
||||
<el-input v-model="inForms[2].ownershipNo" placeholder="归属编号(填工单号自动带出合同号)" clearable
|
||||
<el-input v-model="inForms[2].ownershipNo" placeholder="归属编号(填产品工号自动带出合同号)" clearable
|
||||
:disabled="inForms[2].ownershipType === 'workorder'" />
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -317,7 +317,7 @@ onMounted(() => {
|
||||
</el-form>
|
||||
<el-alert v-if="outForms[2].info" type="info" :closable="false" style="max-width:680px;margin-bottom:12px">
|
||||
<div>图号:<b>{{ outForms[2].info.materialCode || '-' }}</b> 名称:{{ outForms[2].info.materialName || '-' }}</div>
|
||||
<div>已完成至工位:{{ outForms[2].info.completedProcess || '-' }} 工单号:{{ outForms[2].info.orderNo || '-' }} 归属:{{ outForms[2].info.ownershipNo || '-' }}</div>
|
||||
<div>已完成至工位:{{ outForms[2].info.completedProcess || '-' }} 产品工号:{{ outForms[2].info.orderNo || '-' }} 归属:{{ outForms[2].info.ownershipNo || '-' }}</div>
|
||||
</el-alert>
|
||||
<el-form label-width="110px" style="max-width:680px">
|
||||
<el-form-item label="出库原因">
|
||||
@@ -388,7 +388,7 @@ onMounted(() => {
|
||||
<el-table-column prop="outboundReason" label="出库原因" width="90" align="center">
|
||||
<template #default="{ row }">{{ row.outboundReason || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="120">
|
||||
<el-table-column prop="orderNo" label="产品工号" min-width="120">
|
||||
<template #default="{ row }">{{ row.orderNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建时间" width="150" align="center">
|
||||
|
||||
Reference in New Issue
Block a user