From c1b491813b5312a6fc967905316ebdc325d77c41 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 15 四月 2024 20:30:02 +0800
Subject: [PATCH] #

---
 pages/phyz/checkLocDetl/locDetl.vue     |   71 +++++++++++++++++++----
 pages.json                              |    8 ++
 pages/phyz/checkLocDetl/locDetlList.vue |   52 +++++++++++++++++
 3 files changed, 118 insertions(+), 13 deletions(-)

diff --git a/pages.json b/pages.json
index 14f0dad..b9b357e 100644
--- a/pages.json
+++ b/pages.json
@@ -630,6 +630,14 @@
                 "enablePullDownRefresh": false
             }
             
+        },
+        {
+        	"path" : "pages/phyz/checkLocDetl/locDetlList",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "搴撳瓨鏄庣粏",
+        		"enablePullDownRefresh" : false
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/phyz/checkLocDetl/locDetl.vue b/pages/phyz/checkLocDetl/locDetl.vue
index d823113..2ab7d1d 100644
--- a/pages/phyz/checkLocDetl/locDetl.vue
+++ b/pages/phyz/checkLocDetl/locDetl.vue
@@ -3,17 +3,28 @@
 		<view>褰撳墠搴撲綅鍙凤細{{locNo}}</view>
 		<view>褰撳墠璐ф灦鐮侊細{{barcode}}</view>
 		
-		<view>
-			<view>瀹為檯搴撳瓨</view>
-			<view>搴撲綅鍙穥{containerDetl.locNo}}</view>
-			<view>璐ф灦鐮亄{containerDetl.barcode}}</view>
-			<view>搴撳瓨鍝佺被{{containerDetl.count}}</view>
+		<view class="list locSts-O">
+			<view class="list-left">
+				<view>瀹為檯搴撳瓨</view>
+				<view>搴撲綅鍙凤細{{containerDetl.locNo}}</view>
+				<view>璐ф灦鐮侊細{{containerDetl.barcode}}</view>
+				<view>搴撳瓨鍝佺被锛歿{containerDetl.count}}</view>
+			</view>
+			<view class="list-right" @click="goToLocDetl(containerDetl)">
+				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
+			</view>
 		</view>
-		<view v-if="locDetlShow">
-			<view>鏁版嵁搴撳瓨</view>
-			<view>搴撲綅鍙穥{locDetl.locNo}}</view>
-			<view>璐ф灦鐮亄{locDetl.barcode}}</view>
-			<view>搴撳瓨鍝佺被{{locDetl.count}}</view>
+		
+		<view class="list locSts-D" v-if="locDetlShow">
+			<view class="list-left">
+				<view>鏁版嵁搴撳瓨</view>
+				<view>搴撲綅鍙凤細{{locDetl.locNo}}</view>
+				<view>璐ф灦鐮侊細{{locDetl.barcode}}</view>
+				<view>搴撳瓨鍝佺被锛歿{locDetl.count}}</view>
+			</view>
+			<view class="list-right" @click="goToLocDetl(locDetl)">
+				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
+			</view>
 		</view>
 		
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
@@ -34,12 +45,14 @@
 				containerDetl: {
 					locNo: '',
 					barcode: '',
-					count: ''
+					count: '',
+					data: []
 				},
 				locDetl: {
 					locNo: '',
 					barcode: '',
-					count: ''
+					count: '',
+					data: []
 				},
 				dataList: [],
 				locDetlShow: false
@@ -55,6 +68,7 @@
 			eventChannel.on('item', function(data) {
 				console.log(data);
 				_this.locNo = data.item.locNo
+				_this.barcode = data.item.barcode
 				_this.getLocDetl(data.item.locNo,data.item.barcode)
 			})
 		},
@@ -75,6 +89,7 @@
 								_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) {
@@ -82,7 +97,11 @@
 								&& 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
 								}
 								
 							}
@@ -91,6 +110,24 @@
 						}
 					}
 				})
+			},
+			goToLocDetl(item) {
+				let _this = this
+				uni.navigateTo({
+					url: "./locDetlList",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('item', {
+							item: item
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							_this.searchValueFocus = true
+						}
+					},
+				});
 			}
 		}
 	}
@@ -98,4 +135,12 @@
 
 <style>
 	@import url('../../../static/css/common/order.css');
+	.locSts-D {
+		color: #FFF;
+		background-color: #daad25;
+	}
+	.locSts-O {
+		color: #FFF;
+		background-color: #55aaff;
+	}
 </style>
diff --git a/pages/phyz/checkLocDetl/locDetlList.vue b/pages/phyz/checkLocDetl/locDetlList.vue
new file mode 100644
index 0000000..2388b43
--- /dev/null
+++ b/pages/phyz/checkLocDetl/locDetlList.vue
@@ -0,0 +1,52 @@
+<template>
+	<view>
+		<view class="list list-font-color" :class="locMast.color" v-for="(locMast,index) in dataList" :key="index">
+			<view class="list-left">
+				<view class="detl-threeCode">{{locMast.locNo}}</view>
+				<view>搴撲綅鐘舵�侊細{{locMast.locSts$}}</view>
+				<view>搴撲綅绫诲瀷锛歿{locMast.locType1$}}</view>
+				<view>璐ф灦鐮侊細{{locMast.barcode}}</view>
+				<view style="display: flex;">
+					<view style="flex:1">鎺掞細<text style="font-size: 22px;font-weight: bold;">{{locMast.row1}}</text></view>
+					<view style="flex:1">鍒楋細<text style="font-size: 22px;font-weight: bold;">{{locMast.bay1}}</text></view>
+					<view style="flex:1">灞傦細<text style="font-size: 22px;font-weight: bold;">{{locMast.lev1}}</text></view>
+				</view>
+			</view>
+			<view class="list-right" @click="goToLocDetl(locMast)">
+				<uni-icons type="right" size="25"  color="#fff"></uni-icons>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				baseUrl: '',
+				token: '',
+				dataList: []
+				
+			}
+		},
+		onShow() {
+			let _this = this
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
+			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+			eventChannel.on('item', function(data) {
+				console.log(data);
+				_this.dataList = data.item.data
+			})
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	@import url('../../../static/css/common/order.css');
+</style>

--
Gitblit v1.9.1