From b4d9d91339309eda54140917d92038cf047d84d8 Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sun, 24 Dec 2023 16:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/apiTest.js                               | 12 +++++++++-
 apis/http.js                                  |  5 +++-
 .../backMaterialReceive.vue                   |  6 ++---
 .../backMaterialReceiveDetail.vue             | 23 ++++++++++++++-----
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/apis/apiTest.js b/apis/apiTest.js
index 5b3cc31..a04cace 100644
--- a/apis/apiTest.js
+++ b/apis/apiTest.js
@@ -305,10 +305,20 @@ const backMaterialReceive = {
 			header
 		)
 	},
+	async backReceiveEndBack (data = {} , header = {}){
+		return await Http.post(
+			HttpConfig.basePath,
+			HttpConfig.serviceUrl.backMaterialReceive.backReceiveEndBack,
+			data,
+			header
+		)
+	},
+ 
+ 
  
 	
 	
-	fetchMaterialOutStore
+	// fetchMaterialOutStore
 }
 
 export {
diff --git a/apis/http.js b/apis/http.js
index 58fb045..82b310e 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -85,7 +85,10 @@ class HttpConfig {
 			backMaterialSetNumBack: '/backReceive/setNumBack',
 		    backMaterialQrcodeQuery:'backReceive/qrcodeQuery',
 		    backMaterialSetCodeBack:'backReceive/setCodeBack',
-			backReceiveCodeQuery:"backReceive/codeQuery"
+			backReceiveCodeQuery:"backReceive/codeQuery",
+			backReceiveEndBack:"backReceive/endBack",
+			
+			
 		}
 	}
 }
diff --git a/pages/backMaterialReceive/backMaterialReceive.vue b/pages/backMaterialReceive/backMaterialReceive.vue
index e90c9f3..3c8c24e 100644
--- a/pages/backMaterialReceive/backMaterialReceive.vue
+++ b/pages/backMaterialReceive/backMaterialReceive.vue
@@ -24,7 +24,7 @@
 			</view>
 			<view 
 				class="fetch-lower"
-				@click="seeDetail(fetch.id)"
+				@click="seeDetail(fetch)"
 			>
 				<view>
 					<span>退料单号</span>
@@ -97,9 +97,9 @@ import { basePath } from '../../public'
 			}
 		},
 		methods: {
-			seeDetail (id) {
+			seeDetail (item) {
 				uni.navigateTo({
-					url: `/pages/backMaterialReceiveDetail/backMaterialReceiveDetail?id=${id}`
+					url: `/pages/backMaterialReceiveDetail/backMaterialReceiveDetail?id=${item.id}&taskId=${item.taskId}`
 				})
 			},
 			/* checkAll() {
diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
index fd64f22..c4bb19d 100644
--- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
+++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
@@ -108,7 +108,8 @@
 				passedNum: '',
 				waitRepairNum: '',
 				waitCrashNum: '',
-				detailsId: ''
+				detailsId: '',
+				taskId:''
 			}
 		},
 		methods: {
@@ -188,7 +189,7 @@
 				const userInfo = uni.getStorageSync('userInfo');
 				console.log("userInfo", userInfo)
 				const userId = userInfo.userid
-				
+
 				const {
 					taskId,
 					id,
@@ -259,19 +260,29 @@
 				}).catch(err => {
 					console.log(err);
 				})
+			},
+			backReceiveEndBackFn() {
+				const that = this
+				that.$api.backMaterialReceive.backReceiveEndBack({
+					taskId: that.taskId,
+					parentId:that.detailsId
+				}).then(res => {})
 			}
 		},
 		onLoad(params) {
-
+			this.taskId = params.taskId
 			this.detailsId = params.id
 		},
 		onShow() {
 			this.initListData()
 		},
 		onNavigationBarButtonTap(ev) {
-			
-			console.log("点击了自定义按钮",ev);
-			
+			console.log("点击了自定义按钮", ev);
+			const that = this
+			if (ev.text == '结束任务') {
+				that.backReceiveEndBackFn()
+			}
+
 
 		}
 	}