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) => {
{{ department?.name_full ?? userDepartment.name_full }}
-
+
@@ -231,7 +234,7 @@ const formattedLabel = (word, count) => {
- Сохранить отчет
+ Сохранить введенные данные
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 }})
- Сохранить отчет
+ Сохранить введенные данные