diff --git a/frontend/src/components/TaskTree/TaskFlowView.tsx b/frontend/src/components/TaskTree/TaskFlowView.tsx index 2c69ad8..5bf2639 100644 --- a/frontend/src/components/TaskTree/TaskFlowView.tsx +++ b/frontend/src/components/TaskTree/TaskFlowView.tsx @@ -146,6 +146,13 @@ const SlimCard = memo(function SlimCard({ ⏰ {fmtTime(task.created_at)} {task.completed_at ? ` → ${fmtTime(task.completed_at)}` : " → 至今"}

+ {/* 驳回/返工原因:原 REJECTED 取 reject_reason;返工节点取含“驳回/返工”的备注 */} + {(() => { + const rj = task.reject_reason; + const rm = task.remark; + const txt = rj ? `❌ 驳回: ${rj}` : (rm && /驳回|返工/.test(rm) ? rm : null); + return txt ?

{txt}

: null; + })()} {legacy &&

源自: {assigneeName || (findParent(task)?.assignee_id) || "历史任务"}

} {isNestedSpawn &&

协助: {findParent(task)?.assignee_id || "—"}

} {/* 操作按钮 */} diff --git a/track-uniapp/src/pages/scan/components/FlowCard.vue b/track-uniapp/src/pages/scan/components/FlowCard.vue index 96e6d6f..709eb77 100644 --- a/track-uniapp/src/pages/scan/components/FlowCard.vue +++ b/track-uniapp/src/pages/scan/components/FlowCard.vue @@ -16,6 +16,8 @@ ⏰ {{ fmtDate(node.created_at) }}{{ node.completed_at ? '→' + fmtDate(node.completed_at) : '→至今' }} + + ❌ {{ reasonText }} 查看操作日志 ({{ node.records.length }}条) › @@ -34,6 +36,13 @@ export default { }, emits: ["viewRecords"], computed: { + // 驳回/返工原因:原 REJECTED 有 reject_reason;返工节点原因在 remark(形如“返工任务(驳回自…原因…)”) + reasonText() { + const n = this.node || {}; + if (n.reject_reason) return `驳回: ${n.reject_reason}`; + const rm = n.remark; + return rm && (rm.indexOf("驳回") >= 0 || rm.indexOf("返工") >= 0) ? rm : ""; + }, isMainNode() { return !this.node.parent_task_id || this.node.task_type === "TRANSFER" diff --git a/track-uniapp/src/pages/scan/components/TaskSwipeCards.vue b/track-uniapp/src/pages/scan/components/TaskSwipeCards.vue index 589c6f9..11c6d50 100644 --- a/track-uniapp/src/pages/scan/components/TaskSwipeCards.vue +++ b/track-uniapp/src/pages/scan/components/TaskSwipeCards.vue @@ -41,6 +41,9 @@ {{ card.task_name }} + + ❌ 驳回: {{ card.reject_reason }} +