From 856c16c95b2446bdc6364192948bd8d9e29c54c8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 24 四月 2022 12:22:38 +0800
Subject: [PATCH] #

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

diff --git a/pages/basics/checkout.vue b/pages/basics/checkout.vue
index fc747d0..289f168 100644
--- a/pages/basics/checkout.vue
+++ b/pages/basics/checkout.vue
@@ -1,19 +1,48 @@
 <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()">
+						<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>
 				</view>
 				<view class="box-buttom">
-					<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆">
+					<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8" @input="findBarcode()">
 					<view class="search-icon">
 						<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()">
+						<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,17 +53,22 @@
 						<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">
@@ -54,7 +88,7 @@
 				<button class="cu-btn lg" @click="resst()">閲嶇疆</button>
 			</view>
 			<view>
-				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
+				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">纭</button>
 			</view>
 		</view>
 	</view>
@@ -71,7 +105,9 @@
 				pick:'hide',
 				matnr:'',
 				matList:[],
-				result: ''
+				result: '',
+				staNoList:[],
+				staNo:'',
 			}
 		},
 		mounted(){
@@ -79,6 +115,7 @@
 			this.baseIP = UIP;
 			const UPORT = uni.getStorageSync('UPORT');
 			this.basePORT = UPORT
+			this.getOutBound();
 		},
 		methods: {
 			resst() {
@@ -166,37 +203,66 @@
 			findMat() {
 				let that = this
 				uni.request({
-				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/auth',
+				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth',
 				    data: {
+						staNo:that.staNo,
 						matnr:that.matnr
 				    },
 				    header: {
 						'token':uni.getStorageSync('token')
 				    },
 					success(result) {
-						uni.vibrateShort();
-						let res = result.data
-						if (res.code === 200 && res.data) {
-							that.matData = res.data
-							uni.navigateTo({
-								url: "matQuery",
-								events: {
-								    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-								    matList: function(data) {
-										that.matList.push(data.data)
-								    },
-								  },
-								  success: function(res) {
-								    // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
-								    res.eventChannel.emit('matData', { data: that.matData })
-								  }
-							});
-						}
+						console.log(result)
 						
 					}
 				});
 			},
-		
+			findBarcode() {
+				let that = this
+				uni.request({
+				    url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mobile/pakout/query/auth',
+				    data: {
+						barcode:that.barcode
+				    },
+				    header: {
+						'token':uni.getStorageSync('token')
+				    },
+					success(result) {
+						console.log(result)
+						
+					}
+				});
+				
+			},
+			getOutBound() {         // 鑾峰彇鍑哄簱鍙�
+				let that = this
+				uni.request({
+					url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/available/take/check/site',
+					method: 'POST',
+					header: {
+						'token':uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							that.staNoList = res.data
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
+						}
+					},
+				});
+			}, // getOutBound
+			getCheckDetl() {   // 鑾峰彇鍑哄簱鍙h揣鐗╀俊鎭�
+				let that = this
+				
+			}, // getCheckDetl
 			change(e) {
 				console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
 			},
@@ -267,7 +333,7 @@
 	}
 	.box-buttom {
 		display: inline-block;
-		background-color: #ededed;
+		background-color: #f0f0f0;
 		width: 65%;
 		height: 60rpx;
 		border-radius: 20rpx;
@@ -285,6 +351,12 @@
 		margin-top: 5rpx;
 		margin-right: 10rpx;
 	}
+	.combox {
+		position: fixed;
+		display: inline-block;
+		width: 28%;
+		float: right;
+	}
 	/* .pak-seach-box input {
 		background-color: #ededed;
 		border: 1rpx solid #d8d8d8;

--
Gitblit v1.9.1