feat: 新增产品工艺管理与工序审核功能
- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
This commit is contained in:
@@ -4,6 +4,9 @@
|
||||
<!-- ============ 工艺列表 ============ -->
|
||||
<el-tab-pane label="工艺列表" name="list">
|
||||
<el-form inline>
|
||||
<el-form-item label="产品工艺">
|
||||
<el-input v-model="flowPP" placeholder="按产品工艺名称反查" clearable style="width:180px" @keyup.enter="loadFlows" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="loadFlows">查询</el-button>
|
||||
</el-form-item>
|
||||
@@ -15,6 +18,12 @@
|
||||
<el-table :data="flows" border size="small">
|
||||
<el-table-column prop="id" label="ID" width="60" />
|
||||
<el-table-column prop="name" label="工艺名称" min-width="130" show-overflow-tooltip />
|
||||
<el-table-column label="产品工艺(反查)" min-width="160" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.productProcesses && row.productProcesses.length">{{ row.productProcesses.join('、') }}</span>
|
||||
<span v-else style="color:#909399">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="PDF" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.pdfFile" link type="primary" @click="previewPdf(row.pdfFile)">预览</el-button>
|
||||
@@ -180,13 +189,16 @@
|
||||
title="新工艺请先保存,保存后即可维护物料清单。" />
|
||||
<template v-else>
|
||||
<el-alert v-if="materialsUnavailable" type="warning" :closable="false" style="margin-bottom:8px"
|
||||
title="物料档案服务不可用,清单暂只读:不可新增物料行,已有行仅可调整单台用量/损耗率。" />
|
||||
title="物料档案服务暂不可用,可手动输入图号(名称/规格等可留空,保存时仅做基础校验);恢复后可重新选图号自动带出档案信息。" />
|
||||
<el-table :data="flowDlg.materials" border size="small">
|
||||
<el-table-column label="物料编号" min-width="150">
|
||||
<el-table-column label="图号" min-width="150">
|
||||
<template #default="{ row }">
|
||||
<el-select v-model="row.materialCode" filterable placeholder="请选择物料编号" style="width:100%"
|
||||
<el-select v-model="row.materialCode" filterable remote clearable allow-create default-first-option
|
||||
:remote-method="(kw) => searchMaterials(kw)"
|
||||
placeholder="请选择图号(可输入图号/名称模糊搜索,也可直接手输)" style="width:100%"
|
||||
@focus="searchMaterials('')"
|
||||
@change="(code) => onMaterialPicked(row, code)">
|
||||
<el-option v-for="m in materialOptions" :key="m.code" :label="m.code" :value="m.code" />
|
||||
<el-option v-for="m in materialOptions" :key="m.code" :label="(m.code || '') + (m.name ? ' ' + m.name : '')" :value="m.code" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -224,7 +236,7 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div style="display:flex;gap:10px;margin-top:10px;align-items:center">
|
||||
<el-button v-if="!materialsUnavailable" size="small" @click="addMaterial">新增物料行</el-button>
|
||||
<el-button size="small" @click="addMaterial">新增物料行</el-button>
|
||||
<el-button size="small" type="primary" :loading="matSaving" @click="saveMaterials">保存物料清单</el-button>
|
||||
<span style="color:#909399;font-size:12px">物料编号取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管理方式自动带出、不可改;备料需求 = 各工位分产量 × 单台用量 ×(1+损耗率%)。</span>
|
||||
</div>
|
||||
@@ -320,6 +332,8 @@ const pdfInput = ref(null)
|
||||
const flowPage = ref(1)
|
||||
const flowPageSize = ref(10)
|
||||
const flowTotal = ref(0)
|
||||
// 产品工艺反查筛选(2026-10-09):按引用该工艺的产品工艺名称模糊过滤
|
||||
const flowPP = ref('')
|
||||
|
||||
/* ---------- 权限 ---------- */
|
||||
function can(code) {
|
||||
@@ -355,7 +369,7 @@ function blankStep(seq) {
|
||||
}
|
||||
|
||||
async function loadFlows() {
|
||||
const params = { page: flowPage.value, pageSize: flowPageSize.value }
|
||||
const params = { page: flowPage.value, pageSize: flowPageSize.value, pp: flowPP.value || '' }
|
||||
const data = await request.get('/process-flows', { params })
|
||||
flows.value = (data && data.list) ? data.list : (data || [])
|
||||
flowTotal.value = (data && data.total) ? data.total : flows.value.length
|
||||
@@ -404,17 +418,23 @@ function blankMaterial() {
|
||||
return { materialCode: '', materialName: '', spec: '', unit: '', snMode: 2, unitQty: 1, lossRate: 0 }
|
||||
}
|
||||
|
||||
/* ---------- 物料档案(物料清单「物料编号」下拉数据源) ---------- */
|
||||
/* ---------- 物料档案(工艺物料清单「图号」下拉数据源) ---------- */
|
||||
// 大数据量治理:下拉改为远程搜索,按需按 keyword 拉取(后端 limit 默认100、封顶200),不再一次性全量。
|
||||
// pickedMaterials 缓存已选图号对应档案,保证已选行即使不在当前搜索结果内也始终显示「图号 + 名称」。
|
||||
const materialOptions = ref([])
|
||||
const pickedMaterials = reactive({})
|
||||
const materialsUnavailable = ref(false)
|
||||
|
||||
async function loadMaterialArchive() {
|
||||
async function searchMaterials(kw) {
|
||||
materialsUnavailable.value = false
|
||||
try {
|
||||
const list = (await request.get('/materials')) || []
|
||||
materialOptions.value = Array.isArray(list) ? list : []
|
||||
const list = (await request.get('/materials', { params: { keyword: (kw || '').trim(), limit: 100 } })) || []
|
||||
const merged = {}
|
||||
Object.values(pickedMaterials).forEach((m) => { if (m && m.code) merged[m.code] = m })
|
||||
;(Array.isArray(list) ? list : []).forEach((m) => { merged[m.code] = m })
|
||||
materialOptions.value = Object.values(merged)
|
||||
} catch {
|
||||
materialOptions.value = []
|
||||
materialOptions.value = Object.values(pickedMaterials)
|
||||
}
|
||||
if (!materialOptions.value.length) materialsUnavailable.value = true
|
||||
}
|
||||
@@ -423,6 +443,7 @@ async function loadMaterialArchive() {
|
||||
function onMaterialPicked(row, code) {
|
||||
const m = materialOptions.value.find((x) => x.code === code)
|
||||
if (!m) return
|
||||
pickedMaterials[code] = m
|
||||
row.materialName = m.name || ''
|
||||
row.spec = m.spec || ''
|
||||
row.unit = m.unit || ''
|
||||
@@ -439,6 +460,12 @@ async function loadMaterials(flowId) {
|
||||
materialCode: m.materialCode || '', materialName: m.materialName || '', spec: m.spec || '',
|
||||
unit: m.unit || '', snMode: m.snMode === 1 ? 1 : 2, unitQty: m.unitQty ?? 1, lossRate: m.lossRate ?? 0
|
||||
}))
|
||||
// 已保存行:把图号+名称等档案预入 pickedMaterials,并使已选直接进入选项池,
|
||||
// 这样已选下拉无需聚焦即显示「图号 名称」,而非裸图号
|
||||
flowDlg.materials.forEach((m) => {
|
||||
if (m.materialCode) pickedMaterials[m.materialCode] = { code: m.materialCode, name: m.materialName, spec: m.spec, unit: m.unit, snMode: m.snMode }
|
||||
})
|
||||
materialOptions.value = Object.values(pickedMaterials)
|
||||
} catch { /* 拦截器已提示 */ }
|
||||
}
|
||||
|
||||
@@ -616,7 +643,6 @@ async function toggleStatus(row) {
|
||||
|
||||
onMounted(() => {
|
||||
loadFlows()
|
||||
loadMaterialArchive()
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user