diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 029a5ba7d..36707df7a 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -2420,12 +2420,12 @@ class ProjectController extends AbstractController } /** - * @api {post} api/project/task/related/delete 删除任务关联 + * @api {post} api/project/task/related_delete 删除任务关联 * * @apiDescription 需要token身份(限:项目、任务负责人) * @apiVersion 1.0.0 * @apiGroup project - * @apiName task__related__delete + * @apiName task__related_delete * * @apiParam {Number} task_id 任务ID * @apiParam {Number} related_task_id 关联任务ID @@ -2434,7 +2434,7 @@ class ProjectController extends AbstractController * @apiSuccess {String} msg 返回信息(错误描述) * @apiSuccess {Object} data 返回数据 */ - public function task__related__delete() + public function task__related_delete() { User::auth(); // diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index d2465eabd..594ec74d3 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1761,8 +1761,9 @@ export default { return; } $A.modalConfirm({ - title: '温馨提示', - content: '确定要解除与任务 #' + item.related_task_id + ' 的关联吗?', + language: false, + title: this.$L('温馨提示'), + content: this.$L('确定要解除与任务 #(*) 的关联吗?', item.related_task_id), onOk: () => { this.$store.dispatch('deleteTaskRelated', { taskId: this.taskId, diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 2c4cd30ac..ced5f022d 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -2907,7 +2907,7 @@ export default { deleteTaskRelated({commit, dispatch}, {taskId, relatedTaskId}) { return new Promise((resolve, reject) => { dispatch("call", { - url: 'project/task/related/delete', + url: 'project/task/related_delete', data: {task_id: taskId, related_task_id: relatedTaskId}, }).then(({msg}) => { commit('task/related/clear', taskId); diff --git a/routes/api-map.md b/routes/api-map.md index c35632158..ffe52d9c4 100644 --- a/routes/api-map.md +++ b/routes/api-map.md @@ -122,7 +122,7 @@ API 使用动态路由(见 `routes/web.php`),URL 段映射为控制器方 | api/project/task/one | task__one() | get | 获取单个任务信息 | | api/project/task/subdata | task__subdata() | get | 获取子任务数据 | | api/project/task/related | task__related() | get | 获取任务关联任务列表 | -| api/project/task/related/delete | task__related__delete() | post | 删除任务关联 | +| api/project/task/related_delete | task__related_delete() | post | 删除任务关联 | | api/project/task/content | task__content() | get | 获取任务详细描述 | | api/project/task/content_history | task__content_history() | get | 获取任务详细历史描述 | | api/project/task/files | task__files() | get | 获取任务文件列表 |