From a61407a0a647caadb096854c1962b245e01eec79 Mon Sep 17 00:00:00 2001 From: riefive Date: Sat, 6 Dec 2025 04:47:18 +0700 Subject: [PATCH] fix: change payment --- .../{entry-form copy.vue => entry-form-prev.vue} | 0 app/components/app/encounter/entry-form.vue | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) rename app/components/app/encounter/{entry-form copy.vue => entry-form-prev.vue} (100%) diff --git a/app/components/app/encounter/entry-form copy.vue b/app/components/app/encounter/entry-form-prev.vue similarity index 100% rename from app/components/app/encounter/entry-form copy.vue rename to app/components/app/encounter/entry-form-prev.vue diff --git a/app/components/app/encounter/entry-form.vue b/app/components/app/encounter/entry-form.vue index 64290f3e..01afe3c3 100644 --- a/app/components/app/encounter/entry-form.vue +++ b/app/components/app/encounter/entry-form.vue @@ -90,14 +90,13 @@ const isSepValid = computed(() => props.isSepValid || false) // SEP validation s const isCheckingSep = computed(() => props.isCheckingSep || false) const isInsurancePayment = computed(() => ['insurance', 'jkn'].includes(paymentMethodCode.value)) const isDateLoading = ref(false) -const isUsePaymentNew = true const debouncedSepNumber = refDebounced(sepNumber, 500) const debouncedCardNumber = refDebounced(cardNumber, 500) const sepFileReview = ref(null) const sippFileReview = ref(null) const unitFullName = ref('') // Unit, specialist, subspecialist const formRef = ref(null) // Expose submit method for parent component -const paymentMethodItems = isUsePaymentNew ? props.payments : CB.recStrToItem(paymentMethodCodes) +const paymentMethodItems = CB.recStrToItem(paymentMethodCodes) if (mode === 'add') { // Set default sepDate to current date in YYYY-MM-DD format @@ -127,13 +126,15 @@ watch( nationalIdentity.value = objects?.nationalIdentity || '' medicalRecordNumber.value = objects?.medicalRecordNumber || '' doctorCode.value = objects?.doctorCode || '' - paymentMethodCode.value = objects?.paymentMethodCode || '' patientCategory.value = objects?.patientCategory || '' cardNumber.value = objects?.cardNumber || '' sepType.value = objects?.sepType || '' sepNumber.value = objects?.sepNumber || '' sepFileReview.value = objects?.sepFileReview || '' sippFileReview.value = objects?.sippFileReview || '' + if (objects.paymentMethodCode) { + paymentMethodCode.value = objects.paymentMethodCode || '' + } isDateLoading.value = true setTimeout(() => { registerDate.value = objects?.registerDate || '' @@ -397,7 +398,7 @@ defineExpose({ id="paymentMethodCode" v-model="paymentMethodCode" v-bind="paymentMethodCodeAttrs" - :items="paymentMethodItems as any" + :items="payments || []" :disabled="isLoading || isReadonly" placeholder="Pilih Jenis Pembayaran" />