From c1e688c8a52dd517a2b10125ff9fd1ede7499ce3 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 29 四月 2022 11:20:32 +0800
Subject: [PATCH] #

---
 pages/basics/checkout.vue |  130 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 106 insertions(+), 24 deletions(-)

diff --git a/pages/basics/checkout.vue b/pages/basics/checkout.vue
index 26730c1..8b26d47 100644
--- a/pages/basics/checkout.vue
+++ b/pages/basics/checkout.vue
@@ -1,7 +1,20 @@
 <template>
 	<view >
 		<scroll-view scroll-y catch:touchmove="touchmove">
-			<view class="pak-seach-box">
+			<view class="square-2">
+				<view class="square-title">
+					<view class="title-sign"><view class="sign"></view></view>
+					<view class="title-text"><text>鎵樼洏鏉$爜</text></view>
+				</view>
+				<view class="square-content">
+					<view class="content-input">
+						<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8" 
+						@input="findBarcode()" :focus="barcodeFocus" @focus="focuss">
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
+					</view>
+				</view>
+			</view>
+			<!-- <view class="pak-seach-box">
 				<view class="box-top">
 					<view class="color-block-blue"></view>
 					<text class="title">鎵樼洏鏉$爜</text>
@@ -12,8 +25,26 @@
 						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
+			</view> -->
+			
+			<view class="square-2">
+				<view class="square-title">
+					<view class="title-sign"><view class="sign"></view></view>
+					<view class="title-text"><text>璐у搧鏉$爜</text></view>
+				</view>
+				<view class="square-content">
+					<view class="content-combox">
+						<uni-combox  emptyTips="鏆傛棤鏁版嵁" :candidates="staNoList" v-model="staNo" placeholder="绔欏彴鍙�"></uni-combox>
+					</view>
+					<view class="content-input-combox">
+						<input type="text" v-model="matnr" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+						:focus="focus" @focus="focuss">
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
+					</view>
+				</view>
 			</view>
-			<view class="pak-seach-box">
+			
+			<!-- <view class="pak-seach-box">
 				<view class="box-top">
 					<view class="color-block-blue"></view>
 					<text class="title">璐у搧鏉$爜</text>
@@ -24,24 +55,26 @@
 						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeMatnr()"></uni-icons>
 					</view>
 				</view>
-				<button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
-			</view>
-			<view class="pak-data-box">
-				<view class="box-top">
-					<view class="color-block-blue"></view>
-					<text class="title">鍟嗗搧鍒楄〃</text>
+				<view class="combox">
+					<uni-combox  emptyTips="鏆傛棤鏁版嵁" :candidates="staNoList" v-model="staNo" placeholder="绔欏彴鍙�"></uni-combox>
+				</view>
+			</view> -->
+			<view class="square-1">
+				<view class="square-title">
+					<view class="title-sign"><view class="sign"></view></view>
+					<view class="title-text"><text>鍟嗗搧鍒楄〃</text></view>
 				</view>
 			</view>
-			<view class="pak-data-box"  v-show="matList.length === 0">
-				<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
+			<view class="square-none" v-show="matList.length === 0">
+				<view class="v-show">鏆傛棤鏇村鏁版嵁...</view>
 			</view>
+			<!-- <view class="pak-data-box"  v-show="matList.length === 0">
+				<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
+			</view> -->
 			<checkbox-group @change="checkbox">
 				<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
 					<view class="data-list-left">
-						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
-						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
-						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
-						<view><text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text></view>
+						<view class="matnr">{{item.barcode}}</view>
 					</view>
 					<view class="data-list-right">
 						<uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
@@ -66,12 +99,16 @@
 		data() {
 			return {
 				barcode: '',
+				barcodeFocus:true,
+				focus:false,
 				type: 'center',
 				searchBox: 'hide',
 				pick:'hide',
 				matnr:'',
-				matList:[],
-				result: ''
+				matList:[{barcode:'92992929292'}],
+				result: '',
+				staNoList:[],
+				staNo:'',
 			}
 		},
 		mounted(){
@@ -79,8 +116,12 @@
 			this.baseIP = UIP;
 			const UPORT = uni.getStorageSync('UPORT');
 			this.basePORT = UPORT
+			this.getOutBound();
 		},
 		methods: {
+			focuss() {
+				uni.hideKeyboard()
+			},
 			resst() {
 				this.matList = []
 				this.barcode = ''
@@ -90,10 +131,18 @@
 			removeBarcode() {
 				this.barcode = ''
 				uni.vibrateShort();
+				this.barcodeFocus = false;
+				this.$nextTick(function() {
+					this.barcodeFocus = true;
+				});
 			},
 			removeMatnr() {
 				this.matnr = ''
 				uni.vibrateShort();
+				this.focus = false;
+				this.$nextTick(function() {
+					this.focus = true;
+				});
 			},
 			remove(item,index) {
 				this.matList.splice(index,1)
@@ -168,6 +217,7 @@
 				uni.request({
 				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth',
 				    data: {
+						staNo:that.staNo,
 						matnr:that.matnr
 				    },
 				    header: {
@@ -178,6 +228,20 @@
 						
 					}
 				});
+			},
+			addMatList(mat) {
+				let barcode = this.mat.barcode
+				let toUnshift = true
+				for (var i = 0; i < this.matList.length; i++) {
+					if (barcode === this.matList[i].barcode) {
+						this.messageToggle('warn')
+						this.messageText = barcode + '宸茬粡鎵弿锛岃鍕块噸澶嶆壂鎻�'
+						toUnshift = false
+					}
+				}
+				if (toUnshift) {
+					this.matList.unshift(mat)
+				}
 			},
 			findBarcode() {
 				let that = this
@@ -221,6 +285,10 @@
 					},
 				});
 			}, // getOutBound
+			getCheckDetl() {   // 鑾峰彇鍑哄簱鍙h揣鐗╀俊鎭�
+				let that = this
+				
+			}, // getCheckDetl
 			change(e) {
 				console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
 			},
@@ -291,7 +359,7 @@
 	}
 	.box-buttom {
 		display: inline-block;
-		background-color: #ededed;
+		background-color: #f0f0f0;
 		width: 65%;
 		height: 60rpx;
 		border-radius: 20rpx;
@@ -308,6 +376,12 @@
 		float: right;
 		margin-top: 5rpx;
 		margin-right: 10rpx;
+	}
+	.combox {
+		position: fixed;
+		display: inline-block;
+		width: 28%;
+		float: right;
 	}
 	/* .pak-seach-box input {
 		background-color: #ededed;
@@ -354,7 +428,7 @@
 	}
 	.data-list {
 		border-bottom: 1px solid #d8d8d8;
-		height: 180rpx;
+		height: 130rpx;
 		margin: 15rpx;
 		border-radius: 20rpx;
 	}
@@ -373,20 +447,28 @@
 		line-height: 180rpx;
 	} */
 	.data-list-left {
+		width: 550rpx;
+		/* background-color: #007AFF; */
 		display: inline-block;
 		float: left;
-		margin-left: 6%;
-		height: 180rpx;
+		margin-left: 4%;
+		height: 130rpx;
 		color: #676767;
 	}
 	.matnr {
-		padding-top: 10rpx;
+		display: inline-block;
+		width: 100%;
+		font-size: 16px;
+		font-weight: 700;
+		height: 130rpx;
+		line-height: 130rpx;
 	}
 	.data-list-right {
+		/* background-color: #6739B6; */
 		display: inline-block;
 		float: right;
-		height: 180rpx;
-		line-height: 180rpx;
-		margin-right: 10%;
+		width: 100rpx;
+		height: 130rpx;
+		line-height: 130rpx;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1