From e4dc67055ea0c21e72815054c044b56a76ec625e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 17 四月 2024 13:08:36 +0800
Subject: [PATCH] #

---
 pages/order/orderPutOn.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 5b69592..b5cd93d 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -121,7 +121,7 @@
 				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
 			</uni-popup>
 		</view>
-		<!-- 纭缁勬墭 -->
+		<!-- 纭涓婃灦 -->
 		<view>
 			<uni-popup ref="combConfirm" type="dialog">
 				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -144,9 +144,9 @@
 		<view>
 			<!-- 鏅�氬脊绐� -->
 			<uni-popup ref="popup" background-color="#fff">
-				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
+				<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>
-				</view>
+				</scroll-view>
 			</uni-popup>
 		</view>
 	</view>
@@ -289,8 +289,10 @@
 					data: {matnr: that.matnr},
 					header: {'token': uni.getStorageSync('token')},
 					success(res) {
-						res = res.data.data
-						that.recommendLocs = res
+						res = res.data
+						if (res.code == 200 && res.data) {
+							that.recommendLocs = res.data
+						} 
 					}
 					
 				})
@@ -336,14 +338,14 @@
 			combConfirm(type) {
 				this.msgType = type
 				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.content = '鏄惁鐜板湪涓婃灦!'
 				this.$refs.combConfirm.open()
 			},
 			comb() {
 				uni.vibrateShort();
 				let that = this;
 				if (that.barcode === '') {
-					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+					this.messageText = "璇锋坊鍔犲簱浣嶇爜"
 					this.messageToggle('error')
 					return;
 				}
@@ -354,7 +356,7 @@
 				}
 				for (var i = 0; i < that.dataList.length; i++) {
 					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
-						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+						this.messageText = that.dataList[i].matnr + '涓婃灦鏁伴噺涓嶈兘涓�0'
 						this.messageToggle('error')
 						return;
 					}
@@ -373,7 +375,7 @@
 						var res = result.data
 						if (res.code === 200) {
 							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
+							that.messageText = "涓婃灦鎴愬姛"
 							that.messageToggle('success')
 						} else if (res.code == 403) {
 							that.messageText = res.msg
@@ -454,6 +456,7 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.recommendLocs = []
 				this.barcodeFocuss()
 			},
 			combClose() {
@@ -470,6 +473,8 @@
 <style>
 	@import url('../../static/css/wms.css/wms.css');
 	.popup-content {
+		/* height: 90vh; */
+		height: 90vh;
 		width: 200px;
 	}
 	.recommend {

--
Gitblit v1.9.1