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/AGVPakin.vue | 193 +++++++++++++++++++++++++++++++----------------
1 files changed, 127 insertions(+), 66 deletions(-)
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index a5e9d63..b6b4789 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -2,44 +2,22 @@
<view>
<view class="code">
<view class="item">
- <view class="code-decs">璁㈠崟鍙�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="orderNo" :focus="orderNoFocus"
+ <input type="text" placeholder=" 鎵爜 / 杈撳叆 绔欑偣鐮�" v-model="orderNo" :focus="orderNoFocus"
@input="findOrder()">
</view>
- <view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
- @input="barcodeInput()">
- </view>
- <view class="item">
- <view class="code-decs">鐗╂枡鐮�:</view>
- <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
- <view class="item-right">
- <button></button>
- <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
- <uni-icons type="right" color="#c1c1c1"></uni-icons>
- </view>
- </view>
- </view>
- <view class="mat-list-title">
- 鍟嗗搧鍒楄〃
</view>
<scroll-view>
<view class="list" v-for="(item,i) in dataList" :key="i">
<view class="list-left">
<view class="list-left-item">
- <view class="desc">No锛�</view>
- <view class="left-item">{{i + 1}}</view>
- </view>
- <view class="list-left-item">
- <view class="desc">鏂欏彿锛�</view>
+ <view class="desc">绔欑偣鍙凤細</view>
<view class="left-item">
- <uni-tag :text="item.matnr" type="primary"></uni-tag>
+ <uni-tag :text="item.barcode" type="primary"></uni-tag>
</view>
</view>
<view class="list-left-item">
- <view class="desc">鍝佸悕锛�</view>
- <view class="left-item">{{item.maktx}}</view>
+ <view class="desc">绔欑偣鐘舵�侊細</view>
+ <view class="left-item">{{item.sts}}</view>
</view>
<view class="list-left-item">
<view class="desc">瑙勬牸锛�</view>
@@ -62,16 +40,13 @@
<view class="left-item">{{item.anfme}}</view>
</view>
</view>
- <view class="list-right">
- <uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
- <uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
- </view>
</view>
</scroll-view>
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="buttom">
+ <view class="buttom-k">
+ <button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍑哄簱</button>
+ <button size="mini" type="primary" @click="combConfirm('warn')">绌烘澘鍏ュ簱</button>
<button size="mini" @click="reset('warn')">閲嶇疆</button>
- <button size="mini" type="primary" @click="combConfirm('warn')">缁勬墭</button>
</view>
<!-- 寮圭獥 -->
<!-- 淇敼鏁伴噺 -->
@@ -122,7 +97,7 @@
<uni-popup-message :type="msgType1" :message="messageText" :duration="2000"></uni-popup-message>
</uni-popup>
</view>
- <!-- 纭缁勬墭 -->
+ <!-- 纭绌烘澘鍏ュ簱 -->
<view>
<uni-popup ref="combConfirm" type="dialog">
<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
@@ -136,6 +111,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>
@@ -147,7 +126,12 @@
token: '',
barcode: '',
orderNo: '',
- dataList: [],
+ dataList: [
+ {
+ barcode: 'CS-101-001-01@1',
+ sts: 'F.鍦ㄥ簱'
+ }
+ ],
count: 0,
rowNum: '',
matnr: '',
@@ -158,24 +142,48 @@
messageText: '',
title: '',
content: '',
- barcodeFocus: true,
+ orderNoFocus: true,
+ barcodeFocus: false,
matFocus: false,
- orderNoFocus: false,
matData: '',
removeNum: 0,
+ 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 = ''
+ that.tempOrderInfo.isoseq = ''
uni.request({
url: that.baseUrl + '/mobile/order/search/orderNo/auth',
header: {'token': uni.getStorageSync('token')},
@@ -184,9 +192,22 @@
},
success(res) {
res = res.data
- if (res.code === 200 && res.data[0]) {
- for (var i = 0; i < res.data[0].combMats.length; i++) {
- that.checkMat(res.data[0].combMats[i])
+ console.log(res);
+ if (res.code === 200) {
+ if(res.data && res.data[0].combMats) {
+ for (let i = 0; i < res.data[0].combMats.length; i++) {
+ that.checkMat(res.data[0].combMats[i])
+ }
+ that.orderNoFocus = false
+ setTimeout(() => {
+ that.barcodeFocus = true
+ }, 10);
+ } else {
+ // uni.showToast({
+ // title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+ // icon: "none",
+ // position: 'top'
+ // })
}
} else if (res.code == 403) {
uni.showToast({
@@ -223,11 +244,15 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ if (this.barcode.split('_')[1]) {
+ this.barcode = this.barcode.split('_')[1]
+ }
+ // this.barcode = this.barcode.split('_')[1]
setTimeout(() => {
- var len = this.barcode.length
+ let len = this.barcode.length
if (len != 10) {
uni.showToast({
- title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+ title: '鏂欑鐮佹湁璇閲嶈瘯',
icon: "none",
position: 'top'
});
@@ -258,20 +283,16 @@
findMat() {
let that = this
// 鍒ゆ柇鐗╂枡闀垮害鏄惁涓�1
- 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: {
- matnr: that.matnr
- },
- header: {
- 'token': uni.getStorageSync('token')
- },
+ data: { matnr: that.matnr },
+ header: { 'token': uni.getStorageSync('token') },
success(result) {
result = result.data
if (result.code === 200 && result.data) {
@@ -279,16 +300,19 @@
that.matnr = ''
that.matData['batch'] = ''
uni.navigateTo({
- url: "../mat/matSelected",
+ url: "../../mat/matSelected",
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
success: function(res) {
res.eventChannel.emit('mat', {
- data: result.data
+ data: result.data,
+ // tempOrderInfo: that.tempOrderInfo
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
events: {
matList: function(data) {
+ data.data['csocode'] = ''
+ data.data['isoseq'] = ''
that.checkMat(data.data)
that.focuss()
},
@@ -320,7 +344,7 @@
selectMat() {
let that = this
uni.navigateTo({
- url: "../mat/matQuery",
+ url: "../../mat/matQuery",
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('commonUrl', {
@@ -419,7 +443,7 @@
combConfirm(type) {
this.msgType = type
this.title = '璀﹀憡'
- this.content = '鏄惁鐜板湪缁勬墭!'
+ this.content = '鏄惁鐜板湪绌烘澘鍏ュ簱!'
this.$refs.combConfirm.open()
},
combClose() {
@@ -438,13 +462,22 @@
this.messageToggle('error')
return;
}
+ // if (that.dataList.length > 1) {
+ // this.messageText = "鍙兘娣诲姞涓�绉嶇墿鏂�"
+ // this.messageToggle('error')
+ // return;
+ // }
for (var i = 0; i < that.dataList.length; i++) {
if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
- this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+ this.messageText = that.dataList[i].matnr + '绌烘澘鍏ュ簱鏁伴噺涓嶈兘涓�0'
this.messageToggle('error')
return;
}
}
+ console.log(that.dataList);
+ console.log(that.barcode);
+ console.log(that.orderNo);
+ // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
@@ -459,8 +492,11 @@
success(result) {
var res = result.data
if (res.code === 200) {
- that.resst();
- that.messageText = "缁勬墭鎴愬姛"
+ that.dataList = []
+ that.findOrder()
+ // that.resst();
+ that.barcode = ''
+ that.messageText = "绌烘澘鍏ュ簱鎴愬姛"
that.messageToggle('success')
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
@@ -512,13 +548,25 @@
<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: 460rpx;
+ margin-top: 120rpx;
}
.code {
width: 100%;
position: fixed;
- min-height: 200rpx;
+ min-height: 70rpx;
background-color: #FFF;
z-index: 10;
}
@@ -526,7 +574,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -558,10 +606,23 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 300rpx;
+ margin-top: 210rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
}
+ .buttom-k {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ background-color: #FFF;
+ box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.2) ;
+ }
+ .buttom-k button {
+ margin: 20rpx 50rpx;
+ }
</style>
--
Gitblit v1.9.1