From 29c9ba56ffe95a99a0ccfa96d904c70f95b6ce8f Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 27 Jul 2023 12:05:04 +0800 Subject: [PATCH] no message --- resources/assets/sass/pages/page-approve.scss | 1 + resources/views/push/bot.blade.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index 47b4f6326..96dbe5e59 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -273,6 +273,7 @@ } .img-view { + display: flex; max-width: 60px; border-radius: 5px; } diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index fa7cba481..edfa3fd1a 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -146,19 +146,19 @@ @endif @elseif ($type === 'approve_comment_notifier') - {{$data->comment_nickname}}评论了此审批 + {{$data->comment_nickname}}评论了此审批
申请人:{{'@'}}{{$data->nickname}} {{$data->department}} 评论内容 {{$data->comment_content}} -
+
@if ($is_finished == 1) - + @else - + @endif
@elseif ($type === 'approve_submitter') - @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif + @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif
申请人:{{'@'}}{{$data->start_nickname}} {{$data->department}} 审批事由 @if ($data->type)