Squashed commit of the following:
commit82e33c6dbfMerge:f96cbdbeba740aAuthor: Munawwirul Jamal <[email protected]> Date: Thu Dec 4 13:21:37 2025 +0700 Merge pull request #209 from dikstub-rssa/feat/move-kai-ui-to-sidebar-195 Feat/move kai UI to sidebar 195 commitf96cbdb173Merge:5de005762556a5Author: Munawwirul Jamal <[email protected]> Date: Thu Dec 4 12:07:25 2025 +0700 Merge pull request #210 from dikstub-rssa/feat/procedure-room-order Feat/procedure room order commit62556a5c7dMerge:93a294d5de0057Author: Munawwirul Jamal <[email protected]> Date: Thu Dec 4 12:07:18 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit5de0057278Merge:71ca7f9782034cAuthor: Andsky <[email protected]> Date: Thu Dec 4 11:56:31 2025 +0700 Merge pull request #211 from dikstub-rssa/feat/micro-lab-order-50 Feat/micro lab order 50 commit93a294d8d0Merge:6c2636726365bbAuthor: Andrian Roshandy <[email protected]> Date: Thu Dec 4 11:18:49 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commit26365bbd2eMerge:b6b56d1e7cab6cAuthor: Andrian Roshandy <[email protected]> Date: Thu Dec 4 11:18:33 2025 +0700 Merge branch 'dev' of github.com:dikstub-rssa/simrs-fe into dev commit6c26367c1dAuthor: Andrian Roshandy <[email protected]> Date: Thu Dec 4 10:51:40 2025 +0700 feat/procedure-room-order: added item commita0dfd214e5Author: Andrian Roshandy <[email protected]> Date: Thu Dec 4 10:25:50 2025 +0700 feat/procedure-room-order: finishing commitacb573e279Author: Andrian Roshandy <[email protected]> Date: Thu Dec 4 10:25:35 2025 +0700 feat/procedure-room-order: adjust procedure-room-order commit9adb77d10bAuthor: Andrian Roshandy <[email protected]> Date: Thu Dec 4 10:24:52 2025 +0700 feat/procedure-room-order: adjust material-package commit52454a019eMerge:0a0fb73b6b56d1Author: Andrian Roshandy <[email protected]> Date: Thu Dec 4 10:23:14 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commitb6b56d186dAuthor: Munawwirul Jamal <[email protected]> Date: Thu Dec 4 10:17:16 2025 +0700 dev: hotfix, cleaning some pubs commit0a0fb73483Author: Munawwirul Jamal <[email protected]> Date: Wed Dec 3 14:33:13 2025 +0700 feat/procedure-room-order: flow for procedure room commit7b4b4eecf9Merge:9f72e1db172125Author: Andrian Roshandy <[email protected]> Date: Wed Dec 3 10:18:15 2025 +0700 Merge branch 'feat/mcu-order' into feat/procedure-room-order commit782034c2b1Merge:bae0a22b80ee5aAuthor: Andrian Roshandy <[email protected]> Date: Wed Dec 3 10:16:45 2025 +0700 Merge branch 'dev' into feat/micro-lab-order-50 commit9f72e1df47Merge:fa0ae98b80ee5aAuthor: Andrian Roshandy <[email protected]> Date: Wed Dec 3 10:02:57 2025 +0700 Merge branch 'dev' into feat/procedure-room-order commitfa0ae9866eAuthor: Andrian Roshandy <[email protected]> Date: Wed Dec 3 09:44:33 2025 +0700 feat/procedure-room-order: wip #3 commitce93f996d9Author: Andrian Roshandy <[email protected]> Date: Wed Dec 3 09:43:36 2025 +0700 feat/procedure-room-order: wip #2 + procedure-room commit4444e87cb3Author: Andrian Roshandy <[email protected]> Date: Wed Dec 3 09:42:31 2025 +0700 feat/procedure-room-order: wip #1 + material-package + material-package-item commitb172125d99Merge:b2d3c149b7a719Author: Andrian Roshandy <[email protected]> Date: Mon Dec 1 20:41:58 2025 +0700 Merge branch 'feat/page-cleaning' into feat/mcu-order commitbae0a222b8Author: Andrian Roshandy <[email protected]> Date: Mon Dec 1 01:51:04 2025 +0700 feat/micro-lab-order-50: adjust for antibiotic commit1ee0f39e7dAuthor: Andrian Roshandy <[email protected]> Date: Mon Dec 1 01:50:39 2025 +0700 feat/micro-lab-order-50: added antibiotic commit95e27a8b6fAuthor: Andrian Roshandy <[email protected]> Date: Sun Nov 30 13:00:04 2025 +0700 feat/micro-lab-order-50: wip commita002ef6c6eMerge:fb2f01bb2d3c14Author: Andrian Roshandy <[email protected]> Date: Sun Nov 30 12:50:31 2025 +0700 Merge branch 'feat/mcu-order' into feat/micro-lab-order-50 commitb2d3c14ddcAuthor: Andrian Roshandy <[email protected]> Date: Sun Nov 30 12:48:11 2025 +0700 feat/mcu-order: adjustment commitfb2f01bd36Merge:9a481fe5c92f8bAuthor: Andrian Roshandy <[email protected]> Date: Sun Nov 30 12:43:11 2025 +0700 Merge branch 'feat/mcu-order' into feat/micro-lab-order-50 commit5c92f8b946Author: Andrian Roshandy <[email protected]> Date: Sun Nov 30 12:30:19 2025 +0700 feat/mcu-order: added the components commit9a481fec14Merge:425123978fc289Author: Andrian Roshandy <[email protected]> Date: Fri Nov 28 21:18:10 2025 +0700 Merge branch 'dev' into feat/micro-lab-order-50 commit4251239f7cAuthor: Andrian Roshandy <[email protected]> Date: Fri Nov 28 21:17:18 2025 +0700 feat/micro-lab-order-50: wip commitcf5789549eAuthor: Munawwirul Jamal <[email protected]> Date: Sun Nov 23 15:56:31 2025 +0700 feat/mcu: improved wip commita40eac35f8Merge:3211972baf6ab1Author: Andrian Roshandy <[email protected]> Date: Wed Nov 19 22:23:18 2025 +0700 Merge branch 'dev' into feat/radiology-order-54 commit3211972a84Merge:e3fc1e4ccabe01Author: Andrian Roshandy <[email protected]> Date: Sat Nov 15 20:15:07 2025 +0700 Merge branch 'dev' into feat/radiology-order-54 commite3fc1e4ab9Author: Andrian Roshandy <[email protected]> Date: Sat Nov 15 20:14:38 2025 +0700 feat/radiology-order-54: adjust wip
This commit is contained in:
No files matched your search
@@ -0,0 +1,173 @@
|
||||
<script setup lang="ts">
|
||||
//
|
||||
import * as CH from '~/components/pub/my-ui/content-header'
|
||||
import Dialog from '~/components/pub/my-ui/modal/dialog.vue'
|
||||
import NavEntry from '~/components/pub/my-ui/nav-footer/ba-de-dr-su.vue'
|
||||
import NavDetail from '~/components/pub/my-ui/nav-footer/ba.vue'
|
||||
import NavOk from '~/components/pub/my-ui/nav-footer/ok.vue'
|
||||
|
||||
// Procedure Room
|
||||
import type { ProcedureRoom } from '~/models/procedure-room'
|
||||
import { getList as getProcedureRoomList } from '~/services/procedure-room.service'
|
||||
import PRSwitcher from '~/components/app/procedure-room/switcher.vue'
|
||||
import PRMultiOptPicker from '~/components/app/procedure-room/multi-opt-picker.vue'
|
||||
import PRPicker from '~/components/app/procedure-room/picker.vue'
|
||||
|
||||
// Material Package
|
||||
import type { MaterialPackage } from '~/models/material-package'
|
||||
import { getList as getMaterialPackageList } from '~/services/material-package.service'
|
||||
|
||||
// Material Package Item
|
||||
import type { MaterialPackageItem } from '~/models/material-package-item'
|
||||
import { getList as getmaterialPackageItems } from '~/services/material-package-item.service'
|
||||
import MPSwitcher from '~/components/app/material-package/switcher.vue'
|
||||
import MPIQuickList from '~/components/app/material-package-item/quick-list.vue'
|
||||
|
||||
// Main data
|
||||
import { getDetail } from '~/services/procedure-room-order.service'
|
||||
import Detail from '~/components/app/procedure-room-order/detail.vue'
|
||||
|
||||
// Items data
|
||||
import type { ProcedureRoomOrderItem } from '~/models/procedure-room-order-item'
|
||||
import {
|
||||
getList as getOrderItemList,
|
||||
create as createOrderItem,
|
||||
remove as removeOrderItem,
|
||||
} from '~/services/procedure-room-order-item.service'
|
||||
import ItemListEntry from '~/components/app/procedure-room-order-item/list-entry.vue'
|
||||
import ItemListDetail from '~/components/app/procedure-room-order-item/list-detail.vue'
|
||||
|
||||
// data
|
||||
const { backToList, crudQueryParams } = useQueryCRUD()
|
||||
const id = crudQueryParams.value.recordId
|
||||
const dataRes = await getDetail(
|
||||
typeof id === 'string' ? parseInt(id) : 0,
|
||||
{ includes: 'encounter,doctor,doctor-employee,doctor-employee-person' }
|
||||
)
|
||||
const data = dataRes.body?.data
|
||||
const items = ref<ProcedureRoomOrderItem[]>([])
|
||||
|
||||
// Header
|
||||
const headerConfig: CH.Config = {
|
||||
title: 'Order Ruang Tindakan',
|
||||
icon: 'i-lucide-box',
|
||||
}
|
||||
|
||||
//
|
||||
const pickerDialogOpen = ref(false)
|
||||
const procedureRooms = ref<ProcedureRoom[]>([])
|
||||
const procedureRoomType = ref('procedure')
|
||||
getProcedureRooms(procedureRoomType.value)
|
||||
watch(procedureRoomType, async (newValue) => {
|
||||
getProcedureRooms(newValue)
|
||||
})
|
||||
|
||||
//
|
||||
const materialPackages = ref<MaterialPackage[]>([])
|
||||
const selectedMaterialPackage = ref('')
|
||||
const res = await getMaterialPackageList()
|
||||
if (res.success) {
|
||||
materialPackages.value = res.body.data
|
||||
}
|
||||
|
||||
//
|
||||
const materialPackageItems = ref<MaterialPackageItem[]>([])
|
||||
watch(selectedMaterialPackage, async (newValue) => {
|
||||
const res = await getmaterialPackageItems({
|
||||
'material-package-code': selectedMaterialPackage.value,
|
||||
includes: 'material'
|
||||
})
|
||||
if (res.success) {
|
||||
materialPackageItems.value = res.body.data
|
||||
}
|
||||
})
|
||||
|
||||
// last flow
|
||||
onMounted(async () => {
|
||||
await getItems()
|
||||
})
|
||||
|
||||
///// functions
|
||||
async function getProcedureRooms(typeCode: string) {
|
||||
const res = await getProcedureRoomList({ 'type-code': typeCode, includes: 'infra' })
|
||||
if (res.success) {
|
||||
procedureRooms.value = res.body.data
|
||||
}
|
||||
}
|
||||
|
||||
async function getItems() {
|
||||
const res = await getOrderItemList({
|
||||
'procedure-room-order-id': crudQueryParams.value.recordId,
|
||||
includes: 'procedureRoom,procedureRoom-infra',
|
||||
})
|
||||
if (res.success) {
|
||||
items.value = res.body.data
|
||||
}
|
||||
}
|
||||
|
||||
async function pickItem(item: ProcedureRoom) {
|
||||
const exItem = items.value.find(e => e.procedureRoom_code === item.code)
|
||||
if (exItem) {
|
||||
await removeOrderItem(exItem.id)
|
||||
await getItems()
|
||||
} else {
|
||||
const intId = parseInt(id?.toString() || '0')
|
||||
await createOrderItem({
|
||||
procedureRoomOrder_id: intId,
|
||||
procedureRoom_code: item.code,
|
||||
})
|
||||
await getItems()
|
||||
}
|
||||
}
|
||||
|
||||
function requestItem() {
|
||||
pickerDialogOpen.value = true
|
||||
}
|
||||
|
||||
function navClick(type: 'back' | 'delete' | 'draft' | 'submit') {
|
||||
if (type === 'back') {
|
||||
backToList()
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<CH.ContentHeader v-bind="headerConfig" />
|
||||
|
||||
<Separator class="mb-4" />
|
||||
|
||||
<Detail :data="data" />
|
||||
|
||||
<template v-if="data.status_code == 'new'">
|
||||
<ItemListEntry :data="items" @requestItem="requestItem" />
|
||||
<MPSwitcher :data="materialPackages" v-model="selectedMaterialPackage" />
|
||||
</template>
|
||||
<template v-else>
|
||||
<ItemListDetail :data="items" @requestItem="requestItem" />
|
||||
</template>
|
||||
<MPIQuickList :data="materialPackageItems" />
|
||||
|
||||
<div class="w-full flex justify-center">
|
||||
<NavEntry v-if="data.status_code == 'new'" @click="navClick" />
|
||||
<NavDetail v-else @click="navClick" />
|
||||
</div>
|
||||
|
||||
<Dialog
|
||||
v-model:open="pickerDialogOpen"
|
||||
title="Pilih Item"
|
||||
size="2xl"
|
||||
prevent-outside
|
||||
>
|
||||
<PRSwitcher v-model="procedureRoomType" />
|
||||
<PRPicker
|
||||
:data="procedureRooms"
|
||||
:pick-mode="procedureRoomType == 'procedure' ? 'multi' : 'single'"
|
||||
v-model="items"
|
||||
@pick="pickItem"
|
||||
/>
|
||||
|
||||
<Separator />
|
||||
<NavOk @click="() => pickerDialogOpen = false" class="justify-center" />
|
||||
</Dialog>
|
||||
</template>
|
||||
@@ -0,0 +1,191 @@
|
||||
<script setup lang="ts">
|
||||
// Composables
|
||||
import { usePaginatedList } from '~/composables/usePaginatedList'
|
||||
|
||||
// Handlers
|
||||
import type { ToastFn } from '~/handlers/_handler'
|
||||
|
||||
// Pubs component
|
||||
import { toast } from '~/components/pub/ui/toast'
|
||||
import { ActionEvents, type HeaderPrep } from '~/components/pub/my-ui/data/types'
|
||||
import Header from '~/components/pub/my-ui/nav-header/prep.vue'
|
||||
import RecordConfirmation from '~/components/pub/my-ui/confirmation/record-confirmation.vue'
|
||||
|
||||
// Order
|
||||
import {
|
||||
recId,
|
||||
recAction,
|
||||
recItem,
|
||||
isRecordConfirmationOpen,
|
||||
handleActionRemove,
|
||||
} from '~/handlers/procedure-room-order.handler'
|
||||
import { getList, create, submit } from '~/services/procedure-room-order.service'
|
||||
import type { ProcedureRoomOrder } from '~/models/procedure-room-order'
|
||||
import List from '~/components/app/procedure-room-order/list.vue'
|
||||
|
||||
// Common prep
|
||||
const route = useRoute()
|
||||
const { setQueryParams } = useQueryParam()
|
||||
const { crudQueryParams } = useQueryCRUD()
|
||||
|
||||
const plainEid = route.params.id
|
||||
const encounter_id = (plainEid && typeof plainEid == 'string') ? parseInt(plainEid) : 0
|
||||
const isSubmitConfirmationOpen = ref(false)
|
||||
|
||||
// Main data
|
||||
const {
|
||||
data,
|
||||
isLoading,
|
||||
paginationMeta,
|
||||
searchInput,
|
||||
fetchData: getMyList,
|
||||
} = usePaginatedList<ProcedureRoomOrder>({
|
||||
fetchFn: async (params: any) => {
|
||||
const result = await getList({
|
||||
'encounter-id': encounter_id,
|
||||
includes: 'items',
|
||||
search: params.search,
|
||||
page: params.page,
|
||||
'page-number': params['page-number'] || 0,
|
||||
'page-size': params['page-size'] || 10,
|
||||
})
|
||||
return { success: result.success || false, body: result.body || {} }
|
||||
},
|
||||
entityName: 'prescription'
|
||||
})
|
||||
|
||||
// Header things
|
||||
const headerPrep: HeaderPrep = {
|
||||
title: 'Order Ruang Tindakan',
|
||||
icon: 'i-lucide-box',
|
||||
refSearchNav: {
|
||||
placeholder: 'Cari (min. 3 karakter)...',
|
||||
minLength: 3,
|
||||
debounceMs: 500,
|
||||
showValidationFeedback: true,
|
||||
onInput: (value: string) => {
|
||||
searchInput.value = value
|
||||
},
|
||||
onClick: () => {},
|
||||
onClear: () => {},
|
||||
},
|
||||
addNav: {
|
||||
label: 'Tambah',
|
||||
icon: 'i-lucide-plus',
|
||||
onClick: async () => {
|
||||
recItem.value = null
|
||||
recId.value = 0
|
||||
const res = await create({ encounter_id })
|
||||
if (res.success) {
|
||||
crudQueryParams.value = { mode: 'entry', recordId: res.body?.data.id.toString() || '0' }
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// list actions
|
||||
const timestamp = ref<any>({})
|
||||
provide('rec_id', recId)
|
||||
provide('rec_action', recAction)
|
||||
provide('rec_item', recItem)
|
||||
provide('table_data_loader', isLoading)
|
||||
provide('timestamp', timestamp)
|
||||
watch(recAction, () => {
|
||||
if (!recAction.value) {
|
||||
return
|
||||
} else if (recAction.value === ActionEvents.showDetail) {
|
||||
crudQueryParams.value = { mode: 'entry', recordId: recId.value || '0' }
|
||||
} else if (recAction.value === ActionEvents.showConfirmSubmit) {
|
||||
isSubmitConfirmationOpen.value = true
|
||||
} else if (recAction.value === ActionEvents.showConfirmDelete) {
|
||||
isRecordConfirmationOpen.value = true
|
||||
}
|
||||
recAction.value = ''
|
||||
})
|
||||
|
||||
///// functions
|
||||
|
||||
function confirmCancel(data: ProcedureRoomOrder) {
|
||||
recId.value = data.id
|
||||
recItem.value = data
|
||||
isRecordConfirmationOpen.value = true
|
||||
}
|
||||
|
||||
function goToEdit(data: ProcedureRoomOrder) {
|
||||
setQueryParams({
|
||||
'mode': 'entry',
|
||||
'id': data.id.toString()
|
||||
})
|
||||
recItem.value = data
|
||||
}
|
||||
|
||||
function confirmSubmit(data: ProcedureRoomOrder) {
|
||||
recId.value = data.id
|
||||
recItem.value = data
|
||||
isSubmitConfirmationOpen.value = true
|
||||
}
|
||||
|
||||
async function handleActionSubmit(id: number, refresh: () => void, toast: ToastFn) {
|
||||
const result = await submit(id)
|
||||
if (result.success) {
|
||||
toast({ title: 'Berhasil', description: 'Resep telah di ajukan', variant: 'default' })
|
||||
setTimeout(refresh, 300)
|
||||
} else {
|
||||
toast({ title: 'Gagal', description: 'Gagal menjalankan perintah', variant: 'destructive' })
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Header :prep="{ ...headerPrep }" />
|
||||
|
||||
<List
|
||||
v-if="!isLoading.dataListLoading"
|
||||
:data="data"
|
||||
:pagination-meta="paginationMeta"
|
||||
@cancel="confirmCancel"
|
||||
@edit="goToEdit"
|
||||
@submit="confirmSubmit"
|
||||
/>
|
||||
|
||||
<RecordConfirmation
|
||||
v-model:open="isRecordConfirmationOpen"
|
||||
action="delete"
|
||||
:record="recItem"
|
||||
@confirm="() => handleActionRemove(recId, getMyList, toast)"
|
||||
@cancel=""
|
||||
>
|
||||
<div class="flex mb-2">
|
||||
<div class="w-20">Tanggal</div>
|
||||
<div class="w-4">:</div>
|
||||
<div class="">{{ recItem.createdAt?.substring(0, 10) }}</div>
|
||||
</div>
|
||||
<div class="flex">
|
||||
<div class="w-20">DPJP</div>
|
||||
<div class="w-4">:</div>
|
||||
<div class="">{{ recItem.doctor?.employee?.person?.name }}</div>
|
||||
</div>
|
||||
</RecordConfirmation>
|
||||
|
||||
<RecordConfirmation
|
||||
v-model:open="isSubmitConfirmationOpen"
|
||||
action="delete"
|
||||
customTitle="Ajukan Resep"
|
||||
customMessage="Proses akan mengajukan resep ini untuk diproses lebih lanjut. Lanjutkan?"
|
||||
customConfirmText="Ajukan"
|
||||
:record="recItem"
|
||||
@confirm="() => handleActionSubmit(recId, getMyList, toast)"
|
||||
@cancel=""
|
||||
>
|
||||
<div class="flex mb-2">
|
||||
<div class="w-20">Tanggal</div>
|
||||
<div class="w-4">:</div>
|
||||
<div class="">{{ recItem.createdAt.substring(0, 10) }}</div>
|
||||
</div>
|
||||
<div class="flex">
|
||||
<div class="w-20">DPJP</div>
|
||||
<div class="w-4">:</div>
|
||||
<div class="">{{ recItem.doctor?.employee?.person?.name }}</div>
|
||||
</div>
|
||||
</RecordConfirmation>
|
||||
</template>
|
||||
@@ -0,0 +1,17 @@
|
||||
<script setup lang="ts">
|
||||
//
|
||||
import List from './list.vue'
|
||||
import Entry from './entry.vue'
|
||||
|
||||
const props = defineProps<{
|
||||
encounter_id: number
|
||||
}>()
|
||||
|
||||
const { crudQueryParams } = useQueryCRUD()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<List v-if="crudQueryParams.mode === 'list'" :encounter_id="encounter_id" />
|
||||
<Entry v-else :encounter_id="encounter_id" />
|
||||
<div class="hidden">{{ crudQueryParams.mode }}</div>
|
||||
</template>
|
||||
Reference in New Issue
Block a user