Обновление 1.0

app/Http/Controllers/ArchiveInfoController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Resources\ArchiveInfoResource;
 use App\Models\ArchiveInfo;
 use App\Models\Mis\SttMedicalHistory;
 use Illuminate\Http\Request;
@@ -35,4 +36,26 @@ class ArchiveInfoController extends Controller
 
         return $hasCreated;
     }
+
+    public function check(Request $request)
+    {
+        $data = $request->validate([
+            'id' => 'required',
+        ]);
+
+        $archive = ArchiveInfo::where('mis_history_id', $data['id'])
+            ->orWhere('foxpro_history_id', $data['id'])
+            ->first();
+
+        if (isset($archive)) {
+            return response()->json([
+                'id' => $archive->mis_history_id ?? $archive->foxpro_history_id,
+                'type' => $archive->mis_history_id ? 'mis' : 'foxpro',
+            ]);
+        }
+
+        return response()->json([
+            'message' => 'Карты нет в архиве'
+        ])->setStatusCode(404);
+    }
 }

resources/js/Pages/Home/ArchiveHistoryCreateModal/Index.vue

@@ -1,15 +1,21 @@
 <script setup>
 import { NModal, NSelect, NSpace, NFlex, NButton, NForm, NFormItem, NInput, NDatePicker, NDivider, NSpin, NTag } from 'naive-ui'
 import ArchiveHistoryMoveModal from '../ArchiveHistoryMoveModal/Index.vue'
-import {computed, ref, watch} from "vue";
+import {computed, h, ref, watch} from "vue";
 import {useMedicalHistoryFilter} from "../../../Composables/useMedicalHistoryFilter.js";
 import {useNotification} from "../../../Composables/useNotification.js";
 import {useDebounceFn} from "@vueuse/core";
+import {useArchiveCard} from "../../../Stores/ArchiveCard.js";
 
 const open = defineModel('open')
 
 const {errorApi} = useNotification()
 const loading = ref(false)
+const loadingFilterPatients = ref(false)
+const formRef = ref(null)
+const archiveCardStore = useArchiveCard()
+const isCardInArchive = computed(() => archiveCardStore.preOpenCard !== null)
+const emits = defineEmits(['historyUpdated', 'closeWithoutSave', 'openArchiveCard'])
 const archiveInfo = ref({
     id: null,
     num: null,
@@ -20,16 +26,43 @@ const archiveInfoRules = {
         {
             required: true,
             validator(rule, value) {
-                console.log(value)
+                if (isCardInArchive.value) {
+                    return false
+                }
+
                 if (!value) {
-                    return new Error('Это поле необходимо заполнить')
+                    return false
                 }
                 else if (!Number(value)) {
-                    return new Error('Ошибка при получении ID')
+                    return false
                 }
                 return true
             },
-            trigger: ['input', 'blur']
+            renderMessage: () => {
+                if (isCardInArchive.value) {
+                    return h(
+                        'div',
+                        [
+                            'Карта уже находится в архиве. ',
+                            h(
+                                NButton,
+                                {
+                                    text: true,
+                                    onClick: (e) => {
+                                        e.preventDefault()
+                                        archiveCardStore.isOpenArchiveCard = true
+                                        onCloseWithoutSave()
+                                    }
+                                },
+                                'Перейти к карте'
+                            )
+                        ]
+                    )
+                }
+
+                return 'Это поле необходимо заполнить'
+            },
+            trigger: ['change', 'blur']
         }
     ],
     num: [
@@ -47,17 +80,26 @@ const archiveInfoRules = {
         }
     ]
 }
-const loadingFilterPatients = ref(false)
-const formRef = ref(null)
 
-const emits = defineEmits(['historyUpdated', 'closeWithoutSave'])
+const onResetArchiveInfo = (only) => {
-
+    if (only && Object.keys(only).length > 0) {
-const onResetData = () => {
+        archiveInfo.value = {
+            ...archiveInfo.value,
+            ...only
+        }
+    } else {
         archiveInfo.value = {
             id: null,
             num: null,
             post_in: null,
         }
+    }
+}
+
+const onResetData = () => {
+    onResetArchiveInfo()
+    filteredPatients.value = []
+    setTimeout(() => archiveCardStore.resetPreOpenCard(), 100)
 }
 
 const onCloseWithoutSave = () => {
@@ -106,6 +148,27 @@ const onSubmit = async (e) => {
         }
     })
 }
+
+const updateValueSearch = async (value) => {
+    archiveCardStore.setPreOpenCard(null)
+    await axios.post('/api/archive/check', {
+        id: value
+    }).then(res => {
+        archiveCardStore.setPreOpenCard(res.data)
+    }).catch(err => {
+        if (err.code === 404) {
+            archiveCardStore.resetPreOpenCard()
+        }
+    })
+}
+
+watch(() => isCardInArchive.value, (val) => {
+    if (val)
+        onResetArchiveInfo({
+            num: null,
+            post_in: null
+        })
+})
 </script>
 
 <template>
@@ -126,17 +189,20 @@ const onSubmit = async (e) => {
                              :loading="loadingFilterPatients"
                              :options="filteredPatients"
                              v-model:value="archiveInfo.id"
+                             @update:value="(val) => updateValueSearch(val)"
                              @search="handleSearchCard"
                     />
                 </NFormItem>
                 <NFormItem size="large" label="Дата поступления карты в архив" path="post_in">
                     <NDatePicker class="w-full"
                                  v-model:value="archiveInfo.post_in"
+                                 :disabled="archiveCardStore.isSetPreOpenCard"
                                  format="dd.MM.yyyy"
                     />
                 </NFormItem>
                 <NFormItem size="large" label="№ в архиве" path="num">
-                    <NInput v-model:value="archiveInfo.num" />
+                    <NInput v-model:value="archiveInfo.num"
+                            :disabled="archiveCardStore.isSetPreOpenCard"/>
                 </NFormItem>
             </NForm>
         </NFlex>
@@ -147,6 +213,7 @@ const onSubmit = async (e) => {
                              type="primary"
                              attr-type="submit"
                              form="formAddToArchive"
+                             :disabled="archiveCardStore.isSetPreOpenCard"
                              @click="onSubmit">
                         Добавить карту
                     </NButton>

resources/js/Pages/Home/ArchiveHistoryModal/Index.vue

@@ -4,6 +4,7 @@ import ArchiveHistoryMoveModal from '../ArchiveHistoryMoveModal/Index.vue'
 import {computed, ref, watch} from "vue";
 import {useMedicalHistoryFilter} from "../../../Composables/useMedicalHistoryFilter.js";
 import {useNotification} from "../../../Composables/useNotification.js";
+import {useArchiveCard} from "../../../Stores/ArchiveCard.js";
 
 const open = defineModel('open')
 const props = defineProps({
@@ -12,6 +13,7 @@ const props = defineProps({
     }
 })
 
+const archiveCardStore = useArchiveCard()
 const {filtersRef} = useMedicalHistoryFilter()
 const {errorApi} = useNotification()
 const loading = ref(true)
@@ -96,17 +98,26 @@ const columns = [
     {
         title: 'Организация',
         key: 'org',
-        width: 220
+        width: 220,
+        ellipsis: {
+            tooltip: true
+        }
     },
     {
         title: 'ФИО',
         key: 'employee_name',
-        width: 180
+        width: 180,
+        ellipsis: {
+            tooltip: true
+        }
     },
     {
         title: 'Должность',
         key: 'employee_post',
-        width: 120
+        width: 120,
+        ellipsis: {
+            tooltip: true
+        }
     },
 ]
 const rowProps = (row) => ({
@@ -154,6 +165,7 @@ const onSubmit = async () => {
 watch(() => props.patientInfo, async (newId) => {
     if (newId) {
         await loadPatientData()
+        archiveCardStore.isOpenArchiveCard = false
     }
 }, { immediate: true })
 </script>
@@ -187,7 +199,7 @@ watch(() => props.patientInfo, async (newId) => {
             <NButton @click="onShowArchiveHistoryModal(null)" :disabled="!patientData.can_be_issued">
                 Добавить
             </NButton>
-            <NDataTable :row-props="rowProps" min-height="420px" max-height="420px" :columns="columns" :data="patient?.journal" />
+            <NDataTable :row-props="rowProps" min-height="300px" size="small" max-height="300px" :columns="columns" :data="patient?.journal" />
         </NSpace>
         <template #action>
             <NFlex justify="end" align="center">

resources/js/Pages/Home/DataTable/Index.vue

@@ -3,6 +3,7 @@ import {NDataTable, NEllipsis, NTag} from "naive-ui"
 import {computed, h, reactive, ref, watch} from "vue"
 import {useMedicalHistoryFilter} from "../../../Composables/useMedicalHistoryFilter.js";
 import ArchiveHistoryModal from '../ArchiveHistoryModal/Index.vue'
+import {useArchiveCard} from "../../../Stores/ArchiveCard.js";
 
 const props = defineProps({
     filters: {
@@ -24,6 +25,7 @@ const props = defineProps({
 })
 
 const { isLoading, handlePageChange, handlePageSizeChange, meta, filtersRef } = useMedicalHistoryFilter(props.filters)
+const archiveCardStore = useArchiveCard()
 const dataTable = ref(props.data ?? [])
 
 const archiveStatusColumn = (status) => {
@@ -132,6 +134,14 @@ const onUpdateHistory = ({data, patientId}) => {
 watch(() => props.data, (newData) => {
     dataTable.value = newData
 })
+
+watch(() => archiveCardStore.isOpenArchiveCard, (isOpen) => {
+    if (isOpen) {
+        selectedPatientInfo.value = Object.assign(archiveCardStore.preOpenCard)
+        showArchiveHistoryModal.value = true
+        archiveCardStore.setPreOpenCard(null)
+    }
+})
 </script>
 
 <template>

resources/js/Pages/Home/Index.vue

@@ -34,6 +34,10 @@ const onHandleSearch = (search) => {
     handleSearch(search)
 }
 
+const openArchiveCard = (card) => {
+    
+}
+
 const handleBeforeLeave = (tabName) => {
     handleViewTypeChange(tabName)
     return true
@@ -105,7 +109,7 @@ const handleBeforeLeave = (tabName) => {
                     min-height="calc(100vh - 212px)"
                     max-height="calc(100vh - 320px)"
         />
-        <ArchiveHistoryCreateModal v-model:open="ArchiveHistoryCreateModalShow" />
+        <ArchiveHistoryCreateModal v-model:open="ArchiveHistoryCreateModalShow" @open-archive-card="(card) => openArchiveCard(card)" />
     </AppLayout>
 </template>
 

resources/js/Stores/ArchiveCard.js

@@ -0,0 +1,27 @@
+import {defineStore} from "pinia";
+import {computed, ref} from "vue";
+
+export const useArchiveCard = defineStore('archive-card',  () => {
+    const preOpenCard = ref(null)
+    const isOpenArchiveCard = ref(false)
+
+    const isSetPreOpenCard = computed(() => preOpenCard.value !== null)
+
+    const setPreOpenCard = (card) => {
+        preOpenCard.value = card
+    }
+
+    const resetPreOpenCard = () => {
+        preOpenCard.value = null
+    }
+
+    return {
+        preOpenCard,
+        isOpenArchiveCard,
+
+        isSetPreOpenCard,
+
+        setPreOpenCard,
+        resetPreOpenCard
+    }
+})

routes/api.php

@@ -31,6 +31,8 @@ Route::prefix('archive')->group(function () {
         });
     });
 
+    Route::post('check', [\App\Http\Controllers\ArchiveInfoController::class, 'check']);
+
     Route::post('create', [\App\Http\Controllers\ArchiveInfoController::class, 'store']);
 });