Improved: logic for fetching the cycle count details from details page (

#640)
hotwax · Jan 22, 2025 · d33703f · d33703f
1 parent 5dee057
commit d33703f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/src/services/CountService.ts b/src/services/CountService.ts
@@ -18,10 +18,11 @@ const fetchCycleCountStats = async (payload: any): Promise<any> => {
   })
 }
 
-const fetchCycleCount = async (inventoryCountImportId: string): Promise<any> => {
+const fetchCycleCount = async (params: any): Promise<any> => {
   return api({
-    url: `cycleCounts/${inventoryCountImportId}`,
-    method: "GET"
+    url: `cycleCounts/${params.inventoryCountImportId}`,
+    method: "GET",
+    params
   })
 }
 

diff --git a/src/views/AssignedDetail.vue b/src/views/AssignedDetail.vue
@@ -202,7 +202,7 @@ onIonViewWillEnter(async () => {
 
   currentCycleCount.value = {}
   try {
-    const resp = await CountService.fetchCycleCount(props.inventoryCountImportId as string)
+    const resp = await CountService.fetchCycleCount({inventoryCountImportId: props.inventoryCountImportId})
 
     if(!hasError(resp) && resp.data?.inventoryCountImportId && resp.data.statusId === "INV_COUNT_ASSIGNED") {
       currentCycleCount.value = {

diff --git a/src/views/Closed.vue b/src/views/Closed.vue
@@ -167,7 +167,7 @@ async function fetchClosedCycleCounts(vSize?: any, vIndex?: any) {
   const payload = {
     pageSize,
     pageIndex,
-    statusId: "INV_COUNT_CLOSED,INV_COUNT_COMPLETED,INV_COUNT_REJECTED",
+    statusId: "INV_COUNT_COMPLETED,INV_COUNT_REJECTED",
     statusId_op: "in"
   }
   await store.dispatch("count/fetchCycleCounts", payload)

diff --git a/src/views/ClosedDetail.vue b/src/views/ClosedDetail.vue
@@ -120,9 +120,9 @@ onIonViewWillEnter(async () => {
 
   currentCycleCount.value = {}
   try {
-    const resp = await CountService.fetchCycleCount(props.inventoryCountImportId as string)
+    const resp = await CountService.fetchCycleCount({inventoryCountImportId: props.inventoryCountImportId, statusId: "INV_COUNT_COMPLETED,INV_COUNT_REJECTED", statusId_op: "in"})
 
-    if(!hasError(resp) && resp.data?.inventoryCountImportId && ["INV_COUNT_COMPLETED", "INV_COUNT_REJECTED", "INV_COUNT_CLOSED"].includes(resp.data?.statusId)) {
+    if(!hasError(resp) && resp.data?.inventoryCountImportId) {
       currentCycleCount.value = {
         countName: resp.data.countImportName,
         countId: resp.data.inventoryCountImportId,

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
@@ -354,10 +354,9 @@ function inputCountValidation(event) {
 }
 
 async function fetchCycleCount() {
-  let payload = props?.id
   let resp
   try {
-    resp = await CountService.fetchCycleCount(payload)
+    resp = await CountService.fetchCycleCount({inventoryCountImportId: props?.id})
     if (!hasError(resp)) {
       cycleCount.value = resp?.data
     } else {

diff --git a/src/views/DraftDetail.vue b/src/views/DraftDetail.vue
@@ -224,7 +224,7 @@ onIonViewWillEnter(async () => {
   emitter.emit("presentLoader", { message: "Loading cycle count details" })
   currentCycleCount.value = {}
   try {
-    const resp = await CountService.fetchCycleCount(props.inventoryCountImportId as string)
+    const resp = await CountService.fetchCycleCount({inventoryCountImportId: props.inventoryCountImportId})
 
     if(!hasError(resp) && resp.data?.inventoryCountImportId && resp.data.statusId === "INV_COUNT_CREATED") {
       currentCycleCount.value = {

diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
@@ -324,7 +324,7 @@ function handleProductClick(item: any) {
 
 async function fetchCycleCount() {
   try {
-    const resp = await CountService.fetchCycleCount(props?.id)
+    const resp = await CountService.fetchCycleCount({inventoryCountImportId: props?.id})
     if(!hasError(resp)) {
       cycleCount.value = resp?.data
     } else {

diff --git a/src/views/PendingReviewDetail.vue b/src/views/PendingReviewDetail.vue
@@ -242,7 +242,7 @@ onIonViewWillEnter(async () => {
 
   currentCycleCount.value = {}
   try {
-    const resp = await CountService.fetchCycleCount(props.inventoryCountImportId as string)
+    const resp = await CountService.fetchCycleCount({inventoryCountImportId: props.inventoryCountImportId})
 
     if(!hasError(resp) && resp.data?.inventoryCountImportId && resp.data?.statusId === "INV_COUNT_REVIEW") {
       currentCycleCount.value = {