Explain blocked disposal applications in previews
This commit is contained in:
parent
ff3ecafe7a
commit
1029701eca
@ -1,7 +1,7 @@
|
||||
import assert from 'node:assert/strict'
|
||||
import test from 'node:test'
|
||||
import prisma from '../../utils/prisma'
|
||||
import { getDisposalDetail, getDisposalList, getEquipmentDisposalHistory } from '../disposalController'
|
||||
import { getDisposalDetail, getDisposalList, getEquipmentDisposalHistory, previewBatchDisposal } from '../disposalController'
|
||||
|
||||
const response = (role: string) => {
|
||||
const state = { code: 200, body: null as any }
|
||||
@ -55,6 +55,63 @@ test('disposal detail permits IT own record and rejects another applicant', asyn
|
||||
}
|
||||
})
|
||||
|
||||
test('批量预检标记自身或配件的在途报废单,单号按详情权限显示', async () => {
|
||||
const equipmentFind = prisma.equipment.findMany
|
||||
const disposalFind = prisma.disposalRecord.findMany
|
||||
const borrowFind = prisma.borrowRecord.findMany
|
||||
const maintenanceFind = prisma.maintenanceRecord.findMany
|
||||
const equipment = (id: number, status: string, parent_id: number | null = null) => ({
|
||||
id, equipment_code: `TEST-${id}`, equipment_name: '测试资产', status, parent_id,
|
||||
total_quantity: 1, remaining_quantity: 1, mount_status: parent_id ? 'mounted' : 'none'
|
||||
})
|
||||
const assets = [
|
||||
equipment(10, '待报废'), equipment(11, '待报废', 10),
|
||||
equipment(20, '待报废'), equipment(30, '可用'), equipment(40, '待报废'),
|
||||
equipment(60, '可用'), equipment(61, '待报废', 60)
|
||||
]
|
||||
const records = [
|
||||
{ id: 103, equipment_id: 300, status: 'approved', applied_by: 99, items: [{ equipment_id: 11 }, { equipment_id: 61 }] },
|
||||
{ id: 102, equipment_id: 20, status: 'approved', applied_by: 99, items: [] },
|
||||
{ id: 101, equipment_id: 10, status: 'pending', applied_by: 6, items: [] },
|
||||
{ id: 100, equipment_id: 30, status: 'rejected', applied_by: 6, items: [] }
|
||||
]
|
||||
let disposalQueries = 0
|
||||
;(prisma.equipment.findMany as any) = async ({ where }: any) => where.OR
|
||||
? assets.filter(item => where.OR[0].id.in.includes(item.id))
|
||||
: assets.filter(item => where.parent_id.in.includes(item.parent_id))
|
||||
;(prisma.disposalRecord.findMany as any) = async ({ where }: any) => {
|
||||
disposalQueries++
|
||||
assert.deepEqual(where.status.in, ['pending', 'approved'])
|
||||
return records.filter(item => where.status.in.includes(item.status))
|
||||
}
|
||||
;(prisma.borrowRecord.findMany as any) = async () => []
|
||||
;(prisma.maintenanceRecord.findMany as any) = async () => []
|
||||
|
||||
try {
|
||||
for (const role of ['administrative', 'it']) {
|
||||
const { res, state } = response(role)
|
||||
await previewBatchDisposal({ body: { equipment_ids: [10, 11, 20, 30, 40, 60] } } as any, res as any)
|
||||
assert.equal(state.code, 200)
|
||||
const [root, part, legacy, rejected, orphan, onlyChild] = state.body.data.candidates
|
||||
assert.deepEqual(root.blocking_disposal, { id: 101, status: 'pending' })
|
||||
assert.deepEqual(part.blocking_disposal, { id: role === 'it' ? null : 103, status: 'approved' })
|
||||
assert.deepEqual(legacy.blocking_disposal, { id: role === 'it' ? null : 102, status: 'approved' })
|
||||
assert.equal(rejected.blocking_disposal, undefined)
|
||||
assert.equal(rejected.blocked_reason, null)
|
||||
assert.equal(orphan.blocking_disposal, undefined)
|
||||
assert.match(orphan.blocked_reason, /待报废/)
|
||||
assert.deepEqual(onlyChild.blocking_disposal, part.blocking_disposal)
|
||||
assert.match(part.blocked_reason, /挂载/)
|
||||
}
|
||||
assert.equal(disposalQueries, 2)
|
||||
} finally {
|
||||
;(prisma.equipment.findMany as any) = equipmentFind
|
||||
;(prisma.disposalRecord.findMany as any) = disposalFind
|
||||
;(prisma.borrowRecord.findMany as any) = borrowFind
|
||||
;(prisma.maintenanceRecord.findMany as any) = maintenanceFind
|
||||
}
|
||||
})
|
||||
|
||||
test('disposal read endpoints reject unsupported roles and malformed IDs before DB access', async () => {
|
||||
for (const handler of [getDisposalList, getDisposalDetail, getEquipmentDisposalHistory]) {
|
||||
const { res, state } = response('user')
|
||||
|
||||
@ -6,6 +6,7 @@ import { logOperation } from './operationLogController'
|
||||
import { calculateEquipmentValues } from '../utils/assetValue'
|
||||
import { loadAndLockAssetTree, lockEquipmentRows } from '../services/assetMovementService'
|
||||
import { completeLockedBorrowReturn } from '../services/borrowReturnService'
|
||||
import { PERMISSIONS, roleHasPermission } from '../utils/permissions'
|
||||
import {
|
||||
assertDisposalItemsConfirmed, DisposalConflictError, disposalTreeSelect, getDisposalAutoReturn, getDisposalBlockedReason,
|
||||
getDisposalOccupancy, isDisposalAutoReturnRoot, loadDisposalAutoReturnBorrows, loadDisposalTrees,
|
||||
@ -329,6 +330,9 @@ const getDisposalVisibility = (res: Response): Prisma.DisposalRecordWhereInput =
|
||||
throw Object.assign(new Error('无权查看报废流程'), { status: 403 })
|
||||
}
|
||||
|
||||
const canReadDisposal = (visibility: Prisma.DisposalRecordWhereInput, record: { applied_by: number }) =>
|
||||
!visibility.applied_by || visibility.applied_by === record.applied_by
|
||||
|
||||
const DISPOSAL_STATUSES = ['pending', 'approved', 'rejected', 'completed', 'cancelled'] as const
|
||||
|
||||
const parseListPositiveInteger = (
|
||||
@ -509,7 +513,8 @@ const isEquipmentId = (value: unknown): value is number => typeof value === 'num
|
||||
|
||||
export const previewBatchDisposal = async (req: Request, res: Response) => {
|
||||
try {
|
||||
if (!isEquipmentId(getCurrentUser(res).id)) return errorResponse(res, '用户未登录', 401)
|
||||
const user = getCurrentUser(res)
|
||||
if (!isEquipmentId(user.id)) return errorResponse(res, '用户未登录', 401)
|
||||
const { equipment_ids = [], equipment_codes = [] } = req.body || {}
|
||||
if (!Array.isArray(equipment_ids) || !equipment_ids.every(isEquipmentId) ||
|
||||
!Array.isArray(equipment_codes) || !equipment_codes.every(code => typeof code === 'string' && code.trim())) {
|
||||
@ -555,14 +560,21 @@ export const previewBatchDisposal = async (req: Request, res: Response) => {
|
||||
const returnIds = [...new Set(roots.filter(isDisposalAutoReturnRoot)
|
||||
.flatMap(root => trees.get(root.id)!.map(item => item.id)))]
|
||||
const returnBorrows = await loadDisposalAutoReturnBorrows(prisma, returnIds)
|
||||
const visibility = roleHasPermission(user.role, PERMISSIONS.NOTIFICATIONS_VIEW) ? getDisposalVisibility(res) : undefined
|
||||
const candidates = distinctInputs.map(({ label, root }) => {
|
||||
const tree = root ? trees.get(root.id)! : []
|
||||
const autoReturn = root && occupancy ? getDisposalAutoReturn(tree, occupancy, returnBorrows) : undefined
|
||||
const blockingAsset = occupancy && tree.find(item => occupancy.disposal.has(item.id))
|
||||
const blocker = blockingAsset && occupancy?.disposal.get(blockingAsset.id)
|
||||
return {
|
||||
equipment_id: root?.id ?? null, equipment_code: root?.equipment_code ?? label,
|
||||
equipment_name: root?.equipment_name ?? '', status: root?.status ?? '未找到',
|
||||
items: tree.map(({ id, equipment_code, equipment_name, total_quantity }) => ({ id, equipment_code, equipment_name, total_quantity })),
|
||||
blocked_reason: root ? getDisposalBlockedReason(tree, occupancy) : '未找到资产',
|
||||
...(blocker ? { blocking_disposal: {
|
||||
id: visibility && canReadDisposal(visibility, blocker) ? blocker.id : null,
|
||||
status: blocker.status
|
||||
} } : {}),
|
||||
...(autoReturn ? { auto_return_token: autoReturn.token } : {})
|
||||
}
|
||||
})
|
||||
@ -837,7 +849,7 @@ export const getDisposalDetail = async (req: Request, res: Response) => {
|
||||
include: disposalInclude
|
||||
})
|
||||
if (!disposal) return errorResponse(res, '报废记录不存在', 404)
|
||||
if (visibility.applied_by && disposal.applied_by !== visibility.applied_by) {
|
||||
if (!canReadDisposal(visibility, disposal)) {
|
||||
return errorResponse(res, '无权查看该报废申请', 403)
|
||||
}
|
||||
successResponse(res, {
|
||||
|
||||
@ -52,6 +52,8 @@ export const loadDisposalTrees = async (client: Prisma.TransactionClient, roots:
|
||||
}))
|
||||
}
|
||||
|
||||
type BlockingDisposal = { id: number; status: 'pending' | 'approved'; applied_by: number }
|
||||
|
||||
export const getDisposalOccupancy = async (client: Prisma.TransactionClient, ids: number[]) => {
|
||||
const equipmentIds = { in: ids }
|
||||
const [loans, maintenance, disposals] = await Promise.all([
|
||||
@ -59,13 +61,25 @@ export const getDisposalOccupancy = async (client: Prisma.TransactionClient, ids
|
||||
client.maintenanceRecord.findMany({ where: { equipment_id: equipmentIds, status: 'in_progress' }, select: { equipment_id: true }, distinct: ['equipment_id'] }),
|
||||
client.disposalRecord.findMany({
|
||||
where: { status: { in: ['pending', 'approved'] }, OR: [{ equipment_id: equipmentIds }, { items: { some: { equipment_id: equipmentIds } } }] },
|
||||
select: { equipment_id: true, items: { where: { equipment_id: equipmentIds }, select: { equipment_id: true } } }
|
||||
select: {
|
||||
id: true, status: true, applied_by: true, equipment_id: true,
|
||||
items: { where: { equipment_id: equipmentIds }, select: { equipment_id: true } }
|
||||
},
|
||||
orderBy: { id: 'desc' }
|
||||
})
|
||||
])
|
||||
const disposal = new Map<number, BlockingDisposal>()
|
||||
for (const row of disposals) {
|
||||
if (row.status !== 'pending' && row.status !== 'approved') continue
|
||||
const blocker: BlockingDisposal = { id: row.id, status: row.status, applied_by: row.applied_by }
|
||||
for (const id of [row.equipment_id, ...row.items.map(item => item.equipment_id)]) {
|
||||
if (!disposal.has(id)) disposal.set(id, blocker)
|
||||
}
|
||||
}
|
||||
return {
|
||||
borrowed: new Set(loans.map(row => row.equipment_id)),
|
||||
maintenance: new Set(maintenance.map(row => row.equipment_id)),
|
||||
disposal: new Set(disposals.flatMap(row => [row.equipment_id, ...row.items.map(item => item.equipment_id)]))
|
||||
disposal
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -129,6 +129,7 @@ export interface BatchDisposalCandidate {
|
||||
status: string
|
||||
items: Array<{ id: number; equipment_code: string; equipment_name: string; total_quantity?: number }>
|
||||
blocked_reason: string | null
|
||||
blocking_disposal?: { id: number | null; status: 'pending' | 'approved' }
|
||||
auto_return_token?: string
|
||||
}
|
||||
|
||||
|
||||
@ -120,6 +120,13 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<p
|
||||
v-if="previewScope === 'blocked' && blockedReasonCounts.length > 1"
|
||||
class="flex flex-wrap gap-x-3 gap-y-1 text-xs tabular-nums text-text-secondary"
|
||||
>
|
||||
<span v-for="[reason, count] in blockedReasonCounts" :key="reason">{{ reason }} {{ count }} 项</span>
|
||||
</p>
|
||||
|
||||
<details v-if="preview.duplicate_codes.length" class="text-sm text-text-secondary">
|
||||
<summary class="cursor-pointer">已合并 {{ preview.duplicate_codes.length }} 个重复编码</summary>
|
||||
<p class="mt-2 break-words">{{ preview.duplicate_codes.join('、') }}</p>
|
||||
@ -195,7 +202,18 @@
|
||||
<span class="disposal-asset-name">{{ candidate.equipment_name || candidate.equipment_code }}</span>
|
||||
<span v-if="candidate.equipment_name" class="disposal-asset-code">{{ candidate.equipment_code }}</span>
|
||||
</div>
|
||||
<p class="mt-1 break-words text-sm text-text-secondary">{{ blockedReason(candidate) }}</p>
|
||||
<div class="mt-1 flex flex-wrap items-baseline gap-x-3 gap-y-1 text-sm">
|
||||
<span class="break-words text-text-secondary">{{ blockedReason(candidate) }}</span>
|
||||
<RouterLink
|
||||
v-if="candidate.blocking_disposal?.id"
|
||||
:to="{ name: 'DisposalDetail', params: { id: candidate.blocking_disposal.id } }"
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
class="text-accent-primary hover:underline"
|
||||
>
|
||||
查看单据 #{{ candidate.blocking_disposal.id }}
|
||||
</RouterLink>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
@ -271,6 +289,7 @@
|
||||
import { computed, nextTick, onMounted, ref } from 'vue'
|
||||
import { ChevronDownIcon } from '@heroicons/vue/24/outline'
|
||||
import { keepDialogTabFocus } from '@/utils/dialogFocus'
|
||||
import { getDisposalStatusText } from '@/utils/disposalStatus'
|
||||
import DisposalAssetPicker from '@/components/DisposalAssetPicker.vue'
|
||||
import {
|
||||
createBatchDisposal,
|
||||
@ -326,9 +345,20 @@ const candidateSelectionLabel = (candidate: BatchDisposalCandidate) => {
|
||||
}
|
||||
|
||||
const blockedReason = (candidate: BatchDisposalCandidate) => {
|
||||
if (candidate.blocking_disposal) return getDisposalStatusText(candidate.blocking_disposal.status)
|
||||
const message = candidate.blocked_reason || '不可申请'
|
||||
const ownStatus = `资产 ${candidate.equipment_code} 当前为`
|
||||
return (message.startsWith(ownStatus) ? message.slice(ownStatus.length) : message).replace(/,不能申请报废$/, '')
|
||||
const reason = (message.startsWith(ownStatus) ? message.slice(ownStatus.length) : message).replace(/,不能申请报废$/, '')
|
||||
return !candidate.auto_return_token && /已借出$|未归还记录$/.test(reason) ? `${reason},请先归还` : reason
|
||||
}
|
||||
|
||||
const blockedReasonCategory = (candidate: BatchDisposalCandidate) => {
|
||||
if (candidate.blocking_disposal) return getDisposalStatusText(candidate.blocking_disposal.status)
|
||||
if (candidate.equipment_id === null) return '未找到资产'
|
||||
const reason = blockedReason(candidate)
|
||||
if (/已借出|未归还记录/.test(reason)) return '已借出'
|
||||
if (reason.endsWith('已报废')) return '已报废'
|
||||
return '其他原因'
|
||||
}
|
||||
|
||||
const busy = computed(() => readingFile.value || loading.value || submitting.value)
|
||||
@ -337,6 +367,14 @@ const autoReturnCandidates = computed(() => (preview.value?.candidates || []).fi
|
||||
))
|
||||
const eligibleCandidates = computed(() => (preview.value?.candidates || []).filter(canApply))
|
||||
const blockedCandidates = computed(() => (preview.value?.candidates || []).filter((candidate) => !canApply(candidate)))
|
||||
const blockedReasonCounts = computed(() => {
|
||||
const counts = new Map<string, number>()
|
||||
for (const candidate of blockedCandidates.value) {
|
||||
const reason = blockedReasonCategory(candidate)
|
||||
counts.set(reason, (counts.get(reason) ?? 0) + 1)
|
||||
}
|
||||
return Array.from(counts).sort((left, right) => right[1] - left[1])
|
||||
})
|
||||
const visibleCandidates = computed(() => previewScope.value === 'eligible' ? eligibleCandidates.value : blockedCandidates.value)
|
||||
const previewPageCount = computed(() => Math.max(1, Math.ceil(visibleCandidates.value.length / previewPageSize)))
|
||||
const pageCandidates = computed(() => {
|
||||
|
||||
@ -380,7 +380,9 @@
|
||||
<h3 id="disposal-prerequisite-title" class="text-xl font-semibold text-text-primary">{{ disposalPreparationNotice ? '入库完成' : disposalPrerequisite.title }}</h3>
|
||||
<p class="mt-2 text-sm text-text-secondary">{{ disposalPreparationNotice || disposalPrerequisite.reason }}</p>
|
||||
</div>
|
||||
<span v-if="!disposalPreparationNotice" class="badge badge-warning">{{ disposalPrerequisite.status }}</span>
|
||||
<span v-if="!disposalPreparationNotice" class="badge badge-warning">
|
||||
{{ activeDisposalRecord ? getDisposalStatusText(activeDisposalRecord.status) : disposalPrerequisite.status }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<dl class="mt-5 grid gap-4 border-y border-border py-4 sm:grid-cols-2">
|
||||
@ -417,6 +419,15 @@
|
||||
|
||||
<div class="mt-6 flex flex-col-reverse gap-3 sm:flex-row sm:justify-end">
|
||||
<button type="button" class="btn-secondary w-full sm:w-auto" :disabled="disposalReturnLoading" @click="closeDisposalPrerequisite">暂不处理</button>
|
||||
<RouterLink
|
||||
v-if="activeDisposalRecord && !disposalPreparationNotice"
|
||||
:to="{ name: 'DisposalDetail', params: { id: activeDisposalRecord.id } }"
|
||||
target="_blank"
|
||||
rel="noopener"
|
||||
class="btn-primary w-full sm:w-auto"
|
||||
>
|
||||
查看单据 #{{ activeDisposalRecord.id }}
|
||||
</RouterLink>
|
||||
<button
|
||||
v-if="disposalReturnNeedsRefresh"
|
||||
type="button"
|
||||
@ -539,6 +550,7 @@ import {
|
||||
getEquipmentDisposalHistory,
|
||||
createDisposal,
|
||||
returnEquipmentBeforeDisposal,
|
||||
type DisposalRecord,
|
||||
type DisposalReturnCondition,
|
||||
type DisposalReturnChildrenDiff
|
||||
} from '@/api/disposal'
|
||||
@ -619,7 +631,7 @@ const showLocationScanner = ref(false)
|
||||
let bundleChildSeed = 0
|
||||
|
||||
const maintenanceRecords = ref<any[]>([])
|
||||
const disposalRecords = ref<any[]>([])
|
||||
const disposalRecords = ref<DisposalRecord[]>([])
|
||||
const showMaintenanceForm = ref(false)
|
||||
const showDisposalForm = ref(false)
|
||||
const showBarcodePrint = ref(false)
|
||||
@ -684,7 +696,8 @@ const canViewDisposals = computed(() => authStore.canAny([
|
||||
const canPrintLabels = computed(() => authStore.can(PERMISSIONS.ASSETS_PRINT_LABELS))
|
||||
const canOverrideCorrectionRestrictions = computed(() => authStore.can(PERMISSIONS.SYSTEM_SETTINGS))
|
||||
const hasActiveMaintenance = computed(() => maintenanceRecords.value.some((record) => record.status === 'in_progress'))
|
||||
const hasActiveDisposal = computed(() => disposalRecords.value.some((record) => record.status === 'pending' || record.status === 'approved'))
|
||||
const activeDisposalRecord = computed(() => disposalRecords.value.find((record) => record.status === 'pending' || record.status === 'approved'))
|
||||
const hasActiveDisposal = computed(() => Boolean(activeDisposalRecord.value))
|
||||
const activeBorrowRecord = computed<EquipmentCurrentBorrow | null>(() => {
|
||||
const equipment = currentEquipment.value
|
||||
if (!equipment) return null
|
||||
@ -715,7 +728,7 @@ const disposalBlockReason = computed(() => {
|
||||
return '该资产正在维修中,请先完成或取消维修,再申请报废。'
|
||||
}
|
||||
if (equipment.status === '待报废' || hasActiveDisposal.value) {
|
||||
return '该资产已有进行中的报废申请,请在下方报废记录中查看当前进度。'
|
||||
return '该资产已有进行中的报废申请。'
|
||||
}
|
||||
if (equipment.status === '已报废') return '该资产已经完成报废,不能重复发起申请。'
|
||||
if (equipment.status === '已丢失') return '该资产已登记丢失,请先核实实物及后续处理。'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user