From 26a240a9fde1e7911a69f92b33f9d3e3039cadd5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 10:55:34 +0800
Subject: [PATCH] #

---
 pages/order/orderPutOn.vue |   55 ++++++++++++++++++++++---------------------------------
 1 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 5b69592..3af4379 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">
@@ -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"
@@ -139,14 +139,6 @@
 			<!-- 鎻愮ず淇℃伅寮圭獥 -->
 			<uni-popup ref="message" type="message">
 				<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
-			</uni-popup>
-		</view>
-		<view>
-			<!-- 鏅�氬脊绐� -->
-			<uni-popup ref="popup" background-color="#fff">
-				<view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">
-					<view class="recommend" v-for="item in recommendLocs" @click="chose(item)"> {{ item }}</view>
-				</view>
 			</uni-popup>
 		</view>
 	</view>
@@ -177,8 +169,6 @@
 				matFocus: true,
 				matData: '',
 				removeNum: 0,
-				type: 'center',
-				recommendLocs: []
 			}
 		},
 		onShow() {
@@ -186,21 +176,15 @@
 			this.token = uni.getStorageSync('token');
 		},
 		methods: {
-			chose(item) {
-				this.barcode = item
-				this.$refs.popup.close()
-			},
-			toggle(type) {
-				this.type = type
-				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
-				this.$refs.popup.open(type)
-			},
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
 			},
-			matnrInput() {
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
+					var len = this.barcode.length
 					this.focuss()
 				}, 200)
 			},
@@ -238,6 +222,7 @@
 						result = result.data
 						if (result.code === 200 && result.data) {
 							that.matData = result.data
+							that.matnr = ''
 							that.matData['batch'] = ''
 							result.data.batch = matnr[2]
 							uni.navigateTo({
@@ -251,7 +236,6 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
-										that.recommendLoc()
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -289,8 +273,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 +322,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 +340,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 +359,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 +440,7 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.recommendLocs = []
 				this.barcodeFocuss()
 			},
 			combClose() {
@@ -470,6 +457,8 @@
 <style>
 	@import url('../../static/css/wms.css/wms.css');
 	.popup-content {
+		/* height: 90vh; */
+		height: 90vh;
 		width: 200px;
 	}
 	.recommend {

--
Gitblit v1.9.1