From 65b463be4a365fb14ff924e0fe5a7bf89fb51dc8 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Thu, 15 Jun 2023 20:38:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/allprocess/allprocess.vue   |  6 ++++--
 pages/processList/processList.vue |  3 ++-
 pages/taskDetail/taskDetail.vue   | 13 ++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pages/allprocess/allprocess.vue b/pages/allprocess/allprocess.vue
index 9fae35e..9784455 100644
--- a/pages/allprocess/allprocess.vue
+++ b/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'
 				})
 				
 			}
diff --git a/pages/processList/processList.vue b/pages/processList/processList.vue
index 5374c80..f1ac55b 100644
--- a/pages/processList/processList.vue
+++ b/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'
 				})
 				
 			}
diff --git a/pages/taskDetail/taskDetail.vue b/pages/taskDetail/taskDetail.vue
index 7b9c6a3..150e583 100644
--- a/pages/taskDetail/taskDetail.vue
+++ b/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 
+					})
+				}
+				
 			},
 		},