diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index c33c63508..4193ff704 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -2711,14 +2711,11 @@ class ProjectController extends AbstractController */ public function task__template_list() { - $user = User::auth(); + User::auth(); + // $projectId = intval(Request::input('project_id')); if (!$projectId) { - return Base::retError('缺少参数project_id'); - } - $project = Project::userProject($projectId); - if (!$project) { - return Base::retError('项目不存在或已被删除'); + return Base::retError('参数错误'); } $templates = ProjectTaskTemplate::where('project_id', $projectId) ->orderBy('sort') @@ -2751,7 +2748,7 @@ class ProjectController extends AbstractController // $projectId = intval(Request::input('project_id')); if (!$projectId) { - return Base::retError('缺少参数project_id'); + return Base::retError('参数错误'); } Project::userProject($projectId, true, true); // @@ -2783,7 +2780,7 @@ class ProjectController extends AbstractController } else { $templateCount = ProjectTaskTemplate::where('project_id', $projectId)->count(); if ($templateCount >= 20) { - return Base::retError('每个项目最多添加10个模板'); + return Base::retError('每个项目最多添加20个模板'); } $data['sort'] = ProjectTaskTemplate::where('project_id', $projectId)->max('sort') + 1; $template = ProjectTaskTemplate::create($data); @@ -2811,7 +2808,7 @@ class ProjectController extends AbstractController // $id = intval(Request::input('id')); if (!$id) { - return Base::retError('缺少参数id'); + return Base::retError('参数错误'); } $template = ProjectTaskTemplate::find($id); if (!$template) { diff --git a/resources/assets/js/pages/manage/components/ProjectTaskTemplate.vue b/resources/assets/js/pages/manage/components/ProjectTaskTemplate/index.vue similarity index 63% rename from resources/assets/js/pages/manage/components/ProjectTaskTemplate.vue rename to resources/assets/js/pages/manage/components/ProjectTaskTemplate/index.vue index 7da80ab3d..4034c4df3 100644 --- a/resources/assets/js/pages/manage/components/ProjectTaskTemplate.vue +++ b/resources/assets/js/pages/manage/components/ProjectTaskTemplate/index.vue @@ -67,9 +67,9 @@
-
{{$L('使用示例模板')}}
+
{{$L('使用示例模板')}}
@@ -84,7 +84,9 @@