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/AGVStart.vue | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index c06acf6..d94c8c1 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -15,7 +15,7 @@
<view class="mat-list-title">
<view style="-webkit-flex: 1;flex: 1;"></view>
<view style="-webkit-flex: 1;flex: 1;">绔欑偣鍒楄〃</view>
- <view style="-webkit-flex: 1;flex: 1;"><button size="mini">鍏ㄩ��</button></view>
+ <view style="-webkit-flex: 1;flex: 1;"><button size="mini" @click="selectAll()">{{btnText}}</button></view>
</view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i" :class="'bg-'+item.color">
@@ -99,6 +99,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>
@@ -111,7 +115,9 @@
barcode: '',
stationCode: '',
stationCodeFocus: true,
- dataList: [{}],
+ dataList: [
+ // {matnr:'aaa',devNo:'rk123123',color:'red'},
+ ],
count: 0,
rowNum: '',
matnr: '',
@@ -126,18 +132,56 @@
matFocus: false,
matData: '',
removeNum: 0,
- floorList: [1,3],
+ floorList: [1,2,3],
floor: "",
- devNo: []
+ devNo: [],
+ btnText: '鍏ㄩ��',
+ 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'
+ }
+ },
+ selectAll() {
+ if (this.btnText == '鍏ㄩ��') {
+ for (let i in this.dataList) {
+ this.$set(this.dataList[i],'checked',true)
+ this.btnText = '鍙栨秷'
+ }
+ } else {
+ for (let i in this.dataList) {
+ var ck = this.dataList[i].checked
+ this.dataList[i].checked = false
+ this.btnText = '鍏ㄩ��'
+ }
+ }
+
+ },
stationCodeInput() {
setTimeout(() => {
var len = this.stationCode.length
@@ -429,16 +473,23 @@
this.devNo = []
uni.vibrateShort();
let that = this;
+ let params = []
for (var i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].checked) {
this.devNo.push(this.dataList[i].devNo)
+ let param = {
+ devNo: this.dataList[i].devNo,
+ containerCode: this.dataList[i].barcode,
+ containerType: this.dataList[i].locType1,
+ }
+ params.push(param)
}
}
uni.request({
- url: that.baseUrl + '/agvMobile/pakin/auth',
- data: JSON.stringify({
- devNo: that.devNo
- }),
+ url: that.baseUrl + '/agvMobile/pakin/empty/auth',
+ data: {
+ pad: params
+ },
method: 'POST',
header: {
'token': uni.getStorageSync('token')
@@ -506,7 +557,7 @@
color: #666666;
}
.list:first-child {
- margin-top: 360rpx;
+ margin-top: 320rpx;
}
.aside {
width: 100rpx;
--
Gitblit v1.9.1