From beeee57b755ab133afd5ce9870369aab0a1eae65 Mon Sep 17 00:00:00 2001
From: duxingchen <duxingchen@iris-rs.cn>
Date: Mon, 31 Aug 2026 17:20:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E6=B5=81?=
 =?UTF-8?q?=E8=BD=AC=E6=A0=91=E5=9C=A8=E5=BA=93=E4=BB=BB=E5=8A=A1=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=8E=E8=B0=81=E8=BD=AC=E5=85=A5=E5=9C=A8=E5=BA=93?=
 =?UTF-8?q?=E3=80=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- TreeCanvas 全屏流转树 + TaskTreeNode 内嵌树节点，在库/入库任务显示『📥 转入在库: 创建人』
- 复用 formatUserName 中文名映射
---
 .../src/pages/scan/components/TaskTreeNode.vue        | 11 +++++++++++
 track-uniapp/src/pages/scan/components/TreeCanvas.vue |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/track-uniapp/src/pages/scan/components/TaskTreeNode.vue b/track-uniapp/src/pages/scan/components/TaskTreeNode.vue
index d9dcbbf..a6df9f5 100644
--- a/track-uniapp/src/pages/scan/components/TaskTreeNode.vue
+++ b/track-uniapp/src/pages/scan/components/TaskTreeNode.vue
@@ -15,6 +15,8 @@
           <text v-if="task.assignee_id">负责人: {{ task.assignee_id }}</text>
           <text v-if="task.reject_reason" class="reject-reason">驳回: {{ task.reject_reason }}</text>
         </view>
+        <!-- 📥 在库任务：显示谁转入在库 -->
+        <text v-if="isWarehouseTask && task.created_by" class="warehouse-in">📥 转入在库: {{ formatUserName(task.created_by) }}</text>
 
         <!-- 任务初始描述 / 交接备注（常驻显示，区别于动态日志 records） -->
         <view v-if="task.remark || task.description" class="task-initial-remark">
@@ -82,6 +84,7 @@
 
 <script>
 import { getBaseUrl } from "../../../utils/request";
+import { formatUserName } from "../../../utils/format";
 
 export default {
   name: "TaskTreeNode",
@@ -101,6 +104,13 @@ export default {
     console.log("task.description =", this.task.description);
   },
   computed: {
+    isWarehouseTask() {
+      return !!(this.task && (
+        String(this.task.task_name || '').includes('在库')
+        || String(this.task.task_name || '').includes('入库')
+        || this.task.assignee_id === 'virtual_warehouse'
+      ));
+    },
     canEditRecord() {
       if (this.readonly) return false;
       if (this.task.assignee_id == this.currentUserId) return true;
@@ -178,6 +188,7 @@ export default {
 .tag-fission { background: #7c3aed; }
 .tnode-meta { margin-top: 2px; font-size: 11px; color: #9ca3af; display: flex; gap: 8px; flex-wrap: wrap; }
 .reject-reason { color: #ef4444; }
+.warehouse-in { display: block; margin-top: 4px; font-size: 11px; color: #059669; font-weight: 700; }
 
 /* 任务初始描述（常驻，区别于动态记录） */
 .task-initial-remark {
diff --git a/track-uniapp/src/pages/scan/components/TreeCanvas.vue b/track-uniapp/src/pages/scan/components/TreeCanvas.vue
index 71e3f04..b7b3489 100644
--- a/track-uniapp/src/pages/scan/components/TreeCanvas.vue
+++ b/track-uniapp/src/pages/scan/components/TreeCanvas.vue
@@ -43,6 +43,8 @@
               </view>
               <text class="cn-assignee">{{ formatUserName(node.assignee_id) || '—' }}</text>
               <text v-if="!node._isMain && node.parent && !node.parent._isMain" class="cn-nested-hint">协助: {{ formatUserName(node.parent.assignee_id) || '—' }}</text>
+              <!-- 📥 在库任务：显示谁转入在库 -->
+              <text v-if="(String(node.task_name || '').includes('在库') || String(node.task_name || '').includes('入库') || node.assignee_id === 'virtual_warehouse') && node.created_by" class="cn-warehouse-in">📥 转入在库: {{ formatUserName(node.created_by) }}</text>
               <text class="cn-time">⏰ {{ fmtDate(node.created_at) }}{{ node.completed_at ? '→' + fmtDate(node.completed_at) : '→至今' }}</text>
               <text v-if="node.records && node.records.length" class="cn-records-mini">{{ node.records.length }}条</text>
             </view>
@@ -321,6 +323,7 @@ export default {
 .cn-badge-mini.s-archived { background: #ede9fe; color: #7c3aed; }
 .cn-assignee { font-size: 10px; color: #6b7280; }
 .cn-nested-hint { font-size: 8px; color: #a78bfa; font-weight: 600; }
+.cn-warehouse-in { font-size: 9px; color: #059669; font-weight: 700; }
 .cn-time { font-size: 9px; color: #9ca3af; }
 .cn-records-mini { font-size: 9px; color: #2563eb; background: #eff6ff; padding: 1px 6px; border-radius: 6px; display: inline-block; width: max-content; }
 </style>