diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue index f2bb4ea4..829797a5 100644 --- a/src/views/CountDetail.vue +++ b/src/views/CountDetail.vue @@ -267,9 +267,9 @@ const itemsList = computed(() => { if (selectedSegment.value === 'all') { return cycleCountItems.value.itemList; } else if (selectedSegment.value === 'pending') { - return cycleCountItems.value.itemList.filter(item =>(item.quantity === undefined || item.quantity === null)); + return cycleCountItems.value.itemList.filter(item =>(item.quantity === undefined || item.quantity === null) && item.itemStatusId === "INV_COUNT_CREATED"); } else if (selectedSegment.value === 'counted') { - return cycleCountItems.value.itemList.filter(item => item.quantity >= 0); + return cycleCountItems.value.itemList.filter(item => item.quantity >= 0 || (item.itemStatusId === 'INV_COUNT_REJECTED' || item.itemStatusId === 'INV_COUNT_COMPLETED')); } else if (selectedSegment.value === 'notCounted') { return cycleCountItems.value.itemList.filter(item => !item.quantity && item.statusId === "INV_COUNT_REVIEW"); } else if (selectedSegment.value === 'rejected') {