From dce455a8692b9ec18ffdca4d372fde3d617d3e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sat, 11 May 2024 15:25:05 +0800
Subject: [PATCH] =?UTF-8?q?AGV=20=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=AE=8C=E6=88=90=E6=97=B6=E6=B7=BB=E5=8A=A0=E8=AF=A2?=
 =?UTF-8?q?=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialRequisition.vue                   | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
index d28841c..8faa0b5 100644
--- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
+++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue
@@ -33,7 +33,8 @@
 											size="50" @click="detail_item(item.taskId)"></u-icon></u-col>
 									<u-col span="2"><u-button type="success" text="开始" size="mini"
 											@click="confirm_startpoint(item.agvPosition)"></u-button></u-col>
-									<u-col span="2"><u-button type="error" text="结束" size="mini" @click="final_task(item.taskId)"></u-button></u-col>
+									<u-col span="2"><u-button type="error" text="结束" size="mini"
+											@click="final_task(item.taskId)"></u-button></u-col>
 								</u-row>
 							</view>
 						</u-list-item>
@@ -343,21 +344,31 @@
 					}
 				});
 			},
-		
-		    //todo 完成任务
-			final_task(taskid){
-				let query={
-					start_point: this.start_point,
-					end_point: this.end_point,
-					taskId:taskid
-				}
-				FinisBatchingTask(query).then(res=>{
-					if(res.code==200){
-						this.getInitList();
+
+			//todo 完成任务
+			final_task(taskid) {
+				uni.showModal({
+					title: '提示',
+					content: '是否确定完成任务?',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '确定',
+					success: (res) => {
+						if (res.confirm) {
+							let query = {
+								start_point: this.start_point,
+								end_point: this.end_point,
+								taskId: taskid
+							}
+							FinisBatchingTask(query).then(res => {
+								if (res.code == 200) {
+									this.getInitList();
+								}
+							})
+						}
 					}
-				})
+				});
 			}
-		
 		}
 	};
 </script>