Добавил уведомление о создании отчета

2026-06-23 17:28:52 +09:00
parent 8e6bbc5f91
commit 6942b0c091
9 changed files with 121 additions and 42 deletions
--- a/resources/js/Pages/Analytics/Builder.vue
+++ b/resources/js/Pages/Analytics/Builder.vue
@@ -229,7 +229,6 @@ watch([dateModel, departmentModel], () => {
                            <NDropdown trigger="click" :options="exportMenu" @select="download">
                                <NButton>
                                    <template #icon><TbDownload /></template>
-                                    Скачать
                                </NButton>
                            </NDropdown>
                            <NButton v-if="canManage" @click="save">
@@ -330,7 +329,7 @@ watch([dateModel, departmentModel], () => {
    flex-shrink: 0;
    position: sticky;
    top: 12px;
-    border: 1px solid var(--n-border-color, rgba(255,255,255,.1));
+    border: 1px solid var(--border-color, rgba(255,255,255,.1));
    border-radius: 14px;
    background: var(--card-color);
    padding: 14px;
@@ -356,9 +355,9 @@ watch([dateModel, departmentModel], () => {
    display: flex;
    align-items: center;
    justify-content: center;
-    border: 1px solid var(--n-border-color, rgba(255,255,255,.12));
+    border: 1px solid var(--border-color, rgba(255,255,255,.12));
    border-radius: 8px;
-    background: var(--n-card-color);
+    background: var(--card-color);
    cursor: pointer;
 }
 .slide-enter-active, .slide-leave-active { transition: opacity .15s, transform .15s; }
--- a/resources/js/Pages/Analytics/Components/PresetCard.vue
+++ b/resources/js/Pages/Analytics/Components/PresetCard.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { NText } from 'naive-ui'
+import { NText, NEl } from 'naive-ui'
 import { TbPlus } from 'vue-icons-plus/tb'

 defineProps({
@@ -8,7 +8,7 @@ defineProps({
 </script>

 <template>
-    <div class="preset-card">
+    <NEl class="preset-card">
        <div v-if="preset.key === 'blank'" class="preset-blank">
            <TbPlus :size="26" />
        </div>
@@ -17,7 +17,7 @@ defineProps({
        </div>
        <NText class="preset-title">{{ preset.label }}</NText>
        <NText depth="3" class="preset-desc">{{ preset.description }}</NText>
-    </div>
+    </NEl>
 </template>

 <style scoped>
--- a/resources/js/Pages/Analytics/Components/SettingsPanel.vue
+++ b/resources/js/Pages/Analytics/Components/SettingsPanel.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue'
 import {
-    NButton, NText, NIcon, NSelect, NScrollbar, NGrid, NGi, NAlert, NRadio, NEmpty,
+    NButton, NText, NIcon, NSelect, NScrollbar, NGrid, NGi, NAlert, NRadio, NEmpty, NEl
 } from 'naive-ui'
 import {
    TbX, TbChevronRight, TbCalendar, TbTrendingUp, TbLayoutGrid, TbDatabase,
@@ -60,7 +60,7 @@ const filterOptions = (def) => (def.options ?? [])
 </script>

 <template>
-    <div class="settings">
+    <NEl class="settings">
        <!-- ROOT -->
        <template v-if="view === 'root'">
            <div class="head">
@@ -242,11 +242,11 @@ const filterOptions = (def) => (def.options ?? [])
                />
            </div>
        </template>
-    </div>
+    </NEl>
 </template>

 <style scoped>
-.settings { padding: 4px 2px; background: var(--n-) }
+.settings { padding: 4px 2px; }
 .head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12px; }
 .head-title { font-size: 18px; font-weight: 600; }
 .sub-head { display: flex; align-items: center; justify-content: space-between; margin-bottom: 6px; }
@@ -257,15 +257,15 @@ const filterOptions = (def) => (def.options ?? [])
    align-items: center;
    gap: 10px;
    padding: 12px 14px;
-    border: 1px solid var(--n-border-color, rgba(255,255,255,.1));
+    border: 1px solid var(--border-color, rgba(255,255,255,.1));
    border-radius: 12px;
    margin-bottom: 8px;
    cursor: pointer;
-    background: var(--n-card-color);
+    background: var(--card-color);
    transition: border-color .15s;
 }
 .row:hover { border-color: var(--primary-color); }
-.row.static, .row.static:hover { cursor: default; border-color: var(--n-border-color, rgba(255,255,255,.1)); }
+.row.static, .row.static:hover { cursor: default; border-color: var(--border-color, rgba(255,255,255,.1)); }
 .row.disabled { opacity: .5; pointer-events: none; }
 .row-icon { color: var(--primary-color); }
 .row-label { flex: 1; font-weight: 500; }
@@ -293,7 +293,7 @@ const filterOptions = (def) => (def.options ?? [])
    font-size: 13px;
    color: var(--n-text-color-2);
 }
-.seg-btn.active { background: var(--n-card-color); font-weight: 600; box-shadow: 0 1px 3px rgba(0,0,0,.1); }
+.seg-btn.active { background: var(--card-color); font-weight: 600; box-shadow: 0 1px 3px rgba(0,0,0,.1); }
 .data-list { display: flex; flex-direction: column; gap: 8px; }
 .data-card {
    display: flex;
@@ -301,7 +301,7 @@ const filterOptions = (def) => (def.options ?? [])
    justify-content: space-between;
    gap: 8px;
    padding: 12px 14px;
-    border: 1px solid var(--n-border-color, rgba(255,255,255,.1));
+    border: 1px solid var(--border-color, rgba(255,255,255,.1));
    border-radius: 12px;
    cursor: pointer;
 }
--- a/resources/js/Pages/Analytics/Components/TemplatePickerModal.vue
+++ b/resources/js/Pages/Analytics/Components/TemplatePickerModal.vue
@@ -32,16 +32,17 @@ const pick = (preset) => {
        :show="show"
        preset="card"
        title="Шаблоны для отчёта"
-        style="width: 860px; max-width: 94vw;"
-        class="h-[580px]"
+        class="max-w-[860px] h-[580px] relative"
+        :content-scrollable="true"
        @update:show="emit('update:show', $event)"
    >
        <template #header-extra>
            <NText depth="3" style="font-size: 13px;">Создавайте отчёт по шаблонам</NText>
        </template>

-        <div class="picker">
-            <div class="picker-side">
+        <div class="picker relative flex gap-2 items-start">
+            <!-- Боковая панель с sticky -->
+            <div class="picker-side sticky top-0 shrink-0 align-start">
                <NInput v-model:value="search" placeholder="Поиск" clearable size="small">
                    <template #prefix><TbSearch :size="14" /></template>
                </NInput>
@@ -58,13 +59,14 @@ const pick = (preset) => {
                </div>
            </div>

-            <NScrollbar style="max-height: 60vh;" class="picker-main">
+            <!-- Контент справа -->
+            <div style="flex: 1; min-width: 0;">
                <NGrid responsive="screen" cols="2 s:3" :x-gap="12" :y-gap="12" class="pt-0.5">
                    <NGi v-for="preset in filtered" :key="preset.key">
                        <PresetCard :preset="preset" @click="pick(preset)" />
                    </NGi>
                </NGrid>
-            </NScrollbar>
+            </div>
        </div>
    </NModal>
 </template>
--- a/resources/js/Pages/Analytics/Index.vue
+++ b/resources/js/Pages/Analytics/Index.vue
@@ -4,6 +4,7 @@ import { router, Link } from '@inertiajs/vue3'
 import {
    NButton, NText, NDataTable, NEmpty, NDropdown, NIcon, NScrollbar,
    NTag, useDialog, useMessage,
+    NEl,
 } from 'naive-ui'
 import { TbReportMedical, TbPlus, TbDotsVertical, TbLayoutGrid } from 'vue-icons-plus/tb'
 import AppLayout from '../../Layouts/AppLayout.vue'
@@ -54,7 +55,7 @@ const remove = (row) => {
 const rowMenu = (row) => [
    { key: 'open', label: 'Открыть' },
    { key: 'duplicate', label: 'Дублировать' },
-    { key: 'delete', label: 'Удалить', props: { style: 'color: var(--error-color);' } },
+    { key: 'delete', label: 'Удалить' },
 ]

 const onMenuSelect = (key, row) => {
@@ -85,7 +86,8 @@ const columns = computed(() => [
                options: rowMenu(row),
                onSelect: (key) => onMenuSelect(key, row),
            }, () => h(NButton, {
-                text: true,
+                round: true,
+                size: 'small',
                onClick: (e) => e.stopPropagation(),
            }, () => h(NIcon, null, () => h(TbDotsVertical)))) : null,
    },
@@ -114,10 +116,10 @@ const columns = computed(() => [
                </template>
                <NScrollbar x-scrollable class="pb-3">
                    <div class="create-row">
-                        <div class="create-card" @click="openPreset({ key: 'blank' })">
+                        <NEl class="create-card" @click="openPreset({ key: 'blank' })">
                            <div class="blank-tile"><NIcon :size="28"><TbPlus /></NIcon></div>
                            <NText class="blank-title">Отчёт с нуля</NText>
-                        </div>
+                        </NEl>
                        <div v-for="preset in featured" :key="preset.key" class="create-card" @click="openPreset(preset)">
                            <PresetCard :preset="preset" />
                        </div>
--- a/resources/js/Pages/Nurse/Report/Index.vue
+++ b/resources/js/Pages/Nurse/Report/Index.vue
@@ -1,6 +1,7 @@
 <script setup>
 import AppLayout from "../../../Layouts/AppLayout.vue";
 import {NFlex, NTag, NDataTable, NButton, NTabs, NTabPane, NSpace} from 'naive-ui'
+import {useNotification} from "../../../Composables/useNotification.js"
 import AppContainer from "../../../Components/AppContainer.vue";
 import AppPanel from "../../../Components/AppPanel.vue";
 import ShiftPickerQuery from "../../../Components/ShiftPickerQuery.vue";
@@ -163,13 +164,46 @@ const onClickDeleteButton = async (historyId) => {
    }
 }

+const {success} = useNotification()
+
+const notifyReportSaved = () => {
+    const notification = success('Сохранено', 'Отчет успешно сохранен', {
+        meta: '',
+        duration: 5000,
+        action: () => h(
+            NButton,
+            {
+                text: true,
+                type: 'success',
+                onClick: () => {
+                    notification.destroy()
+                    router.visit('/')
+                }
+            },
+            {default: () => 'Вернуться на главную страницу'}
+        )
+    })
+}
+
 const submit = () => {
-    router.post('/nurse/report/save', {
+    const queryString = window.location.search;
+    const params = new URLSearchParams(queryString);
+    const url = new URL(`${window.location.origin}/nurse/report/save`)
+    const startAt = params.get('startAt')
+    const endAt = params.get('endAt')
+    if (startAt && startAt !== 'null') url.searchParams.append('startAt', startAt)
+    if (endAt && endAt !== 'null') url.searchParams.append('endAt', endAt)
+
+    loading.value = true
+    router.post(url.toString(), {
        userId: props.selectedUserId,
        departmentId: props.selectedDepartmentId,
    }, {
        onSuccess: () => {
-            alert('Сохранено')
+            notifyReportSaved()
+        },
+        onFinish: () => {
+            loading.value = false
        }
    })
 }
--- a/resources/js/Pages/Report/Components/HeaderWidget.vue
+++ b/resources/js/Pages/Report/Components/HeaderWidget.vue
@@ -1,6 +1,6 @@
 <script setup>
 import AppPanel from "../../../Components/AppPanel.vue";
-import {NNumberAnimation, NStatistic} from "naive-ui";
+import {NNumberAnimation, NStatistic, NTooltip} from "naive-ui";
 const props = defineProps({
    label: String,
    counter: {
@@ -35,15 +35,27 @@ const props = defineProps({
        <div class="flex flex-col items-center justify-center text-center py-2">
            <NStatistic :label="label">
                <template v-if="isDoubleCounter">
-                    <span :class="counterClass">
-                        <NNumberAnimation :from="0" :to="counter" />
-                        <span v-if="percent" style="color: var(--n-close-icon-color)">%</span>
-                    </span>
+                    <NTooltip>
+                        <template #trigger>
+                            <span :class="counterClass">
+                                <NNumberAnimation :from="0" :to="counter" />
+                                <span v-if="percent" style="color: var(--n-close-icon-color)">%</span>
+                            </span>
+                        </template>
+                        Данные из МИС
+                    </NTooltip>
+
                    <span style="color: var(--n-close-icon-color)"> / </span>
-                    <span :class="counterSuffixClass">
-                        <NNumberAnimation :from="0" :to="counterSuffix" />
-                        <span v-if="percent" style="color: var(--n-close-icon-color)">%</span>
-                    </span>
+                    <NTooltip>
+                        <template #trigger>
+                            <span :class="counterSuffixClass">
+                                <NNumberAnimation :from="0" :to="counterSuffix" />
+                                <span v-if="percent" style="color: var(--n-close-icon-color)">%</span>
+                            </span>
+                        </template>
+                        Данные из журнала пациентов
+                    </NTooltip>
+
                </template>
                <span v-else :class="counterClass">
                    <NNumberAnimation :from="0" :to="counter" />
--- a/resources/js/Pages/Report/Index.vue
+++ b/resources/js/Pages/Report/Index.vue
@@ -1,7 +1,8 @@
 <script setup>
 import AppLayout from "../../Layouts/AppLayout.vue";
 import {useReportStore} from "../../Stores/report.js";
-import {onMounted, ref, watch, provide, computed} from "vue";
+import {onMounted, ref, watch, provide, computed, h} from "vue";
+import {useNotification} from "../../Composables/useNotification.js";
 import {useAuthStore} from "../../Stores/auth.js";
 import {
    NFormItem,
@@ -88,6 +89,26 @@ const props = defineProps({
 const reportStore = useReportStore()
 const authStore = useAuthStore()
 const userDepartment = authStore.userDepartment
+const {success} = useNotification()
+
+const notifyReportSaved = () => {
+    const notification = success('Сохранено', 'Отчет успешно сохранен', {
+        meta: '',
+        duration: 5000,
+        action: () => h(
+            NButton,
+            {
+                text: true,
+                type: 'success',
+                onClick: () => {
+                    notification.destroy()
+                    router.visit('/')
+                }
+            },
+            {default: () => 'Вернуться на главную страницу'}
+        )
+    })
+}

 const patientCollection = ref({...props.patients})
 const nursePatientCollection = ref({...props.nursePatients})
@@ -142,7 +163,7 @@ const submit = () => {
        departmentId: props.selectedDepartmentId,
    }, {
        onSuccess: () => {
-            alert('Сохранено')
+            notifyReportSaved()
        }
    })
 }