Merge branch 'dev' into feat/device-order-x

app/components/content/device-order/list.vue

@@ -34,11 +34,10 @@ import {
 
 // 
 import { getList } from '~/services/device-order.service'
-import type { Encounter } from '~/models/encounter'
 
 // Props
 interface Props {
-  encounter: Encounter
+  encounter_id: number
 }
 const props = defineProps<Props>()
 
@@ -64,7 +63,8 @@ const {
       sort: 'createdAt:asc',
       'page-number': params['page-number'] || 0,
       'page-size': params['page-size'] || 10,
-      includes: 'encounter',
+      // includes: 'encounter',
+      includes: 'parent,childrens',
     })
     return { success: result.success || false, body: result.body || {} }
   },
@@ -90,13 +90,18 @@ const headerPrep: HeaderPrep = {
     icon: 'i-lucide-plus',
     onClick: async () => {
       const data = {
-        encounter_id: props.encounter.id,
+        encounter_id: props.encounter_id,
       }
       const dateResp = await handleActionSave(data, getMyList, () => {}, () => {})
       if (dateResp.success) {
         const currentData = dateResp.body.data || []
         // goToEntry()
       }
+      recItem.value = null
+      recId.value = 0
+      isReadonly.value = false
+      // await handleActionSave(recItem, getMyList, () => {}, () => {})
+      goToEntry()
     },
   },
 }