From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:23:06 +0800
Subject: [PATCH] #

---
 pages/tzsk/AGV/AGVPakin.vue |  175 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 110 insertions(+), 65 deletions(-)

diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index db03d7d..b6b4789 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -2,44 +2,22 @@
 	<view>
 		<view class="code">
 			<view class="item">
-				<view class="code-decs">璁㈠崟鍙�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆 绔欑偣鐮�" v-model="orderNo" :focus="orderNoFocus"
 					@input="findOrder()">
 			</view>
-			<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>
-					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
-					<uni-icons type="right" color="#c1c1c1"></uni-icons>
-				</view>
-			</view>
-		</view>
-		<view class="mat-list-title">
-			鍟嗗搧鍒楄〃
 		</view>
 		<scroll-view>
 			<view class="list" v-for="(item,i) in dataList" :key="i">
 				<view class="list-left">
 					<view class="list-left-item">
-						<view class="desc">No锛�</view>
-						<view class="left-item">{{i + 1}}</view>
-					</view>
-					<view class="list-left-item">
-						<view class="desc">鏂欏彿锛�</view>
+						<view class="desc">绔欑偣鍙凤細</view>
 						<view class="left-item">
-							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+							<uni-tag :text="item.barcode" type="primary"></uni-tag>
 						</view>
 					</view>
 					<view class="list-left-item">
-						<view class="desc">鍝佸悕锛�</view>
-						<view class="left-item">{{item.maktx}}</view>
+						<view class="desc">绔欑偣鐘舵�侊細</view>
+						<view class="left-item">{{item.sts}}</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">瑙勬牸锛�</view>
@@ -62,16 +40,13 @@
 						<view class="left-item">{{item.anfme}}</view>
 					</view>
 				</view>
-				<view class="list-right">
-					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
-					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
-				</view>
 			</view>
 		</scroll-view>
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">
+		<view class="buttom-k">
+			<button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍑哄簱</button>
+			<button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍏ュ簱</button>
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
-			<button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
 		</view>
 		<!-- 寮圭獥 -->
 		<!-- 淇敼鏁伴噺 -->
@@ -122,7 +97,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"
@@ -136,6 +111,10 @@
 					@confirm="resetConfirm" @close="resetClose"></uni-popup-dialog>
 			</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>
 
@@ -147,7 +126,12 @@
 				token: '',
 				barcode: '',
 				orderNo: '',
-				dataList: [],
+				dataList: [
+					{
+						barcode: 'CS-101-001-01@1',
+						sts: 'F.鍦ㄥ簱'
+					}
+				],
 				count: 0,
 				rowNum: '',
 				matnr: '',
@@ -158,22 +142,43 @@
 				messageText: '',
 				title: '',
 				content: '',
-				barcodeFocus: true,
+				orderNoFocus: true,
+				barcodeFocus: false,
 				matFocus: false,
-				orderNoFocus: false,
 				matData: '',
 				removeNum: 0,
-				tempOrderInfo: {csocode: '',isoseq: ''}
+				tempOrderInfo: {csocode: '',isoseq: ''},
+				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'
+				}
+			},
 			// 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
 			findOrder() {
 				let that = this
@@ -187,19 +192,22 @@
 					},
 					success(res) {
 						res = res.data
+						console.log(res);
 						if (res.code === 200) {
 							if(res.data && res.data[0].combMats) {
 								for (let i = 0; i < res.data[0].combMats.length; i++) {
 									that.checkMat(res.data[0].combMats[i])
 								}
-								// that.tempOrderInfo.csocode = res.data[0].combMats.csocode ? res.data[0].combMats.csocode : ''
-								// that.tempOrderInfo.isoseq = res.data[0].combMats.isoseq ? res.data[0].combMats.isoseq : ''
+								that.orderNoFocus = false
+								setTimeout(() => {
+									that.barcodeFocus = true
+								}, 10);
 							} else {
-								uni.showToast({
-									title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝g‘',
-									icon: "none",
-									position: 'top'
-								})
+								// uni.showToast({
+								// 	title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝g‘',
+								// 	icon: "none",
+								// 	position: 'top'
+								// })
 							}
 						} else if (res.code == 403) {
 							uni.showToast({
@@ -236,7 +244,10 @@
 			},
 			barcodeInput() {
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
-				this.barcode = this.barcode.split('_')[1]
+				if (this.barcode.split('_')[1]) {
+					this.barcode = this.barcode.split('_')[1]
+				} 
+				// this.barcode = this.barcode.split('_')[1]
 				setTimeout(() => {
 					let len = this.barcode.length
 					if (len != 10) {
@@ -272,12 +283,12 @@
 			findMat() {
 				let that = this
 				// 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
-				if (that.dataList.length >= 1) {
-					this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
-					this.messageToggle('warn')
-					that.matnr = ''
-					return
-				}
+				// if (that.dataList.length >= 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('warn')
+				// 	that.matnr = ''
+				// 	return
+				// }
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
 					data: { matnr: that.matnr },
@@ -294,12 +305,14 @@
 								success: function(res) {
 									res.eventChannel.emit('mat', {
 										data: result.data,
-										tempOrderInfo: that.tempOrderInfo
+										// tempOrderInfo: that.tempOrderInfo
 									})
 								},
 								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								events: {
 									matList: function(data) {
+										data.data['csocode'] = ''
+										data.data['isoseq'] = ''
 										that.checkMat(data.data)
 										that.focuss()
 									},
@@ -430,7 +443,7 @@
 			combConfirm(type) {
 				this.msgType = type
 				this.title = '璀﹀憡'
-				this.content = '鏄惁鐜板湪缁勬墭!'
+				this.content = '鏄惁鐜板湪绌烘澘鍏ュ簱!'
 				this.$refs.combConfirm.open()
 			},
 			combClose() {
@@ -449,18 +462,22 @@
 					this.messageToggle('error')
 					return;
 				}
-				if (that.dataList.length > 1) {
-					this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
-					this.messageToggle('error')
-					return;
-				}
+				// if (that.dataList.length > 1) {
+				// 	this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+				// 	this.messageToggle('error')
+				// 	return;
+				// }
 				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;
 					}
 				}
+				console.log(that.dataList);
+				console.log(that.barcode);
+				console.log(that.orderNo);
+				// return
 				uni.request({
 					url: that.baseUrl + '/agvMobile/comb/auth',
 					data: JSON.stringify({
@@ -475,8 +492,11 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
-							that.resst();
-							that.messageText = "缁勬墭鎴愬姛"
+							that.dataList = []
+							that.findOrder()
+							// that.resst();
+							that.barcode = ''
+							that.messageText = "绌烘澘鍏ュ簱鎴愬姛"
 							that.messageToggle('success')
 							const innerAudioContext = uni.createInnerAudioContext();
 							innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -528,13 +548,25 @@
 <style>
 	@import url('../../../static/css/wms.css/wms.css');
 
+	.keyboard{
+		width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+			top: 5px;right: 5px; border-radius: 50%;
+			display: flex;align-items: center;justify-content: center;
+	}
+	.kb-bgtr {
+		background-color: #55557f;
+	}
+	.kb-bgfa {
+		background-color: #00aeec;
+	}
+
 	.list:first-child {
-		margin-top: 340rpx;
+		margin-top: 120rpx;
 	}
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 200rpx;
+		min-height: 70rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -580,4 +612,17 @@
 		text-align: center;
 		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
 	}
+	.buttom-k {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		background-color: #FFF;
+		box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
+	}
+	.buttom-k button {
+		margin: 20rpx 50rpx;
+	}
 </style>

--
Gitblit v1.9.1