工业级重构: 用户Grid选择+工序由接收人定+隐藏结束按钮(次分支卡片内结束)+蓝图网格背景

backend/app/api/v1/endpoints/tasks.py

@@ -154,16 +154,17 @@ async def receive_task_endpoint(
     task_id: str,
     operator_id: str | None = Query(None, description="操作人ID"),
     remark: str | None = Body(None, description="接收备注", embed=True),
+    task_name: str | None = Body(None, description="接收人选定的工序名称", embed=True),
     db: AsyncSession = Depends(get_db),
 ):
     """
-    **确认接收任务。**
+    **确认接收任务。工人选定工序名称后接收。**
 
     校验：只有状态为 PENDING 的任务可接收。
-    动作：将状态改为 WIP，记录 received_at 为当前时间，写入 remark。
+    动作：状态改为 WIP，记录 received_at，更新 task_name，同步产品宏观状态。
     """
     return await task_service.receive_task(
-        db, uuid.UUID(task_id), operator_id, remark
+        db, uuid.UUID(task_id), operator_id, remark, task_name
     )
 
 

backend/app/services/task_service.py

@@ -335,13 +335,13 @@ ARCHIVED_STATUS = "ARCHIVED"
 
 async def receive_task(
     db: AsyncSession, task_id: uuid.UUID, operator_id: str | None = None,
-    remark: str | None = None,
+    remark: str | None = None, task_name: str | None = None,
 ) -> TaskResponse:
     """
-    操作员确认接收任务。
+    操作员确认接收任务。工人选定工序名称后接收。
 
     校验：只有状态为 PENDING 的任务可接收。
-    动作：状态改为 WIP，记录 received_at，写入 remark。
+    动作：状态改为 WIP，记录 received_at，更新 task_name，同步产品宏观状态。
     """
     task = await _get_task_or_404(db, task_id)
 
@@ -364,6 +364,8 @@ async def receive_task(
     task.received_at = now
     if remark:
         task.remark = remark
+    if task_name:
+        task.task_name = task_name
 
     await _create_task_log(
         db, task_id,
@@ -372,11 +374,14 @@ async def receive_task(
         remark=remark or f"操作员确认接收任务「{task.task_name}」",
     )
 
-    # 接收时同步产品位置到接收人
+    # 接收时同步产品位置到接收人 + 宏观状态同步
     product_result = await db.execute(select(Product).where(Product.id == task.product_id))
     product = product_result.scalar_one_or_none()
-    if product and task.assignee_id:
+    if product:
+        if task.assignee_id:
             product.current_location_id = task.assignee_id
+        if task_name:
+            product.overall_status = task_name
 
     await db.commit()
     await db.refresh(task)

track-uniapp/src/pages/scan/components/TreeCanvas.vue

@@ -165,9 +165,9 @@ export default {
 .zero-icon { font-size: 40px; margin-bottom: 10px; }
 .zero-text { font-size: 14px; color: #9ca3af; }
 .canvas-hint { font-size: 11px; color: #9ca3af; text-align: center; padding: 8px 0; background: #fff; border-bottom: 1px solid #e5e7eb; flex-shrink: 0; }
-.tree-movable-area { flex: 1; width: 100%; }
+.tree-movable-area { flex: 1; width: 100%; background-color: #f8fafc; background-image: linear-gradient(#e5e7eb 1px, transparent 1px), linear-gradient(90deg, #e5e7eb 1px, transparent 1px); background-size: 20px 20px; }
 .canvas-inner { position: absolute; left: 0; top: 0; }
-.canvas-node { position: absolute; width: 240px; min-height: 120px; background: #ffffff; border-radius: 12px; padding: 16px; box-shadow: 0 6px 16px rgba(0,0,0,0.06); border-left: 8px solid #3b82f6; border-top: none; z-index: 10; display: flex; flex-direction: column; gap: 8px; }
+.canvas-node { position: absolute; width: 240px; min-height: 120px; background: #ffffff; border-radius: 14px; padding: 16px; box-shadow: 0 8px 24px rgba(0,0,0,0.10), 0 2px 4px rgba(0,0,0,0.06); border-left: 8px solid #3b82f6; z-index: 10; display: flex; flex-direction: column; gap: 8px; }
 .canvas-node.s-yellow { border-left-color: #f59e0b; }
 .canvas-node.s-blue { border-left-color: #3b82f6; }
 .canvas-node.s-green { border-left-color: #22c55e; }

track-uniapp/src/pages/scan/components/WorkspaceArea.vue

@@ -46,6 +46,8 @@
         <view class="fc-header">
           <text class="fc-status">{{ statusLabel(lockedTask.status) }}</text>
           <text v-if="lockedTask.is_rework" class="tag tag-rework-sm">⚠返工</text>
+          <text v-if="lockedTask.parent_task_id && lockedTask.status === 'WIP'" class="sub-branch-end"
+            @tap="$emit('action', { task: lockedTask, type: 'end' })">🛑 结束协助</text>
         </view>
         <text class="fc-name">{{ lockedTask.task_name }}</text>
 
@@ -80,8 +82,6 @@
           @tap="$emit('action', { task: lockedTask, type: 'record' })">📝 记录/拍照</button>
         <button v-if="lockedTask.status === 'WIP'" class="footer-btn footer-spawn"
           @tap="$emit('action', { task: lockedTask, type: 'spawn' })">➕ 派发协助分支</button>
-        <button v-if="lockedTask.status === 'WIP'" class="footer-btn footer-end"
-          @tap="$emit('action', { task: lockedTask, type: 'end' })">🏁 结束分支</button>
         <button v-if="lockedTask.status === 'PENDING'" class="footer-btn footer-receive"
           @tap="$emit('action', { task: lockedTask, type: 'receive' })">✅ 接收任务</button>
         <button v-if="lockedTask.status === 'PENDING'" class="footer-btn footer-reject"
@@ -172,6 +172,7 @@ export default {
 .s-yellow .fc-status { background: #fef3c7; color: #b45309; }
 .s-blue .fc-status { background: #dbeafe; color: #1d4ed8; }
 .tag-rework-sm { font-size: 10px; padding: 2px 6px; border-radius: 8px; background: #ef4444; color: #fff; }
+.sub-branch-end { font-size: 11px; color: #ef4444; font-weight: 600; margin-left: auto; padding: 2px 6px; }
 .fc-name { font-size: 22px; font-weight: 800; color: #1f2937; display: block; margin-bottom: 10px; }
 .fc-link { padding: 6px 10px; border-radius: 8px; margin-bottom: 4px; font-size: 12px; margin-top: 10px; }
 .fc-up { background: #f0fdf4; color: #16a34a; }

track-uniapp/src/pages/scan/detail.vue

@@ -67,17 +67,19 @@
         <view class="popup-btns"><button class="btn-cancel" @tap="editProductVisible = false">取消</button><button class="btn-primary" :disabled="editSaving" @tap="doEditProduct">{{ editSaving ? '保存中...' : '保存' }}</button></view>
       </view>
     </view>
-    <!-- 发起首道工序 -->
+    <!-- 发起首道工序 (只选人+填备注) -->
     <view v-if="createFirstVisible" class="overlay" @tap="createFirstVisible = false">
       <view class="popup" @tap.stop>
         <text class="popup-title">{{ isWarehouseTransfer ? '📤 仓库转出派发' : '🚀 发起首道工序' }}</text>
-        <view class="field-label">工序名称 <text class="required">*</text></view>
-        <picker :range="TASK_NAME_OPTIONS" :value="firstForm.taskNameIdx" @change="onTaskNameChange"><view class="picker-box">{{ firstForm.task_name || '请选择工序名称' }}</view></picker>
         <view class="field-label">接收人 <text class="required">*</text></view>
-        <picker :range="userLabels" :value="firstForm.assigneeIdx" @change="onAssigneeChange"><view class="picker-box">{{ firstForm.assigneeLabel || '请选择接收人' }}</view></picker>
-        <view class="field-label">备注 <text class="required">*</text></view>
+        <view class="user-grid">
+          <view v-for="u in userGridOptions" :key="u.id"
+            :class="['user-grid-item', firstForm.assignee_id === u.id ? 'user-grid-active' : '']"
+            @tap="firstForm.assignee_id = u.id; firstForm.assigneeLabel = u.name">{{ formatName(u.name) }}</view>
+        </view>
+        <view class="field-label" style="margin-top:12px;">备注 <text class="required">*</text></view>
         <textarea v-model="firstForm.note" class="popup-textarea" placeholder="请填写备注说明（必填）" :maxlength="500" />
-        <view class="popup-btns"><button class="btn-cancel" @tap="createFirstVisible = false">取消</button><button class="btn-primary" :disabled="firstSaving || !firstForm.task_name || !firstForm.assignee_id || !firstForm.note.trim()" @tap="doCreateFirstTask">{{ firstSaving ? '创建中...' : '确认创建' }}</button></view>
+        <view class="popup-btns"><button class="btn-cancel" @tap="createFirstVisible = false">取消</button><button class="btn-primary" :disabled="firstSaving || !firstForm.assignee_id || !firstForm.note.trim()" @tap="doCreateFirstTask">{{ firstSaving ? '创建中...' : '确认创建' }}</button></view>
       </view>
     </view>
     <!-- 记录/拍照 -->
@@ -101,8 +103,14 @@
           <text class="popup-title">确认接收任务</text>
           <view class="popup-task">{{ actionPopup.task && actionPopup.task.task_name }}</view>
           <text class="popup-hint">状态: {{ statusLabel(actionPopup.task && actionPopup.task.status) }} → 进行中</text>
-          <textarea v-model="receiveRemark" class="popup-textarea" placeholder="接收备注（选填）" :maxlength="500" />
-          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary" :disabled="actionLoading" @tap="doReceive">确认接收</button></view>
+          <view class="field-label">选择工序 <text class="required">*</text></view>
+          <view class="user-grid">
+            <view v-for="opt in TASK_NAME_OPTIONS" :key="opt"
+              :class="['user-grid-item', receiveTaskName === opt ? 'user-grid-active' : '']"
+              @tap="receiveTaskName = opt">{{ opt }}</view>
+          </view>
+          <textarea v-model="receiveRemark" class="popup-textarea" placeholder="接收备注（选填）" :maxlength="500" style="margin-top:12px;" />
+          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary" :disabled="actionLoading || !receiveTaskName" @tap="doReceive">确认接收</button></view>
         </template>
         <template v-if="actionPopup.type === 'reject'">
           <text class="popup-title">品质驳回</text>
@@ -112,20 +120,29 @@
         </template>
         <template v-if="actionPopup.type === 'transfer'">
           <text class="popup-title">完工转交</text>
-          <view class="form-item"><text class="form-label">下一道工序 <text class="required">*</text></text><picker mode="selector" :range="processOptions" @change="onTransferProcessChange"><view class="picker-value"><text :class="transferForm.next_task_name ? '' : 'picker-placeholder'">{{ transferForm.next_task_name || '请选择工序' }}</text><text class="picker-arrow">▾</text></view></picker></view>
-          <view v-if="!transferForm.isWarehouse" class="form-item"><text class="form-label">接收人 <text class="required">*</text></text><picker mode="selector" :range="userOptions" range-key="name" @change="onTransferUserChange"><view class="picker-value"><text :class="transferUserName ? '' : 'picker-placeholder'">{{ transferUserName || '请选择接收人' }}</text><text class="picker-arrow">▾</text></view></picker></view>
-          <view v-if="transferForm.isWarehouse" class="warehouse-hint">📦 入库 — 直接归档，无需指定接收人</view>
+          <view class="field-label">接收人 <text class="required">*</text></view>
+          <view class="user-grid">
+            <view v-for="u in userGridOptions" :key="u.id"
+              :class="['user-grid-item', transferForm.selectedUserId === u.id ? 'user-grid-active' : '']"
+              @tap="transferForm.selectedUserId = u.id">{{ formatName(u.name) }}</view>
+          </view>
+          <view class="field-label" style="margin-top:12px;">或</view>
+          <view :class="['user-grid-item', transferForm.isWarehouse ? 'user-grid-active' : '']" style="width:100%;" @tap="transferForm.isWarehouse = !transferForm.isWarehouse; transferForm.selectedUserId = '';">📦 入库 (virtual_warehouse)</view>
           <input v-model="transferForm.note" class="popup-input" placeholder="交接备注（选填）" style="margin-top:12px;" />
-          <view v-if="transferForm.next_task_name" class="preview-hint">{{ transferForm.isWarehouse ? '产品将入库并从个人待办中移除' : '将创建 1 个「' + transferForm.next_task_name + '」任务指派给 ' + (transferUserName || '—') }}</view>
-          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary" :disabled="actionLoading || !transferForm.next_task_name || (!transferForm.isWarehouse && !transferForm.selectedUserId)" @tap="doTransfer">{{ actionLoading ? '提交中...' : (transferForm.isWarehouse ? '📦 确认入库' : '确认转交') }}</button></view>
+          <view v-if="transferForm.isWarehouse || transferForm.selectedUserId" class="preview-hint">{{ transferForm.isWarehouse ? '产品将入库并从个人待办中移除' : '将创建新任务指派给 ' + (transferUserName || '—') }}</view>
+          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary" :disabled="actionLoading || (!transferForm.isWarehouse && !transferForm.selectedUserId)" @tap="doTransfer">{{ actionLoading ? '提交中...' : (transferForm.isWarehouse ? '📦 确认入库' : '确认转交') }}</button></view>
         </template>
         <template v-if="actionPopup.type === 'spawn'">
           <text class="popup-title">➕ 派发协助分支</text>
-          <text class="popup-hint">为当前任务创建一个并行协助任务，当前任务保持进行中</text>
-          <view class="form-item"><text class="form-label">工序名称 <text class="required">*</text></text><picker mode="selector" :range="spawnProcessOptions" @change="onSpawnProcessChange"><view class="picker-value"><text :class="spawnForm.task_name ? '' : 'picker-placeholder'">{{ spawnForm.task_name || '请选择工序' }}</text><text class="picker-arrow">▾</text></view></picker></view>
-          <view class="form-item"><text class="form-label">接收人 <text class="required">*</text></text><picker mode="selector" :range="userOptions" range-key="name" @change="onSpawnUserChange"><view class="picker-value"><text :class="spawnUserName ? '' : 'picker-placeholder'">{{ spawnUserName || '请选择接收人' }}</text><text class="picker-arrow">▾</text></view></picker></view>
-          <input v-model="spawnForm.remark" class="popup-input" placeholder="派发备注（选填）" />
-          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary btn-spawn" :disabled="actionLoading || !spawnForm.task_name || !spawnForm.assignee_id" @tap="doSpawn">{{ actionLoading ? '提交中...' : '确认派发' }}</button></view>
+          <text class="popup-hint">为当前任务创建并行协助，当前任务保持进行中</text>
+          <view class="field-label">接收人 <text class="required">*</text></view>
+          <view class="user-grid">
+            <view v-for="u in userGridOptions" :key="u.id"
+              :class="['user-grid-item', spawnForm.assignee_id === u.id ? 'user-grid-active' : '']"
+              @tap="spawnForm.assignee_id = u.id">{{ formatName(u.name) }}</view>
+          </view>
+          <input v-model="spawnForm.remark" class="popup-input" placeholder="派发备注（选填）" style="margin-top:12px;" />
+          <view class="popup-btns"><button class="btn-cancel" @tap="closeActionPopup">取消</button><button class="btn-primary btn-spawn" :disabled="actionLoading || !spawnForm.assignee_id" @tap="doSpawn">{{ actionLoading ? '提交中...' : '确认派发' }}</button></view>
         </template>
       </view>
     </view>
@@ -152,9 +169,9 @@ export default {
       recordPopup: { visible: false, task: null }, recordForm: { recordId: null, remark: "", images: [], pendingCount: 0 }, recordSaving: false, isUploading: false,
       currentUser: null, currentUserId: "", currentUsername: "", currentMode: "tree",
       processOptions: [], userOptions: [],
-      actionPopup: { visible: false, type: "", task: null }, actionLoading: false, rejectReason: "", receiveRemark: "",
-      transferForm: { next_task_name: "", selectedUserId: "", isWarehouse: false, note: "" },
-      spawnForm: { task_name: "", assignee_id: "", remark: "" },
+      actionPopup: { visible: false, type: "", task: null }, actionLoading: false, rejectReason: "", receiveRemark: "", receiveTaskName: "",
+      transferForm: { selectedUserId: "", isWarehouse: false, note: "" },
+      spawnForm: { assignee_id: "", remark: "" },
     };
   },
   computed: {
@@ -162,7 +179,7 @@ export default {
     canDeleteImage() { if (!this.recordPopup.task) return true; if (!this.currentUser) return true; return this.currentUser.username === this.recordPopup.task.assignee_id; },
     transferUserName() { const u = this.userOptions.find(u => u.id === this.transferForm.selectedUserId); return u ? u.name : ""; },
     spawnUserName() { const u = this.userOptions.find(u => u.id === this.spawnForm.assignee_id); return u ? u.name : ""; },
-    spawnProcessOptions() { return (this.processOptions || []).filter(o => o !== "🏭 入库 (virtual_warehouse)"); },
+    userGridOptions() { return (this.userOptions || []).map(u => ({ id: u.id, name: u.name })); },
     hasMyActiveTask() {
       const find = (tasks) => { if (!tasks) return false; for (const t of tasks) { if ((t.status === 'WIP' || t.status === 'PENDING') && (t.assignee_id == this.currentUserId || t.assignee_id == this.currentUsername)) return true; if (find(t.child_tasks)) return true; } return false; };
       return this.product ? find(this.product.task_tree) : false;
@@ -170,6 +187,7 @@ export default {
   },
   onLoad(options) { this.loadUsers(); this.loadCurrentUser(); const sn = options.serial || ""; if (sn) this.doQuery(sn); },
   methods: {
+    formatName(name) { if (!name) return ""; return name.length === 2 ? name[0] + "　" + name[1] : name; },
     statusLabel(s) { return STATUS_MAP[s] || s; },
     statusColor(s) { switch (s) { case "PENDING": return "s-yellow"; case "WIP": return "s-blue"; case "COMPLETED": return "s-green"; case "REJECTED": return "s-red"; default: return "s-gray"; } },
 
@@ -185,10 +203,10 @@ export default {
 
     onTaskNameChange(e) { const idx = e.detail.value; this.firstForm.taskNameIdx = idx; this.firstForm.task_name = TASK_NAME_OPTIONS[idx]; },
     onAssigneeChange(e) { const idx = e.detail.value; const u = this.users[idx]; if (u) { this.firstForm.assigneeIdx = idx; this.firstForm.assignee_id = u.username; this.firstForm.assigneeLabel = `${u.full_name} (${u.username})`; } },
-    openCreateFirstTask() { this.isWarehouseTransfer = false; if (this.currentMode === 'tree') this.currentMode = 'workspace'; this.firstForm = { task_name: TASK_NAME_OPTIONS[0], taskNameIdx: 0, assignee_id: this.users.length > 0 ? this.users[0].username : "", assigneeLabel: this.users.length > 0 ? `${this.users[0].full_name} (${this.users[0].username})` : "", assigneeIdx: 0, note: "" }; this.createFirstVisible = true; },
+    openCreateFirstTask() { this.isWarehouseTransfer = false; if (this.currentMode === 'tree') this.currentMode = 'workspace'; this.firstForm = { assignee_id: "", assigneeLabel: "", note: "" }; this.createFirstVisible = true; },
     handleOverallBarClick() { if (!this.product.task_tree || !this.product.task_tree.length) { this.openCreateFirstTask(); } else { this.showStatusPicker = true; } },
     openWarehouseTransfer() { this.isWarehouseTransfer = true; this.openCreateFirstTask(); },
-    async doCreateFirstTask() { this.firstSaving = true; try { await post("/tasks/", { product_id: this.product.id, task_name: this.firstForm.task_name, assignee_id: this.firstForm.assignee_id, notify_parent_on_complete: false, remark: this.firstForm.note.trim() || undefined }); if (this.product.current_location_id === 'virtual_warehouse') { try { await patch(`/products/${this.product.id}`, { current_location_id: this.firstForm.assignee_id }); } catch {} } uni.showToast({ title: "任务已派发，待接收", icon: "success" }); this.createFirstVisible = false; this.doQuery(this.product.serial_number); } catch {} finally { this.firstSaving = false; } },
+    async doCreateFirstTask() { this.firstSaving = true; try { await post("/tasks/", { product_id: this.product.id, task_name: "待确认", assignee_id: this.firstForm.assignee_id, notify_parent_on_complete: false, remark: this.firstForm.note.trim() || undefined }); if (this.product.current_location_id === 'virtual_warehouse') { try { await patch(`/products/${this.product.id}`, { current_location_id: this.firstForm.assignee_id }); } catch {} } uni.showToast({ title: "任务已派发，待接收", icon: "success" }); this.createFirstVisible = false; this.doQuery(this.product.serial_number); } catch {} finally { this.firstSaving = false; } },
 
     openRecordPopup(task) { this.recordPopup = { visible: true, task }; this.recordForm = { recordId: null, remark: "", images: [], pendingCount: 0 }; this.isUploading = false; },
     openEditRecord({ task, record }) { this.recordPopup = { visible: true, task }; this.recordForm = { recordId: record.id, remark: record.remark || "", images: record.images || [], pendingCount: 0 }; this.isUploading = false; },
@@ -204,25 +222,21 @@ export default {
       if (type === "deleteRecord") { this.doDeleteRecord(record); return; }
       if (type === "end") { this.confirmEndBranch(task); return; }
       if (type === "transfer" || type === "spawn") { uni.showLoading({ title: "加载数据..." }); try { if (!this.userOptions.length) await this.loadUsers(); if (!this.processOptions.length) this.processOptions = ["🏭 入库 (virtual_warehouse)", ...TASK_NAME_OPTIONS]; } finally { uni.hideLoading(); } }
-      this.actionPopup = { visible: true, type, task }; this.rejectReason = ""; this.receiveRemark = "";
-      this.transferForm = { next_task_name: "", selectedUserId: "", isWarehouse: false, note: "" };
-      this.spawnForm = { task_name: "", assignee_id: "", remark: "" };
+      this.actionPopup = { visible: true, type, task }; this.rejectReason = ""; this.receiveRemark = ""; this.receiveTaskName = "";
+      this.transferForm = { selectedUserId: "", isWarehouse: false, note: "" };
+      this.spawnForm = { assignee_id: "", remark: "" };
     },
     handleViewRecords(task) { uni.navigateTo({ url: `/pages/scan/records?taskId=${task.id}` }); },
     async doDeleteRecord(record) { try { await request({ url: `/records/${record.id}`, method: "DELETE" }); uni.showToast({ title: "记录已删除", icon: "success" }); this.doQuery(this.product.serial_number); } catch {} },
     confirmEndBranch(task) { uni.showModal({ title: "结束分支", content: `确定结束「${task.task_name}」吗？`, success: (res) => { if (res.confirm) this.doEndBranch(task); } }); },
     async doEndBranch(task) { try { const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${task.id}/end?operator_id=${encodeURIComponent(opId)}`); uni.showToast({ title: "分支已结束", icon: "success" }); this.doQuery(this.product.serial_number); } catch {} },
     closeActionPopup() { this.actionPopup = { visible: false, type: "", task: null }; },
-    async doReceive() { this.actionLoading = true; try { const remark = this.receiveRemark.trim() || undefined; const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${this.actionPopup.task.id}/receive?operator_id=${encodeURIComponent(opId)}`, { remark }); uni.showToast({ title: "已接收", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
+    async doReceive() { this.actionLoading = true; try { const remark = this.receiveRemark.trim() || undefined; const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${this.actionPopup.task.id}/receive?operator_id=${encodeURIComponent(opId)}`, { remark, task_name: this.receiveTaskName }); uni.showToast({ title: "已接收", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
     async doReject() { this.actionLoading = true; try { const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${this.actionPopup.task.id}/reject?operator_id=${encodeURIComponent(opId)}`, { reason: this.rejectReason.trim() }); uni.showToast({ title: "已驳回", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
     // 转交（单线）
-    onTransferProcessChange(e) { this.transferForm.next_task_name = this.processOptions[e.detail.value]; this.transferForm.isWarehouse = this.transferForm.next_task_name === "🏭 入库 (virtual_warehouse)"; this.transferForm.selectedUserId = ""; },
-    onTransferUserChange(e) { const user = this.userOptions[e.detail.value]; if (user) this.transferForm.selectedUserId = user.id; },
-    async doTransfer() { this.actionLoading = true; try { const assignees = this.transferForm.isWarehouse ? ["virtual_warehouse"] : [this.transferForm.selectedUserId]; await post(`/tasks/${this.actionPopup.task.id}/transfer`, { next_tasks: [{ task_name: this.transferForm.next_task_name, assignees }], note: this.transferForm.note.trim() || undefined }); uni.showToast({ title: this.transferForm.isWarehouse ? "已入库" : "转交成功", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
+    async doTransfer() { this.actionLoading = true; try { const assignees = this.transferForm.isWarehouse ? ["virtual_warehouse"] : [this.transferForm.selectedUserId]; const taskName = this.transferForm.isWarehouse ? "🏭 入库 (virtual_warehouse)" : "待确认"; await post(`/tasks/${this.actionPopup.task.id}/transfer`, { next_tasks: [{ task_name: taskName, assignees }], note: this.transferForm.note.trim() || undefined }); uni.showToast({ title: this.transferForm.isWarehouse ? "已入库" : "转交成功", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
     // 派发协助分支
-    onSpawnProcessChange(e) { this.spawnForm.task_name = this.spawnProcessOptions[e.detail.value]; },
-    onSpawnUserChange(e) { const user = this.userOptions[e.detail.value]; if (user) this.spawnForm.assignee_id = user.id; },
-    async doSpawn() { this.actionLoading = true; try { const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${this.actionPopup.task.id}/spawn?operator_id=${encodeURIComponent(opId)}`, { task_name: this.spawnForm.task_name, assignee_id: this.spawnForm.assignee_id, remark: this.spawnForm.remark.trim() || undefined }); uni.showToast({ title: "协助分支已派发", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
+    async doSpawn() { this.actionLoading = true; try { const opId = this.currentUsername || this.currentUserId; await post(`/tasks/${this.actionPopup.task.id}/spawn?operator_id=${encodeURIComponent(opId)}`, { task_name: "待确认", assignee_id: this.spawnForm.assignee_id, remark: this.spawnForm.remark.trim() || undefined }); uni.showToast({ title: "协助分支已派发", icon: "success" }); this.closeActionPopup(); this.doQuery(this.product.serial_number); } catch {} finally { this.actionLoading = false; } },
   },
 };
 </script>
@@ -292,8 +306,9 @@ export default {
 .form-item { margin: 10px 0; }
 .form-label { font-size: 14px; font-weight: 600; color: #374151; display: block; margin-bottom: 4px; }
 .picker-value { display: flex; align-items: center; justify-content: space-between; width: 100%; height: 42px; padding: 0 12px; border: 1px solid #e5e7eb; border-radius: 10px; background: #f9fafb; font-size: 14px; box-sizing: border-box; }
-.picker-placeholder { color: #9ca3af; }
-.picker-arrow { font-size: 12px; color: #9ca3af; margin-left: 8px; }
+.user-grid { display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px; }
+.user-grid-item { padding: 12px 8px; border-radius: 10px; background: #f3f4f6; text-align: center; font-size: 14px; font-weight: 600; color: #374151; border: 2px solid transparent; }
+.user-grid-active { background: #dbeafe; color: #2563eb; border-color: #2563eb; }
 .warehouse-hint { font-size: 13px; background: #ede9fe; color: #7c3aed; padding: 10px 14px; border-radius: 10px; margin: 8px 0; text-align: center; }
 .warehouse-transfer-banner { display: flex; align-items: center; gap: 12px; font-weight: 700; background: linear-gradient(135deg, #ede9fe, #dbeafe); color: #5b21b6; padding: 14px 16px; border-radius: 12px; margin-bottom: 12px; border: 2px dashed #a78bfa; }
 .wt-icon { font-size: 24px; }