chore: 批量完成项目多模块迭代优化
1. 废弃半成品库存表并统一库存主表 2. 修复列表排序与搜索大小写不敏感问题 3. 新增用户最近登录时间、工单BOM名称字段 4. 完善角色管理、工位选择器功能 5. 增加拧紧数据补录、成品自动回流WMS能力 6. 统一导出时间范围校验规则 7. 丰富物料/备料单筛选条件 8. 调整菜单与权限命名适配产品型号业务
This commit is contained in:
@@ -106,7 +106,7 @@ const materials = ref([])
|
||||
const materialTotal = ref(0)
|
||||
const materialLoading = ref(false)
|
||||
const matFilter = reactive({
|
||||
materialCode: '', name: '', spec: '', manageMode: '', startDate: defaultStart(), endDate: ''
|
||||
materialCode: '', name: '', spec: '', manageMode: '', itemType: '', startDate: defaultStart(), endDate: ''
|
||||
})
|
||||
const matPage = reactive({ current: 1, size: 10 })
|
||||
|
||||
@@ -127,6 +127,7 @@ async function loadMaterials() {
|
||||
name: matFilter.name.trim(),
|
||||
spec: matFilter.spec.trim(),
|
||||
manageMode: matFilter.manageMode,
|
||||
itemType: matFilter.itemType,
|
||||
startDate: matFilter.startDate,
|
||||
endDate: matFilter.endDate,
|
||||
page: matPage.current,
|
||||
@@ -213,7 +214,8 @@ async function exportMaterials() {
|
||||
materialCode: matFilter.materialCode.trim(),
|
||||
name: matFilter.name.trim(),
|
||||
spec: matFilter.spec.trim(),
|
||||
manageMode: matFilter.manageMode
|
||||
manageMode: matFilter.manageMode,
|
||||
itemType: matFilter.itemType
|
||||
}, '物料档案.xlsx')
|
||||
ElMessage.success('已导出:' + name)
|
||||
} catch (e) {
|
||||
@@ -388,6 +390,13 @@ async function onMaterialFile(e) {
|
||||
<el-table-column prop="unit" label="单位" width="70" align="center">
|
||||
<template #default="{ row }">{{ row.unit || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="品类" width="90" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.itemType === 3 ? 'success' : (row.itemType === 2 ? 'warning' : 'info')" size="small">
|
||||
{{ row.itemType === 3 ? '成品' : (row.itemType === 2 ? '半成品' : '原材料') }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型" width="140" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.manageMode === 2 ? 'warning' : 'info'" size="small">
|
||||
|
||||
@@ -25,11 +25,12 @@ function defaultStart() {
|
||||
return `${y}-${m}-${day}`
|
||||
}
|
||||
|
||||
// manageMode: ''=全部 1=结构件 2=精密件
|
||||
// manageMode: ''=全部 1=结构件 2=精密件;category: ''=全部 1=原材料 2=半成品 3=成品
|
||||
const filters = reactive({
|
||||
materialCode: '',
|
||||
materialName: '',
|
||||
manageMode: '',
|
||||
category: '',
|
||||
zoneCode: '',
|
||||
qualityStatus: '',
|
||||
startDate: defaultStart(),
|
||||
@@ -72,6 +73,7 @@ async function loadMaterial() {
|
||||
materialCode: filters.materialCode.trim(),
|
||||
materialName: filters.materialName.trim(),
|
||||
manageMode: filters.manageMode,
|
||||
category: filters.category,
|
||||
page: matPage.current,
|
||||
pageSize: matPage.size
|
||||
}
|
||||
@@ -94,6 +96,7 @@ async function loadDetail() {
|
||||
zoneCode: filters.zoneCode,
|
||||
qualityStatus: filters.qualityStatus,
|
||||
manageMode: filters.manageMode,
|
||||
category: filters.category,
|
||||
startDate: filters.startDate,
|
||||
endDate: filters.endDate,
|
||||
page: page.current,
|
||||
@@ -457,6 +460,11 @@ onMounted(() => {
|
||||
<el-tag size="small" :type="row.manageMode === 1 ? 'primary' : 'warning'">{{ typeLabel(row.manageMode) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="品类" width="85" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag size="small" type="info" effect="plain">{{ categoryLabel(row.category) }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="zoneCode" label="区域" width="100" align="center">
|
||||
<template #default="{ row }">{{ row.zoneCode || '未分区' }}</template>
|
||||
</el-table-column>
|
||||
|
||||
Reference in New Issue
Block a user