feat: 新增收集式校验错误弹窗及工位报警语音播报
新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<el-card>
|
||||
<el-tabs v-model="activeTab">
|
||||
<el-tabs v-model="activeTab" @tab-change="onTabChange">
|
||||
<!-- ============ 产品工艺(2026-10-10:并入工艺页,作为最前面的 tab,不再独立菜单) ============ -->
|
||||
<el-tab-pane label="产品工艺" name="pp">
|
||||
<ProductProcess />
|
||||
<ProductProcess ref="ppRef" />
|
||||
</el-tab-pane>
|
||||
<!-- ============ 工艺列表 ============ -->
|
||||
<el-tab-pane label="工艺列表" name="list">
|
||||
@@ -124,13 +124,11 @@
|
||||
<el-select v-model="row.collectType" placeholder="请选择">
|
||||
<el-option value="AUTO" label="拧紧枪自动" />
|
||||
<el-option value="MANUAL" label="手填" />
|
||||
<el-option value="SCAN" label="扫码" />
|
||||
<el-option value="NONE" label="仅记录" />
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否拧紧" width="90" align="center">
|
||||
<template #default="{ row }"><el-switch v-model="row.isTorque" /></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="检测确认" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-switch v-model="row.needCheck" />
|
||||
@@ -210,7 +208,7 @@
|
||||
<el-table-column label="单位" width="80">
|
||||
<template #default="{ row }"><el-input v-model="row.unit" disabled /></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管理方式" width="110">
|
||||
<el-table-column label="序列号" width="110">
|
||||
<template #default="{ row }">
|
||||
<el-select v-model="row.snMode" disabled>
|
||||
<el-option :value="1" label="序列号=是" />
|
||||
@@ -237,7 +235,7 @@
|
||||
<div style="display:flex;gap:10px;margin-top:10px;align-items:center">
|
||||
<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>
|
||||
<span style="color:#909399;font-size:12px">物料编码取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/序列号自动带出、不可改;备料需求 = 各工位分产量 × 单台用量 ×(1+损耗率%)。</span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
@@ -327,6 +325,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import request from '../utils/request'
|
||||
|
||||
const activeTab = ref('list')
|
||||
const ppRef = ref(null)
|
||||
const flows = ref([])
|
||||
const pdfInput = ref(null)
|
||||
const flowPage = ref(1)
|
||||
@@ -356,13 +355,18 @@ function statusText(s) {
|
||||
}
|
||||
|
||||
/* ---------- 工艺 ---------- */
|
||||
// 切 tab 重新加载对应数据:修复「工艺列表新增工艺后,产品工艺 tab 的工艺下拉看不到新工艺」
|
||||
// (2026-10-19:各 tab 数据只在挂载时加载一次,切 tab 不 reload)
|
||||
function onTabChange(name) {
|
||||
if (name === 'pp') ppRef.value?.reload()
|
||||
else if (name === 'list') loadFlows()
|
||||
}
|
||||
function blankStep(seq) {
|
||||
return {
|
||||
_key: Date.now() + Math.random(),
|
||||
seq,
|
||||
name: '',
|
||||
collectType: 'MANUAL',
|
||||
isTorque: false,
|
||||
needCheck: false,
|
||||
needOperatorSign: false,
|
||||
needInspectorSign: false,
|
||||
@@ -443,7 +447,7 @@ async function searchMaterials(kw) {
|
||||
if (!materialOptions.value.length) materialsUnavailable.value = true
|
||||
}
|
||||
|
||||
// 选中物料编码后,快照字段(名称/规格/单位/管理方式)自动带出,均不可手改
|
||||
// 选中物料编码后,快照字段(名称/规格/单位/序列号)自动带出,均不可手改
|
||||
function onMaterialPicked(row, code) {
|
||||
const m = materialOptions.value.find((x) => x.code === code)
|
||||
if (!m) return
|
||||
@@ -513,7 +517,6 @@ function openFlow(row) {
|
||||
seq: s.seq || i + 1,
|
||||
name: s.name || '',
|
||||
collectType: s.collectType || 'MANUAL',
|
||||
isTorque: !!s.isTorque,
|
||||
needCheck: !!s.needCheck,
|
||||
needOperatorSign: !!s.needOperatorSign,
|
||||
needInspectorSign: !!s.needInspectorSign,
|
||||
@@ -605,7 +608,6 @@ async function saveFlow() {
|
||||
seq: st.seq,
|
||||
name: st.name,
|
||||
collectType: st.collectType,
|
||||
isTorque: st.isTorque,
|
||||
needCheck: st.needCheck,
|
||||
needOperatorSign: st.needOperatorSign,
|
||||
needInspectorSign: st.needInspectorSign,
|
||||
|
||||
Reference in New Issue
Block a user