feat: 看板管理屏专属面板与追溯查询三合一 + AGV状态WS实时推送 + 数据库错误友好文案分层

This commit is contained in:
SunYF
2026-11-17 06:41:41 +08:00
parent 3b0fb2ea46
commit 5c9a7e32d2
59 changed files with 2302 additions and 789 deletions
@@ -9,6 +9,8 @@ import * as echarts from 'echarts'
const props = defineProps({
option: { type: Object, required: true }
})
// 客户诉求21:物料结构饼图点击下钻——透传 ECharts 点击事件参数
const emit = defineEmits(['chartClick'])
const el = ref(null)
let chart = null
@@ -22,6 +24,8 @@ function render() {
onMounted(() => {
chart = echarts.init(el.value)
render()
// 客户诉求21:物料结构饼图点击下钻;无监听时 emit 是空操作,无副作用。
chart.on('click', (params) => emit('chartClick', params))
ro = new ResizeObserver(() => { if (chart) chart.resize() })
ro.observe(el.value)
})
@@ -124,7 +124,7 @@
<el-form-item label="包号"><b>{{ deliveryDlg.pkg }}</b></el-form-item>
<el-form-item label="工位"><b>{{ deliveryDlg.stationNo }}</b></el-form-item>
<el-form-item label="配送接驳台">
<el-select v-model="deliveryDlg.targetDock" placeholder="左右手必选" style="width:160px">
<el-select v-model="deliveryDlg.targetDock" filterable placeholder="左右手必选" style="width:160px">
<el-option v-for="d in deliveryDlg.docks" :key="d.dockCode || d.code"
:label="(d.name || d.label || d.dockCode || d.code) + (d.sideCn ? '(' + d.sideCn + ')' : '')"
:value="d.dockCode || d.code" />
+144 -8
View File
@@ -5,6 +5,7 @@
// 库龄口径(2026-10-27 拍板):按入库时间计算「入库至今 N 天」,页脚注明。
// 占用率口径(2026-10-27 二次拍板):已占位置数 / 架内位置总数(zones level=4);缺位置主数据退化为按存量着色。
import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
import { useRouter } from 'vue-router'
import request from '../utils/request'
import PageHelp from '../components/PageHelp.vue'
import VChart from '../components/VChart.vue'
@@ -23,6 +24,21 @@ const overview = ref({})
const analytics = ref({})
const callsData = ref({ calls: [], mesOk: true })
// ===== 双屏机制(客户纸质前提):未登录/参观指导(VISITOR)→欢乐屏(报喜不报忧);其他账号→管理屏 =====
// 与 MES BoardApp.vue 同构:只读本机登录态,读不到按欢乐屏兜底,永不白屏。
function boardUserRoleCode() {
try {
const raw = localStorage.getItem('user')
if (!raw) return ''
const u = JSON.parse(raw)
return String(u?.roleCode || '')
} catch { return '' }
}
const isManageScreen = computed(() => {
const role = boardUserRoleCode()
return !!localStorage.getItem('token') && role !== '' && role !== 'VISITOR'
})
// ---------- 大屏运行配置(基础设置页维护,保存即生效;每 60 秒回读跟随) ----------
const screenCfg = ref({ title: '库存动态大屏', corner: '库房监控', refreshSeconds: 5, callsRefreshSeconds: 10 })
@@ -132,6 +148,23 @@ const hasTrend = computed(() => trend.value.some(t => t.in > 0 || t.out > 0))
const hasAge = computed(() => ageBuckets.value.some(b => b.qty > 0))
const hasPie = computed(() => [...manageMode.value, ...itemType.value].some(d => d.qty > 0))
// ===== 管理屏数据(客户诉求 13/16/17/18/20)=====
const repairStock = computed(() => Number(overview.value.repairStock) || 0)
const defectStock = computed(() => Number(overview.value.defectStock) || 0)
const pendingReturn = computed(() => Number(overview.value.pendingReturn) || 0)
const lowStocks = computed(() => Array.isArray(overview.value.lowStocks) ? overview.value.lowStocks : [])
const overdueOps = computed(() => Number(overview.value.overdueOps) || 0)
const callWaits = computed(() => Array.isArray(overview.value.callWaits) ? overview.value.callWaits : [])
// 20 断料颜色:waiting≥20分红 / ≥10分黄 / 其余绿
function waitLevel(min) {
const m = Number(min) || 0
if (m >= 20) return 'danger'
if (m >= 10) return 'warn'
return 'ok'
}
const lowStockLoop = computed(() => lowStocks.value.length > 5)
const lowStockDuration = computed(() => `${Math.max(lowStocks.value.length * 2.6, 14)}s`)
// 冷色系(无红色):越浅越"新",越深越"久"
const AGE_COLORS = ['#7fe7ff', '#37e2ff', '#2b9fd8', '#1b6ca8']
const OUT_COLORS = ['#2b9fd8', '#37e2ff', '#7fe7ff']
@@ -221,16 +254,16 @@ const pieOption = computed(() => ({
series: [
{
type: 'pie', radius: ['56%', '74%'], center: ['50%', '44%'],
label: { show: false }, silent: true,
label: { show: false }, silent: false, cursor: 'pointer',
data: manageMode.value.map((d, i) => ({
name: d.name, value: d.qty, itemStyle: { color: OUT_COLORS[i % OUT_COLORS.length] }
name: d.name, value: d.qty, key: d.key, itemStyle: { color: OUT_COLORS[i % OUT_COLORS.length] }
}))
},
{
type: 'pie', radius: ['36%', '50%'], center: ['50%', '44%'],
label: { show: false }, silent: true,
label: { show: false }, silent: false, cursor: 'pointer',
data: itemType.value.map((d, i) => ({
name: d.name, value: d.qty, itemStyle: { color: IN_COLORS[i % IN_COLORS.length] }
name: d.name, value: d.qty, key: d.key, itemStyle: { color: IN_COLORS[i % IN_COLORS.length] }
}))
}
]
@@ -285,6 +318,25 @@ const clock = computed(() => {
}
})
// ---------- 客户诉求21:物料结构饼图点击下钻到库存查询并带分类筛选 ----------
const router = useRouter()
function onPieClick(params) {
const key = Number(params?.data?.key)
const name = String(params?.name || '')
const query = {}
// 外环=类型(manage_mode 1结构件/2电气件/3其他),内环=物料类别(itemType→category 1原材料/2在制品/3成品)
if (name === '结构件') query.manageMode = '1'
else if (name === '电气件') query.manageMode = '2'
else if (name === '其他') query.manageMode = '3'
else if (name === '原材料') query.category = '1'
else if (name === '在制品') query.category = '2'
else if (name === '成品') query.category = '3'
if (!Number.isNaN(key) && key > 0) {
if (!query.manageMode && !query.category) query.category = String(key)
}
router.push({ path: '/inventory', query })
}
// ---------- 轮询:概览 5 秒,聚合 30 秒(趋势/库龄变化慢) ----------
async function load() {
try {
@@ -395,9 +447,28 @@ onBeforeUnmount(() => {
<span class="pending-num"><AnimNumber :value="Number(overview.pendingOutbound) || 0" /></span>
<span class="pending-label">待送达</span>
</div>
<!-- 客户诉求16:待退料(仅管理屏) -->
<template v-if="isManageScreen">
<div class="pending-divider"></div>
<div class="pending-item">
<span class="pending-num danger-num">{{ pendingReturn }}</span>
<span class="pending-label">待退料</span>
</div>
</template>
</div>
<div class="kpi-label">待处理任务</div>
</div>
<!-- 客户诉求13:返修/不良库存(仅管理屏) -->
<template v-if="isManageScreen">
<div class="kpi mng-kpi">
<div class="kpi-value"><AnimNumber :value="repairStock" /></div>
<div class="kpi-label">返修库存</div>
</div>
<div class="kpi mng-kpi">
<div class="kpi-value"><AnimNumber :value="defectStock" /></div>
<div class="kpi-label">不良库存</div>
</div>
</template>
</section>
<!-- 三栏主体 -->
@@ -413,10 +484,12 @@ onBeforeUnmount(() => {
<div class="heat-cells">
<div
v-for="s in g.items" :key="s.shelf"
class="heat-cell" :style="heatCell(s)"
class="heat-cell bar-cell"
:title="`${g.zone} ${s.shelf} ${s.name || ''}:在库 ${s.qty},${s.batches} 批` + (s.totalPos > 0 ? `,占 ${s.usedPos}/${s.totalPos} 位` : '')"
>
<span class="cell-shelf">{{ s.shelf }}</span>
<!-- 客户诉求14:库区/货架占用改条形占比(替换原热力色块) -->
<span class="cell-bar-track"><span class="cell-bar-fill" :style="{ width: (shelfPct(s) ?? 0) + '%' }" /></span>
<span class="cell-qty">{{ s.used ? (shelfPct(s) !== null ? shelfPct(s) + '%' : s.qty.toLocaleString('zh-CN')) : '空' }}</span>
</div>
</div>
@@ -467,7 +540,7 @@ onBeforeUnmount(() => {
<section class="panel" style="flex: 1.15;">
<div class="panel-title">物料结构</div>
<div class="panel-body">
<VChart v-if="hasPie" :option="pieOption" />
<VChart v-if="hasPie" :option="pieOption" @chart-click="onPieClick" />
<div v-else class="empty">暂无数据</div>
</div>
</section>
@@ -511,6 +584,37 @@ onBeforeUnmount(() => {
</div>
</main>
<!-- 管理屏专属告警带(客户诉求 17/18/20):低库存滚动 + 作业超时 + 断料颜色预警;演示屏不渲染 -->
<section v-if="isManageScreen" class="mng-alert-strip">
<div class="mng-strip-item mng-strip-overdue">
<span class="mng-strip-title">作业超时</span>
<span class="mng-strip-num">{{ overdueOps }}</span>
<span class="mng-strip-unit">单</span>
</div>
<div class="mng-strip-sep"></div>
<div class="mng-strip-item mng-strip-wait">
<span class="mng-strip-title">断料等待</span>
<span v-for="(c, i) in callWaits.slice(0, 6)" :key="i" class="wait-badge" :class="'wait-' + waitLevel(c.waitMin)">
{{ c.stationNo }}工位·{{ Number(c.waitMin) || 0 }}分
</span>
<span v-if="!callWaits.length" class="mng-strip-none">无</span>
</div>
<div class="mng-strip-sep"></div>
<div class="mng-strip-item mng-strip-stock">
<span class="mng-strip-title">低安全库存</span>
<div class="lowstock-viewport">
<div class="lowstock-track" :class="{ rolling: lowStockLoop }" :style="lowStockLoop ? { animationDuration: lowStockDuration } : {}">
<template v-for="copy in (lowStockLoop ? 2 : 1)" :key="copy">
<span v-for="(s, i) in lowStocks" :key="copy + '-' + i" class="lowstock-item">
{{ s.materialName || s.material }} 库存{{ s.qty }}/阈值{{ s.safetyStock }}
</span>
</template>
<span v-if="!lowStocks.length" class="mng-strip-none">无</span>
</div>
</div>
</div>
</section>
<PageHelp :data="helpDisplay" page="Display" />
</div>
</template>
@@ -525,7 +629,8 @@ onBeforeUnmount(() => {
min-height: 0;
overflow: hidden;
display: grid;
grid-template-rows: auto auto minmax(0, 1fr);
/* 客户诉求17/18/20:管理屏告警带占第4行(auto,演示屏 v-if 不渲染时自动收缩) */
grid-template-rows: auto auto minmax(0, 1fr) auto;
background:
radial-gradient(ellipse at 50% 0%, rgba(0, 170, 255, 0.18), transparent 55%),
linear-gradient(180deg, #04102a 0%, #071e42 60%, #04102a 100%);
@@ -678,7 +783,8 @@ onBeforeUnmount(() => {
padding: 1px 0; font-weight: 600; font-size: clamp(14px, 0.85vw, 20px);
}
.call-badge { width: clamp(68px, 4.6vw, 100px); }
.badge-pending { color: #04142e; background: #37e2ff; }
/* 客户诉求15:待备料状态徽标标红(原本青色) */
.badge-pending { color: #fff; background: #ef4444; font-weight: 700; }
.badge-shipping { color: #eaf4ff; background: #2f6fe4; }
.badge-done { color: #cfe6ff; background: #44598a; }
@@ -711,6 +817,10 @@ onBeforeUnmount(() => {
}
.cell-shelf { font-size: clamp(13px, 0.8vw, 18px); font-weight: 700; }
.cell-qty { font-size: clamp(12px, 0.72vw, 16px); opacity: 0.92; font-variant-numeric: tabular-nums; }
/* 客户诉求14:货架占用条形占比图 */
.bar-cell { background: rgba(19,56,110,0.35); border: 1px solid rgba(64,158,255,0.25); }
.cell-bar-track { display: block; width: 100%; height: clamp(5px, 0.6vh, 9px); background: rgba(8,20,42,0.8); border-radius: 4px; overflow: hidden; margin: clamp(3px,0.4vh,6px) 0; }
.cell-bar-fill { display: block; height: 100%; border-radius: 4px; background: linear-gradient(90deg, #1b6ca8, #37e2ff); transition: width 0.6s ease; }
/* ---------- 空状态 ---------- */
.empty {
@@ -718,4 +828,30 @@ onBeforeUnmount(() => {
display: flex; align-items: center; justify-content: center;
color: #5f86b8; font-size: clamp(17px, 1vw, 22px); letter-spacing: 2px;
}
/* ===== 管理屏专属(客户诉求 13/16/17/18/20)===== */
.danger-num { color: #ef4444 !important; }
.mng-kpi { border-color: rgba(239,68,68,0.3) !important; }
.mng-alert-strip {
display: flex; align-items: center; gap: clamp(10px, 1vw, 30px);
margin: 0 clamp(16px, 1.4vw, 40px) clamp(8px, 0.8vh, 18px);
padding: clamp(6px, 0.7vh, 14px) clamp(12px, 1vw, 28px);
background: rgba(60, 12, 20, 0.35); border: 1px solid rgba(239,68,68,0.28); border-radius: 8px;
min-height: 0; flex-shrink: 0;
}
.mng-strip-item { display: flex; align-items: center; gap: clamp(6px, 0.5vw, 16px); min-width: 0; }
.mng-strip-title { color: #fca5a5; font-size: clamp(11px, 0.8vw, 28px); font-weight: 600; white-space: nowrap; }
.mng-strip-num { color: #ef4444; font-size: clamp(18px, 1.4vw, 48px); font-weight: 700; }
.mng-strip-unit { color: #7f8fa6; font-size: clamp(10px, 0.72vw, 26px); }
.mng-strip-sep { width: 1px; align-self: stretch; background: rgba(239,68,68,0.2); }
.mng-strip-none { color: #7f8fa6; font-size: clamp(10px, 0.72vw, 26px); }
.wait-badge { font-size: clamp(10px, 0.72vw, 26px); padding: 2px 8px; border-radius: 10px; white-space: nowrap; font-variant-numeric: tabular-nums; }
.wait-ok { background: rgba(34,197,94,0.25); color: #86efac; }
.wait-warn { background: rgba(234,179,8,0.3); color: #fde047; }
.wait-danger { background: rgba(239,68,68,0.35); color: #fca5a5; font-weight: 700; }
.lowstock-viewport { flex: 1; min-width: 0; overflow: hidden; height: clamp(20px, 2.4vh, 44px); }
.lowstock-track { display: flex; gap: clamp(12px, 1vw, 30px); white-space: nowrap; }
.lowstock-track.rolling { animation: lowstock-scroll linear infinite; }
.lowstock-item { color: #fca5a5; font-size: clamp(10px, 0.76vw, 28px); }
@keyframes lowstock-scroll { from { transform: translateX(0); } to { transform: translateX(-50%); } }
</style>
+155 -76
View File
@@ -162,8 +162,8 @@ function clearAll() {
sourceInboundNo.value = '' // 解除入库单绑定,回到自由录入模式
}
// 结论变化:SN/其他 自动定检验数=1、合格数随结论;批次合格时合格数=检验数。
// 2026-11-16 拍板:处置下放明细行——行判「不合格」时初始化一条处置明细(默认全量退货),
// 可按数量拆分为退货/返修/报废多行;运单号概念废除,物流信息填备注。
// 2026-11-16 拍板:判「不合格」不预置任何处置方式,全部由检验员在「登记不合格处置」弹窗里自行选
// 退货/返修/报废并填数量;Σqty 必须等于不合格数。运单号概念废除,物流信息填备注。
function rejectQtyOfRow(row) {
return Math.max(0, (Number(row.inspectQty) || 0) - (Number(row.passQty) || 0))
}
@@ -172,7 +172,8 @@ function disposalSum(row) {
}
function addDisposalLine(row) {
if (!row.disposals) row.disposals = []
row.disposals.push({ type: 'RETURN', qty: Math.max(1, rejectQtyOfRow(row) - disposalSum(row)), remark: '' })
// 新行不指定类型(type 空=让检验员自己选),数量默认剩余未分配数
row.disposals.push({ type: '', qty: Math.max(1, rejectQtyOfRow(row) - disposalSum(row)), remark: '' })
}
function onItemStatus(row) {
if (!isRowBatch(row)) {
@@ -182,9 +183,7 @@ function onItemStatus(row) {
row.passQty = row.inspectQty
}
if (row.status === '不合格') {
if (!row.disposals || !row.disposals.length) {
row.disposals = [{ type: 'RETURN', qty: rejectQtyOfRow(row) || 1, remark: '' }]
}
if (!row.disposals) row.disposals = []
} else {
row.disposals = []
}
@@ -194,6 +193,51 @@ function onTargetTypeChange() {
loadPicker()
}
// 登记不合格处置(弹窗):检验员自行选退货/返修/报废并填数量,Σqty 必须=不合格数。
const disposalDlg = reactive({ show: false, row: null })
function openDisposalDlg(row) {
if (row.status !== '不合格') return
if (!row.disposals) row.disposals = []
disposalDlg.row = row
disposalDlg.show = true
}
function disposalDlgAdd() {
if (!disposalDlg.row) return
addDisposalLine(disposalDlg.row)
}
function disposalDlgRemove(i) {
if (disposalDlg.row) disposalDlg.row.disposals.splice(i, 1)
}
// 实时校验(2026-11-16 纠偏):合计数量一旦大于该行不合格数,立刻飘红提示并禁用「确认」按钮,不等提交才报错。
const disposalOver = computed(() => {
const row = disposalDlg.row
if (!row) return false
return disposalSum(row) > rejectQtyOfRow(row)
})
function disposalDlgOk() {
const row = disposalDlg.row
if (!row) return
const rq = rejectQtyOfRow(row)
const sum = disposalSum(row)
if (disposalOver.value) {
ElMessage.warning(`处置数量合计(${sum})不能大于不合格数(${rq})`)
return
}
if (sum !== rq) {
ElMessage.warning(`处置数量合计(${sum})必须等于不合格数(${rq})`)
return
}
if ((row.disposals || []).some((d) => !d.type)) {
ElMessage.warning('请为每条处置选择方式(退货 / 返修 / 报废)')
return
}
if ((row.disposals || []).some((d) => (Number(d.qty) || 0) <= 0)) {
ElMessage.warning('处置数量必须大于 0')
return
}
disposalDlg.show = false
}
// 从待检清单送检:把明细带入录入页已选清单,并回填归属(§E1/E2)
async function sendToEntry(details, row) {
if (!details.length) return
@@ -259,6 +303,10 @@ async function submitInspection() {
}
const rq = rejectQtyOfRow(it)
const sum = disposalSum(it)
if (it.disposals.some((d) => !d.type)) {
ElMessage.warning(`批次/SN「${it.targetId}」请选择每条处置的方式(退货 / 返修 / 报废)`)
return
}
if (it.disposals.some((d) => (Number(d.qty) || 0) <= 0)) {
ElMessage.warning(`批次/SN「${it.targetId}」处置明细行数量必须大于 0`)
return
@@ -775,77 +823,61 @@ onMounted(() => {
</div>
</el-form-item>
<!-- 已选清单(逐个判定:每条独立结论/检验数/合格数) -->
<el-form-item label="已选清单">
<div style="width:100%">
<el-table v-if="items.length" :data="items" border size="small" style="width:100%">
<el-table-column label="编号" prop="targetId" min-width="150" />
<el-table-column label="入库单号" min-width="150">
<template #default="{ row }">{{ row.inboundNo || '-' }}</template>
</el-table-column>
<el-table-column label="图号" min-width="130">
<template #default="{ row }">{{ row.materialCode || '-' }}</template>
</el-table-column>
<el-table-column label="名称" min-width="120">
<template #default="{ row }">{{ row.materialName || '-' }}</template>
</el-table-column>
<el-table-column label="结论" width="150" align="center">
<template #default="{ row }">
<el-radio-group v-model="row.status" @change="() => onItemStatus(row)">
<el-radio value="合格">合格</el-radio>
<el-radio value="不合格">不合格</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="检验数" width="120" align="center">
<template #default="{ row }">
<el-input-number v-model="row.inspectQty" :min="1" :max="999999" :disabled="!isRowBatch(row)"
style="width:110px" controls-position="right" />
</template>
</el-table-column>
<el-table-column label="合格数" width="120" align="center">
<template #default="{ row }">
<el-input-number v-model="row.passQty" :min="0" :max="999999" :disabled="!isRowBatch(row)"
style="width:110px" controls-position="right" />
</template>
</el-table-column>
<el-table-column label="不合格数" width="100" align="center">
<template #default="{ row }">{{ (Number(row.inspectQty)||0) - (Number(row.passQty)||0) }}</template>
</el-table-column>
<!-- 2026-11-16 拍板:处置下放明细行——按数量拆退货/返修/报废,Σqty=不合格数;备注可空(退货物流信息也填此处) -->
<el-table-column label="处置明细" min-width="280">
<template #default="{ row }">
<div v-if="row.status === '不合格'" style="width:100%">
<div v-for="(d, di) in row.disposals" :key="di" style="display:flex;gap:4px;margin-bottom:4px;align-items:center">
<el-select v-model="d.type" size="small" style="width:86px">
<el-option label="退货" value="RETURN" />
<el-option label="返修" value="REWORK" />
<el-option label="报废" value="SCRAP" />
</el-select>
<el-input-number v-model="d.qty" size="small" :min="1" :max="999999" controls-position="right" style="width:100px" />
<el-input v-model="d.remark" size="small" placeholder="备注(可空)" style="flex:1;min-width:90px" />
<el-button link type="danger" size="small" @click="row.disposals.splice(di, 1)">删</el-button>
</div>
<div style="display:flex;gap:8px;align-items:center">
<el-button link type="primary" size="small" @click="addDisposalLine(row)">+ 添加处置行</el-button>
<span v-if="disposalSum(row) !== rejectQtyOfRow(row)" style="color:#f56c6c;font-size:12px">
已拆 {{ disposalSum(row) }}/{{ rejectQtyOfRow(row) }},需等于不合格数
</span>
</div>
</div>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" width="90" align="center">
<template #default="{ row, $index }">
<el-button link type="danger" size="small" @click="removeAt($index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<span v-if="!items.length" style="color:#909399;font-size:12px">尚未选择任何待检编号(可逐项判定合格/不合格,产品序号(SN)/其他默认检验数=1)</span>
<el-button v-if="items.length" type="default" size="small" style="margin-top:8px" @click="clearAll">清空</el-button>
<!-- 已选清单(逐个判定:每条独立结论/检验数/合格数;处置移到独立弹窗填写) -->
<div style="width:100%">
<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:8px">
<span style="font-weight:600">已选清单</span>
<el-button v-if="items.length" type="default" size="small" @click="clearAll">清空</el-button>
</div>
</el-form-item>
<el-table v-if="items.length" :data="items" border size="small" style="width:100%">
<el-table-column label="编号" prop="targetId" min-width="140" show-overflow-tooltip />
<el-table-column label="名称" min-width="130">
<template #default="{ row }">{{ row.materialName || row.materialCode || '-' }}</template>
</el-table-column>
<el-table-column label="结论" width="132" align="center">
<template #default="{ row }">
<el-radio-group v-model="row.status" @change="() => onItemStatus(row)">
<el-radio value="合格">合格</el-radio>
<el-radio value="不合格">不合格</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="检验数" width="104" align="center">
<template #default="{ row }">
<el-input-number v-model="row.inspectQty" :min="1" :max="999999" :disabled="!isRowBatch(row)"
style="width:88px" controls-position="right" />
</template>
</el-table-column>
<el-table-column label="合格数" width="104" align="center">
<template #default="{ row }">
<el-input-number v-model="row.passQty" :min="0" :max="999999" :disabled="!isRowBatch(row)"
style="width:88px" controls-position="right" />
</template>
</el-table-column>
<el-table-column label="不合格数" width="84" align="center">
<template #default="{ row }">{{ rejectQtyOfRow(row) }}</template>
</el-table-column>
<el-table-column label="处置" width="150" align="center">
<template #default="{ row }">
<template v-if="row.status === '不合格'">
<el-button link type="primary" size="small" @click="openDisposalDlg(row)">
{{ disposalSum(row) === rejectQtyOfRow(row) && disposalSum(row) > 0 ? '已登记处置' : '登记不合格处置' }}
</el-button>
<div v-if="disposalSum(row) !== rejectQtyOfRow(row)" style="color:#f56c6c;font-size:11px">
待分配 {{ rejectQtyOfRow(row) - disposalSum(row) }}
</div>
</template>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" width="64" align="center">
<template #default="{ row, $index }">
<el-button link type="danger" size="small" @click="removeAt($index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<span v-if="!items.length" style="color:#909399;font-size:12px">尚未选择任何待检编号(可逐项判定合格/不合格,产品序号(SN)/其他默认检验数=1)</span>
</div>
<el-form-item>
<el-button type="primary" :loading="submitting" :disabled="!items.length" @click="submitInspection">提交检验</el-button>
@@ -1045,6 +1077,53 @@ onMounted(() => {
</div>
</el-drawer>
<!-- 登记不合格处置(检查录入阶段):检验员自行选退货/返修/报废并填数量,不预置默认值 -->
<el-dialog v-model="disposalDlg.show" title="登记不合格处置" width="620px" :close-on-click-modal="false">
<div style="font-size:13px;color:#606266;margin-bottom:10px">
批次/产品序号(SN):<b>{{ disposalDlg.row?.targetId || '' }}</b> 不合格数:<b style="color:#f56c6c">{{ rejectQtyOfRow(disposalDlg.row) }}</b>
 已分配:<b>{{ disposalSum(disposalDlg.row) }}</b> 按数量拆分,合计须等于不合格数。
</div>
<el-table :data="disposalDlg.row?.disposals || []" border size="small">
<el-table-column label="处置方式" width="150">
<template #default="{ row }">
<el-select v-model="row.type" size="small" placeholder="请选择" style="width:130px">
<el-option label="退货" value="RETURN" />
<el-option label="返修" value="REWORK" />
<el-option label="报废" value="SCRAP" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="130">
<template #default="{ row }">
<el-input-number v-model="row.qty" size="small" :min="1" :max="999999" controls-position="right" style="width:110px" />
</template>
</el-table-column>
<el-table-column label="备注(可空)">
<template #default="{ row }">
<el-input v-model="row.remark" size="small" placeholder="退货物流信息等(可空)" />
</template>
</el-table-column>
<el-table-column label="操作" width="64" align="center">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="disposalDlgRemove($index)">删</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top:10px">
<el-button link type="primary" size="small" @click="disposalDlgAdd">+ 添加处置行</el-button>
<span v-if="disposalOver" style="color:#f56c6c;font-size:12px;margin-left:10px">
处置数量不能大于不合格数(已填 {{ disposalSum(disposalDlg.row) }} / 不合格 {{ rejectQtyOfRow(disposalDlg.row) }})
</span>
<span v-else-if="disposalSum(disposalDlg.row) !== rejectQtyOfRow(disposalDlg.row)" style="color:#f56c6c;font-size:12px;margin-left:10px">
还差 {{ rejectQtyOfRow(disposalDlg.row) - disposalSum(disposalDlg.row) }} 件未分配
</span>
</div>
<template #footer>
<el-button @click="disposalDlg.show = false">取消</el-button>
<el-button type="primary" :disabled="disposalOver" @click="disposalDlgOk">确认</el-button>
</template>
</el-dialog>
<!-- 不合格处置弹窗(2026-11-16 拍板:运单号概念废除,备注统一非必填) -->
<el-dialog v-model="disposeDialog.visible" title="不合格品处置" width="480px">
<el-form label-width="96px">
@@ -8,9 +8,10 @@ import { exportXlsxFetch } from '../utils/export'
import { can } from '../utils/perm'
import PageHelp from '../components/PageHelp.vue'
import { helpInventory } from '../help'
import { useRouter } from 'vue-router'
import { useRouter, useRoute } from 'vue-router'
const router = useRouter()
const route = useRoute()
// 视图切换:物料汇总(一物料一行) / 库位明细(物料×库位×批次SN) / 区域汇总 / 缺料补货
// 物料汇总为默认首视图:快速回答"这个物料总共有多少"
@@ -444,6 +445,10 @@ async function exportCsv() {
}
onMounted(() => {
// 客户诉求21:从大屏物料结构饼图下钻,带分类筛选条件进入
const q = route.query || {}
if (q.manageMode) filters.manageMode = String(q.manageMode)
if (q.category) filters.category = String(q.category)
loadZones()
load()
})
@@ -76,7 +76,7 @@
<el-input v-model="manual.unit" style="width:80px;margin-left:8px" />
</el-form-item>
<el-form-item label="退料接驳台">
<el-select v-model="manual.returnDock" placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-select v-model="manual.returnDock" filterable placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-option v-for="d in stationDocks" :key="d.code" :label="d.label" :value="d.code" />
</el-select>
</el-form-item>
@@ -12,7 +12,7 @@
<el-input v-model="q.materialCode" placeholder="按图号过滤" clearable style="width:180px" @input="page=1" />
</el-form-item>
<el-form-item label="工位">
<el-select v-model="q.stationNo" placeholder="全部" clearable style="width:120px" @change="page=1">
<el-select v-model="q.stationNo" filterable placeholder="全部" clearable style="width:120px" @change="page=1">
<el-option v-for="n in stationOptions" :key="n" :label="'工位 ' + n" :value="n" />
</el-select>
</el-form-item>
@@ -546,7 +546,7 @@ async function loadAllDocks() {
<el-input v-model="manual.unit" style="width:80px;margin-left:8px" />
</el-form-item>
<el-form-item label="退料接驳台">
<el-select v-model="manual.returnDock" placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-select v-model="manual.returnDock" filterable placeholder="先填工位号带出左/右,必选" style="width:100%">
<el-option v-for="d in stationDocks" :key="d.code" :label="d.label" :value="d.code" />
</el-select>
</el-form-item>
@@ -286,7 +286,7 @@ onMounted(() => {
<el-input v-model="form.realName" placeholder="显示名(必填)" />
</el-form-item>
<el-form-item label="角色" required>
<el-select v-model="form.roleId" style="width:100%" placeholder="请选择角色">
<el-select v-model="form.roleId" filterable style="width:100%" placeholder="请选择角色">
<el-option v-for="o in roleOptions" :key="o.value" :value="o.value" :label="o.label" />
</el-select>
</el-form-item>