* работа над функционалом автоматического заполнения

* исправил фантомный сдвиг даты
* переделал получение ФИО врачей из отделений
* добавил возможность поиска врача
* переписал сохранение отчета

resources/js/Pages/Report/Components/ReportHeader.vue

@@ -61,13 +61,16 @@ const currentDate = computed(() => {
                         {{ authStore.userDepartment.name_full }}
                     </NTag>
                     <DepartmentSelect v-if="isReadonlyMode" />
-                    <NTag v-if="reportStore.reportInfo?.userName" type="warning">
-                        Ответственный: {{ reportStore.reportInfo?.userName }}
+                    <NTag v-if="reportStore.reportInfo?.report?.userName" type="warning">
+                        Ответственный: {{ reportStore.reportInfo?.report.userName }}
                     </NTag>
                 </NSpace>
 
                 <div class="col-3 w-full">
-                    <DatePickerQuery :is-head-or-admin="reportStore.reportInfo.report?.isHeadOrAdmin" v-model:date="reportStore.timestampCurrentRange" :is-one-day="reportStore.reportInfo.report?.isOneDay" />
+                    <DatePickerQuery class="text-lg!"
+                                     :is-head-or-admin="reportStore.reportInfo.report?.isHeadOrAdmin"
+                                     v-model:date="reportStore.timestampCurrentRange"
+                                     :is-one-day="reportStore.reportInfo.report?.isOneDay" />
                 </div>
             </div>
 

resources/js/Pages/Report/Components/ReportSection.vue

@@ -82,15 +82,6 @@ const isReadonlyMode = computed(() => props.mode.toLowerCase() === 'readonly')
                     <ReportSectionHeader title="Выбывшие" status="outcome" />
                 </template>
                 <NTabs type="segment" animated>
-                    <NTabPane name="transferred">
-                        <template #tab>
-                            <ReportSectionHeader title="Переведённые" status="outcome-transferred" />
-                        </template>
-                        <ReportSectionItem status="outcome-transferred"
-                                           @item-dragged="handleItemDragged"
-                                           @item-dropped="handleItemDropped"
-                        />
-                    </NTabPane>
                     <NTabPane name="discharged">
                         <template #tab>
                             <ReportSectionHeader title="Выписанные" status="outcome-discharged" />
@@ -109,6 +100,15 @@ const isReadonlyMode = computed(() => props.mode.toLowerCase() === 'readonly')
                                            @item-dropped="handleItemDropped"
                         />
                     </NTabPane>
+                    <NTabPane name="transferred">
+                        <template #tab>
+                            <ReportSectionHeader title="Переведённые" status="outcome-transferred" />
+                        </template>
+                        <ReportSectionItem status="outcome-transferred"
+                                           @item-dragged="handleItemDragged"
+                                           @item-dropped="handleItemDropped"
+                        />
+                    </NTabPane>
                 </NTabs>
             </NCollapseItem>
         </NCollapse>

resources/js/Pages/Report/Components/ReportSectionItem.vue

@@ -244,7 +244,6 @@ function rowProps(row) {
     style.push(props.isDraggable ? 'cursor: grab;' : 'cursor: arrow;')
 
     if (props.accentIds.length) {
-        console.log(props.accentIds.includes(row.id))
         if (props.accentIds.includes(row.id)) {
             style.push('--n-merged-td-color: #047857')
         }

resources/js/Pages/Report/Components/SelectUserModal.vue

@@ -63,7 +63,10 @@ const onAfterLeave = () => {
     >
         <NForm id="select-user-form" ref="formRef" :model="reportStore.reportInfo" :rules="rules">
             <NFormItem label="Выберите ответственного" path="userId">
-                <NSelect :options="users" v-model:value="reportStore.reportInfo.userId" />
+                <NSelect :options="users"
+                         v-model:value="reportStore.reportInfo.userId"
+                         filterable
+                />
             </NFormItem>
         </NForm>
         <template #action>

resources/js/Pages/Report/Index.vue

@@ -34,7 +34,10 @@ onMounted(() => {
 
     reportStore.reportInfo.userId = userId
 
-    reportStore.reportInfo = props
+    reportStore.reportInfo = {
+        ...reportStore.reportInfo,
+        ...props
+    }
 
     reportStore.reportForm.metrika_item_3 = props.department.recipientCount
     reportStore.reportForm.metrika_item_7 = props.department.extractCount
@@ -46,10 +49,17 @@ onMounted(() => {
 
     reportStore.unwantedEvents = props.report.unwantedEvents
 
-    reportStore.timestampCurrentRange = [
-        props.dates.startAt,
-        props.dates.endAt,
-    ]
+    if (props.report.isHeadOrAdmin) {
+        reportStore.timestampCurrentRange = [
+            props.dates.startAt,
+            props.dates.endAt,
+        ]
+    } else {
+        reportStore.timestampCurrentRange = [
+            props.dates.endAt,
+            props.dates.endAt
+        ]
+    }
 
     // reportStore.getReportInfo()
 })
@@ -63,8 +73,14 @@ const mode = computed(() => {
 })
 
 watch(() => props, (newProps) => {
+    reportStore.reportInfo = {
+        ...reportStore.reportInfo,
+        ...newProps
+    }
 
-    reportStore.reportInfo = newProps
+    if (newProps.report.isHeadOrAdmin) {
+        reportStore.reportInfo.userId = newProps.report.userId
+    }
 
     reportStore.reportForm.metrika_item_3 = newProps.department.recipientCount
     reportStore.reportForm.metrika_item_7 = newProps.department.extractCount
@@ -76,10 +92,17 @@ watch(() => props, (newProps) => {
 
     reportStore.unwantedEvents = newProps.report.unwantedEvents
 
-    reportStore.timestampCurrentRange = [
-        newProps.dates.startAt,
-        newProps.dates.endAt,
-    ]
+    if (props.report.isHeadOrAdmin) {
+        reportStore.timestampCurrentRange = [
+            props.dates.startAt,
+            props.dates.endAt,
+        ]
+    } else {
+        reportStore.timestampCurrentRange = [
+            props.dates.endAt,
+            props.dates.endAt
+        ]
+    }
 }, {
     deep: true, // важно для глубокого отслеживания
     immediate: true // выполнить сразу при создании