Merge branch 'dev' into feat/role-check

app/components/content/soapi/form-rehab.vue

@@ -7,7 +7,9 @@ import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
 import { EarlyRehabSchema } from '~/schemas/soapi.schema'
 import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
-const { backToList } = useQueryMode('mode')
+
+const { backToList } = useQueryCRUDMode('mode')
+const { recordId } = useQueryCRUDRecordId('record-id')
 
 const route = useRoute()
 const isOpenProcedure = ref(false)
@@ -66,6 +68,7 @@ const model = ref({
   weight: '',
   height: '',
 })
+const formKey = ref(0)
 
 const isLoading = reactive<DataTableLoader>({
   isTableLoading: false,
@@ -89,9 +92,23 @@ async function getProcedures() {
   isLoading.isTableLoading = false
 }
 
+async function getDetail() {
+  isLoading.isTableLoading = true
+  const resp = await xfetch(`/api/v1/soapi/${recordId.value}`)
+  if (resp.success) {
+    const raw = (resp.body as Record<string, any>).data
+    const values = JSON.parse(raw.value)
+    console.log('values', values)
+    model.value = values
+    formKey.value++ // Force re-render with new data
+  }
+  isLoading.isTableLoading = false
+}
+
 onMounted(() => {
   getProcedures()
   getDiagnoses()
+  getDetail()
 })
 
 function handleOpen(type: string) {
@@ -146,6 +163,7 @@ provide('icdPreview', icdPreview)
 </script>
 <template>
   <Entry
+    :key="formKey"
     ref="entryRehabRef"
     v-model="model"
     :schema="schema"

app/components/content/soapi/form.vue

@@ -9,7 +9,7 @@ import { toast } from '~/components/pub/ui/toast'
 import { handleActionSave, handleActionEdit } from '~/handlers/soapi-early.handler'
 
 const { goToEntry, backToList } = useQueryCRUDMode('mode')
-const { recordId } = useQueryCRUDMode('record-id')
+const { recordId } = useQueryCRUDRecordId('record-id')
 const route = useRoute()
 const isOpenProcedure = ref(false)
 const isOpenDiagnose = ref(false)
@@ -44,12 +44,26 @@ const model = ref({
 const isLoading = reactive<DataTableLoader>({
   isTableLoading: false,
 })
+const formKey = ref(0)
 
-async function getDiagnoses() {
+async function getDetail() {
   isLoading.isTableLoading = true
-  const resp = await xfetch(`/api/v1/soapi/${recordId}`)
+  const resp = await xfetch(`/api/v1/soapi/${recordId.value}`)
   if (resp.success) {
-    diagnoses.value = (resp.body as Record<string, any>).data
+    const raw = (resp.body as Record<string, any>).data
+    const values = JSON.parse(raw.value)
+    console.log('values', values)
+    model.value = values
+    formKey.value++ // Force re-render with new data
+  }
+  isLoading.isTableLoading = false
+}
+
+async function getDiagnose() {
+  isLoading.isTableLoading = true
+  const resp = await xfetch('/api/v1/diagnose-src')
+  if (resp.success) {
+    procedures.value = (resp.body as Record<string, any>).data
   }
   isLoading.isTableLoading = false
 }
@@ -64,8 +78,7 @@ async function getProcedures() {
 }
 
 onMounted(() => {
-  getProcedures()
-  getDiagnoses()
+  getDetail()
 })
 
 function handleOpen(type: string) {
@@ -125,6 +138,7 @@ provide('icdPreview', icdPreview)
 </script>
 <template>
   <Entry
+    :key="formKey"
     ref="entryRef"
     v-model="model"
     :schema="schema"

app/components/content/soapi/list.vue

@@ -67,7 +67,7 @@ if(props.canUpdate) {
   }
 }
 
-const type = computed(() => (route.query.tab as string) || 'early-medical-assessment')
+const type = computed(() => (route.query.menu as string) || 'early-medical-assessment')
 
 onMounted(async () => {
   await getMyList()