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 }}) - - Сформировать отчет дежурного - - - Сохранить введенные данные - + + + + Скачать отчет + + + Сохранить введенные данные + + 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 @@

Плановые: {{ $planned['count'] }}

@foreach ($planned['patients'] as $i => $p) -

{{ $i + 1 }}-{{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif

+

{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif

@endforeach

Экстренные: {{ $urgent['count'] }}

@foreach ($urgent['patients'] as $i => $p) -

{{ $i + 1 }}-{{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif

+

{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) Д/З: {{ $p['diagnosis'] }}.@endif

@endforeach -

В отделении состоит: {{ $inDepartment }}

+

В отделении состоит: {{ $inDepartment }}

-

ПЛАНОВЫХ ОПЕРАЦИЙ: {{ $plannedOperations['count'] }}

+

Плановых операций: {{ $plannedOperations['count'] }}

@foreach ($plannedOperations['patients'] as $p)

{{ $p['full_name'] }} {{ $p['age'] }}.

@endforeach @@ -44,9 +44,9 @@

{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) {{ $p['diagnosis'] }}.@endif

@endforeach -

Под наблюдением: {{ $observableCount }}

+

Под наблюдением: {{ $observableCount }}

-

Летальные исходы: {{ $deceased['count'] > 0 ? '' : 'не было.' }}

+

Летальные исходы: {{ $deceased['count'] > 0 ? '' : 'не было.' }}

@foreach ($deceased['patients'] as $i => $p)

{{ $i + 1 }}. {{ $p['full_name'] }} {{ $p['age'] }}.@if ($p['diagnosis']) {{ $p['diagnosis'] }}.@endif

@endforeach