diff --git a/inventory-web/src/views/transaction/records.vue b/inventory-web/src/views/transaction/records.vue
index d42a4b8..b5a361c 100644
--- a/inventory-web/src/views/transaction/records.vue
+++ b/inventory-web/src/views/transaction/records.vue
@@ -463,11 +463,14 @@
:key="i"
:timestamp="e.time"
placement="top"
- :type="eventMeta(e.type).type"
+ :type="eventNodeType(e)"
:hollow="e.type === 'borrow'"
>
- {{ eventMeta(e.type).label }}
+
+ 转交被拒
+ {{ eventMeta(e.type).label }}
{{ e.material_name || e.sku }}
× {{ e.quantity }}
@@ -478,15 +481,14 @@
{{ e.from_name || '—' }} → {{ e.actor_name || '—' }}
-
+
{{ e.status_text || e.status }}
- · 经手库管:{{ e.operator_name }}
+ v-if="e.status === 'PENDING'"
+ type="warning" size="small" style="margin-left:6px"
+ >{{ e.status_text || '待接收' }}
+
+ · 发起人:{{ e.operator_name }}
归还人:{{ e.actor_name || '—' }}
@@ -496,8 +498,16 @@
报废 · 经手库管:{{ e.operator_name || '—' }}
+
- 备注:{{ e.remark }}
+ 转交备注:{{ e.remark }}
+
+
+ 拒收原因:{{ e.reject_reason }}
@@ -1073,6 +1083,18 @@ const EVENT_META: Record = {
}
const eventMeta = (t: string) => EVENT_META[t] || { label: t, type: 'info' }
+// 被拒收的转交 —— 时间线上要按「异常」呈现,不能和正常转交一个模样
+const isRejectedTransfer = (e: any): boolean =>
+ e.type === 'transfer' && e.status === 'REJECTED'
+
+// 时间线圆点颜色:被拒收的转交用红色(danger),其余沿用动作类型配色。
+// 待接收(PENDING)保持黄色 warning —— 它是「进行中」不是「失败」。
+const eventNodeType = (e: any): any => {
+ if (isRejectedTransfer(e)) return 'danger'
+ if (e.type === 'transfer' && e.status === 'PENDING') return 'warning'
+ return eventMeta(e.type).type
+}
+
const openHistoryDrawer = async (row: any) => {
historyBorrowNo.value = row.borrow_no
historyEvents.value = []