diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index da3d8c8c5..8d348d4d7 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -975,7 +975,10 @@ class ApproveController extends AbstractController 'department' => $process['department'], 'type' => $process['var']['type'], '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_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_content' => $process['comment_content'] ?? '' ]; diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index 72db8fa6c..9a34117b1 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -114,12 +114,13 @@ @elseif ($type === 'approve_reviewer') {{$data->nickname}}提交的「{{$data->proc_def_name}}」待你审批
申请人:{{'@'}}{{$data->nickname}} {{$data->department}} - 审批事由 + 详情 @if ($data->type) 假期类型:{{$data->type}} @endif - 开始时间:{{$data->start_time}} - 结束时间:{{$data->end_time}} + 开始时间:{{$data->start_time}} ({{ $data->start_day_of_week }}) + 结束时间:{{$data->end_time}} ({{ $data->end_day_of_week }}) + 事由:{{$data->description}}
@if ($action === 'pass') @@ -135,12 +136,13 @@ @elseif ($type === 'approve_notifier') 抄送{{$data->nickname}}提交的「{{$data->proc_def_name}}」记录
申请人:{{'@'}}{{$data->nickname}} {{$data->department}} - 审批事由 + 详情 @if ($data->type) 假期类型:{{$data->type}} @endif - 开始时间:{{$data->start_time}} - 结束时间:{{$data->end_time}} + 开始时间:{{$data->start_time}} ({{ $data->start_day_of_week }}) + 结束时间:{{$data->end_time}} ({{ $data->end_day_of_week }}) + 事由:{{$data->description}}
@if ($is_finished == 1) @@ -163,12 +165,13 @@ @elseif ($type === 'approve_submitter') @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif
申请人:{{'@'}}{{$data->start_nickname}} {{$data->department}} - 审批事由 + 详情 @if ($data->type) 假期类型:{{$data->type}} @endif - 开始时间:{{$data->start_time}} - 结束时间:{{$data->end_time}} + 开始时间:{{$data->start_time}} ({{ $data->start_day_of_week }}) + 结束时间:{{$data->end_time}} ({{ $data->end_day_of_week }}) + 事由:{{$data->description}}
@if ($action === 'pass')