Merge pull request #511 from amansinghbais/#508

Improved: conditions to show rejected and completed items in the counted tab (#508)
hotwax · Nov 12, 2024 · bafb1a2 · bafb1a2
2 parents 901cc7b + 38fd983
commit bafb1a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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') {