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 |  103 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 84 insertions(+), 19 deletions(-)

diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 4469957..b5cd93d 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">
@@ -51,6 +51,12 @@
 						</view>
 					</view>
 					<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 class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
@@ -85,9 +91,13 @@
 						<view class="popup-item-right"><input type="text" v-model="batch"></view>
 					</view> -->
 					<view class="popup-item">
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
+					</view>
+					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
@@ -111,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"
@@ -129,6 +139,14 @@
 			<!-- 鎻愮ず淇℃伅寮圭獥 -->
 			<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">
+				<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>
@@ -149,15 +167,18 @@
 				matnr: '',
 				matnr1: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
 				title: '',
 				content: '',
-				barcodeFocus: true,
-				matFocus: false,
+				barcodeFocus: false,
+				matFocus: true,
 				matData: '',
-				removeNum: 0
+				removeNum: 0,
+				type: 'center',
+				recommendLocs: []
 			}
 		},
 		onShow() {
@@ -165,15 +186,21 @@
 			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()
 			},
-			// barcode input 浜嬩欢
-			barcodeInput() {
-				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+			matnrInput() {
 				setTimeout(() => {
-					var len = this.barcode.length
 					this.focuss()
 				}, 200)
 			},
@@ -211,7 +238,6 @@
 						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({
@@ -225,6 +251,7 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
+										that.recommendLoc()
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -252,6 +279,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
@@ -294,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;
 				}
@@ -312,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;
 					}
@@ -331,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
@@ -371,6 +415,7 @@
 				this.matnr1 = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -395,6 +440,7 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
 				this.$refs.revise.close()
@@ -410,7 +456,15 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.recommendLocs = []
 				this.barcodeFocuss()
+			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
+			// 鍙栨秷绉婚櫎
+			removeClose() {
+				this.$refs.alertDialog.close()
 			},
 		}
 	}
@@ -418,6 +472,17 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
+	.popup-content {
+		/* height: 90vh; */
+		height: 90vh;
+		width: 200px;
+	}
+	.recommend {
+		width: 300rpx;
+		height: 100rpx;
+		text-align: center;
+		line-height: 100rpx;
+	}
 	.list {
 		display: flex;
 		min-height: 80rpx;

--
Gitblit v1.9.1