gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化创建者和协助人机制

Browse Source
This commit is contained in:
kuaifan 2022-02-23 23:30:33 +08:00
parent 04533e17ec
commit 23ef992a7f
3 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Api/ProjectController.php
View File

@ -1083,7 +1083,7 @@ class ProjectController extends AbstractController
return Base::retError('文件不存在或已被删除');
}
//
$task = ProjectTask::userTask($file->task_id, true, 3);
$task = ProjectTask::userTask($file->task_id, true, true);
//
$task->pushMsg('filedelete', $file);
$file->delete();
@ -1284,7 +1284,7 @@ class ProjectController extends AbstractController
$task_id = intval(Request::input('task_id'));
$name = Request::input('name');
//
$task = ProjectTask::userTask($task_id, true, 3);
$task = ProjectTask::userTask($task_id, true, true);
if ($task->complete_at) {
return Base::retError('主任务已完成无法添加子任务');
}
@ -1336,10 +1336,7 @@ class ProjectController extends AbstractController
parse_str(Request::getContent(), $data);
$task_id = intval($data['task_id']);
//
if (!Arr::exists($data, 'flow_item_id') && !Arr::exists($data, 'complete_at'))
$task = ProjectTask::userTask($task_id, true, 3);
else
$task = ProjectTask::userTask($task_id, true, 2);
$task = ProjectTask::userTask($task_id, true, 2);
// 更新任务
$updateMarking = [];
$task->updateTask($data, $updateMarking);

15
app/Models/ProjectTask.php
View File

@ -950,20 +950,6 @@ class ProjectTask extends AbstractModel
return false;
}
/**
* 是否是参与者或者创建人
* @return bool
*/
public function isActor(): bool
{
$user = User::auth();
$actor = ProjectTaskUser::whereTaskId($this->id)->whereUserid($user->userid)->exists();
if (!$actor && $user->userid != $this->userid) {
return false;
}
return true;
}
/**
* 是否有负责人
* @return bool
@ -1211,6 +1197,7 @@ class ProjectTask extends AbstractModel
if (($permission === 1 || $permission === true) && !$project->owner && !$task->permission(3)) {
throw new ApiException('仅限项目负责人、任务负责人、协助人员或任务创建者操作');
}
//
return $task;
}
}

13
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -249,9 +249,6 @@ export default {
immediate: true
}
},
created() {
this.pasteEnter()
},
methods: {
sendMsg(text) {
@ -356,15 +353,7 @@ export default {
this.dialogDrag = true;
}
},
pasteEnter() {
var that = this;
document.onkeydown = function (e) {
if (e.keyCode === 13 && that.pasteShow) {
that.pasteSend();
that.pasteShow = false;
}
}
},
pasteSend() {
this.pasteFile.some(file => {
this.$refs.chatUpload.upload(file)