Align asset and disposal approval status labels

This commit is contained in:
WuYongJie 2026-11-12 14:11:11 +08:00
parent d344e331fd
commit ff3ecafe7a
8 changed files with 102 additions and 35 deletions

View File

@ -172,3 +172,55 @@ test('资产列表最近变动排序会把有最新挂载记录的父资产排
;(prisma.mountHistory.groupBy as any) = originalGroupBy
}
})
test('资产列表按页标记当前获批的待报废根资产和配件,历史终态不影响展示', async () => {
const originalFindMany = prisma.equipment.findMany
const originalCount = prisma.equipment.count
const originalFindDisposals = prisma.disposalRecord.findMany
const approvedPart = { id: 2, status: '待报废' }
const pendingPart = { id: 3, status: '待报废' }
const availablePart = { id: 4, status: '可用' }
const root = { id: 1, status: '待报废', children: [approvedPart, pendingPart, availablePart] }
const pending = { id: 5, status: '待报废', children: [] }
const records = [
{ equipment_id: root.id, status: 'approved', items: [] },
{ equipment_id: 99, status: 'approved', items: [{ equipment_id: approvedPart.id }, { equipment_id: availablePart.id }] },
{ equipment_id: pending.id, status: 'pending', items: [] },
{ equipment_id: pending.id, status: 'rejected', items: [{ equipment_id: pendingPart.id }] },
{ equipment_id: pending.id, status: 'cancelled', items: [{ equipment_id: pendingPart.id }] },
{ equipment_id: pending.id, status: 'completed', items: [{ equipment_id: pendingPart.id }] }
]
const queries: number[][] = []
;(prisma.equipment.findMany as any) = async ({ where }: any) => where.parent_id === root.id
? root.children : [root, pending]
;(prisma.equipment.count as any) = async () => 2
;(prisma.disposalRecord.findMany as any) = async ({ where, select }: any) => {
const ids = where.OR[0].equipment_id.in as number[]
assert.equal(where.status, 'approved')
assert.deepEqual(where.OR[1].items.some.equipment_id.in, ids)
assert.deepEqual(select.items.where.equipment_id.in, ids)
queries.push(ids)
return records.filter(record => record.status === where.status &&
(ids.includes(record.equipment_id) || record.items.some(item => ids.includes(item.equipment_id))))
.map(record => ({ equipment_id: record.equipment_id, items: record.items.filter(item => ids.includes(item.equipment_id)) }))
}
try {
const first = createMockResponse()
await getEquipmentList({ query: {} } as any, first.res as any)
assert.equal(first.responseBody.statusCode, 200)
const [rootRow, pendingRow] = first.responseBody.body.data.list
assert.deepEqual([rootRow.status, rootRow.disposal_approved, pendingRow.disposal_approved], ['待报废', true, false])
assert.deepEqual(rootRow.children.map((item: any) => item.disposal_approved), [true, false, false])
const childPage = createMockResponse()
await getEquipmentList({ query: { parent_id: String(root.id) } } as any, childPage.res as any)
assert.equal(childPage.responseBody.statusCode, 200)
assert.deepEqual(childPage.responseBody.body.data.list.map((item: any) => item.disposal_approved), [true, false, false])
assert.deepEqual(queries, [[1, 2, 3, 5], [2, 3]])
} finally {
;(prisma.equipment.findMany as any) = originalFindMany
;(prisma.equipment.count as any) = originalCount
;(prisma.disposalRecord.findMany as any) = originalFindDisposals
}
})

View File

@ -275,12 +275,13 @@ const getLatestTimestamp = (...values: Array<Date | string | null | undefined>)
}, null)
}
const serializeEquipmentListItem = (equipment: any) => {
const serializeEquipmentListItem = (equipment: any, approvedEquipmentIds: Set<number>) => {
const children = Array.isArray(equipment.children)
? equipment.children.map((child: any) => {
const { borrow_records, ...restChild } = child
return {
...restChild,
disposal_approved: child.status === '待报废' && approvedEquipmentIds.has(child.id),
current_borrow: mapCurrentBorrow(borrow_records)
}
})
@ -300,6 +301,7 @@ const serializeEquipmentListItem = (equipment: any) => {
return {
...restEquipment,
disposal_approved: equipment.status === '待报废' && approvedEquipmentIds.has(equipment.id),
children,
latest_mount_change_at: latestMountChangeAt,
recent_change_at: recentChangeAt,
@ -866,10 +868,28 @@ export const getEquipmentList = async (req: Request, res: Response) => {
])
}
const pendingEquipmentIds = [...new Set<number>(list.flatMap(equipment =>
[equipment, ...(equipment.children || [])]
.filter(item => item.status === '待报废')
.map(item => item.id)
))]
const approvedEquipmentIds = new Set<number>()
if (pendingEquipmentIds.length) {
const inPage = { in: pendingEquipmentIds }
const approved = await prisma.disposalRecord.findMany({
where: { status: 'approved', OR: [{ equipment_id: inPage }, { items: { some: { equipment_id: inPage } } }] },
select: { equipment_id: true, items: { where: { equipment_id: inPage }, select: { equipment_id: true } } }
})
for (const record of approved) {
approvedEquipmentIds.add(record.equipment_id)
for (const item of record.items) approvedEquipmentIds.add(item.equipment_id)
}
}
successResponse(
res,
{
list: list.map(serializeEquipmentListItem),
list: list.map(item => serializeEquipmentListItem(item, approvedEquipmentIds)),
total,
page: Number(page),
pageSize: Number(pageSize)

View File

@ -138,6 +138,7 @@ export interface Equipment {
equipment_type: EquipmentType
code_generation_mode: CodeGenerationMode
status: EquipmentStatus
disposal_approved?: boolean
total_quantity: number
remaining_quantity: number
unit_price: number

View File

@ -0,0 +1,11 @@
export const APPROVED_DISPOSAL_LABEL = '已审批 · 待处置'
const disposalStatusLabels: Record<string, string> = {
pending: '待审批',
approved: APPROVED_DISPOSAL_LABEL,
rejected: '已驳回',
completed: '已完成',
cancelled: '已撤销'
}
export const getDisposalStatusText = (status: string) => disposalStatusLabels[status] || status

View File

@ -525,6 +525,7 @@
<script setup lang="ts">
import { ref, computed, onMounted, onBeforeUnmount, reactive, watch } from 'vue'
import { createRequestScope } from '@/utils/requestScope'
import { getDisposalStatusText } from '@/utils/disposalStatus'
import { useRouter, useRoute } from 'vue-router'
import { useAuthStore } from '@/stores/auth'
import { PERMISSIONS } from '@/auth/permissions'
@ -1312,11 +1313,6 @@ const getDisposalStatusClass = (status: string) => {
return map[status] || 'badge-neutral'
}
const getDisposalStatusText = (status: string) => {
const map: Record<string, string> = { pending: '待审批', approved: '已审批', rejected: '已驳回', completed: '已完成', cancelled: '已撤销' }
return map[status] || status
}
const handleSubmit = async () => {
if (!canEditBasic.value) return
if (!isEdit.value && parentPriceOverflow.value) {

View File

@ -217,7 +217,7 @@
<p class="mt-1 font-mono text-xs text-text-tertiary">{{ equipment.equipment_code }}</p>
</div>
</div>
<span class="badge" :class="getStatusBadgeClass(equipment.status)">{{ equipment.status }}</span>
<span class="badge" :class="getStatusBadgeClass(equipment.status)">{{ getAssetStatusText(equipment) }}</span>
</div>
<div class="mt-4 mobile-card__meta">
@ -340,7 +340,7 @@
<div class="space-y-2">
<div class="flex flex-wrap items-center gap-2">
<p class="text-lg font-semibold text-text-primary">{{ formatCurrencyNoFraction(Number(equipment.unit_price || 0)) }}</p>
<span class="badge" :class="getStatusBadgeClass(equipment.status)">{{ equipment.status }}</span>
<span class="badge" :class="getStatusBadgeClass(equipment.status)">{{ getAssetStatusText(equipment) }}</span>
</div>
<p class="text-xs text-text-tertiary">库存 {{ equipment.remaining_quantity }} / {{ equipment.total_quantity }}</p>
</div>
@ -796,6 +796,7 @@ import { getEquipmentList, getEquipmentDetail, deleteEquipment, scanEquipment }
import { indexEquipmentSelection, resolveSelectedEquipmentCodes, type SelectableEquipment } from '@/utils/equipmentSelection'
import { parseEquipmentImportRows } from '@/utils/equipmentImport'
import { createRequestScope } from '@/utils/requestScope'
import { APPROVED_DISPOSAL_LABEL } from '@/utils/disposalStatus'
import { getReturnCompletionText } from '@/utils/returnConfirmation'
import { getPersonOptions, type PersonOption } from '@/api/person'
import { getDepartmentOptions } from '@/api/department'
@ -1926,6 +1927,9 @@ const handleMountUpdated = async (equipmentId: number) => {
expandedIds.value.add(equipmentId)
}
const getAssetStatusText = (equipment: Equipment) =>
equipment.status === '待报废' && equipment.disposal_approved === true ? APPROVED_DISPOSAL_LABEL : equipment.status
const getStatusBadgeClass = (status: string) => {
const map: Record<string, string> = {
'可用': 'badge-success',

View File

@ -17,7 +17,7 @@
<p class="page-meta__value">{{ formatSummaryCount(summary?.pending) }}</p>
</div>
<div class="page-meta">
<p class="page-meta__label">已审批</p>
<p class="page-meta__label">{{ APPROVED_DISPOSAL_LABEL }}</p>
<p class="page-meta__value">{{ formatSummaryCount(summary?.approved) }}</p>
</div>
<div class="page-meta">
@ -54,11 +54,11 @@
<div class="filter-bar">
<div class="filter-bar__inputs">
<div class="field-stack">
<label class="field-label">报废状态</label>
<label class="field-label">单据状态</label>
<select v-model="filters.status" class="select" @change="handleQuery">
<option value="">全部状态</option>
<option value="pending">待审批</option>
<option value="approved">已审批</option>
<option value="approved">{{ APPROVED_DISPOSAL_LABEL }}</option>
<option value="rejected">已驳回</option>
<option value="completed">已完成</option>
<option value="cancelled">已撤销</option>
@ -136,7 +136,7 @@
</div>
</div>
<span class="badge" :class="getStatusBadgeClass(item.status)">
{{ getStatusText(item.status) }}
{{ getDisposalStatusText(item.status) }}
</span>
</div>
@ -212,7 +212,7 @@
<th>报废原因</th>
<th>处置方式</th>
<th class="text-right">残值估价</th>
<th>状态</th>
<th>单据状态</th>
<th>申请人</th>
<th>申请时间</th>
<th class="text-right">操作</th>
@ -244,7 +244,7 @@
<td class="text-right text-sm text-text-primary">{{ formatCurrency(item.estimated_value) }}</td>
<td>
<span class="badge" :class="getStatusBadgeClass(item.status)">
{{ getStatusText(item.status) }}
{{ getDisposalStatusText(item.status) }}
</span>
</td>
<td class="text-sm text-text-secondary">{{ item.applier?.name || '-' }}</td>
@ -338,6 +338,7 @@ import { PERMISSIONS } from '@/auth/permissions'
import MobileActionSheet from '@/components/MobileActionSheet.vue'
import BatchDisposalApprovalDialog from '@/components/BatchDisposalApprovalDialog.vue'
import { createRequestScope } from '@/utils/requestScope'
import { APPROVED_DISPOSAL_LABEL, getDisposalStatusText } from '@/utils/disposalStatus'
type DisposalScope = 'pending' | 'mine' | 'processed' | 'all'
type DisposalQuery = { scope: DisposalScope; status: string; keyword: string }
@ -596,17 +597,6 @@ const getStatusBadgeClass = (status: string) => {
return map[status] || ''
}
const getStatusText = (status: string) => {
const map: Record<string, string> = {
pending: '待审批',
approved: '已审批',
rejected: '已驳回',
completed: '已完成',
cancelled: '已撤销'
}
return map[status] || status
}
const formatDate = (date: string) => {
if (!date) return '-'
return new Date(date).toLocaleDateString('zh-CN')

View File

@ -9,7 +9,7 @@
<div v-if="record" class="page-meta-grid">
<div class="page-meta">
<p class="page-meta__label">当前状态</p>
<span class="badge mt-2" :class="getStatusBadgeClass(record.status)">{{ getStatusText(record.status) }}</span>
<span class="badge mt-2" :class="getStatusBadgeClass(record.status)">{{ getDisposalStatusText(record.status) }}</span>
</div>
<div class="page-meta">
<p class="page-meta__label">包含资产</p>
@ -193,6 +193,7 @@ import {
import { useAuthStore } from '@/stores/auth'
import { PERMISSIONS } from '@/auth/permissions'
import { formatDateTime } from '@/utils/format'
import { getDisposalStatusText } from '@/utils/disposalStatus'
const route = useRoute()
const router = useRouter()
@ -362,14 +363,6 @@ const getStatusBadgeClass = (status: string) => ({
completed: 'badge-success'
}[status] || 'badge-neutral')
const getStatusText = (status: string) => ({
pending: '待审批',
approved: '已审批',
rejected: '已驳回',
completed: '已完成',
cancelled: '已撤销'
}[status] || status)
const formatCurrency = (value?: number) => `¥${Number(value || 0).toFixed(2)}`
onMounted(loadDetail)