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

---
 pages/order/orderPutOn.vue |   86 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index e08133a..ba692e6 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -2,16 +2,16 @@
 	<view>
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">搴撲綅鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
-					@input="barcodeInput()">
-			</view>
-			<view class="item">
 				<view class="code-decs">鐗╂枡鍙�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
 				<view class="item-right">
 					<button></button>
 				</view>
+			</view>
+			<view class="item">
+				<view class="code-decs">搴撲綅鍙�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus">
+					<button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
 			</view>
 		</view>
 		<view class="mat-list-title">
@@ -50,12 +50,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
-					</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -90,10 +90,10 @@
 						<view class="popup-item-left">鎵瑰彿:</view>
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
 					</view> -->
-					<view class="popup-item">
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
 						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view>
+					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -141,6 +141,18 @@
 				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
 			</uni-popup>
 		</view>
+		<view>
+			<!-- 鏅�氬脊绐� -->
+			<uni-popup ref="popup" background-color="#fff">
+				<scroll-view scroll-y="true" class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+					<view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
+				</scroll-view>
+			</uni-popup>
+		</view>
+		
+		<view class="keyboard" :class="hidebg" mode="aspectFit" @click="hideKeyboard">
+			<image src="@/static/img/keyboard1.png" style="height: 70%;width: 70%;"></image>
+		</view>
 	</view>
 </template>
 
@@ -165,17 +177,43 @@
 				messageText: '',
 				title: '',
 				content: '',
-				barcodeFocus: true,
-				matFocus: false,
+				barcodeFocus: false,
+				matFocus: true,
 				matData: '',
-				removeNum: 0
+				removeNum: 0,
+				type: 'center',
+				recommendLocs: [],
+				hide: true,
+				hidebg: 'kb-bgtr'
 			}
+		},
+		onLoad() {
+			// #ifdef APP
+			setInterval(()=>{
+				if (this.hide) {
+					uni.hideKeyboard()
+				} else {
+					
+				}
+			},20)
+			// #endif
+		},
+		onBackPress() {
+			this.hide = false
 		},
 		onShow() {
 			this.baseUrl = uni.getStorageSync('baseUrl');
 			this.token = uni.getStorageSync('token');
 		},
 		methods: {
+			hideKeyboard() {
+				this.hide = this.hide ? false : true
+				if (this.hide) {
+					this.hidebg = 'kb-bgtr'
+				} else {
+					this.hidebg = 'kb-bgfa'
+				}
+			},
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
@@ -236,6 +274,7 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
+										that.recommendLoc()
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -263,6 +302,23 @@
 					}
 				});
 			
+			},
+			// 鎺ㄨ崘搴撲綅
+			recommendLoc() {
+				let that = this
+				that.recommendLocs = []
+				uni.request({
+					url: that.baseUrl + '/node/recommendLoc',
+					data: {matnr: that.matnr},
+					header: {'token': uni.getStorageSync('token')},
+					success(res) {
+						res = res.data
+						if (res.code == 200 && res.data) {
+							that.recommendLocs = res.data
+						} 
+					}
+					
+				})
 			},
 			checkMat(mat) {
 				mat['orderNo'] = this.order
@@ -447,7 +503,7 @@
 		box-shadow: 0px 0px 30px 0px rgba(0,0,0,0.2);
 	}
 	.list:first-child {
-		margin-top: 410rpx;
+		margin-top: 280rpx;
 	}
 	.list:last-child {
 		margin-bottom: 120rpx;
@@ -462,7 +518,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
+		height: 70rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
@@ -494,7 +550,7 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 140rpx;
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;

--
Gitblit v1.9.1