From 442772e4b934444a1168eba55972fbbd1aa3dc4e Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 09 四月 2024 23:57:55 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |    3 +--
 pages/phyz/order/orderCar.vue            |   14 ++++++++++++--
 pages/phyz/order/pakinOrderSelect.vue    |    3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue
index 43b5ce3..b55cfa8 100644
--- a/pages/phyz/order/orderCar.vue
+++ b/pages/phyz/order/orderCar.vue
@@ -66,8 +66,8 @@
 				orderCarList: [],
 				count: 0,
 				index: 0,
-				barcode: '100997',
-				agvDevp: 'DI_01F2',
+				barcode: '',
+				agvDevp: '',
 			}
 		},
 		onShow() {
@@ -165,8 +165,18 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
+							_this.orderCarList = []
+							_this.$refs.agvStart.close()
+							uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "error", 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' })
 						}
 					}
 				});
diff --git a/pages/phyz/order/pakinOrderSelect.vue b/pages/phyz/order/pakinOrderSelect.vue
index 8e7d9f3..23888a2 100644
--- a/pages/phyz/order/pakinOrderSelect.vue
+++ b/pages/phyz/order/pakinOrderSelect.vue
@@ -173,6 +173,9 @@
 					events: {
 						acceptDataFromOpenedPage: function(data) {
 							console.log(data);
+							if (data.data == 1) {
+								_this.orderCarList = []
+							}
 						}
 					}
 				})
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 0cf6167..9fa6b9d 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -193,7 +193,6 @@
 					success(res) {
 						res = res.data
 						if (res.code === 200) {
-							
 							if (res.data.records[0].locSts == 'O') {
 								_this.btnType = 'emptyPakin' 
 							} else if (res.data.records[0].locSts == 'F') {
@@ -215,8 +214,8 @@
 								_this.reload.loadingText = '鏇存柊鐘舵��'
 								_this.getContainerType()
 							},500)
-							
 							_this.getWrkMast(res.data.records[0].barcode)
+							uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);

--
Gitblit v1.9.1