diff --git a/backend/src/controllers/__tests__/equipmentController.search.test.ts b/backend/src/controllers/__tests__/equipmentController.search.test.ts index cf1391e..0e2afd1 100644 --- a/backend/src/controllers/__tests__/equipmentController.search.test.ts +++ b/backend/src/controllers/__tests__/equipmentController.search.test.ts @@ -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 + } +}) diff --git a/backend/src/controllers/equipmentController.ts b/backend/src/controllers/equipmentController.ts index fdeeaea..11b90b2 100644 --- a/backend/src/controllers/equipmentController.ts +++ b/backend/src/controllers/equipmentController.ts @@ -275,12 +275,13 @@ const getLatestTimestamp = (...values: Array) }, null) } -const serializeEquipmentListItem = (equipment: any) => { +const serializeEquipmentListItem = (equipment: any, approvedEquipmentIds: Set) => { 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(list.flatMap(equipment => + [equipment, ...(equipment.children || [])] + .filter(item => item.status === '待报废') + .map(item => item.id) + ))] + const approvedEquipmentIds = new Set() + 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) diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts index 919b8dc..9a3e4d4 100644 --- a/frontend/src/types/index.ts +++ b/frontend/src/types/index.ts @@ -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 diff --git a/frontend/src/utils/disposalStatus.ts b/frontend/src/utils/disposalStatus.ts new file mode 100644 index 0000000..90a0a5a --- /dev/null +++ b/frontend/src/utils/disposalStatus.ts @@ -0,0 +1,11 @@ +export const APPROVED_DISPOSAL_LABEL = '已审批 · 待处置' + +const disposalStatusLabels: Record = { + pending: '待审批', + approved: APPROVED_DISPOSAL_LABEL, + rejected: '已驳回', + completed: '已完成', + cancelled: '已撤销' +} + +export const getDisposalStatusText = (status: string) => disposalStatusLabels[status] || status diff --git a/frontend/src/views/equipment/EquipmentForm.vue b/frontend/src/views/equipment/EquipmentForm.vue index 34ff0e2..a881da7 100644 --- a/frontend/src/views/equipment/EquipmentForm.vue +++ b/frontend/src/views/equipment/EquipmentForm.vue @@ -525,6 +525,7 @@