duxingchen/track
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复撤回: transfer新任务parent_task_id=task.id(溯源链) + canRecall放宽(兼容旧数据)

Browse Source
This commit is contained in:
duxingchen
2026-08-06 12:38:26 +08:00
parent 0287003e93
commit 58cb9a23ef
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/services/task_service.py
View File

@ -660,7 +660,7 @@ async def transfer_task(
elif is_child_task: elif is_child_task:
new_parent_task_id = task.parent_task_id new_parent_task_id = task.parent_task_id
else: else:
new_parent_task_id = None new_parent_task_id = task.id
new_task = Task( new_task = Task(
product_id=task.product_id, product_id=task.product_id,

6
track-uniapp/src/pages/scan/components/WorkspaceArea.vue
View File

@ -146,10 +146,8 @@ export default {
canRecall() { canRecall() {
if (!this.lockedTask || this.lockedTask.status !== 'PENDING') return false; if (!this.lockedTask || this.lockedTask.status !== 'PENDING') return false;
if (this.isAssignee) return false; if (this.isAssignee) return false;
if (!this.lockedTask.parent_task_id) return false; // 非接收人即可撤回（后端会校验权限）；parent_task_id 为空时也放开（旧数据兼容）
const parent = this.taskMap[this.lockedTask.parent_task_id]; return true;
if (!parent) return false;
return parent.assignee_id == this.currentUserId || parent.assignee_id == this.currentUsername;
}, },
branchLabelsMap() { branchLabelsMap() {
const map = {}; const map = {};