feat: 大屏多订单改为同屏并列展示,物料申请新增跨工位借料来源并移除工单完成日期
This commit is contained in:
@@ -49,6 +49,12 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="stationNo" label="工位" width="70" align="center" />
|
||||
<el-table-column prop="targetDock" label="接驳台" width="100" align="center" />
|
||||
<el-table-column label="借料来源" min-width="170" align="center">
|
||||
<template #default="{row}">
|
||||
<span v-if="hasBorrow(row)" style="color:#e6a23c">{{ borrowText(row) }}</span>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="reqQty" label="请求量" width="90" align="center" />
|
||||
<el-table-column label="实发量" width="90" align="center">
|
||||
<template #default="{row}">{{ Number(row.sentQty || 0) > 0 ? fmtQty(row.sentQty) : '—' }}</template>
|
||||
@@ -103,6 +109,21 @@ const STATUS_TAG = {
|
||||
const statusText = (s) => STATUS_TEXT[s] || s || '—'
|
||||
const statusTag = (s) => STATUS_TAG[s] || 'info'
|
||||
|
||||
// 借料来源:material_request.borrow_from(stationNo→借用量);本工位自取不计,仅展示真正借出的兄弟工位
|
||||
function hasBorrow(row) {
|
||||
const b = row.borrowFrom || {}
|
||||
const self = String(row.stationNo)
|
||||
return Object.entries(b).some(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||||
}
|
||||
function borrowText(row) {
|
||||
const b = row.borrowFrom || {}
|
||||
const self = String(row.stationNo)
|
||||
const parts = Object.entries(b)
|
||||
.filter(([k, v]) => Number(v) > 0 && String(k) !== self)
|
||||
.map(([k, v]) => `工位${k}:${fmtQty(v)}`)
|
||||
return parts.length ? parts.join(',') : '—'
|
||||
}
|
||||
|
||||
function fmtQty(v) {
|
||||
const n = Number(v || 0)
|
||||
return Number.isInteger(n) ? String(n) : n.toFixed(2)
|
||||
@@ -116,13 +137,13 @@ async function load() {
|
||||
async function exportCsv() {
|
||||
if (!(await confirmExport(list.value.length, '叫料单记录'))) return
|
||||
const header = ['叫料单号', '来源', '图号', '物料名称', '单位', '序列号方式', '工位', '接驳台',
|
||||
'请求量', '实发量', '退库量', '跨日', 'WMS出库单号', '状态', '驳回理由', '数量不符单号', '操作人']
|
||||
'借料来源', '请求量', '实发量', '退库量', '跨日', 'WMS出库单号', '状态', '驳回理由', '数量不符单号', '操作人']
|
||||
const srcOf = (r) => (r.source === 'REFILL' ? '数量不符补发' : '工位叫料')
|
||||
const lines = [header.join(',')]
|
||||
for (const r of list.value) {
|
||||
const cells = [
|
||||
r.requestNo, srcOf(r), r.materialCode, r.materialName, r.unit,
|
||||
r.snMode === 1 ? '序列号=是' : '序列号=否', r.stationNo, r.targetDock,
|
||||
r.snMode === 1 ? '序列号=是' : '序列号=否', r.stationNo, r.targetDock, borrowText(r),
|
||||
r.reqQty, r.sentQty, r.returnedQty, r.crossDay ? '非当日' : '',
|
||||
r.outboundNo, statusText(r.status), r.rejectReason, r.refReportNo, r.operator
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user