diff --git a/frontend/src/views/Materials.vue b/frontend/src/views/Materials.vue index 40052798..eb5b8327 100644 --- a/frontend/src/views/Materials.vue +++ b/frontend/src/views/Materials.vue @@ -93,7 +93,7 @@ - + @@ -219,6 +219,11 @@ function categoryLabel(category, withCode = false) { return category.status === 'active' ? name : `${name}(已停用)` } +function minorCategoryLabel(category, majorId) { + const major = categories.value.find(item => item.id === majorId) + return major && major.status !== 'active' ? category.name : categoryLabel(category) +} + function handleImageUpload(e) { const file = e.target.files[0] if (file) { @@ -293,12 +298,13 @@ function markCodeEdited() { function getMajorCategoryDisplay(row) { const { major } = resolveCategoryPath(categories.value, row.category_id) - if (major) return `${major.code} ${major.name}` + if (major) return categoryLabel(major, true) return materialsStore.getCategoryDisplay(row.category) } function getMinorCategoryDisplay(row) { - return resolveCategoryPath(categories.value, row.category_id).minor?.name || '-' + const { major, minor } = resolveCategoryPath(categories.value, row.category_id) + return minor ? minorCategoryLabel(minor, major?.id) : '-' } function syncUnit(id) {