From 5ae892cfa1274ba7563b2ee761778643ddd9e684 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 31 Dec 2024 13:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/pages/task/countFgDetail.vue  | 11 ++++++-----
 fe/PDA/pages/task/countRawDetail.vue | 13 +++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/fe/PDA/pages/task/countFgDetail.vue b/fe/PDA/pages/task/countFgDetail.vue
index 141df4cbc..17443a6f4 100644
--- a/fe/PDA/pages/task/countFgDetail.vue
+++ b/fe/PDA/pages/task/countFgDetail.vue
@@ -280,12 +280,13 @@
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
 				if (this.jobStatus == 2) {
+					uni.navigateBack();
 					//取消承接任务	
-					cancelTakeCountJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
+					// cancelTakeCountJob(this.id).then(res => {
+					// 	uni.navigateBack();
+					// }).catch(error => {
+					// 	uni.navigateBack();
+					// })
 				} else {
 					uni.navigateBack();
 				}
diff --git a/fe/PDA/pages/task/countRawDetail.vue b/fe/PDA/pages/task/countRawDetail.vue
index 4832c6fcd..0bb484a5b 100644
--- a/fe/PDA/pages/task/countRawDetail.vue
+++ b/fe/PDA/pages/task/countRawDetail.vue
@@ -279,12 +279,13 @@
 			//已经接收但是没提交任务
 			if (e.from == 'backbutton') {
 				if (this.jobStatus == 2) {
-					//取消承接任务	
-					cancelTakeCountJob(this.id).then(res => {
-						uni.navigateBack();
-					}).catch(error => {
-						uni.navigateBack();
-					})
+					uni.navigateBack();
+					// //取消承接任务	
+					// cancelTakeCountJob(this.id).then(res => {
+					// 	uni.navigateBack();
+					// }).catch(error => {
+					// 	uni.navigateBack();
+					// })
 				} else {
 					uni.navigateBack();
 				}