diff --git a/src/pages/08_request-list/ProductExpansion.vue b/src/pages/08_request-list/ProductExpansion.vue index ed104a0a..1603c3b7 100644 --- a/src/pages/08_request-list/ProductExpansion.vue +++ b/src/pages/08_request-list/ProductExpansion.vue @@ -36,6 +36,7 @@ defineProps<{ paySuccess: boolean; payCondition: PayCondition; readonly?: boolean; + cancel?: boolean; }>(); // NOTE: Function @@ -98,7 +99,7 @@ defineProps<{ : !paySuccess ? $t('general.unavailable') : $t( - `requestList.status.work.${status?.workStatus ?? RequestWorkStatus.Pending}`, + `requestList.status.work.${status?.workStatus ?? (cancel ? RequestWorkStatus.Canceled : RequestWorkStatus.Pending)}`, ) " class="text-capitalize text-weight-regular product-status rounded" @@ -182,15 +183,16 @@ defineProps<{ status?.workStatus === RequestWorkStatus.Ended || status?.workStatus === RequestWorkStatus.Completed, canceled: - $q.screen.gt.xs && - status?.workStatus === RequestWorkStatus.Canceled, + ($q.screen.gt.xs && + status?.workStatus === RequestWorkStatus.Canceled) || + (!status?.workStatus && cancel), }" > {{ !paySuccess ? `${$t(`quotation.payCondition.${payCondition}`)} ${payCondition.includes('Split') ? `${installmentNo}/${installmentInfo?.total} ` : ''}` : $t( - `requestList.status.work.${status?.workStatus ?? 'Pending'}`, + `requestList.status.work.${status?.workStatus ?? (cancel ? RequestWorkStatus.Canceled : RequestWorkStatus.Pending)}`, ) }} diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue index 043e7028..fae92bc6 100644 --- a/src/pages/08_request-list/RequestListView.vue +++ b/src/pages/08_request-list/RequestListView.vue @@ -572,6 +572,7 @@ function isInstallmentPaySuccess(installmentNo: number) { :key="value" >