feat: 新增多类功能并优化现有流程
1. 工序工位支持0号上线位,更新解析逻辑与注释 2. 物料清单模块重命名为产品物料清单并优化文案 3. WMS与工位端新增用户/角色详情抽屉组件 4. 工单模块新增自动生成工单号、工位分组选择器 5. 日排产支持批量生成与详情查看 6. 工单列表重构操作菜单与表单优化
This commit is contained in:
@@ -57,12 +57,11 @@
|
||||
<el-table-column label="完成日期" width="110">
|
||||
<template #default="{ row }">{{ fmtDateOnly(row.dueDate) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="420" fixed="right">
|
||||
<el-table-column label="开始时间" width="110">
|
||||
<template #default="{ row }">{{ fmtDateOnly(row.planStart) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="300" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<template v-if="row.status === 'CREATED'">
|
||||
<el-button v-if="can('produce.workorder:edit')" size="small" type="primary" plain @click="openSeq(row)">工位组合</el-button>
|
||||
<el-button v-if="can('produce.workorder:edit')" size="small" type="warning" @click="openEdit(row)">编辑</el-button>
|
||||
</template>
|
||||
<el-button v-if="can('produce.workorder:dailyplan') && !['DONE','CANCELLED'].includes(row.status)"
|
||||
size="small" type="success" plain @click="openAutoSchedule(row)">自动排产</el-button>
|
||||
<el-dropdown
|
||||
@@ -75,7 +74,18 @@
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
<el-button v-if="can('produce.workorder:delete') && ['CREATED','PENDING','CONFIRMED'].includes(row.status)" size="small" type="danger" @click="del(row)">删除</el-button>
|
||||
<el-dropdown
|
||||
v-if="(row.status === 'CREATED' && can('produce.workorder:edit')) || (can('produce.workorder:delete') && ['CREATED','PENDING','CONFIRMED'].includes(row.status))"
|
||||
trigger="click" @command="(cmd) => moreAction(row, cmd)">
|
||||
<el-button size="small">更多 ▾</el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item v-if="row.status === 'CREATED'" command="seq">工位组合</el-dropdown-item>
|
||||
<el-dropdown-item v-if="can('produce.workorder:edit') && row.status === 'CREATED'" command="edit">编辑</el-dropdown-item>
|
||||
<el-dropdown-item v-if="can('produce.workorder:delete') && ['CREATED','PENDING','CONFIRMED'].includes(row.status)" command="del" divided>删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -84,23 +94,31 @@
|
||||
<!-- 新建/编辑工单 -->
|
||||
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑工单' : '新建工单'" width="560px">
|
||||
<el-form :model="dialog" label-width="90px">
|
||||
<el-form-item label="工单号"><el-input v-model="dialog.workOrderNo" /></el-form-item>
|
||||
<el-form-item label="产品型号">
|
||||
<el-select v-model="dialog.productTypeId" placeholder="请选择产品型号" style="width:100%">
|
||||
<el-form-item label="工单号" required><el-input v-model="dialog.workOrderNo" /></el-form-item>
|
||||
<el-form-item label="产品型号" required>
|
||||
<el-select v-model="dialog.productTypeId" placeholder="---请选择---" style="width:100%" @change="onProductTypeChange">
|
||||
<el-option v-for="p in productTypes" :key="p.id" :label="p.name + (p.code ? ' / ' + p.code : '')" :value="p.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品编号"><el-input v-model="dialog.productCode" placeholder="请输入产品编号" /></el-form-item>
|
||||
<el-form-item label="产品名称"><el-input v-model="dialog.productName" placeholder="请输入产品名称" /></el-form-item>
|
||||
<el-form-item label="产品编号">
|
||||
<el-input v-model="dialog.productCode" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称">
|
||||
<el-input v-model="dialog.productName" placeholder="随产品型号自动带出" :disabled="dialog.productTypeId > 0" />
|
||||
</el-form-item>
|
||||
<el-form-item label="合同号"><el-input v-model="dialog.contractNo" placeholder="一个合同对应一个工程编号" /></el-form-item>
|
||||
<el-form-item label="工程编号"><el-input v-model="dialog.projectNo" placeholder="工程编号下挂各产品序号" /></el-form-item>
|
||||
<el-form-item label="产品序号"><el-input v-model="dialog.productSerial" placeholder="本产品在该工程下的序号" /></el-form-item>
|
||||
<el-form-item label="数量"><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
|
||||
<el-form-item label="数量" required><el-input-number v-model="dialog.quantity" :min="1" /></el-form-item>
|
||||
<el-form-item label="完成日期" required>
|
||||
<el-date-picker v-model="dialog.dueDate" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="请选择完成日期(必填)" style="width:100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工位组合">
|
||||
<el-form-item label="开始时间">
|
||||
<el-date-picker v-model="dialog.planStart" type="date" value-format="YYYY-MM-DD"
|
||||
placeholder="计划开始日期(选填)" style="width:100%" />
|
||||
</el-form-item>
|
||||
<el-form-item label="工位组合" required>
|
||||
<ProcessSeqPicker :model-value="dialog.processSeq" @update:model-value="dialog.processSeq = $event" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -133,6 +151,8 @@
|
||||
<el-dialog v-model="sched.show" :title="`自动排产 - ${sched.orderNo}`" width="640px">
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||||
title="自动排产仅排「未开工数量 = 工单总数 − 已完工 − 在产未完工」,生成后状态为未启用(PENDING),需到「日排产」页面人工启用后生效。" />
|
||||
<el-alert type="info" :closable="false" style="margin-bottom:14px"
|
||||
:title="`项目开始:${fmtDateOnly(sched.planStart)} 结束:${fmtDateOnly(sched.dueDate)} 工单数量:${sched.quantity} 已完工:${sched.finishedNum}`" />
|
||||
<el-form :model="sched" label-width="100px">
|
||||
<el-form-item label="排产模式">
|
||||
<el-radio-group v-model="sched.mode">
|
||||
@@ -159,6 +179,9 @@
|
||||
<div>共 {{ previewDates.length }} 天:{{ previewDates.join('、') || '-' }}</div>
|
||||
<div v-if="sched.mode === 'AVG' && previewDates.length">平均分摊到 {{ previewDates.length }} 天(余数补前几天)</div>
|
||||
<div v-if="sched.mode === 'FIXED' && previewDates.length">每日 {{ sched.dailyQty }} 件 × {{ previewDates.length }} 天(超未开工数量将被拒)</div>
|
||||
<div v-if="sched.mode === 'FIXED' && previewDates.length" :class="{ 'sched-warn': previewTotal > sched.quantity }">
|
||||
本次计划总量 {{ previewTotal }},工单数量 {{ sched.quantity }}<span v-if="previewTotal > sched.quantity">(超出工单数量,保存将被拒绝)</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -214,7 +237,7 @@ function seqToCodes(s) {
|
||||
const out = []
|
||||
String(s).split(',').forEach((p) => {
|
||||
const n = Number(p)
|
||||
if (n >= 1 && !out.includes(n)) out.push(n)
|
||||
if (n >= 0 && !out.includes(n)) out.push(n)
|
||||
})
|
||||
return out.sort((a, b) => a - b)
|
||||
}
|
||||
@@ -232,7 +255,7 @@ const query = reactive({ orderNo: '', productCode: '', productName: '', contract
|
||||
const list = ref([])
|
||||
const productTypes = ref([])
|
||||
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', processSeq: '', status: 'CREATED' })
|
||||
const dialog = reactive({ show: false, id: 0, workOrderNo: '', productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', processSeq: '', status: 'CREATED' })
|
||||
const seq = reactive({ show: false, id: 0, orderNo: '', productCode: '', productName: '', processSeq: '' })
|
||||
const stationNos = ref([])
|
||||
|
||||
@@ -249,15 +272,32 @@ async function load() {
|
||||
async function loadProducts() {
|
||||
productTypes.value = (await request.get('/product-types')) || []
|
||||
}
|
||||
function genOrderNo() {
|
||||
const d = new Date()
|
||||
const ymd = `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, '0')}${String(d.getDate()).padStart(2, '0')}`
|
||||
return `WO-${ymd}-001`
|
||||
}
|
||||
// Q1=A:选产品型号后自动带出产品编号/名称(只读,避免手填错位)
|
||||
function onProductTypeChange(id) {
|
||||
const p = productTypes.value.find((x) => x.id === id)
|
||||
if (p) {
|
||||
dialog.productCode = p.code || ''
|
||||
dialog.productName = p.name || ''
|
||||
} else {
|
||||
dialog.productCode = ''
|
||||
dialog.productName = ''
|
||||
}
|
||||
}
|
||||
function openCreate() {
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: `WO${Date.now()}`, productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', processSeq: '', status: 'CREATED' })
|
||||
Object.assign(dialog, { show: true, id: 0, workOrderNo: genOrderNo(), productTypeId: 0, productCode: '', productName: '', contractNo: '', projectNo: '', productSerial: '', quantity: 1, dueDate: '', planStart: '', processSeq: '', status: 'CREATED' })
|
||||
}
|
||||
function openEdit(row) {
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', projectNo: row.projectNo || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', processSeq: row.processSeq || '', status: row.status })
|
||||
Object.assign(dialog, { show: true, id: row.id, workOrderNo: row.workOrderNo, productTypeId: row.productTypeId, productCode: row.productCode, productName: row.productName, contractNo: row.contractNo || '', projectNo: row.projectNo || '', productSerial: row.productSerial || '', quantity: row.quantity, dueDate: row.dueDate ? String(row.dueDate).slice(0, 10) : '', planStart: row.planStart ? String(row.planStart).slice(0, 10) : '', processSeq: row.processSeq || '', status: row.status })
|
||||
}
|
||||
async function save() {
|
||||
if (!dialog.dueDate) return ElMessage.warning('请选择完成日期(必填)')
|
||||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, projectNo: dialog.projectNo, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, processSeq: dialog.processSeq }
|
||||
if (!dialog.processSeq || !dialog.processSeq.trim()) return ElMessage.warning('请至少选择一个工位(工位组合为必填项)')
|
||||
const body = { id: dialog.id, workOrderNo: dialog.workOrderNo, productTypeId: dialog.productTypeId, productCode: dialog.productCode, productName: dialog.productName, contractNo: dialog.contractNo, projectNo: dialog.projectNo, productSerial: dialog.productSerial, quantity: dialog.quantity, dueDate: dialog.dueDate, planStart: dialog.planStart, processSeq: dialog.processSeq }
|
||||
if (dialog.id) await request.put('/work-orders', body)
|
||||
else await request.post('/work-orders', body)
|
||||
ElMessage.success('保存成功')
|
||||
@@ -315,10 +355,20 @@ async function del(row) {
|
||||
load()
|
||||
}
|
||||
|
||||
// 操作列「更多」菜单分发:工位组合 / 编辑 / 删除
|
||||
function moreAction(row, cmd) {
|
||||
if (cmd === 'seq') openSeq(row)
|
||||
else if (cmd === 'edit') openEdit(row)
|
||||
else if (cmd === 'del') del(row)
|
||||
}
|
||||
|
||||
// ---- 自动排产(引导式,Item K)----
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }] })
|
||||
const sched = reactive({ show: false, orderNo: '', mode: 'AVG', dailyQty: 1, segments: [{ range: null }], planStart: '', dueDate: '', quantity: 0, finishedNum: 0 })
|
||||
function openAutoSchedule(row) {
|
||||
Object.assign(sched, { show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }] })
|
||||
Object.assign(sched, {
|
||||
show: true, orderNo: row.workOrderNo, mode: 'AVG', dailyQty: 1, segments: [{ range: null }],
|
||||
planStart: row.planStart || '', dueDate: row.dueDate || '', quantity: row.quantity || 0, finishedNum: row.finishedNum || 0
|
||||
})
|
||||
}
|
||||
function addSegment() { sched.segments.push({ range: null }) }
|
||||
function removeSegment(i) { sched.segments.splice(i, 1) }
|
||||
@@ -340,6 +390,12 @@ const previewDates = computed(() => {
|
||||
}
|
||||
return out.sort()
|
||||
})
|
||||
// 本次排产计划总量(仅用于前端提示);AVG 模式后端按未开工数量自动均摊,此处不预估精确值
|
||||
const previewTotal = computed(() => {
|
||||
if (!previewDates.length) return 0
|
||||
if (sched.mode === 'FIXED') return sched.dailyQty * previewDates.length
|
||||
return 0
|
||||
})
|
||||
async function submitAutoSchedule() {
|
||||
const segments = sched.segments
|
||||
.filter((s) => s.range && s.range.length === 2 && s.range[0] && s.range[1])
|
||||
|
||||
Reference in New Issue
Block a user