From 6ae5703d2973288a1ecbe1d2960590e217cd9ec0 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Tue, 2 Jun 2026 16:23:53 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/Pages/Nurse/Report/Index.vue | 9 ++++++---
 resources/js/Pages/Report/Index.vue       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/js/Pages/Nurse/Report/Index.vue b/resources/js/Pages/Nurse/Report/Index.vue
index 92e4b19..4202955 100644
--- a/resources/js/Pages/Nurse/Report/Index.vue
+++ b/resources/js/Pages/Nurse/Report/Index.vue
@@ -14,6 +14,8 @@ import EditMedicalHistoryModal from "../Components/EditMedicalHistoryModal.vue";
 import {router} from "@inertiajs/vue3";
 import ActionsColumnDataTable from "../Components/ActionsColumnDataTable.vue";
 import {useAppDialog} from "../../../Composables/useAppDialog.js";
+import {format} from "date-fns";
+import DatePickerQuery from "../../../Components/DatePickerQuery.vue";
 
 const props = defineProps({
     patients: {
@@ -92,7 +94,8 @@ const columns = [
         minWidth: 180,
         maxWidth: 180,
         width: 180,
-        resizable: false
+        resizable: false,
+        render: (row) => format(new Date(row.migrations[0].ingoing_date), 'dd.MM.yyyy HH:mm')
     },
     {
         title: 'Срочность',
@@ -168,7 +171,7 @@ const formattedLabel = (word, count) => {
                     <NTag type="info" :bordered="false">
                         {{ department?.name_full ?? userDepartment.name_full }}
                     </NTag>
-                    <ShiftPickerQuery :date="dates" class="text-lg!" />
+                    <DatePickerQuery :date="dates" :is-head-or-admin="true" class="text-lg!" hint />
                 </NFlex>
             </AppPanel>
             <AppPanel header="Журнал пациентов" header-include-body>
@@ -231,7 +234,7 @@ const formattedLabel = (word, count) => {
                 </NTabs>
             </AppPanel>
             <NButton v-if="canSaveReport" secondary size="large" @click="submit" :loading="loading">
-                Сохранить отчет
+                Сохранить введенные данные
             </NButton>
         </AppContainer>
         <AddMedicalHistoryModal v-model:show="showAddMedicalHistoryModal" />
diff --git a/resources/js/Pages/Report/Index.vue b/resources/js/Pages/Report/Index.vue
index b4a0c3e..6d5879d 100644
--- a/resources/js/Pages/Report/Index.vue
+++ b/resources/js/Pages/Report/Index.vue
@@ -290,7 +290,7 @@ watch(() => props, (newProps) => {
                         Нежелательные события ({{ latestReportObj.unwanted_events?.length ?? 0 }})
                     </NButton>
                     <NButton v-if="props.canSaveReport" secondary @click="submit" :loading="loading">
-                        Сохранить отчет
+                        Сохранить введенные данные
                     </NButton>
                 </NFlex>
             </AppPanel>