github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化审批信息推送内容（时间、事由）

Browse Source
This commit is contained in:
ganzizi 2023-09-18 11:19:29 +08:00
parent a2cd57641b
commit 7fe3436819
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -975,7 +975,10 @@ class ApproveController extends AbstractController
'department' => $process['department'], 'department' => $process['department'],
'type' => $process['var']['type'], 'type' => $process['var']['type'],
'start_time' => $process['var']['start_time'], 'start_time' => $process['var']['start_time'],
'start_day_of_week' => '周'.Base::getTimeWeek(Carbon::parse($process['var']['start_time'])->timestamp),
'end_time' => $process['var']['end_time'], 'end_time' => $process['var']['end_time'],
'end_day_of_week' => '周'.Base::getTimeWeek(Carbon::parse($process['var']['end_time'])->timestamp),
'description' => $process['var']['description'],
'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '', 'comment_nickname' => $process['comment_user_id'] ? User::userid2nickname($process['comment_user_id']) : '',
'comment_content' => $process['comment_content'] ?? '' 'comment_content' => $process['comment_content'] ?? ''
]; ];

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

@ -114,12 +114,13 @@
@elseif ($type === 'approve_reviewer') @elseif ($type === 'approve_reviewer')
<span class="open-approve-details" data-id="{{$data->id}}"><b>{{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批</b> <span class="open-approve-details" data-id="{{$data->id}}"><b>{{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批</b>
<div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span> <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
<b>审批事由</b> <b>详情</b>
@if ($data->type) @if ($data->type)
<span>假期类型：{{$data->type}}</span> <span>假期类型：{{$data->type}}</span>
@endif @endif
<span>开始时间：{{$data->start_time}}</span> <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
<span>结束时间：{{$data->end_time}}</span> <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
<span>事由：{{$data->description}}</span>
</div><div class="btn-raw no-dark-content"> </div><div class="btn-raw no-dark-content">
@if ($action === 'pass') @if ($action === 'pass')
<button class="ivu-btn">已同意</button> <button class="ivu-btn">已同意</button>
@ -135,12 +136,13 @@
@elseif ($type === 'approve_notifier') @elseif ($type === 'approve_notifier')
<span class="open-approve-details" data-id="{{$data->id}}"><b>抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录</b> <span class="open-approve-details" data-id="{{$data->id}}"><b>抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录</b>
<div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span> <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->nickname}}</span> {{$data->department}}</span>
<b>审批事由</b> <b>详情</b>
@if ($data->type) @if ($data->type)
<span>假期类型：{{$data->type}}</span> <span>假期类型：{{$data->type}}</span>
@endif @endif
<span>开始时间：{{$data->start_time}}</span> <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
<span>结束时间：{{$data->end_time}}</span> <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
<span>事由：{{$data->description}}</span>
</div><div class="btn-raw no-dark-content"> </div><div class="btn-raw no-dark-content">
@if ($is_finished == 1) @if ($is_finished == 1)
<button class="ivu-btn">已同意</button> <button class="ivu-btn">已同意</button>
@ -163,12 +165,13 @@
@elseif ($type === 'approve_submitter') @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> <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->start_nickname}}</span> {{$data->department}}</span> <div class="cause"><span>申请人：<span style="color:#84c56a">{{'@'}}{{$data->start_nickname}}</span> {{$data->department}}</span>
<b>审批事由</b> <b>详情</b>
@if ($data->type) @if ($data->type)
<span>假期类型：{{$data->type}}</span> <span>假期类型：{{$data->type}}</span>
@endif @endif
<span>开始时间：{{$data->start_time}}</span> <span>开始时间：{{$data->start_time}} ({{ $data->start_day_of_week }})</span>
<span>结束时间：{{$data->end_time}}</span> <span>结束时间：{{$data->end_time}} ({{ $data->end_day_of_week }})</span>
<span>事由：{{$data->description}}</span>
</div><div class="btn-raw no-dark-content"> </div><div class="btn-raw no-dark-content">
@if ($action === 'pass') @if ($action === 'pass')
<button class="ivu-btn">已同意</button> <button class="ivu-btn">已同意</button>