提交

pages/allprocess/allprocess.vue

@@ -37,7 +37,8 @@
 					</view>
 					<view class="code rowItem">
 						<view>
-							编码：{{info.code?info.code:'-'}}
+							<!-- 编码：{{info.code?info.code:'-'}} -->
+							编码：{{item.task?item.task.art_number:'-'}}
 						</view>
 						<view class="right">
 							数量：{{item.num}}
@@ -142,8 +143,9 @@
 				})
 			},
 			goProgress(item){
+				console.log(item,"99999")
 				uni.navigateTo({
-					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +this.info.heat_num +'&taskId='+this.info.id+'&code='+this.info.code
+					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +item.task.heat_number +'&taskId='+item.task.id+'&code='+item.task.art_number+ '&resource='+'navbar'
 				})
 				
 			}

pages/processList/processList.vue

@@ -103,8 +103,9 @@
 				})
 			},
 			goProgress(item){
+				console.log(item,"正确的")
 				uni.navigateTo({
-					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +this.info.heat_num +'&taskId='+this.info.id+'&code='+this.info.code
+					url:'/pages/taskDetail/taskDetail?id='+item.id + '&status='+item.status + '&is_start='+ item.is_start +'&heat_num=' +this.info.heat_num +'&taskId='+this.info.id+'&code='+this.info.code+ '&resource='+'task'
 				})
 				
 			}

pages/taskDetail/taskDetail.vue

@@ -359,9 +359,16 @@
 				})
 			},
 			leftClick(){
-				uni.navigateTo({
-					url:'/pages/processList/processList?code='+this.info.code+'&id='+this.info.taskId+'&heat_num=' +this.info.heat_num 
-				})
+				if(this.info.resource=="navbar"){
+					uni.reLaunch({
+						url:'/pages/allprocess/allprocess?code='+this.info.code+'&id='+this.info.taskId+'&heat_num=' +this.info.heat_num 
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/processList/processList?code='+this.info.code+'&id='+this.info.taskId+'&heat_num=' +this.info.heat_num 
+					})
+				}
+				
 			},
 		},