From 06fc3eebef4e55e96b95ff0349e02de1f6f22771 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 七月 2022 08:10:48 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |  124 ++++++++++++++++++++++------------------
 1 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 9a1e612..7a5ff5a 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -1,20 +1,51 @@
 <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"
+						: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>
 				</view>
 				<view class="box-buttom">
-					<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆">
+					<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8">
 					<view class="search-icon">
 						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
-				<button class="cu-btn bg-blue" @click="scan">鎵爜</button>
+			</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-input-btn">
+						<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()"
+						:focus="focus" @focus="focuss">
+						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeMatnr()"></uni-icons>
+					</view>
+					<view class="content-btn">
+						<button class="cu-btn bg-blue pda-btn" @click="selectMat()">+鎻愬彇</button>
+					</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>
@@ -26,8 +57,19 @@
 					</view>
 				</view>
 				<button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
+			</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">
+			<view class="square-none"  v-show="matList.length === 0">
+				<view class="v-show">鏆傛棤鏇村鏁版嵁...</view>
+			</view>
+			
+			<!-- <view class="pak-data-box">
 				<view class="box-top">
 					<view class="color-block-blue"></view>
 					<text class="title">鍟嗗搧鍒楄〃</text>
@@ -35,14 +77,11 @@
 			</view>
 			<view class="pak-data-box"  v-show="matList.length === 0">
 				<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
-			</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>
@@ -52,10 +91,10 @@
 		</scroll-view>
 		<view class="footer flex justify-around">
 			<view>
-				<button class="cu-btn" @click="resst()">閲嶇疆</button>
+				<button class="cu-btn lg" @click="resst()">閲嶇疆</button>
 			</view>
 			<view>
-				<button class="cu-btn pakin-btn bg-blue" @click="comb()">缁勬墭</button>
+				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
 			</view>
 		</view>
 	</view>
@@ -67,12 +106,13 @@
 		data() {
 			return {
 				barcode: '',
+				barcodeFocus:true,
+				focus:false,
 				type: 'center',
 				searchBox: 'hide',
 				pick:'hide',
 				matnr:'',
 				matList:[],
-				man:'',
 				result: ''
 			}
 		},
@@ -83,46 +123,9 @@
 			this.basePORT = UPORT
 		},
 		methods: {
-			async scan() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.matnr = res.result
-						this.findMat(this.matnr)
-					},
-					fail: (err) => {
-						// 闇�瑕佹敞鎰忕殑鏄皬绋嬪簭鎵爜涓嶉渶瑕佺敵璇风浉鏈烘潈闄�
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "闇�瑕佺浉鏈烘潈闄�",
-						confirmText: "璁剧疆",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-			,
+			focuss() {
+				uni.hideKeyboard()
+			},
 			resst() {
 				this.matList = []
 				this.barcode = ''
@@ -132,10 +135,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)
@@ -188,6 +199,7 @@
 			selectMat() {
 				let that = this
 				uni.vibrateShort();
+				uni.showLoading();
 				uni.navigateTo({
 					url: "matSelect",
 					events: {
@@ -309,7 +321,7 @@
 	.box-buttom {
 		display: inline-block;
 		background-color: #ededed;
-		width: 70%;
+		width: 65%;
 		height: 60rpx;
 		border-radius: 20rpx;
 		margin: 15rpx 15rpx 0rpx 15rpx;
@@ -343,7 +355,7 @@
 		color: #ffffff;
 		display: inline-block;
 		float: right;
-		width: 150rpx;
+		width: 180rpx;
 		height: 60rpx;
 		margin: 15rpx 15rpx 0rpx 15rpx;
 		line-height: 60rpx;
@@ -406,4 +418,4 @@
 		line-height: 180rpx;
 		margin-right: 10%;
 	}
-</style>
+</style>
\ No newline at end of file

--
Gitblit v1.9.1