Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/rm-rajal-183

app/components/content/encounter/process.vue

@@ -34,6 +34,7 @@ import GeneralConsentList from '~/components/content/general-consent/entry.vue'
 import SummaryMedic from '~/components/content/summary-medic/entry.vue'
 import ResumeList from '~/components/content/resume/list.vue'
 import ControlLetterList from '~/components/content/control-letter/list.vue'
+import InitialNursingStudy from '~/components/content/initial-nursing/entry.vue'
 // App Components
 import EncounterPatientInfo from '~/components/app/encounter/quick-info.vue'
 import EncounterHistoryButtonMenu from '~/components/app/encounter/quick-shortcut.vue'
@@ -43,6 +44,10 @@ import EncounterHistoryButtonMenu from '~/components/app/encounter/quick-shortcu
 const props = defineProps<{
   classCode: EncounterProps['classCode']
   subClassCode?: EncounterProps['subClassCode']
+  canCreate?: boolean
+  canRead?: boolean
+  canUpdate?: boolean
+  canDelete?: boolean
 }>()
 
 // Common preparations
@@ -104,6 +109,13 @@ const protocolRows = [
   { value: 'device', label: 'Order Alkes' },
   { value: 'mcu-radiology', label: 'Order Radiologi', component: Radiology, props: { encounter_id: data.id } },
   { value: 'mcu-lab-cp', label: 'Order Lab PK', component: CpLabOrder, props: { encounter_id: data.id } },
+  { value: 'consent', label: 'General Consent', component: GeneralConsentList, props: { encounter: data } },
+  {
+    value: 'initial-nursing-study',
+    label: 'Kajian Awal Keperawatan',
+    component: InitialNursingStudy,
+    props: { encounter: data },
+  },
   { value: 'mcu-lab-micro', label: 'Order Lab Mikro' },
   { value: 'mcu-lab-pa', label: 'Order Lab PA' },
   { value: 'medical-action', label: 'Order Ruang Tindakan' },
@@ -149,7 +161,7 @@ onMounted(async () => {
 ///// Functions
 function handleClick(type: string) {
   if (type === 'draft') {
-    router.back()
+    router.push(`/${props.classCode}/encounter`)
   }
 }
 
@@ -176,27 +188,13 @@ async function getData() {
 
 <template>
   <div class="w-full">
-    <div class="bg-white p-4 dark:bg-slate-800 2xl:p-5">
-      <div class="mb-4 flex">
-        <div>
-          <ContentNavBa
-            label="Kembali"
-            @click="handleClick"
-          />
-        </div>
-        <!-- <div class="ms-auto pe-3 pt-1 text-end text-xl 2xl:text-2xl font-semibold">
-            Pasien: {{ data.patient.person.name }} --- No. RM: {{ data.patient.number }}
-        </div> -->
+    <div class="bg-white dark:bg-slate-800">
+      <div class="p-3 2xl:p-4 border-b border-slate-300  dark:border-slate-700">
+        <ContentNavBa label="Kembali Ke Daftar" @click="handleClick" />
       </div>
-      <ContentSwitcher
-        :active="1"
-        :height="150"
-      >
+      <ContentSwitcher :active="1" class="h-[130px] 2xl:h-[160px]">
         <template v-slot:content1>
-          <EncounterPatientInfo
-            v-if="isShowPatient"
-            :data="data"
-          />
+          <EncounterPatientInfo v-if="isShowPatient" :data="data" />
         </template>
         <template v-slot:content2>
           <EncounterHistoryButtonMenu v-if="isShowPatient" />
@@ -207,6 +205,10 @@ async function getData() {
       :data="menus"
       :initial-active-menu="activeMenu"
       @change-menu="activeMenu = $event"
+      :can-create="canCreate"
+      :can-read="canRead"
+      :can-update="canUpdate"
+      :can-delete="canDelete"
     />
   </div>
-</template>
+</template>