From 9fc09df4b407066d2584fa8c2f9b4fdefe04035d Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 17 Dec 2025 16:42:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Mobile/VisitController.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index b3d4dd0..907cea8 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -67,13 +67,18 @@ class VisitController extends CommonController $messages = [ 'name.required' => '名称必填', 'visit_area_id.required' => '区域id必填', - 'accept_admin_id.required' => '接待人必填' + 'accept_admin_id.required' => '接待人必填', + 'accompany_id.required' => '陪同人必填', + 'date.required' => '到访日期必填', + 'mobile.required' => '电话必填', ]; $validator = Validator::make($all, [ 'name' => 'required', 'visit_area_id' => 'required', 'accept_admin_id' => 'required', - 'accompany_id' => 'required' + 'accompany_id' => 'required', + 'date' => 'required', + 'mobile' => 'required', ], $messages); if ($validator->fails()) { return $this->fail([ResponseCode::ERROR_PARAMETER, implode('，', $validator->errors()->all())]); @@ -136,6 +141,12 @@ class VisitController extends CommonController } VisitLog::add('', $this->getUser(), $model->id, isset($all['id']) ? '更新拜访记录' : '新增拜访记录'); DB::commit(); + // 短信通知被访人 + $vars = ['date' => $all['date'], 'name' => $all['name'], 'phone_number' => $all['mobile']]; + $template_id = '5wReg1'; + // 被访人信息 + $acceptAdmin = Admin::find($all['accept_admin_id']); + sms($acceptAdmin->mobile, $vars, $template_id); // 邮件通知第一个审核人 VisitAudit::emailNextAudit($model, -1); } From d15d03b2b8189a52efd8bca56ef952bb9f515482 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Wed, 17 Dec 2025 16:52:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Mobile/VisitController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index 907cea8..c6e89f7 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -143,7 +143,7 @@ class VisitController extends CommonController DB::commit(); // 短信通知被访人 $vars = ['date' => $all['date'], 'name' => $all['name'], 'phone_number' => $all['mobile']]; - $template_id = '5wReg1'; + $template_id = 'Sjwgv1'; // 被访人信息 $acceptAdmin = Admin::find($all['accept_admin_id']); sms($acceptAdmin->mobile, $vars, $template_id); From 34c128c2730505f260c0c126ca3b270e4232ebb9 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Thu, 18 Dec 2025 09:37:14 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Mobile/VisitController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Mobile/VisitController.php b/app/Http/Controllers/Mobile/VisitController.php index c6e89f7..6e000bc 100644 --- a/app/Http/Controllers/Mobile/VisitController.php +++ b/app/Http/Controllers/Mobile/VisitController.php @@ -142,7 +142,7 @@ class VisitController extends CommonController VisitLog::add('', $this->getUser(), $model->id, isset($all['id']) ? '更新拜访记录' : '新增拜访记录'); DB::commit(); // 短信通知被访人 - $vars = ['date' => $all['date'], 'name' => $all['name'], 'phone_number' => $all['mobile']]; + $vars = ['date' => $all['date'], 'name' => $all['name']]; $template_id = 'Sjwgv1'; // 被访人信息 $acceptAdmin = Admin::find($all['accept_admin_id']); From f9e6fc4c602f819485e4ad56c84cbb6425b8f574 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Mon, 22 Dec 2025 09:25:28 +0800 Subject: [PATCH 4/8] update --- app/Notifications/AuditEmailNotify.php | 10 ++++++++-- app/Notifications/AuditResultEmailNotify.php | 10 ++++++++-- app/Notifications/CancelEmailNotify.php | 5 ++++- app/Notifications/EmailNotify.php | 5 ++++- app/Notifications/VisitEmailNotify.php | 5 ++++- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/Notifications/AuditEmailNotify.php b/app/Notifications/AuditEmailNotify.php index 23217f2..e02df1a 100644 --- a/app/Notifications/AuditEmailNotify.php +++ b/app/Notifications/AuditEmailNotify.php @@ -50,21 +50,27 @@ class AuditEmailNotify extends Notification if ($this->isFirstAudit) { // 第一个审核人的邮件 return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('新的拜访审核通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访申请需要审核，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) - ->line('请及时审核此拜访申请。'); + ->line('请及时审核此拜访申请。') + ->line('') + ->line('Regards'); } else { // 后续审核人的邮件 return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('拜访审核流转通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('拜访申请 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 的审核已流转到您这里，上一级审核人：' . ($visitData['previous_admin'] ?? '') . '。') ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) - ->line('请及时处理此审核流转。'); + ->line('请及时处理此审核流转。') + ->line('') + ->line('Regards'); } } } diff --git a/app/Notifications/AuditResultEmailNotify.php b/app/Notifications/AuditResultEmailNotify.php index 5f05f0d..0d02dd7 100644 --- a/app/Notifications/AuditResultEmailNotify.php +++ b/app/Notifications/AuditResultEmailNotify.php @@ -51,22 +51,28 @@ class AuditResultEmailNotify extends Notification if ($auditResult === '通过') { // 审核通过的邮件 return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('拜访申请审核通过通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('您的拜访申请已审核通过，预约于 ' . $visitData['date'] . ' 到访。') ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) - ->line('请按时到访，如有疑问请联系被访人。'); + ->line('请按时到访，如有疑问请联系被访人。') + ->line('') + ->line('Regards'); } else { // 审核驳回的邮件 return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('拜访申请审核驳回通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('很抱歉，您的拜访申请未通过审核。') ->line('预约日期：' . $visitData['date']) ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) - ->line('如有疑问，请联系被访人或重新提交申请。'); + ->line('如有疑问，请联系被访人或重新提交申请。') + ->line('') + ->line('Regards'); } } } diff --git a/app/Notifications/CancelEmailNotify.php b/app/Notifications/CancelEmailNotify.php index 03cb2b2..7338b46 100644 --- a/app/Notifications/CancelEmailNotify.php +++ b/app/Notifications/CancelEmailNotify.php @@ -45,12 +45,15 @@ class CancelEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('拜访预约取消通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('访客 ' . $visitData['name'] . ' 原预约于 ' . $visitData['date'] . ' 的拜访已取消。') ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) - ->line('如有疑问，请联系访客确认。'); + ->line('如有疑问，请联系访客确认。') + ->line('') + ->line('Regards'); } } diff --git a/app/Notifications/EmailNotify.php b/app/Notifications/EmailNotify.php index d0ab372..5208b1a 100644 --- a/app/Notifications/EmailNotify.php +++ b/app/Notifications/EmailNotify.php @@ -44,8 +44,11 @@ class EmailNotify extends Notification public function toMail($notifiable) { return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject($notifiable->title) - ->line($notifiable->content); + ->line($notifiable->content) + ->line('') + ->line('Regards'); } /** diff --git a/app/Notifications/VisitEmailNotify.php b/app/Notifications/VisitEmailNotify.php index 48bb41d..02ecbc6 100644 --- a/app/Notifications/VisitEmailNotify.php +++ b/app/Notifications/VisitEmailNotify.php @@ -45,11 +45,14 @@ class VisitEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) + ->from('no-reply@tinge.com', 'tinge Suzhou HR') ->subject('新的拜访预约通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访预约，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) - ->line('请及时处理此拜访预约。'); + ->line('请及时处理此拜访预约。') + ->line('') + ->line('Regards'); } } From f857efa4f1eedda0a9c630924aa539ca9dcbb76f Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Mon, 22 Dec 2025 09:38:08 +0800 Subject: [PATCH 5/8] update --- app/Notifications/AuditEmailNotify.php | 4 ++-- app/Notifications/AuditResultEmailNotify.php | 4 ++-- app/Notifications/CancelEmailNotify.php | 2 +- app/Notifications/EmailNotify.php | 2 +- app/Notifications/VisitEmailNotify.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Notifications/AuditEmailNotify.php b/app/Notifications/AuditEmailNotify.php index e02df1a..ddf1f60 100644 --- a/app/Notifications/AuditEmailNotify.php +++ b/app/Notifications/AuditEmailNotify.php @@ -50,7 +50,7 @@ class AuditEmailNotify extends Notification if ($this->isFirstAudit) { // 第一个审核人的邮件 return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('新的拜访审核通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访申请需要审核，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') @@ -62,7 +62,7 @@ class AuditEmailNotify extends Notification } else { // 后续审核人的邮件 return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('拜访审核流转通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('拜访申请 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 的审核已流转到您这里，上一级审核人：' . ($visitData['previous_admin'] ?? '') . '。') diff --git a/app/Notifications/AuditResultEmailNotify.php b/app/Notifications/AuditResultEmailNotify.php index 0d02dd7..58c1c37 100644 --- a/app/Notifications/AuditResultEmailNotify.php +++ b/app/Notifications/AuditResultEmailNotify.php @@ -51,7 +51,7 @@ class AuditResultEmailNotify extends Notification if ($auditResult === '通过') { // 审核通过的邮件 return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('拜访申请审核通过通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('您的拜访申请已审核通过，预约于 ' . $visitData['date'] . ' 到访。') @@ -63,7 +63,7 @@ class AuditResultEmailNotify extends Notification } else { // 审核驳回的邮件 return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('拜访申请审核驳回通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('很抱歉，您的拜访申请未通过审核。') diff --git a/app/Notifications/CancelEmailNotify.php b/app/Notifications/CancelEmailNotify.php index 7338b46..093453a 100644 --- a/app/Notifications/CancelEmailNotify.php +++ b/app/Notifications/CancelEmailNotify.php @@ -45,7 +45,7 @@ class CancelEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('拜访预约取消通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('访客 ' . $visitData['name'] . ' 原预约于 ' . $visitData['date'] . ' 的拜访已取消。') diff --git a/app/Notifications/EmailNotify.php b/app/Notifications/EmailNotify.php index 5208b1a..bc83361 100644 --- a/app/Notifications/EmailNotify.php +++ b/app/Notifications/EmailNotify.php @@ -44,7 +44,7 @@ class EmailNotify extends Notification public function toMail($notifiable) { return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject($notifiable->title) ->line($notifiable->content) ->line('') diff --git a/app/Notifications/VisitEmailNotify.php b/app/Notifications/VisitEmailNotify.php index 02ecbc6..35b8ea8 100644 --- a/app/Notifications/VisitEmailNotify.php +++ b/app/Notifications/VisitEmailNotify.php @@ -45,7 +45,7 @@ class VisitEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) - ->from('no-reply@tinge.com', 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject('新的拜访预约通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访预约，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') From 550d2c032a6c9f2816042dab852c90d4330e21a1 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Mon, 22 Dec 2025 09:40:54 +0800 Subject: [PATCH 6/8] update --- app/Notifications/AuditEmailNotify.php | 4 ++-- app/Notifications/AuditResultEmailNotify.php | 4 ++-- app/Notifications/CancelEmailNotify.php | 2 +- app/Notifications/EmailNotify.php | 2 +- app/Notifications/VisitEmailNotify.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Notifications/AuditEmailNotify.php b/app/Notifications/AuditEmailNotify.php index ddf1f60..6438f56 100644 --- a/app/Notifications/AuditEmailNotify.php +++ b/app/Notifications/AuditEmailNotify.php @@ -57,7 +57,7 @@ class AuditEmailNotify extends Notification ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时审核此拜访申请。') - ->line('') + ->salutation('') ->line('Regards'); } else { // 后续审核人的邮件 @@ -69,7 +69,7 @@ class AuditEmailNotify extends Notification ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时处理此审核流转。') - ->line('') + ->salutation('') ->line('Regards'); } } diff --git a/app/Notifications/AuditResultEmailNotify.php b/app/Notifications/AuditResultEmailNotify.php index 58c1c37..8b56752 100644 --- a/app/Notifications/AuditResultEmailNotify.php +++ b/app/Notifications/AuditResultEmailNotify.php @@ -58,7 +58,7 @@ class AuditResultEmailNotify extends Notification ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) ->line('请按时到访，如有疑问请联系被访人。') - ->line('') + ->salutation('') ->line('Regards'); } else { // 审核驳回的邮件 @@ -71,7 +71,7 @@ class AuditResultEmailNotify extends Notification ->line('被访人：' . $visitData['accept_admin_name']) ->line('公司名称：' . $visitData['company_name']) ->line('如有疑问，请联系被访人或重新提交申请。') - ->line('') + ->salutation('') ->line('Regards'); } } diff --git a/app/Notifications/CancelEmailNotify.php b/app/Notifications/CancelEmailNotify.php index 093453a..7b9071e 100644 --- a/app/Notifications/CancelEmailNotify.php +++ b/app/Notifications/CancelEmailNotify.php @@ -52,7 +52,7 @@ class CancelEmailNotify extends Notification ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('如有疑问，请联系访客确认。') - ->line('') + ->salutation('') ->line('Regards'); } } diff --git a/app/Notifications/EmailNotify.php b/app/Notifications/EmailNotify.php index bc83361..0b144fe 100644 --- a/app/Notifications/EmailNotify.php +++ b/app/Notifications/EmailNotify.php @@ -47,7 +47,7 @@ class EmailNotify extends Notification ->from(config('mail.from.address'), 'tinge Suzhou HR') ->subject($notifiable->title) ->line($notifiable->content) - ->line('') + ->salutation('') ->line('Regards'); } diff --git a/app/Notifications/VisitEmailNotify.php b/app/Notifications/VisitEmailNotify.php index 35b8ea8..2aa55c8 100644 --- a/app/Notifications/VisitEmailNotify.php +++ b/app/Notifications/VisitEmailNotify.php @@ -52,7 +52,7 @@ class VisitEmailNotify extends Notification ->line('访客联系电话：' . $visitData['mobile']) ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时处理此拜访预约。') - ->line('') + ->salutation('') ->line('Regards'); } } From a7ed4fea30cbf767a53a001e3369eca4b00ba624 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Mon, 22 Dec 2025 09:43:49 +0800 Subject: [PATCH 7/8] update --- .../vendor/notifications/email.blade.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 resources/views/vendor/notifications/email.blade.php diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php new file mode 100644 index 0000000..423d27c --- /dev/null +++ b/resources/views/vendor/notifications/email.blade.php @@ -0,0 +1,55 @@ + +{{-- Greeting --}} +@if (! empty($greeting)) +# {{ $greeting }} +@else +@if ($level === 'error') +# @lang('Whoops!') +@else +# @lang('Hello!') +@endif +@endif + +{{-- Intro Lines --}} +@foreach ($introLines as $line) +{{ $line }} + +@endforeach + +{{-- Action Button --}} +@isset($actionText) + $level, + default => 'primary', + }; +?> + +{{ $actionText }} + +@endisset + +{{-- Outro Lines --}} +@foreach ($outroLines as $line) +{{ $line }} + +@endforeach + +{{-- Salutation --}} +@if (! empty($salutation)) +{{ $salutation }} +@endif + +{{-- Subcopy --}} +@isset($actionText) + +@lang( + "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\n". + 'into your web browser:', + [ + 'actionText' => $actionText, + ] +) [{{ $displayableActionUrl }}]({{ $actionUrl }}) + +@endisset + From 115af99e9bdb6c18b8573bcb678b72f3814e92d5 Mon Sep 17 00:00:00 2001 From: cody <648753004@qq.com> Date: Mon, 22 Dec 2025 10:26:42 +0800 Subject: [PATCH 8/8] update --- app/Notifications/AuditEmailNotify.php | 10 ++++++---- app/Notifications/AuditResultEmailNotify.php | 10 ++++++---- app/Notifications/CancelEmailNotify.php | 5 +++-- app/Notifications/EmailNotify.php | 5 +++-- app/Notifications/VisitEmailNotify.php | 5 +++-- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/Notifications/AuditEmailNotify.php b/app/Notifications/AuditEmailNotify.php index 6438f56..2fda332 100644 --- a/app/Notifications/AuditEmailNotify.php +++ b/app/Notifications/AuditEmailNotify.php @@ -50,7 +50,7 @@ class AuditEmailNotify extends Notification if ($this->isFirstAudit) { // 第一个审核人的邮件 return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('新的拜访审核通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访申请需要审核，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') @@ -58,11 +58,12 @@ class AuditEmailNotify extends Notification ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时审核此拜访申请。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } else { // 后续审核人的邮件 return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('拜访审核流转通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('拜访申请 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 的审核已流转到您这里，上一级审核人：' . ($visitData['previous_admin'] ?? '') . '。') @@ -70,7 +71,8 @@ class AuditEmailNotify extends Notification ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时处理此审核流转。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } } } diff --git a/app/Notifications/AuditResultEmailNotify.php b/app/Notifications/AuditResultEmailNotify.php index 8b56752..a7790a3 100644 --- a/app/Notifications/AuditResultEmailNotify.php +++ b/app/Notifications/AuditResultEmailNotify.php @@ -51,7 +51,7 @@ class AuditResultEmailNotify extends Notification if ($auditResult === '通过') { // 审核通过的邮件 return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('拜访申请审核通过通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('您的拜访申请已审核通过，预约于 ' . $visitData['date'] . ' 到访。') @@ -59,11 +59,12 @@ class AuditResultEmailNotify extends Notification ->line('公司名称：' . $visitData['company_name']) ->line('请按时到访，如有疑问请联系被访人。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } else { // 审核驳回的邮件 return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('拜访申请审核驳回通知 - ' . $visitData['name']) ->greeting('您好 ' . $visitData['visitor_name'] . '，') ->line('很抱歉，您的拜访申请未通过审核。') @@ -72,7 +73,8 @@ class AuditResultEmailNotify extends Notification ->line('公司名称：' . $visitData['company_name']) ->line('如有疑问，请联系被访人或重新提交申请。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } } } diff --git a/app/Notifications/CancelEmailNotify.php b/app/Notifications/CancelEmailNotify.php index 7b9071e..91e1456 100644 --- a/app/Notifications/CancelEmailNotify.php +++ b/app/Notifications/CancelEmailNotify.php @@ -45,7 +45,7 @@ class CancelEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('拜访预约取消通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('访客 ' . $visitData['name'] . ' 原预约于 ' . $visitData['date'] . ' 的拜访已取消。') @@ -53,7 +53,8 @@ class CancelEmailNotify extends Notification ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('如有疑问，请联系访客确认。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } } diff --git a/app/Notifications/EmailNotify.php b/app/Notifications/EmailNotify.php index 0b144fe..5c1e34f 100644 --- a/app/Notifications/EmailNotify.php +++ b/app/Notifications/EmailNotify.php @@ -44,11 +44,12 @@ class EmailNotify extends Notification public function toMail($notifiable) { return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject($notifiable->title) ->line($notifiable->content) ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } /** diff --git a/app/Notifications/VisitEmailNotify.php b/app/Notifications/VisitEmailNotify.php index 2aa55c8..5ff79f1 100644 --- a/app/Notifications/VisitEmailNotify.php +++ b/app/Notifications/VisitEmailNotify.php @@ -45,7 +45,7 @@ class VisitEmailNotify extends Notification $visitData = $this->visitData; return (new MailMessage) - ->from(config('mail.from.address'), 'tinge Suzhou HR') + ->from(config('mail.from.address'), 'Getinge Suzhou HR') ->subject('新的拜访预约通知 - ' . $visitData['name']) ->greeting('您好 ' . $notifiable->name . '，') ->line('您有一个新的拜访预约，访客 ' . $visitData['name'] . ' 预约于 ' . $visitData['date'] . ' 到访。') @@ -53,6 +53,7 @@ class VisitEmailNotify extends Notification ->line('拜访事由：' . ($visitData['reason'] ?? '无')) ->line('请及时处理此拜访预约。') ->salutation('') - ->line('Regards'); + ->line('Regards') + ->line('Getinge Suzhou HR'); } }