Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_app

pages/addNewBatch/index.vue

@@ -11,7 +11,7 @@
 						{{ item.lotCode }}{{ item.isLast == 1 ? ' (尾批)': '' }}
 					</view>
 				</view>
-				<view class="inpAndScan ">
+				<view class="inpAndScan">
 					<uni-easyinput v-if="batchNoList.length > 0" class="inp" suffixIcon="checkmarkempty"
 						v-model="inpValue" placeholder="可手动修正批次" @iconClick="iconClick"></uni-easyinput>
 					<view class="uni-row" style="justify-content: space-between;">

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) {