From 135004c97e97267ff98df24efcf0d528505a8258 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 20 十月 2023 14:18:49 +0800
Subject: [PATCH] #
---
pages/stock/stockQuery.vue | 34 ++
pages/home/home.vue | 161 +++++++------
pages/pakin/pakin2.vue | 30 ++
pages/order/orderPakin.vue | 36 ++
pages/order/orderPutOn.vue | 34 ++
pages/tzsk/order/orderPick.vue | 34 ++
pages/stock/stockCheck.vue | 29 ++
pages/tzsk/AGV/AGVContainerMove.vue | 27 ++
pages/tzsk/pakin/untie.vue | 44 +++
pages/tzsk/AGV/AGVPakin.vue | 47 +++
pages/tzsk/pakin/pakin2.vue | 17 -
pages/tzsk/AGV/AGVPick.vue | 39 +++
pages/tzsk/AGV/AGVPakinOn.vue | 46 +++
pages/order/orderPutDown.vue | 34 ++
pages/tzsk/order/orderPutOn.vue | 46 +++
pages/tzsk/AGV/AGVPakinBing.vue | 15 +
pages/tzsk/AGV/AGVStart.vue | 26 ++
static/css/wms.css/wms.css | 13 +
18 files changed, 573 insertions(+), 139 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c803e8f..df4467b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -25,61 +25,20 @@
elements: [],
elements2: [
{
- title: '缁勬墭鍏ュ簱',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/tzsk/pakin/pakin2'
- },
- {
- title: '鎵樼洏瑙ｇ粦',
- name: 'untie',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/tzsk/pakin/untie'
- },
- {
- title: '缁勬墭涓婃灦',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/tzsk/order/orderPutOn'
- },
- {
- title: '璁㈠崟鎷ｈ揣',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/tzsk/order/orderPick'
- },
- {
- title: '涓存椂鍏ュ簱',
- name: 'pakin',
- color: 'cyan',
- cuIcon: 'pullup',
- url: '/pakin/pakin2'
+ title: 'AGV缁勬墭',
+ name: 'AGVPakin',
+ color: 'blue',
+ // cuIcon: 'pullup',
+ url: '/tzsk/AGV/AGVPakin'
},
{
title: 'AGV鐩樼偣/鎷ｆ枡',
name: 'AGVPick',
color: 'cyan',
- cuIcon: 'pullup',
+ // cuIcon: 'pullup',
url: '/tzsk/AGV/AGVPick'
},
- {
- title: '鍐嶆鎷ｆ枡',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/pakin/pickAgain'
- },
- {
- title: 'AGV缁勬墭',
- name: 'AGVPakin',
- color: 'blue',
- cuIcon: 'pullup',
- url: '/tzsk/AGV/AGVPakin'
- },
+
{
title: 'AGV涓婃灦缁戝畾',
name: 'AGVPakinBing',
@@ -103,31 +62,25 @@
},
{
title: 'AGV瀹瑰櫒绂诲満',
- name: 'pakin',
+ name: 'AGVContainerMove',
color: 'cyan',
- cuIcon: 'pullup',
+ // cuIcon: 'pullup',
url: '/tzsk/AGV/AGVContainerMove'
},
+
{
- title: '璁㈠崟鍏ュ簱',
- name: 'orderPakin',
- color: 'red',
- cuIcon: 'pullup',
- url: '/order/orderPakin'
+ title: '缁勬墭鍏ュ簱',
+ name: 'pakin',
+ color: 'cyan',
+ // cuIcon: 'pullup',
+ url: '/tzsk/pakin/pakin2'
},
{
title: '缁勬墭涓婃灦',
- name: 'putOn',
- color: 'orange',
- cuIcon: 'pullup',
- url: '/pakin/putOn'
- },
- {
- title: '鎵撳嵃',
- name: 'print',
- color: 'purple',
- cuIcon: 'text',
- url: '/print/print'
+ name: 'PutOn',
+ color: 'cyan',
+ // cuIcon: 'pullup',
+ url: '/tzsk/order/orderPutOn'
},
{
title: '璁㈠崟涓婃灦',
@@ -144,6 +97,54 @@
url: '/order/orderPutDown'
},
{
+ title: '璁㈠崟鍏ュ簱',
+ name: 'orderPakin',
+ color: 'red',
+ cuIcon: 'pullup',
+ url: '/order/orderPakin'
+ },
+
+
+ {
+ title: '璁㈠崟鎷ｈ揣',
+ name: 'orderPick',
+ color: 'cyan',
+ // cuIcon: 'pullup',
+ url: '/tzsk/order/orderPick'
+ },
+ {
+ title: '鎵樼洏瑙ｇ粦',
+ name: 'untie',
+ color: 'cyan',
+ // cuIcon: 'pullup',
+ url: '/tzsk/pakin/untie'
+ },
+ {
+ title: '涓存椂鍏ュ簱',
+ name: 'pakin',
+ color: 'cyan',
+ cuIcon: 'pullup',
+ url: '/pakin/pakin2'
+ },
+
+ {
+ title: '鍐嶆鎷ｆ枡',
+ name: 'changePallet',
+ color: 'green',
+ cuIcon: 'order',
+ url: '/pakin/pickAgain'
+ },
+
+
+ {
+ title: '缁勬墭涓婃灦',
+ name: 'putOn',
+ color: 'orange',
+ cuIcon: 'pullup',
+ url: '/pakin/putOn'
+ },
+
+ {
title: '搴撳瓨鏌ヨ',
name: 'stockQuery',
color: 'green',
@@ -157,12 +158,13 @@
cuIcon: 'post',
url: '/stock/stockCheck'
},
+
{
- title: '鍟嗗搧鎵撳嵃',
- name: 'matList',
- color: 'orange',
- cuIcon: 'post',
- url: '/mat/matList'
+ title: '鎹㈡澘缁戝畾',
+ name: 'changePallet',
+ color: 'green',
+ cuIcon: 'order',
+ url: '/stock/changePallet'
},
{
title: '琛ヨ揣',
@@ -179,11 +181,18 @@
url: '/pakin/piking'
},
{
- title: '鎹㈡澘缁戝畾',
- name: 'changePallet',
- color: 'green',
- cuIcon: 'order',
- url: '/stock/changePallet'
+ title: '鎵撳嵃',
+ name: 'print',
+ color: 'purple',
+ cuIcon: 'text',
+ url: '/print/print'
+ },
+ {
+ title: '鍟嗗搧鎵撳嵃',
+ name: 'matList',
+ color: 'orange',
+ cuIcon: 'post',
+ url: '/mat/matList'
},
{
title: '閫�鍑虹櫥褰�',
diff --git a/pages/order/orderPakin.vue b/pages/order/orderPakin.vue
index 24be376..6df10b6 100644
--- a/pages/order/orderPakin.vue
+++ b/pages/order/orderPakin.vue
@@ -143,6 +143,10 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</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>
@@ -169,14 +173,38 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- removeNum: 0
+ removeNum: 0,
+ hide: true,
+ hidebg: 'kb-bgtr'
}
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
+ onLoad() {
+ // #ifdef APP
+ setInterval(()=>{
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
+ },20)
+ // #endif
+ },
+ onBackPress() {
+ this.hide = false
+ },
methods: {
+ hideKeyboard() {
+ this.hide = this.hide ? false : true
+ if (this.hide) {
+ this.hidebg = 'kb-bgtr'
+ } else {
+ this.hidebg = 'kb-bgfa'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -435,14 +463,14 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -474,7 +502,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/order/orderPutDown.vue b/pages/order/orderPutDown.vue
index 5293bc6..b457e21 100644
--- a/pages/order/orderPutDown.vue
+++ b/pages/order/orderPutDown.vue
@@ -141,6 +141,10 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</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>
@@ -168,14 +172,38 @@
barcodeFocus: true,
matFocus: false,
matData: '',
- removeNum: 0
+ removeNum: 0,
+ 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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -460,7 +488,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -492,7 +520,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/order/orderPutOn.vue b/pages/order/orderPutOn.vue
index 0f36504..6df14c3 100644
--- a/pages/order/orderPutOn.vue
+++ b/pages/order/orderPutOn.vue
@@ -149,6 +149,10 @@
</scroll-view>
</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>
@@ -178,14 +182,38 @@
matData: '',
removeNum: 0,
type: 'center',
- recommendLocs: []
+ recommendLocs: [],
+ 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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -490,7 +518,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -522,7 +550,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/pakin/pakin2.vue b/pages/pakin/pakin2.vue
index 06b3861..acd003e 100644
--- a/pages/pakin/pakin2.vue
+++ b/pages/pakin/pakin2.vue
@@ -112,6 +112,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>
@@ -136,18 +140,37 @@
matFocus: true,
matData: '',
removeNum: 0,
+ hide: true,
+ hidebg: 'kb-bgtr'
}
},
onLoad() {
+ // #ifdef APP
setInterval(()=>{
- uni.hideKeyboard()
- },10)
+ 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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -429,6 +452,9 @@
<style>
@import url('../../static/css/wms.css/wms.css');
+ .keyboard{
+ top: 120rpx;
+ }
.list:first-child {
margin-top: 220rpx;
}
diff --git a/pages/stock/stockCheck.vue b/pages/stock/stockCheck.vue
index 614db9d..8c52a6b 100644
--- a/pages/stock/stockCheck.vue
+++ b/pages/stock/stockCheck.vue
@@ -121,6 +121,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>
@@ -143,18 +147,39 @@
content: '',
barcodeFocus: true,
matFocus: false,
- matData: ''
+ matData: '',
+ 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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
diff --git a/pages/stock/stockQuery.vue b/pages/stock/stockQuery.vue
index 2270073..308c8d9 100644
--- a/pages/stock/stockQuery.vue
+++ b/pages/stock/stockQuery.vue
@@ -78,6 +78,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>
@@ -95,13 +99,37 @@
messageText: '',
title: '',
content: '',
+ 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'
+ }
+ },
search() {
let that = this
uni.request({
@@ -173,7 +201,7 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
@@ -181,7 +209,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -213,7 +241,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/tzsk/AGV/AGVContainerMove.vue b/pages/tzsk/AGV/AGVContainerMove.vue
index 195d769..224053c 100644
--- a/pages/tzsk/AGV/AGVContainerMove.vue
+++ b/pages/tzsk/AGV/AGVContainerMove.vue
@@ -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>
@@ -134,16 +138,37 @@
floor: "",
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'
+ }
+ },
stationCodeInput() {
setTimeout(() => {
var len = this.stationCode.length
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index 883389b..4fd6b47 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -157,6 +157,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>
@@ -184,17 +188,38 @@
matFocus: false,
matData: '',
removeNum: 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
@@ -213,8 +238,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 + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
@@ -551,6 +578,18 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
+ .keyboard{
+ width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+ top: 5px;right: 5px; border-radius: 50%;
+ display: flex;align-items: center;justify-content: center;
+ }
+ .kb-bgtr {
+ background-color: #55557f;
+ }
+ .kb-bgfa {
+ background-color: #00aeec;
+ }
+
.list:first-child {
margin-top: 340rpx;
}
diff --git a/pages/tzsk/AGV/AGVPakinBing.vue b/pages/tzsk/AGV/AGVPakinBing.vue
index 1a9d7d7..d8af43d 100644
--- a/pages/tzsk/AGV/AGVPakinBing.vue
+++ b/pages/tzsk/AGV/AGVPakinBing.vue
@@ -132,6 +132,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>
@@ -159,7 +163,8 @@
matFocus: false,
matData: '',
removeNum: 0,
- hide: true
+ hide: true,
+ hidebg: 'kb-bgtr'
}
},
onLoad() {
@@ -181,6 +186,14 @@
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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
diff --git a/pages/tzsk/AGV/AGVPakinOn.vue b/pages/tzsk/AGV/AGVPakinOn.vue
index 181ab96..e5075d9 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 + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
@@ -648,10 +675,11 @@
.list:first-child {
margin-top: 540rpx;
}
+
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 210rpx;
background-color: #FFF;
z-index: 10;
}
@@ -659,7 +687,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -691,7 +719,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;
diff --git a/pages/tzsk/AGV/AGVPick.vue b/pages/tzsk/AGV/AGVPick.vue
index 65eba3d..b21a541 100644
--- a/pages/tzsk/AGV/AGVPick.vue
+++ b/pages/tzsk/AGV/AGVPick.vue
@@ -100,6 +100,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>
@@ -134,16 +138,37 @@
floor: "",
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'
+ }
+ },
stationCodeInput() {
setTimeout(() => {
var len = this.stationCode.length
@@ -519,6 +544,18 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
+ .keyboard{
+ width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+ top: 5px;right: 5px; border-radius: 50%;
+ display: flex;align-items: center;justify-content: center;
+ }
+ .kb-bgtr {
+ background-color: #55557f;
+ }
+ .kb-bgfa {
+ background-color: #00aeec;
+ }
+
.bg-red {
background-color: #e54d42;
color: #ffffff;
diff --git a/pages/tzsk/AGV/AGVStart.vue b/pages/tzsk/AGV/AGVStart.vue
index 3d0ff3b..da37dcf 100644
--- a/pages/tzsk/AGV/AGVStart.vue
+++ b/pages/tzsk/AGV/AGVStart.vue
@@ -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>
@@ -132,15 +136,37 @@
floor: "",
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) {
diff --git a/pages/tzsk/order/orderPick.vue b/pages/tzsk/order/orderPick.vue
index d5d9c22..ed3b862 100644
--- a/pages/tzsk/order/orderPick.vue
+++ b/pages/tzsk/order/orderPick.vue
@@ -139,6 +139,10 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</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>
@@ -168,14 +172,38 @@
matFocus: false,
matData: '',
removeNum: 0,
- pickData: ''
+ pickData: '',
+ 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'
+ }
+ },
pickCodeFn() {
let _this = this
let pickCode = _this.pickCode.split(';')
@@ -452,7 +480,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -484,7 +512,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 100rpx;
+ margin-top: 70rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/tzsk/order/orderPutOn.vue b/pages/tzsk/order/orderPutOn.vue
index 0fabc14..74a5f94 100644
--- a/pages/tzsk/order/orderPutOn.vue
+++ b/pages/tzsk/order/orderPutOn.vue
@@ -2,16 +2,16 @@
<view>
<view class="code">
<view class="item">
+ <view class="code-decs">搴撲綅鍙�:</view>
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="locNoFocus">
+ <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
+ </view>
+ <view class="item">
<view class="code-decs">鎵樼洏鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus" @input="recommendLoc()">
<view class="item-right">
<button></button>
</view>
- </view>
- <view class="item">
- <view class="code-decs">搴撲綅鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locNo" :focus="locNoFocus">
- <button v-show="recommendLocs.length" size="mini" type="primary" @click="toggle('right')">鎺ㄨ崘</button>
</view>
</view>
<view class="mat-list-title">
@@ -149,6 +149,10 @@
</scroll-view>
</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>
@@ -179,14 +183,38 @@
matData: '',
removeNum: 0,
type: 'center',
- recommendLocs: []
+ recommendLocs: [],
+ hide: true,
+ hidebg: 'kb-bgtr'
}
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
},
+ onLoad() {
+ // #ifdef APP
+ setInterval(()=>{
+ if (this.hide) {
+ uni.hideKeyboard()
+ } else {
+
+ }
+ },20)
+ // #endif
+ },
+ onBackPress() {
+ this.hide = false
+ },
methods: {
+ hideKeyboard() {
+ this.hide = this.hide ? false : true
+ if (this.hide) {
+ this.hidebg = 'kb-bgtr'
+ } else {
+ this.hidebg = 'kb-bgfa'
+ }
+ },
chose(item) {
this.locNo = item
this.$refs.popup.close()
@@ -445,14 +473,14 @@
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 140rpx;
background-color: #FFF;
z-index: 10;
}
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -484,7 +512,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 200rpx;
+ margin-top: 140rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
diff --git a/pages/tzsk/pakin/pakin2.vue b/pages/tzsk/pakin/pakin2.vue
index fd0b746..b8d94e5 100644
--- a/pages/tzsk/pakin/pakin2.vue
+++ b/pages/tzsk/pakin/pakin2.vue
@@ -243,8 +243,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 + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
@@ -563,17 +565,6 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
- .keyboard{
- width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
- top: 5px;right: 5px; border-radius: 50%;
- display: flex;align-items: center;justify-content: center;
- }
- .kb-bgtr {
- background-color: #55557f;
- }
- .kb-bgfa {
- background-color: #00aeec;
- }
.list:first-child {
margin-top: 360rpx;
}
diff --git a/pages/tzsk/pakin/untie.vue b/pages/tzsk/pakin/untie.vue
index 4ff98ce..3a331a8 100644
--- a/pages/tzsk/pakin/untie.vue
+++ b/pages/tzsk/pakin/untie.vue
@@ -96,6 +96,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>
@@ -118,22 +122,41 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: false,
- orderNoFocus: true,
- matFocus: false,
+ barcodeFocus: true,
matData: '',
removeNum: 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'
+ }
+ },
messageToggle(type) {
this.msgType1 = type
this.$refs.message.open()
@@ -326,6 +349,17 @@
<style>
@import url('../../../static/css/wms.css/wms.css');
+ .keyboard{
+ width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+ top: 5px;right: 5px; border-radius: 50%;
+ display: flex;align-items: center;justify-content: center;
+ }
+ .kb-bgtr {
+ background-color: #55557f;
+ }
+ .kb-bgfa {
+ background-color: #00aeec;
+ }
.list:first-child {
margin-top: 200rpx;
}
diff --git a/static/css/wms.css/wms.css b/static/css/wms.css/wms.css
index 075d6b1..5829924 100644
--- a/static/css/wms.css/wms.css
+++ b/static/css/wms.css/wms.css
@@ -125,3 +125,16 @@
.search-bar {
background-color: #f8f8f8;
}
+
+
+.keyboard{
+ width: 40px;height: 40px;background-size: 100%;position: absolute;z-index: 99;
+ top: 5px;right: 5px; border-radius: 50%;
+ display: flex;align-items: center;justify-content: center;
+}
+.kb-bgtr {
+ background-color: #55557f;
+}
+.kb-bgfa {
+ background-color: #00aeec;
+}
\ No newline at end of file
--
Gitblit v1.9.1