feat: 新增多类功能并优化现有流程

1. 工序工位支持0号上线位,更新解析逻辑与注释
2. 物料清单模块重命名为产品物料清单并优化文案
3. WMS与工位端新增用户/角色详情抽屉组件
4. 工单模块新增自动生成工单号、工位分组选择器
5. 日排产支持批量生成与详情查看
6. 工单列表重构操作菜单与表单优化
This commit is contained in:
SunYF
2026-09-18 13:54:30 +08:00
parent bf3a408839
commit 672cd23329
17 changed files with 780 additions and 207 deletions
+124 -18
View File
@@ -32,8 +32,9 @@
</template>
</el-table-column>
<el-table-column prop="operator" label="操作人" min-width="90" />
<el-table-column label="操作" width="230">
<el-table-column label="操作" width="330">
<template #default="{ row }">
<el-button size="small" type="primary" link @click="openDetail(row)">详情</el-button>
<el-button v-if="can('produce.workorder:dailyplan') && (row.status === 'PENDING' || row.status === 'CONFIRMED')"
size="small" :type="row.status === 'CONFIRMED' ? 'warning' : 'success'" @click="toggleStatus(row)">
{{ row.status === 'CONFIRMED' ? '停用' : '启用' }}
@@ -44,19 +45,47 @@
</el-table-column>
</el-table>
<el-dialog v-model="dialog.show" title="新建/编辑排产" width="520px">
<el-form :model="dialog" label-width="90px">
<el-dialog v-model="dialog.show" :title="dialog.id ? '编辑排产' : '新建排产'" width="560px">
<el-form :model="dialog" label-width="92px">
<el-form-item label="工单号">
<el-select v-model="dialog.orderNo" filterable allow-create placeholder="请选择/输入工单号" style="width:100%" @change="loadSuggest">
<el-select v-model="dialog.orderNo" filterable allow-create placeholder="请选择/输入工单号" style="width:100%" @change="onOrderChange">
<el-option v-for="w in workOrders" :key="w.workOrderNo" :label="w.workOrderNo" :value="w.workOrderNo" />
</el-select>
</el-form-item>
<el-form-item label="排产日期">
<el-date-picker v-model="dialog.planDate" type="date" value-format="YYYY-MM-DD" style="width:100%" />
</el-form-item>
<el-form-item label="计划数量">
<el-input-number v-model="dialog.planQty" :min="1" style="width:100%" />
</el-form-item>
<!-- 选工单号后自动带出只读 -->
<el-form-item label="产品型号"><el-input :model-value="dialog.productType" disabled placeholder="随工单号自动带出" /></el-form-item>
<el-form-item label="产品编号"><el-input :model-value="dialog.productCode" disabled placeholder="随工单号自动带出" /></el-form-item>
<el-form-item label="产品名称"><el-input :model-value="dialog.productName" disabled placeholder="随工单号自动带出" /></el-form-item>
<el-form-item label="工单数量"><el-input :model-value="dialog.woQty" disabled placeholder="随工单号自动带出" /></el-form-item>
<!-- 新建日期范围 + 排产模式一排多天参考工单自动排产 -->
<template v-if="!dialog.id">
<el-form-item label="排产日期范围">
<el-date-picker v-model="dialog.planRange" type="daterange" value-format="YYYY-MM-DD"
start-placeholder="开始日期" end-placeholder="结束日期" style="width:100%" />
</el-form-item>
<el-form-item label="排产模式">
<el-radio-group v-model="dialog.mode">
<el-radio value="AVG">平均分摊</el-radio>
<el-radio value="FIXED">固定日产</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="dialog.mode === 'FIXED' ? '每日产量' : '总数量'">
<el-input-number v-model="dialog.planQty" :min="1" style="width:100%" />
</el-form-item>
<el-alert type="info" :closable="false" style="margin-bottom:12px"
:title="`共 ${previewDates.length} 天:${previewDates.join('、') || '-'}`" />
</template>
<!-- 编辑单日 -->
<template v-else>
<el-form-item label="排产日期">
<el-date-picker v-model="dialog.planDate" type="date" value-format="YYYY-MM-DD" style="width:100%" />
</el-form-item>
<el-form-item label="计划数量">
<el-input-number v-model="dialog.planQty" :min="1" style="width:100%" />
</el-form-item>
</template>
<el-form-item label="送达接驳台" prop="dockCodes">
<el-select v-model="dialog.dockCodes" multiple filterable clearable placeholder="该工单物料送达哪些接驳台(可多选)" style="width:100%">
<el-option-group label="产线接驳台(DOCK n↔工位n)">
@@ -74,6 +103,10 @@
<el-button v-if="can('produce.workorder:dailyplan')" type="primary" @click="save">保存</el-button>
</template>
</el-dialog>
<!-- 排产详情只读列表点详情打开不可编辑 -->
<DetailDrawer :visible="detail.show" @update:visible="detail.show = $event"
:title="detail.title" :fields="detail.fields" :data="detail.row" />
</el-card>
<PageHelp :data="helpDailyPlan" page="DailyPlan" />
</template>
@@ -85,17 +118,34 @@
</style>
<script setup>
import { reactive, ref, onMounted } from 'vue'
import { reactive, ref, computed, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import { can } from '../utils/perm'
import PageHelp from '../components/PageHelp.vue'
import DetailDrawer from '../components/DetailDrawer.vue'
import { helpDailyPlan } from '../help'
const query = reactive({ orderNo: '', planDate: '' })
const list = ref([])
const workOrders = ref([])
const dialog = reactive({ show: false, id: 0, orderNo: '', planDate: '', planQty: 1, dockCodes: [] })
const productTypes = ref([])
const dialog = reactive({ show: false, id: 0, orderNo: '', planDate: '', planRange: [], mode: 'AVG', planQty: 1, dockCodes: [], productType: '', productCode: '', productName: '', woQty: '' })
// 新建排产「日期范围 + 模式」预览:展开为去重升序日期列表(仅前端提示,后端以 planRange 为准)
const previewDates = computed(() => {
const r = dialog.planRange
if (!r || r.length !== 2 || !r[0] || !r[1]) return []
const p = (n) => String(n).padStart(2, '0')
const start = new Date(r[0] + 'T00:00:00')
const end = new Date(r[1] + 'T00:00:00')
if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || end < start) return []
const out = []
for (let d = new Date(start); d <= end; d.setDate(d.getDate() + 1)) {
out.push(`${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`)
}
return out
})
const dockOptions = [...Array.from({ length: 20 }, (_, i) => `DOCK${String(i + 1).padStart(2, '0')}`), 'DOCK21']
const statusOptions = [
@@ -117,22 +167,77 @@ async function loadSuggest() {
dialog.dockCodes = d?.dockCodes || []
} catch { dialog.dockCodes = [] }
}
// 选工单号自动带出其产品信息(只读展示,避免手填错位)
function loadWorkOrderInfo() {
const wo = workOrders.value.find((w) => w.workOrderNo === dialog.orderNo)
if (!wo) {
dialog.productType = ''; dialog.productCode = ''; dialog.productName = ''; dialog.woQty = ''
return
}
dialog.productCode = wo.productCode || ''
dialog.productName = wo.productName || ''
dialog.woQty = wo.quantity || 0
const pt = productTypes.value.find((p) => p.id === wo.productTypeId)
dialog.productType = pt ? (pt.name + (pt.code ? ' / ' + pt.code : '')) : ''
}
function onOrderChange() {
loadSuggest()
loadWorkOrderInfo()
}
function openAdd() {
Object.assign(dialog, { show: true, id: 0, orderNo: '', planDate: new Date().toISOString().slice(0, 10), planQty: 1, dockCodes: [] })
const today = new Date().toISOString().slice(0, 10)
Object.assign(dialog, {
show: true, id: 0, orderNo: '', planDate: '', planRange: [today, today], mode: 'AVG',
planQty: 1, dockCodes: [], productType: '', productCode: '', productName: '', woQty: ''
})
}
function openEdit(row) {
Object.assign(dialog, { show: true, id: row.id, orderNo: row.orderNo, planDate: row.planDate, planQty: row.planQty, dockCodes: row.dockCodes || [] })
Object.assign(dialog, {
show: true, id: row.id, orderNo: row.orderNo, planDate: row.planDate, planRange: [],
mode: 'AVG', planQty: row.planQty, dockCodes: row.dockCodes || [],
productType: '', productCode: '', productName: '', woQty: ''
})
loadWorkOrderInfo()
}
async function save() {
if (!dialog.orderNo || !dialog.planDate) return ElMessage.warning('请选择工单号和排产日期')
if (!dialog.orderNo) return ElMessage.warning('请选择工单号')
if (!dialog.dockCodes.length) return ElMessage.warning('请确认送达接驳台(AGV 配送目标)')
const payload = { orderNo: dialog.orderNo, planDate: dialog.planDate, planQty: dialog.planQty, dockCodes: dialog.dockCodes }
if (dialog.id) await request.put(`/daily-plans/${dialog.id}`, payload)
else await request.post('/daily-plans', payload)
if (dialog.id) {
// 编辑单条日排产
if (!dialog.planDate) return ElMessage.warning('请选择排产日期')
await request.put(`/daily-plans/${dialog.id}`, {
id: dialog.id, orderNo: dialog.orderNo, planDate: dialog.planDate, planQty: dialog.planQty, dockCodes: dialog.dockCodes
})
} else {
// 新建批量:按日期范围 + 模式生成多天日排产
if (!dialog.planRange || dialog.planRange.length !== 2 || !dialog.planRange[0] || !dialog.planRange[1])
return ElMessage.warning('请选择排产日期范围')
if (!dialog.planQty || dialog.planQty < 1) return ElMessage.warning('请填写数量')
await request.post('/daily-plans', {
orderNo: dialog.orderNo, planRange: dialog.planRange, mode: dialog.mode,
planQty: dialog.planQty, dockCodes: dialog.dockCodes
})
}
ElMessage.success('保存成功')
dialog.show = false
load()
}
// 排产详情(只读,列表点「详情」打开)
const detail = reactive({ show: false, title: '排产详情', fields: [], row: null })
function openDetail(row) {
detail.fields = [
{ key: 'orderNo', label: '工单号' },
{ key: 'planDate', label: '排产日期' },
{ key: 'planQty', label: '计划数量' },
{ key: 'completedQty', label: '已完成' },
{ key: 'dockCodes', label: '送达接驳台', format: (v) => (v && v.length ? v.join('、') : '未指定') },
{ key: 'status', label: '执行状态', type: 'enum', map: statusOptions.reduce((m, x) => { m[x.v] = x.l; return m }, {}) },
{ key: 'operator', label: '操作人' }
]
detail.row = row
detail.show = true
}
async function del(row) {
await ElMessageBox.confirm('确认删除该排产?', '提示', { type: 'warning' })
await request.delete(`/daily-plans/${row.id}`)
@@ -152,6 +257,7 @@ async function toggleStatus(row) {
}
onMounted(async () => {
workOrders.value = (await request.get('/work-orders')) || []
productTypes.value = (await request.get('/product-types')) || []
load()
})
</script>