github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-14 21:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pro' of https://github.com/hitosea/dootask into pro

Browse Source
This commit is contained in:
Meng 2023-06-20 17:08:08 +08:00
commit 76866e6292
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/ApproveController.php
View File

@ -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'],

2
resources/views/push/bot.blade.php
View File

@ -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>