From f646b3c9ba120aabc77211a439b9c11ef269cb82 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Fri, 4 Jul 2025 17:13:07 +0700 Subject: [PATCH] refactor: credit note role check --- src/pages/09_task-order/SelectReadyRequestWork.vue | 8 +++++--- src/pages/11_credit-note/FormPage.vue | 6 ++++-- src/pages/11_credit-note/MainPage.vue | 12 ++++++++++-- src/pages/11_credit-note/RefundInformation.vue | 9 +++++---- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/pages/09_task-order/SelectReadyRequestWork.vue b/src/pages/09_task-order/SelectReadyRequestWork.vue index 34d9dd22..a3cf6856 100644 --- a/src/pages/09_task-order/SelectReadyRequestWork.vue +++ b/src/pages/09_task-order/SelectReadyRequestWork.vue @@ -4,6 +4,7 @@ import { useRequestList, RequestWork, RequestWorkStatus, + RequestDataStatus, } from 'src/stores/request-list'; import DialogHeader from 'src/components/dialog/DialogHeader.vue'; import CancelButton from 'src/components/button/CancelButton.vue'; @@ -192,7 +193,8 @@ function submit() { s.workStatus === (props.creditNote ? RequestWorkStatus.Canceled - : RequestWorkStatus.InProgress), + : RequestWorkStatus.InProgress) || + v.request.requestDataStatus === RequestDataStatus.Canceled, ); if (curr) { const task: Task = { @@ -387,8 +389,8 @@ function assignTempGroup() { } :deep( - i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated - ) { + i.q-icon.mdi.mdi-chevron-down-circle.q-expansion-item__toggle-icon.q-expansion-item__toggle-icon--rotated +) { color: var(--brand-1); } diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue index 0dde0352..88d3606c 100644 --- a/src/pages/11_credit-note/FormPage.vue +++ b/src/pages/11_credit-note/FormPage.vue @@ -34,7 +34,7 @@ import { import { RequestWork } from 'src/stores/request-list/types'; import { storeToRefs } from 'pinia'; import useOptionStore from 'src/stores/options'; -import { dialogWarningClose } from 'src/stores/utils'; +import { dialogWarningClose, canAccess } from 'src/stores/utils'; import { useI18n } from 'vue-i18n'; import { QForm } from 'quasar'; import { getName } from 'src/services/keycloak'; @@ -684,6 +684,7 @@ onMounted(async () => {