Изменение компонента выбора даты

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" />

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>