Merge branch 'hitosea-pro' into pro

# Conflicts:
#	public/manifest.json
#	resources/assets/js/components/UserInput.vue
#	resources/assets/js/pages/manage/components/TaskDetail.vue

app/Http/Controllers/Api/ApproveController.php

@@ -952,6 +952,7 @@ class ApproveController extends AbstractController
         $data = [
             'id' => $process['id'],
             'nickname' => User::userid2nickname($type == 'approve_submitter' ? $toUser['userid'] : $process['start_user_id']),
+            'start_nickname' => User::userid2nickname($process['start_user_id']),
             'proc_def_name' => $process['proc_def_name'],
             'department' => $process['department'],
             'type' => $process['var']['type'],

app/Http/Controllers/Api/ProjectController.php

@@ -16,6 +16,7 @@ use App\Models\ProjectLog;
 use App\Models\ProjectTask;
 use App\Models\ProjectTaskFile;
 use App\Models\ProjectTaskFlowChange;
+use App\Models\ProjectTaskUser;
 use App\Models\ProjectUser;
 use App\Models\User;
 use App\Models\WebSocketDialog;
@@ -895,8 +896,17 @@ class ProjectController extends AbstractController
     public function task__lists()
     {
         $user = User::auth();
-        //
+
+        // 任务可见性
+        $project_ids = Project::whereUserid($user->userid)->pluck('id')->toArray();                                                                    // 负责人项目ids
+        $main_task_ids = ProjectTask::whereIn('project_id', $project_ids)->pluck('id')->toArray();                                             // 负责人项目任务ids
+        $other_task_ids = ProjectTaskUser::whereUserid($user->userid)->whereColumn('task_id', '=', 'task_pid')->whereNotIn('project_id', $project_ids)->pluck('task_id')->toArray();    // 非负责人项目任务ids
+        $all_visible_task_ids = ProjectTask::whereIsAllVisible(1)->pluck('id')->toArray();                                                                    // 所有人可见项目ids
+        $one_task_ids = array_merge($main_task_ids, $other_task_ids);
+        $visibility_task_ids = array_merge($one_task_ids, $all_visible_task_ids);
+
         $builder = ProjectTask::with(['taskUser', 'taskTag']);
+        $builder->whereIn("project_tasks.id", $visibility_task_ids);
         //
         $parent_id = intval(Request::input('parent_id'));
         $project_id = intval(Request::input('project_id'));
@@ -1341,17 +1351,26 @@ class ProjectController extends AbstractController
      */
     public function task__one()
     {
-        User::auth();
+        $user = User::auth();
         //
         $task_id = intval(Request::input('task_id'));
         $archived = Request::input('archived', 'no');
         //
         $isArchived = str_replace(['all', 'yes', 'no'], [null, false, true], $archived);
         $task = ProjectTask::userTask($task_id, $isArchived, true, false, ['taskUser', 'taskTag']);
+        // 项目可见性
+        $project_userid = Project::whereId($task->project_id)->value('userid');     // 项目负责人
+        if ($task->is_all_visible != 1 && $user->userid != $project_userid) {
+            $visibleUserids = ProjectTaskUser::whereTaskId($task_id)->pluck('userid')->toArray();
+            if (!in_array($user->userid, $visibleUserids)) {
+                return Base::retError('无任务权限');
+            }
+        }
         //
         $data = $task->toArray();
         $data['project_name'] = $task->project?->name;
         $data['column_name'] = $task->projectColumn?->name;
+        $data['visibility_appointor'] = $task->is_all_visible==1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid');
         return Base::retSuccess('success', $data);
     }
 
@@ -1557,7 +1576,7 @@ class ProjectController extends AbstractController
      */
     public function task__add()
     {
-        User::auth();
+        $user = User::auth();
         //
         $data = Request::input();
         $project_id = intval($data['project_id']);
@@ -1602,6 +1621,17 @@ class ProjectController extends AbstractController
             $data = $data->toArray();
             $data['new_column'] = $newColumn;
         }
+
+
+        if ($data['is_all_visible'] == 1) {
+            $data['is_visible'] = 1;
+        } else {
+            $projectOwner = Project::whereId($data['project_id'])->pluck('userid')->toArray();  // 项目负责人
+            $taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($data['id'])->pluck('userid')->toArray();
+            $visibleIds = array_merge($projectOwner, $taskOwnerAndAssists);
+            $data['is_visible'] = in_array($user->userid, $visibleIds) ? 1 : 0;
+        }
+
         $task->pushMsg('add', $data);
         $task->taskPush(null, 0);
         return Base::retSuccess('添加成功', $data);
@@ -1663,6 +1693,7 @@ class ProjectController extends AbstractController
      * @apiParam {String} [content]             任务详情（子任务不支持）
      * @apiParam {String} [color]               背景色（子任务不支持）
      * @apiParam {Array} [assist]               修改协助人员（子任务不支持）
+     * @apiParam {Array} [visibility_appointor] 修改可见性人员
      *
      * @apiParam {Number} [p_level]             优先级相关（子任务不支持）
      * @apiParam {String} [p_name]              优先级相关（子任务不支持）
@@ -1679,17 +1710,47 @@ class ProjectController extends AbstractController
     {
         User::auth();
         //
-        $data = Request::input();
-        $task_id = intval($data['task_id']);
+        $param = Request::input();
+        $task_id = intval($param['task_id']);
         //
         $task = ProjectTask::userTask($task_id, true, true, 2);
+        $taskUser = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($task_id)->whereIn('owner', [0, 1])->get();
+        $owners = $taskUser->where('owner', 1)->pluck('userid')->toArray();         // 负责人
+        $assist = $taskUser->where('owner', 0)->pluck('userid')->toArray();         // 协助人
+
         // 更新任务
         $updateMarking = [];
-        $task->updateTask($data, $updateMarking);
+        $task->updateTask($param, $updateMarking);
         //
         $data = ProjectTask::oneTask($task->id)->toArray();
         $data['update_marking'] = $updateMarking ?: json_decode('{}');
+        $data['visibility_appointor'] = $data['is_all_visible'] == 1 ? [0] : ProjectTaskUser::whereTaskId($task->id)->whereOwner(2)->pluck('userid');
         $task->pushMsg('update', $data);
+        // 可见性推送
+        if (Arr::exists($param, 'visibility_appointor')) {
+            if ($data['is_all_visible'] == 1) {
+                $task->pushMsgVisibleAdd($data);
+            }
+            if ($data['is_all_visible'] == 0) {
+                if ($param['visibility_appointor']) {
+                    $task->pushMsgVisibleUpdate($data);
+                } else {
+                    $task->pushMsgVisibleRemove();
+                }
+            }
+        }
+        if (Arr::exists($param, 'owner') && $data['is_all_visible'] == 0) {
+            $diff = array_diff($owners, $param['owner']);
+            if ($diff) {
+                $task->pushMsgVisibleRemove($diff);
+            }
+        }
+        if (Arr::exists($param, 'assist') && $data['is_all_visible'] == 0) {
+            $diff = array_diff($owners, $param['assist']);
+            if ($diff) {
+                $task->pushMsgVisibleRemove($diff);
+            }
+        }
         //
         return Base::retSuccess('修改成功', $data);
     }

app/Models/ProjectTask.php

@@ -370,6 +370,18 @@ class ProjectTask extends AbstractModel
         $p_color    = $data['p_color'];
         $top        = intval($data['top']);
         $userid     = User::userid();
+        $visibility_appoint = $data['visibility_appoint'];
+        $visibility_appointor = $data['visibility_appointor'];
+        // 可见性
+        $visibility_userids = [];
+        $is_all_visible = 0;
+        if ($visibility_appoint) {
+            if (in_array(0, $visibility_appointor)) {
+                $is_all_visible = 1;
+            } else {
+                $visibility_userids = $visibility_appointor;
+            }
+        }
         //
         if (ProjectTask::whereProjectId($project_id)
                 ->whereNull('project_tasks.complete_at')
@@ -398,6 +410,7 @@ class ProjectTask extends AbstractModel
             'p_level' => $p_level,
             'p_name' => $p_name,
             'p_color' => $p_color,
+            'is_all_visible' => $is_all_visible
         ]);
         if ($content) {
             $task->desc = Base::getHtml($content, 100);
@@ -462,7 +475,7 @@ class ProjectTask extends AbstractModel
             }
         }
         //
-        return AbstractModel::transaction(function() use ($assist, $times, $subtasks, $content, $owner, $task) {
+        return AbstractModel::transaction(function() use ($assist, $times, $subtasks, $content, $owner, $task, $visibility_userids) {
             $task->save();
             $owner = array_values(array_unique($owner));
             foreach ($owner as $uid) {
@@ -484,6 +497,17 @@ class ProjectTask extends AbstractModel
                     'owner' => 0,
                 ])->save();
             }
+
+            foreach ($visibility_userids as $uid) {
+                ProjectTaskUser::createInstance([
+                    'project_id' => $task->project_id,
+                    'task_id' => $task->id,
+                    'task_pid' => $task->parent_id ?: $task->id,
+                    'userid' => $uid,
+                    'owner' => 2,
+                ])->save();
+            }
+
             if ($content) {
                 ProjectTaskContent::createInstance([
                     'project_id' => $task->project_id,
@@ -691,6 +715,26 @@ class ProjectTask extends AbstractModel
                 $updateMarking['is_update_project'] = true;
                 $this->syncDialogUser();
             }
+            // 可见性
+            if (Arr::exists($data, 'visibility_appointor')) {
+                if (in_array(0, $data['visibility_appointor'])) {
+                    ProjectTask::whereId($data['task_id'])->update(['is_all_visible' => 1]);
+                } else {
+                    ProjectTask::whereId($data['task_id'])->update(['is_all_visible' => 0]);
+                    // 覆盖
+                    ProjectTaskUser::whereTaskId($data['task_id'])->whereOwner(2)->delete();
+                    foreach ($data['visibility_appointor'] as $uid) {
+                        ProjectTaskUser::createInstance([
+                            'project_id' => $this->project_id,
+                            'task_id' => $this->id,
+                            'task_pid' => $this->parent_id ?: $this->id,
+                            'userid' => $uid,
+                            'owner' => 2,
+                        ])->save();
+                    }
+
+                }
+            }
             // 计划时间（原则：子任务时间在主任务时间内）
             if (Arr::exists($data, 'times')) {
                 $oldAt = [Carbon::parse($this->start_at), Carbon::parse($this->end_at)];
@@ -1372,6 +1416,8 @@ class ProjectTask extends AbstractModel
             $userids = $this->project->relationUserids();
         } elseif (!is_array($userid)) {
             $userids = [$userid];
+        } elseif (is_array($userid)) {
+            $userids = $userid;
         }
         //
         $array = [];
@@ -1391,8 +1437,10 @@ class ProjectTask extends AbstractModel
                     ];
                 }
                 // 协助人
-                $assists = $taskUser->pluck('userid')->toArray();
-                $assists = array_intersect($userids, array_diff($assists, $owners));
+//                $assists = $taskUser->pluck('userid')->toArray();
+//                $assists = array_intersect($userids, array_diff($assists, $owners));
+                $assists = $taskUser->where('owner', 0)->pluck('userid')->toArray();
+                $assists = array_intersect($userids, $assists);
                 if ($assists) {
                     $array[] = [
                         'userid' => array_values($assists),
@@ -1403,13 +1451,21 @@ class ProjectTask extends AbstractModel
                     ];
                 }
                 // 项目成员（其他人）
-                $userids = array_diff($userids, $owners, $assists);
+                if ($data['is_all_visible'] == 1) {
+                    // 全部可见
+                    $userids = array_diff($userids, $owners, $assists);
+                } else {
+                    // 指定可见
+                    $visible = $taskUser->where('owner', 2)->pluck('userid')->toArray();
+                    $userids = $visible;
+                }
                 $data = array_merge($data, [
                     'owner' => 0,
                     'assist' => 0,
                 ]);
             }
         }
+        //
         $array[] = [
             'userid' => array_values($userids),
             'data' => $data
@@ -1418,7 +1474,7 @@ class ProjectTask extends AbstractModel
         foreach ($array as $item) {
             $params = [
                 'ignoreFd' => Request::header('fd'),
-                'userid' => array_values($item),
+                'userid' => $item['userid'],
                 'msg' => [
                     'type' => 'projectTask',
                     'action' => $action,
@@ -1430,6 +1486,114 @@ class ProjectTask extends AbstractModel
         }
     }
 
+    /**
+     * 添加可见性任务 推送
+     * @param array|self $data      发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
+     */
+    public function pushMsgVisibleAdd($data = null)
+    {
+        if (!$this->project) {
+            return;
+        }
+        if ($data === null) {
+            $data = [
+                'id' => $this->id,
+                'parent_id' => $this->parent_id,
+                'project_id' => $this->project_id,
+                'column_id' => $this->column_id,
+                'dialog_id' => $this->dialog_id,
+            ];
+        } elseif ($data instanceof self) {
+            $data = $data->toArray();
+        }
+        //
+        $array = [];
+        if ($this->is_all_visible == 0) {
+            $userids = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($this->id)->pluck('userid')->toArray();
+        } else {
+            $userids = ProjectUser::whereProjectId($this->project_id)->pluck('userid')->toArray();  // 项目成员
+        }
+        //
+        $array[] = [
+            'userid' => array_values($userids),
+            'data' => $data
+        ];
+        //
+        foreach ($array as $item) {
+            $params = [
+//                'ignoreFd' => Request::header('fd'),
+                'ignoreFd' => '0',
+                'userid' => array_values($item),
+                'msg' => [
+                    'type' => 'projectTask',
+                    'action' => 'add',
+                    'data' => $item['data'],
+                ]
+            ];
+            $task = new PushTask($params, false);
+            Task::deliver($task);
+        }
+    }
+
+    /**
+     * 删除可见性任务 推送
+     * @param array $userids
+     * @return void
+     */
+    public function pushMsgVisibleRemove(array $userids = [])
+    {
+        if (!$this->project) {
+            return;
+        }
+        $data = [
+            'id' => $this->id,
+            'parent_id' => $this->parent_id,
+            'project_id' => $this->project_id,
+            'column_id' => $this->column_id,
+            'dialog_id' => $this->dialog_id,
+        ];
+        //
+        $array = [];
+        if (empty($userids)) {
+            // 默认 项目成员 与 项目负责人，任务负责人、协助人的差集
+            $projectUserids = ProjectUser::whereProjectId($this->project_id)->pluck('userid')->toArray();  // 项目成员
+            $projectOwner = Project::whereId($this->project_id)->pluck('userid')->toArray();  // 项目负责人
+            $taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereIn('owner', [0, 1])->whereTaskId($this->id)->pluck('userid')->toArray();
+            $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists);
+        }
+        //
+        $array[] = [
+            'userid' => array_values($userids),
+            'data' => $data
+        ];
+        //
+        foreach ($array as $item) {
+            $params = [
+//                'ignoreFd' => Request::header('fd'),
+                'ignoreFd' => '0',
+                'userid' => array_values($item),
+                'msg' => [
+                    'type' => 'projectTask',
+                    'action' => 'delete',
+                    'data' => $item['data'],
+                ]
+            ];
+            $task = new PushTask($params, false);
+            Task::deliver($task);
+        }
+    }
+
+    /**
+     * 更新可见性任务 推送
+     * @param array|self $data      发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
+     */
+    public function pushMsgVisibleUpdate($data)
+    {
+        $this->pushMsgVisibleRemove();
+        usleep(300);
+        $this->pushMsgVisibleAdd($data);
+    }
+
     /**
      * 任务提醒
      * @param $userids

database/migrations/2023_06_15_093619_add_project_tasks_is_all_visible.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddProjectTasksIsAllVisible extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::table('project_tasks', function (Blueprint $table) {
+            if (!Schema::hasColumn('project_tasks', 'is_all_visible')) {
+                $table->tinyInteger('is_all_visible')->nullable()->default(1)->after('userid')->comment('是否所有人可见');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+        Schema::table('project_tasks', function (Blueprint $table) {
+            $table->dropColumn("avatar");
+        });
+    }
+}

resources/assets/js/pages/manage/approve/details.vue

@@ -159,8 +159,8 @@
         </div>
         <div class="approve-operation">
             <div style="flex: 1;"></div>
-            <Button type="success" v-if="(datas.candidate || '').split(',').indexOf(userId + '') != -1" @click="approve(1)">{{$L('同意')}}</Button>
-            <Button type="error" v-if="(datas.candidate || '').split(',').indexOf(userId + '') != -1" @click="approve(2)">{{$L('拒绝')}}</Button>
+            <Button type="success" v-if="isShowAgreeBtn" @click="approve(1)">{{$L('同意')}}</Button>
+            <Button type="error" v-if="isShowAgreeBtn" @click="approve(2)">{{$L('拒绝')}}</Button>
             <Button type="warning" v-if="isShowWarningBtn" @click="revocation">{{$L('撤销')}}</Button>
             <Button @click="comment" type="success" ghost>+{{$L('添加评论')}}</Button>
         </div>
@@ -232,6 +232,9 @@ export default {
         },
     },
     computed: {
+        isShowAgreeBtn(){
+            return (this.datas.candidate || '').split(',').indexOf(this.userId + '') != -1 && !this.datas.is_finished
+        },
         isShowWarningBtn(){
             let is = (this.userId == this.datas.start_user_id) && this.datas?.is_finished != true;
             (this.datas.node_infos || []).map(h=>{

resources/assets/js/pages/manage/components/TaskAdd.vue

@@ -93,6 +93,25 @@
                     </ETooltip>
                 </div>
             </FormItem>
+            <FormItem :label="$L('可见性')">
+                <Checkbox disabled v-model="addData.visibility_principal" :true-value="1" :false-value="0">{{$L('项目负责人')}}</Checkbox>
+                <Checkbox disabled v-model="addData.visibility_assist" :true-value="1" :false-value="0">{{$L('项目协助人')}}</Checkbox>
+                <Checkbox v-model="addData.visibility_appoint" :true-value="1" :false-value="0">{{$L('指定人员')}}</Checkbox>
+                <UserInput
+                    v-show="addData.visibility_appoint"
+                    v-model="addData.visibility_appointor"
+                    :placeholder="$L('选择指定人员')"
+                    :project-id="addData.project_id"
+                    :transfer="false">
+                    <Option slot="option-prepend" :value="0" :label="$L('所有人')" >
+                        <div class="user-input-option">
+                            <div class="user-input-avatar"><EAvatar class="avatar" icon="el-icon-s-custom"/></div>
+                            <div class="user-input-nickname">{{ $L('所有人') }}</div>
+                            <div class="user-input-userid">All</div>
+                        </div>
+                    </Option>
+                </UserInput>
+            </FormItem>
             <div class="subtasks">
                 <div v-if="addData.subtasks.length > 0" class="sublist">
                     <Row>
@@ -186,6 +205,11 @@ export default {
                 p_level: 0,
                 p_name: '',
                 p_color: '',
+                // 可见性
+                visibility_principal: 1,
+                visibility_assist: 1,
+                visibility_appoint: 1,
+                visibility_appointor: [0],
             },
 
             cascaderShow: false,

resources/assets/js/pages/manage/components/TaskAddSimple.vue

@@ -113,6 +113,11 @@ export default {
                 p_level: 0,
                 p_name: '',
                 p_color: '',
+                // 可见性
+                visibility_principal: 1,
+                visibility_assist: 1,
+                visibility_appoint: 1,
+                visibility_appointor: [0],
             },
             active: false,
 
@@ -217,6 +222,11 @@ export default {
                     p_level: 0,
                     p_name: '',
                     p_color: '',
+                    // 可见性
+                    visibility_principal: 1,
+                    visibility_assist: 1,
+                    visibility_appoint: 1,
+                    visibility_appointor: [0],
                 }
             }).catch(({msg}) => {
                 $A.modalError(msg);

resources/assets/js/store/actions.js

@@ -1819,7 +1819,9 @@ export default {
                 data: post,
                 method: 'post',
             }).then(result => {
-                dispatch("addTaskSuccess", result.data)
+                if (result.data.is_visible === 1) {
+                    dispatch("addTaskSuccess", result.data)
+                }
                 resolve(result)
             }).catch(e => {
                 console.warn(e);

resources/assets/sass/pages/components/task-detail.scss

@@ -19,7 +19,8 @@
             &:before {
                 content: "";
                 position: absolute;
-                left: 36px;
+                //left: 36px;
+                left: 0;
                 right: 0;
                 bottom: 0;
                 height: 1px;
@@ -149,9 +150,9 @@
             }
         }
         .scroller {
-            margin-left: 28px;
-            padding-left: 8px;
-            padding-right: 36px;
+            //margin-left: 28px;
+            //padding-left: 8px;
+            //padding-right: 36px;
             .title {
                 margin-top: 18px;
                 .ivu-input {

resources/views/push/bot.blade.php

@@ -147,7 +147,7 @@
     </div></span>
 @elseif ($type === 'approve_submitter')
     <span class="open-approve-details" data-id="{{$data->id}}"><b> @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
-    <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
+    <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->start_nickname}}</span> {{$data->department}}</span>
         <b>审批事由</b>
         @if ($data->type)
         <span>假期类型：{{$data->type}}</span>