From 19dbefcff0dc6b0a0cc6673517d64c0f05c45be8 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@github.com>
Date: Tue, 7 Jul 2026 00:51:11 +0900
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D1=82=D1=87=D0=B5=D1=82=D0=B0=20+=20=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exports/DutyReportExport.php       |  2 +-
 resources/js/Pages/Report/Index.vue    | 25 +++++++++++++++++--------
 resources/views/reports/duty.blade.php | 12 ++++++------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/Exports/DutyReportExport.php b/app/Exports/DutyReportExport.php
index ff0e9c8..2880de6 100644
--- a/app/Exports/DutyReportExport.php
+++ b/app/Exports/DutyReportExport.php
@@ -20,7 +20,7 @@ class DutyReportExport
         protected array $dateRange,
         protected User $user,
         protected Department $department,
-        protected string $reportName = 'Отчёт дежурного врача по приёмному покою и отделению',
+        protected string $reportName = 'Отчёт дежурного врача',
     ) {}
 
     /**
diff --git a/resources/js/Pages/Report/Index.vue b/resources/js/Pages/Report/Index.vue
index 45c2101..1935948 100644
--- a/resources/js/Pages/Report/Index.vue
+++ b/resources/js/Pages/Report/Index.vue
@@ -11,7 +11,8 @@ import {
     NTabPane,
     NTabs,
     NTag,
-    NRow, NCol, NDivider, NButton, NSpace
+    NRow, NCol, NDivider, NButton, NSpace,
+    NIcon
 } from "naive-ui";
 import DatePickerQuery from "../../Components/DatePickerQuery.vue";
 import AppPanel from "../../Components/AppPanel.vue";
@@ -25,6 +26,7 @@ import OperationWidget from "./Components/Widgets/OperationWidget.vue";
 import LoadedWidget from "./Components/Widgets/LoadedWidget.vue";
 import UnwantedEventModal from "./Components/Modals/UnwantedEventModal.vue";
 import RecipientWidget from "./Components/Widgets/RecipientWidget.vue";
+import { PiMicrosoftExcelLogo } from "vue-icons-plus/pi";
 
 const props = defineProps({
     department: {
@@ -233,7 +235,7 @@ const downloadReport = async () => {
         const url = window.URL.createObjectURL(blob)
         const a = document.createElement('a')
         a.href = url
-        a.download = 'Отчёт дежурного.xlsx'
+        a.download = 'Отчёт дежурного.pdf'
         document.body.appendChild(a)
         a.click()
         window.URL.revokeObjectURL(url)
@@ -348,12 +350,19 @@ watch(() => props, (newProps) => {
                              secondary type="error" :loading="loading" @click="onShowUnwantedEventModal">
                         Нежелательные события ({{ latestReportObj.unwanted_events?.length ?? 0 }})
                     </NButton>
-                    <NButton secondary @click="downloadReport" :loading="loading">
-                        Сформировать отчет дежурного
-                    </NButton>
-                    <NButton v-if="props.canSaveReport" secondary @click="submit" :loading="loading">
-                        Сохранить введенные данные
-                    </NButton>
+                    <NSpace>
+                        <NButton secondary @click="downloadReport" :loading="loading">
+                            <template #icon>
+                                <NIcon>
+                                    <PiMicrosoftExcelLogo />
+                                </NIcon>
+                            </template>
+                            Скачать отчет
+                        </NButton>
+                        <NButton v-if="props.canSaveReport" secondary @click="submit" :loading="loading">
+                            Сохранить введенные данные
+                        </NButton>
+                    </NSpace>
                 </NFlex>
             </AppPanel>
         </AppContainer>
diff --git a/resources/views/reports/duty.blade.php b/resources/views/reports/duty.blade.php
index ab1341e..cee9ca2 100644
--- a/resources/views/reports/duty.blade.php
+++ b/resources/views/reports/duty.blade.php
@@ -19,17 +19,17 @@
 
     <p class="label">Плановые: {{ $planned['count'] }}</p>
     @foreach ($planned['patients'] as $i => $p)
-        <p class="patient">{{ $i + 1 }}-{{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif</p>
+        <p class="patient">{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif</p>
     @endforeach
 
     <p class="label">Экстренные: {{ $urgent['count'] }}</p>
     @foreach ($urgent['patients'] as $i => $p)
-        <p class="patient">{{ $i + 1 }}-{{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif</p>
+        <p class="patient">{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif</p>
     @endforeach
 
-    <p>В отделении состоит: {{ $inDepartment }}</p>
+    <p class="label">В отделении состоит: {{ $inDepartment }}</p>
 
-    <p class="label">ПЛАНОВЫХ ОПЕРАЦИЙ: {{ $plannedOperations['count'] }}</p>
+    <p class="label">Плановых операций: {{ $plannedOperations['count'] }}</p>
     @foreach ($plannedOperations['patients'] as $p)
         <p class="patient">{{ $p['full_name'] }} {{ $p['age'] }}.</p>
     @endforeach
@@ -44,9 +44,9 @@
         <p class="patient">{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) {{ $p['diagnosis'] }}.@endif</p>
     @endforeach
 
-    <p>Под наблюдением: {{ $observableCount }}</p>
+    <p class="label">Под наблюдением: {{ $observableCount }}</p>
 
-    <p>Летальные исходы: {{ $deceased['count'] > 0 ? '' : 'не было.' }}</p>
+    <p class="label">Летальные исходы: {{ $deceased['count'] > 0 ? '' : 'не было.' }}</p>
     @foreach ($deceased['patients'] as $i => $p)
         <p class="patient">{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) {{ $p['diagnosis'] }}.@endif</p>
     @endforeach