From 2880ea6df7467483429a467985f7ea8ead4bdca0 Mon Sep 17 00:00:00 2001
From: duxingchen <duxingchen@iris-rs.cn>
Date: Mon, 10 Aug 2026 10:58:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Grid=E5=9B=9E=E9=80=80grid-cols-12?=
 =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E5=AF=B9=E9=BD=90+=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=8C=89device/order=E5=88=87=E6=8D=A2+?=
 =?UTF-8?q?=E5=AE=8F=E8=A7=82=E7=8A=B6=E6=80=81receive/transfer=E5=8F=AA?=
 =?UTF-8?q?=E4=B8=BB=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/services/task_service.py        |  9 ++-
 frontend/src/pages/admin/AdminTasksPage.tsx | 64 +++++++--------------
 2 files changed, 26 insertions(+), 47 deletions(-)

diff --git a/backend/app/services/task_service.py b/backend/app/services/task_service.py
index 3aa6c0f..962cdcb 100644
--- a/backend/app/services/task_service.py
+++ b/backend/app/services/task_service.py
@@ -546,8 +546,10 @@ async def receive_task(
     if product:
         if task.assignee_id:
             product.current_location_id = task.assignee_id
-        if task_name:
-            product.overall_status = task_name
+        if task_name and (
+            not task.parent_task_id or task.task_type in ("TRANSFER", "RECOVERY")
+        ):
+            product.overall_status = task_name  # 只主线任务同步宏观状态
 
     await db.commit()
     await db.refresh(task)
@@ -818,7 +820,8 @@ async def transfer_task(
             product.overall_status = "在库"
         elif real_branches:
             product.current_location_id = real_branches[0][1]
-            product.overall_status = real_branches[0][0]
+            if not task.parent_task_id or task.task_type in ("TRANSFER", "RECOVERY"):
+                product.overall_status = real_branches[0][0]
 
         # 🔧 位置回溯：如果有新任务创建，优先新任务负责人；否则回溯到父任务
         if not real_branches and not has_warehouse:
diff --git a/frontend/src/pages/admin/AdminTasksPage.tsx b/frontend/src/pages/admin/AdminTasksPage.tsx
index 7476478..74aa112 100644
--- a/frontend/src/pages/admin/AdminTasksPage.tsx
+++ b/frontend/src/pages/admin/AdminTasksPage.tsx
@@ -326,9 +326,11 @@ export default function AdminTasksPage() {
                   <div className="flex-1 min-w-0">
                     <div className="flex items-center gap-2">
                       <span className="text-sm font-semibold text-gray-800">
-                        {group.orderNo === "未绑定订单"
-                          ? "📋 未绑定订单"
-                          : `📦 订单: ${group.orderNo}`}
+                        {group.orderNo === "未绑定订单" || group.orderNo === "未命名设备"
+                          ? "📋 未分类"
+                          : groupBy === "device"
+                            ? `⚙️ 设备: ${group.orderNo}`
+                            : `📦 订单: ${group.orderNo}`}
                       </span>
                       <span className="text-xs text-gray-400">
                         {group.products.length} 个产品
@@ -351,15 +353,15 @@ export default function AdminTasksPage() {
                 {isOpen && (
                   <div className="border-t border-gray-100">
                     {/* 表头 */}
-                    <div className="grid gap-2 bg-gray-50 px-5 py-2 text-xs font-medium text-gray-500" style={{ gridTemplateColumns: "2fr 1fr 2fr 1fr 1fr 2fr 2fr 2fr" }}>
-                      <div className="">产品身份证</div>
+                    <div className="grid grid-cols-12 gap-2 bg-gray-50 px-5 py-2 text-xs font-medium text-gray-500">
+                      <div className="col-span-2">产品身份证</div>
                       <div className="col-span-1">序列号</div>
-                      <div className="">规格型号</div>
+                      <div className="col-span-2">规格型号</div>
                       <div className="col-span-1">宏观状态</div>
                       <div className="col-span-1">任务状态</div>
-                      <div className="">当前位置</div>
-                      <div className="">创建时间</div>
-                      <div className="">操作</div>
+                      <div className="col-span-1">当前位置</div>
+                      <div className="col-span-2">创建时间</div>
+                      <div className="col-span-2">操作</div>
                     </div>
 
                     {/* 产品行 */}
@@ -374,41 +376,15 @@ export default function AdminTasksPage() {
 
                       return (
                         <div key={p.id}>
-                          <div className="grid gap-2 border-t border-gray-50 px-5 py-3 items-center text-sm hover:bg-gray-50/50" style={{ gridTemplateColumns: "2fr 1fr 2fr 1fr 1fr 2fr 2fr 2fr" }}>
-                            <div className="col-span-2 font-mono text-xs font-semibold text-gray-800 tracking-wider">
-                              {p.serial_number}
-                            </div>
-                            <div className="col-span-1 font-mono text-xs text-gray-600 truncate">
-                              {p.external_serial || "—"}
-                            </div>
-                            <div className="col-span-2 text-xs text-gray-500 truncate">
-                              {p.spec_model || p.material_name || p.material_id || "—"}
-                            </div>
-                            <div className="col-span-1">
-                              <span className="text-xs font-medium text-gray-700">
-                                {p.overall_status || "—"}
-                              </span>
-                            </div>
-                            <div className="col-span-1">
-                              <span
-                                className={`inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium ${statusCfg.bg} ${statusCfg.text}`}
-                              >
-                                {statusCfg.label}
-                              </span>
-                            </div>
-                            <div className="col-span-2 text-xs text-gray-500 truncate">
-                              {p.current_location_id === "virtual_warehouse" ? (
-                                <span className="inline-flex items-center gap-1 text-purple-600">
-                                  🏭 仓库
-                                </span>
-                              ) : (
-                                p.current_location_name || p.current_location_id || "—"
-                              )}
-                            </div>
-                            <div className="col-span-2 text-xs text-gray-400">
-                              {new Date(p.created_at).toLocaleDateString("zh-CN")}
-                            </div>
-                            <div className="">
+                          <div className="grid grid-cols-12 gap-2 border-t border-gray-50 px-5 py-3 items-center text-sm hover:bg-gray-50/50">
+                            <div className="col-span-2 font-mono text-xs font-semibold text-gray-800 tracking-wider">{p.serial_number}</div>
+                            <div className="col-span-1 font-mono text-xs text-gray-600 truncate">{p.external_serial || "—"}</div>
+                            <div className="col-span-2 text-xs text-gray-500 truncate">{p.spec_model || p.material_name || p.material_id || "—"}</div>
+                            <div className="col-span-1"><span className="text-xs font-medium text-gray-700">{p.overall_status || "—"}</span></div>
+                            <div className="col-span-1"><span className={`inline-flex items-center rounded-full px-2 py-0.5 text-[10px] font-medium ${statusCfg.bg} ${statusCfg.text}`}>{statusCfg.label}</span></div>
+                            <div className="col-span-1 text-xs text-gray-500 truncate">{p.current_location_id === "virtual_warehouse" ? (<span className="inline-flex items-center gap-1 text-purple-600">🏭 仓库</span>) : (p.current_location_name || p.current_location_id || "—")}</div>
+                            <div className="col-span-2 text-xs text-gray-400">{new Date(p.created_at).toLocaleDateString("zh-CN")}</div>
+                            <div className="col-span-2">
                               <button
                                 onClick={() => toggleProductTree(p.serial_number)}
                                 className="flex items-center gap-1 rounded border border-blue-200 px-2.5 py-1 text-xs font-medium text-blue-600 hover:bg-blue-50 transition-colors"