Show disposal stage and next action in asset dialog

This commit is contained in:
WuYongJie 2026-11-12 14:43:13 +08:00
parent 1029701eca
commit 1eeb3cb93f

View File

@ -377,11 +377,11 @@
<div class="sheet-panel max-w-lg">
<div class="flex flex-wrap items-start justify-between gap-3">
<div>
<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>
<h3 id="disposal-prerequisite-title" class="text-xl font-semibold text-text-primary">{{ disposalPrerequisiteCopy.title }}</h3>
<p class="mt-2 text-sm text-text-secondary">{{ disposalPrerequisiteCopy.reason }}</p>
</div>
<span v-if="!disposalPreparationNotice" class="badge badge-warning">
{{ activeDisposalRecord ? getDisposalStatusText(activeDisposalRecord.status) : disposalPrerequisite.status }}
<span v-if="!disposalPreparationNotice && !activeDisposalRecord && disposalPrerequisite.status !== '待报废'" class="badge badge-warning">
{{ disposalPrerequisite.status }}
</span>
</div>
@ -418,7 +418,7 @@
<p v-if="disposalReturnError" class="mt-4 text-sm text-status-error" role="alert">{{ disposalReturnError }}</p>
<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>
<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 } }"
@ -426,7 +426,7 @@
rel="noopener"
class="btn-primary w-full sm:w-auto"
>
查看单据 #{{ activeDisposalRecord.id }}
查看报废单 #{{ activeDisposalRecord.id }}
</RouterLink>
<button
v-if="disposalReturnNeedsRefresh"
@ -640,6 +640,7 @@ const currentEquipment = ref<EquipmentDetail | null>(null)
const equipmentRequestScope = createRequestScope()
const maintenanceRequestScope = createRequestScope()
const disposalRequestScope = createRequestScope()
const disposalRecordsLoading = ref(false)
const detailLoading = ref(false)
const detailReady = computed(() => !isEdit.value || (
!detailLoading.value && currentEquipment.value?.id === Number(route.params.id)
@ -737,6 +738,26 @@ const disposalBlockReason = computed(() => {
const disposalPrerequisiteTitle = computed(() =>
currentEquipment.value?.status === '已借出' ? '报废前需先入库' : '暂时不能申请报废'
)
const disposalPrerequisiteCopy = computed(() => {
if (disposalPreparationNotice.value) return { title: '入库完成', reason: disposalPreparationNotice.value }
const status = activeDisposalRecord.value?.status
if (status === 'approved') {
return { title: getDisposalStatusText(status), reason: '实物处理后,由管理员或行政在原单点「完成报废」。' }
}
if (status === 'pending') {
return { title: getDisposalStatusText(status), reason: '请等待审批结果,无需再次申请。' }
}
const prerequisite = disposalPrerequisite.value
if (prerequisite?.status === '待报废') {
return {
title: '报废进度待确认',
reason: disposalRecordsLoading.value ? '正在查询报废单…' : '请联系管理员核对报废单。'
}
}
return { title: prerequisite?.title, reason: prerequisite?.reason }
})
const canQuickReturnBeforeDisposal = computed(() =>
currentEquipment.value?.status === '已借出' &&
currentEquipment.value.total_quantity === 1 &&
@ -1094,11 +1115,16 @@ const fetchDisposalRecords = async () => {
if (!isEdit.value || !canViewDisposals.value) return
const equipmentId = Number(route.params.id)
const requestVersion = disposalRequestScope.begin()
disposalRecordsLoading.value = true
try {
const response = await getEquipmentDisposalHistory(equipmentId)
if (!disposalRequestScope.isCurrent(requestVersion) || equipmentId !== Number(route.params.id)) return
disposalRecords.value = response.data?.data || []
} catch (error) { console.error('获取报废记录失败:', error) }
} catch (error) {
console.error('获取报废记录失败:', error)
} finally {
if (disposalRequestScope.isCurrent(requestVersion)) disposalRecordsLoading.value = false
}
}
const handleDepartmentChange = async () => {