From 95308b5b767ada3ce748c104424357189d7746c4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 15:06:36 +0800
Subject: [PATCH] #

---
 pages/phyz/checkLocDetl/locDetl.vue      |   36 ++++++++++++++++++------------------
 pages/phyz/checkLocDetl/checkLocDetl.vue |    2 ++
 pages/phyz/checkLocDetl/locDetlList.vue  |    4 +++-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pages/phyz/checkLocDetl/checkLocDetl.vue b/pages/phyz/checkLocDetl/checkLocDetl.vue
index 8b10df0..3dc4f02 100644
--- a/pages/phyz/checkLocDetl/checkLocDetl.vue
+++ b/pages/phyz/checkLocDetl/checkLocDetl.vue
@@ -129,6 +129,8 @@
 									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' 
 								}
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
index 1e68996..9dbab99 100644
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ b/pages/phyz/checkLocDetl/locDetl.vue
@@ -79,7 +79,7 @@
 					data: []
 				},
 				dataList: [],
-				locDetlShow: false,
+				locDetlShow: true,
 				isOpen: false,
 				locSts: '',
 				locSts2: '',
@@ -120,26 +120,22 @@
 						res = res.data
 						console.log(res);
 						if (res.code === 200) {
-							_this.dataList = res.data.containerCode
-							if (res.data.containerCode[0].locNo) {
-								_this.containerDetl.locNo = res.data.containerCode[0].locNo
-								_this.containerDetl.barcode = res.data.containerCode[0].suppCode
-								_this.containerDetl.count = res.data.containerCode.length
-								_this.containerDetl.data = res.data.containerCode
+							if (res.data.containerCode.length > 0) {
+								_this.dataList = res.data.containerCode
+								if (res.data.containerCode[0].locNo) {
+									_this.containerDetl.locNo = res.data.containerCode[0].locNo
+									_this.containerDetl.barcode = res.data.containerCode[0].suppCode
+									_this.containerDetl.count = res.data.containerCode.length
+									_this.containerDetl.data = res.data.containerCode
+								}
 							}
 							
+							
 							if (res.data.locNo.length > 0) {
-								if (res.data.containerCode[0].locNo == res.data.locNo[0].locNo
-								&& res.data.containerCode[0].suppCode == res.data.locNo[0].suppCode) {
-									_this.locDetlShow = false
-								} else {
-									_this.locDetlShow = true
-									_this.locDetl.locNo = res.data.locNo[0].locNo
-									_this.locDetl.barcode = res.data.locNo[0].suppCode
-									_this.locDetl.count = res.data.locNo.length
-									_this.locDetl.data = res.data.locNo
-								}
-								
+								_this.locDetl.locNo = res.data.locNo[0].locNo
+								_this.locDetl.barcode = res.data.locNo[0].suppCode
+								_this.locDetl.count = res.data.locNo.length
+								_this.locDetl.data = res.data.locNo
 							}
 							
 							
@@ -154,6 +150,10 @@
 			},
 			goToLocDetl(item) {
 				let _this = this
+				if (item.data.length <= 0) {
+					uni.showToast({ title: '娌℃湁搴撳瓨', icon: "error", position: 'top' })
+					return
+				}
 				uni.navigateTo({
 					url: "./locDetlList",
 					success: function(res) {
diff --git a/pages/phyz/checkLocDetl/locDetlList.vue b/pages/phyz/checkLocDetl/locDetlList.vue
index 9a1a437..150af04 100644
--- a/pages/phyz/checkLocDetl/locDetlList.vue
+++ b/pages/phyz/checkLocDetl/locDetlList.vue
@@ -60,7 +60,9 @@
 				count: '',
 				index: 0,
 				locNo: '',
-				barcode: ''
+				barcode: '',
+				orderNo: '',
+				threeCode: ''
 			}
 		},
 		onShow() {

--
Gitblit v1.9.1