diff --git a/src/pages/09_task-order/TaskStatusComponent.vue b/src/pages/09_task-order/TaskStatusComponent.vue index e77056d6..2ab602d8 100644 --- a/src/pages/09_task-order/TaskStatusComponent.vue +++ b/src/pages/09_task-order/TaskStatusComponent.vue @@ -34,8 +34,7 @@ const currStatus = computed(() => statusList.find((v) => v.value === props.status), ); -function hideIcon() { - if (props.noAction) return props.noAction; +function inactiveCheck() { if (props.type === 'order') { return ( currStatus.value?.value === TaskStatus.InProgress || @@ -81,7 +80,8 @@ function hideIcon() { " class="text-capitalize text-weight-regular product-status rounded" :class="{ - 'hide-icon q-pr-md inactive': hideIcon(), + 'inactive hide-icon q-pr-md': inactiveCheck(), + 'hide-icon q-pr-md': noAction, warning: currStatus?.value === TaskStatus.Pending || currStatus?.value === TaskStatus.InProgress, @@ -175,7 +175,8 @@ function hideIcon() { } &.inactive { --_color: var(--stone-7-hsl); - opacity: 0.7; + opacity: 0.8; + cursor: default; } } diff --git a/src/pages/09_task-order/constants.ts b/src/pages/09_task-order/constants.ts index 449364bb..07bc01d5 100644 --- a/src/pages/09_task-order/constants.ts +++ b/src/pages/09_task-order/constants.ts @@ -81,7 +81,7 @@ export const taskStatusOrderToggle = [ { value: TaskStatus.InProgress, icon: 'mdi-file-move-outline', - color: 'positive', + color: 'warning', }, { value: TaskStatus.Complete,