From ad4d41f60d4a44e945c8e55d66bfe23ee8c668f6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 11:10:12 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs
---
pages/tzsk/AGV/AGVPakinOn.vue | 66 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/pages/tzsk/AGV/AGVPakinOn.vue b/pages/tzsk/AGV/AGVPakinOn.vue
index 181ab96..f244269 100644
--- a/pages/tzsk/AGV/AGVPakinOn.vue
+++ b/pages/tzsk/AGV/AGVPakinOn.vue
@@ -160,6 +160,10 @@
@confirm="agvStartConfirm" @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>
@@ -183,25 +187,46 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: true,
+ barcodeFocus: false,
stationCodeFocus: false,
matFocus: false,
- orderNoFocus: false,
+ orderNoFocus: true,
matData: '',
removeNum: 0,
devNo: [],
flag: 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
that.tempOrderInfo.csocode = ''
@@ -219,8 +244,10 @@
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‘',
@@ -279,7 +306,9 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
- this.barcode = this.barcode.split('_')[1]
+ if (this.barcode.split('_')[1]) {
+ this.barcode = this.barcode.split('_')[1]
+ }
setTimeout(() => {
var len = this.barcode.length
if (len != 10) {
@@ -323,12 +352,12 @@
// 鎼滅储鐗╂枡
findMat() {
let that = this
- 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: {
@@ -354,6 +383,8 @@
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
+ data.data['csocode'] = ''
+ data.data['isoseq'] = ''
that.checkMat(data.data)
that.focuss()
},
@@ -646,12 +677,13 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 540rpx;
+ margin-top: 400rpx;
}
+
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 210rpx;
background-color: #FFF;
z-index: 10;
}
@@ -659,7 +691,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -691,7 +723,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 400rpx;
+ margin-top: 280rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1