0626

pages/batchReporting/index.vue

@@ -350,8 +350,12 @@
 		}
 		let nextIndex = 0;
 		for (let i = 0; i < item.processSequence.length; i++) {
-			if (item.nextProcess.id == item.processSequence[i].id) {
-				nextIndex = i;
+			if(item.nextProcess){
+				if (item.nextProcess.processStepNumber == item.processSequence[i].processStepNumber) {
+					nextIndex = i;
+				}
+			}else{
+				nextIndex = item.processSequence.length
 			}
 		}
 		for (let i = 0; i < item.processSequence.length; i++) {

pages/sortBatchReporting/index.vue

@@ -415,9 +415,15 @@
 		}
 		let nextIndex = 0;
 		for (let i = 0; i < item.processSequence.length; i++) {
-			if (item.nextProcess.id == item.processSequence[i].id) {
-				nextIndex = i;
+			console.log(item.nextProcess,"next")
+			if(item.nextProcess){
+				if (item.nextProcess.processStepNumber == item.processSequence[i].processStepNumber) {
+					nextIndex = i;
+				}
+			}else{
+				nextIndex = item.processSequence.length
 			}
+			
 		}
 		for (let i = 0; i < item.processSequence.length; i++) {
 			if (i >= nextIndex) {