chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

feat: fallback pending to cancel if parent is canceled

Browse source
This commit is contained in:
Methapon2001 2024-12-25 13:56:22 +07:00
parent d1b81fe30e
commit ebd6de9c29
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pages/08_request-list/ProductExpansion.vue
View file

@ -36,6 +36,7 @@ defineProps<{
paySuccess: boolean; paySuccess: boolean;
payCondition: PayCondition; payCondition: PayCondition;
readonly?: boolean; readonly?: boolean;
cancel?: boolean;
}>(); }>();
// NOTE: Function // NOTE: Function
@ -98,7 +99,7 @@ defineProps<{
: !paySuccess : !paySuccess
? $t('general.unavailable') ? $t('general.unavailable')
: $t( : $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" class="text-capitalize text-weight-regular product-status rounded"
@ -182,15 +183,16 @@ defineProps<{
status?.workStatus === RequestWorkStatus.Ended || status?.workStatus === RequestWorkStatus.Ended ||
status?.workStatus === RequestWorkStatus.Completed, status?.workStatus === RequestWorkStatus.Completed,
canceled: canceled:
$q.screen.gt.xs && ($q.screen.gt.xs &&
status?.workStatus === RequestWorkStatus.Canceled, status?.workStatus === RequestWorkStatus.Canceled) ||
(!status?.workStatus && cancel),
}" }"
> >
{{ {{
!paySuccess !paySuccess
? `${$t(`quotation.payCondition.${payCondition}`)} ${payCondition.includes('Split') ? `${installmentNo}/${installmentInfo?.total} ` : ''}` ? `${$t(`quotation.payCondition.${payCondition}`)} ${payCondition.includes('Split') ? `${installmentNo}/${installmentInfo?.total} ` : ''}`
: $t( : $t(
`requestList.status.work.${status?.workStatus ?? 'Pending'}`, `requestList.status.work.${status?.workStatus ?? (cancel ? RequestWorkStatus.Canceled : RequestWorkStatus.Pending)}`,
) )
}} }}
</span> </span>

1
src/pages/08_request-list/RequestListView.vue
View file

@ -572,6 +572,7 @@ function isInstallmentPaySuccess(installmentNo: number) {
:key="value" :key="value"
> >
<ProductExpansion <ProductExpansion
:cancel="data.requestDataStatus === RequestDataStatus.Canceled"
:readonly="data.requestDataStatus === RequestDataStatus.Canceled" :readonly="data.requestDataStatus === RequestDataStatus.Canceled"
:installment-info="getInstallmentInfo()" :installment-info="getInstallmentInfo()"
:pay-success=" :pay-success="