From 32bb7e03a59a03edd409ca528ee15d6ee3652684 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 20 十月 2023 11:16:54 +0800
Subject: [PATCH] #

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

diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index b667bb5..0f36504 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,6 +50,12 @@
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</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>
@@ -84,10 +90,14 @@
 						<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-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">
@@ -131,6 +141,14 @@
 				<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>
 </template>
 
@@ -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() {
@@ -225,6 +246,7 @@
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
+										that.recommendLoc()
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -252,6 +274,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
@@ -371,6 +410,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 +435,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()

--
Gitblit v1.9.1