Merge branch 'dev' into fe-prescription-56

app/components/content/encounter/list.vue

@@ -95,14 +95,22 @@ provide('table_data_loader', isLoading)
 </script>
 
 <template>
-  <Header :prep="{ ...hreaderPrep }" :ref-search-nav="refSearchNav" />
+  <Header
+    :prep="{ ...hreaderPrep }"
+    :ref-search-nav="refSearchNav"
+  />
+  <Separator class="my-4 xl:my-5" />
 
   <Filter :ref-search-nav="refSearchNav" />
 
   <AppEncounterList :data="data" />
 
-  <Dialog v-model:open="isFormEntryDialogOpen" title="Filter" size="lg" prevent-outside>
+  <Dialog
+    v-model:open="isFormEntryDialogOpen"
+    title="Filter"
+    size="lg"
+    prevent-outside
+  >
     <AppEncounterFilter />
   </Dialog>
-  <!-- <Pagination :pagination-meta="paginationMeta" @page-change="handlePageChange" /> -->
 </template>

app/components/content/encounter/process.vue

@@ -5,18 +5,14 @@ import { useRoute, useRouter } from 'vue-router'
 
 import { getDetail } from '~/services/encounter.service'
 
-import type { Encounter } from '~/models/encounter'
-
 // Components
-import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
 import type { TabItem } from '~/components/pub/my-ui/comp-tab/type'
-
-import Status from '~/components/app/encounter/status.vue'
-import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
+import CompTab from '~/components/pub/my-ui/comp-tab/comp-tab.vue'
+import AssesmentFunctionList from '~/components/content/soapi/entry.vue'
 import EarlyMedicalAssesmentList from '~/components/content/soapi/entry.vue'
-// import AssesmentFunctionList from '~/components/content/assesment-function/list.vue'
-import Prescription from '~/components/content/prescription/main.vue'
 import EarlyMedicalRehabList from '~/components/content/soapi/entry.vue'
+import Prescription from '~/components/content/prescription/main.vue'
+import Status from '~/components/app/encounter/status.vue'
 import Consultation from '~/components/content/consultation/list.vue'
 
 const route = useRoute()
@@ -31,7 +27,10 @@ const activeTab = computed({
 })
 
 const id = typeof route.params.id == 'string' ? parseInt(route.params.id) : 0
-const dataRes = await getDetail(id, { includes: 'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person'})
+const dataRes = await getDetail(id, {
+  includes:
+    'patient,patient-person,patient-person-addresses,unit,Appointment_Doctor,Appointment_Doctor-employee,Appointment_Doctor-employee-person',
+})
 const dataResBody = dataRes.body ?? null
 const data = dataResBody?.data ?? null