From 172d04fc9d2d7afb28dd3de207f05bbf90a1b58e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 五月 2024 19:40:51 +0800
Subject: [PATCH] #

---
 pages/phyz/order/orderCar.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
index bad5d50..cb99ab8 100644
--- a/pages/phyz/order/orderCar.vue
+++ b/pages/phyz/order/orderCar.vue
@@ -60,14 +60,15 @@
 </template>
 
 <script>
+	// todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦�
 	export default {
 		data() {
 			return {
 				orderCarList: [],
 				count: 0,
 				index: 0,
-				barcode: '100997',
-				agvDevp: 'DI_01F2',
+				barcode: '',
+				agvDevp: '',
 			}
 		},
 		onShow() {
@@ -137,14 +138,13 @@
 				let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] }
 				let combMats = []
 				for (let item of _this.orderCarList) {
-					let orderNo = item.orderNo
-					combMat.orderNo = orderNo
+					combMat.orderNo = item.orderNo
 					combMat.barcode = _this.barcode
 					combMat.locNo = _this.agvDevp
 					combMat.combMats = []
 					let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs}
 					combMat.combMats.push(combM)
-					combMats.push(combMat)
+					combMats.push({...combMat})
 				}
 				this.comb(combMats)
 				
@@ -155,6 +155,7 @@
 					url: _this.baseUrl + '/agvMobile/start/pakin/auth',
 					data: JSON.stringify({
 						barcode: _this.barcode,
+						containerCode: _this.barcode,
 						devNo: _this.agvDevp,
 						combParams: combMats
 					}),
@@ -165,8 +166,18 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
+							_this.orderCarList = []
+							_this.$refs.agvStart.close()
+							uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' })
+							setTimeout(()=> {
+								_this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1});
+								uni.navigateBack({})
+							},1000)
 						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
 						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
 					}
 				});

--
Gitblit v1.9.1