diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 3f190782a..38773b888 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -2307,8 +2307,8 @@ class ProjectController extends AbstractController * @apiGroup project * @apiName task__flow * - * @apiParam {Number} task_id 任务ID - * @apiParam {Number} project_id 项目ID - 存在时只返回这个项目的 + * @apiParam {Number} [task_id] 任务ID + * @apiParam {Number} [project_id] 项目ID(存在时只返回这个项目的工作流,主要用于任务移动到其他项目时) * * @apiSuccess {Number} ret 返回状态码(1正确、0错误) * @apiSuccess {String} msg 返回信息(错误描述) diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue index 1fd0917e0..a6afba5a9 100644 --- a/resources/assets/js/pages/manage/components/TaskOperation.vue +++ b/resources/assets/js/pages/manage/components/TaskOperation.vue @@ -137,7 +137,11 @@ export default { }, flow() { - return this.taskFlows.find(({task_id}) => task_id == this.task.id); + const item = this.taskFlows.find(({task_id}) => task_id == this.task.id); + if (item) { + return item; + } + return this.taskFlows.find(({flow_item_id}) => flow_item_id == this.task.flow_item_id); }, turns() {