From 16b692b3ea44779cd15f730b5376ef12b39a9e13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 15:06:44 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

---
 pages/phyz/checkLocDetl/checkLocDetl.vue |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
index cb1c3e3..3dc4f02 100644
--- a/pages/phyz/checkLocDetl/checkLocDetl.vue
+++ b/pages/phyz/checkLocDetl/checkLocDetl.vue
@@ -65,9 +65,10 @@
 				bay1: '',
 				lev1: '',
 				dataList: [],
+				item: ''
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 			this.getLocMastList()
@@ -128,16 +129,29 @@
 									k['color'] = 'locSts-X' 
 								} else if (k.locSts == 'Q') {
 									k['color'] = 'locSts-Q' 
+								} else if (k.locSts == 'P') {
+									k['color'] = 'locSts-P' 
 								} else if (k.locSts == 'X') {
 									k['color'] = 'locSts-X' 
 								}
 							}
 							_this.dataList = res.data.records
+						} 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' })
 						} 
 					}
 				})
 			},
-			goToLocDetl() {
+			goToLocDetl(e) {
+				this.locNo = e.locNo
+				this.item = e
+				if (e.locSts == 'S' || e.locSts == 'R') {
+					uni.showToast({ title: '褰撳墠搴撲綅鍦ㄤ綔涓�', icon: "error", position: 'top' })
+					return
+				}
 				this.$refs.check.open()
 			},
 			checkClose() {
@@ -147,11 +161,13 @@
 				let _this = this
 				let param = {
 					barcode : _this.barcode,
-					locNo : _this.locNo
+					locNo : _this.locNo,
+					item: _this.item
 				}
 				uni.navigateTo({
 					url: "./locDetl",
 					success: function(res) {
+						_this.$refs.check.close()
 						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 						res.eventChannel.emit('item', {
 							item: param
@@ -160,7 +176,8 @@
 					events: {
 						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 						acceptDataFromOpenedPage: function(data) {
-							_this.searchValueFocus = true
+							_this.$refs.check.close()
+							_this.getLocMastList()
 						}
 					},
 				});

--
Gitblit v1.9.1