From d78a337df4af502f6e886dd4cb1533f2ec02843c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 04 十月 2023 22:59:44 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index a5e9d63..9335e56 100644
--- a/pages/tzsk/AGV/AGVPakin.vue
+++ b/pages/tzsk/AGV/AGVPakin.vue
@@ -7,7 +7,7 @@
@input="findOrder()">
</view>
<view class="item">
- <view class="code-decs">鎵樼洏鐮�:</view>
+ <view class="code-decs">鏂欑鐮�:</view>
<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
@input="barcodeInput()">
</view>
@@ -30,6 +30,27 @@
<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="left-item">
+ <input type="text" v-model="item.containerCode">
+ <uni-tag :text="item.containerCode" type="primary"></uni-tag>
+ </view>
+ </view> -->
+ <view class="list-left-item">
+ <view class="desc">閿�鍞崟鍙凤細</view>
+ <view class="left-item">
+ <input type="text" v-model="item.csocode">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
+ </view>
+ <view class="list-left-item">
+ <view class="desc">璁㈠崟琛屽彿锛�</view>
+ <view class="left-item">
+ <input type="text" v-model="item.isoseq">
+ <!-- <uni-tag :text="item.containerCode" type="primary"></uni-tag> -->
+ </view>
</view>
<view class="list-left-item">
<view class="desc">鏂欏彿锛�</view>
@@ -163,6 +184,7 @@
orderNoFocus: false,
matData: '',
removeNum: 0,
+ tempOrderInfo: {csocode: '',isoseq: ''}
}
},
onLoad() {
@@ -176,6 +198,8 @@
// 鏍规嵁璁㈠崟鍙疯繑鍥炲晢鍝佽鎯�
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 +208,19 @@
},
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])
+ 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.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 : ''
+ } else {
+ uni.showToast({
+ title: that.orderNo + '璇锋鏌ヨ鍗曞彿鏄惁姝ｇ‘',
+ icon: "none",
+ position: 'top'
+ })
}
} else if (res.code == 403) {
uni.showToast({
@@ -223,11 +257,12 @@
},
barcodeInput() {
// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+ 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'
});
@@ -266,12 +301,8 @@
}
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,11 +310,12 @@
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
})
},
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
@@ -320,7 +352,7 @@
selectMat() {
let that = this
uni.navigateTo({
- url: "../mat/matQuery",
+ url: "../../mat/matQuery",
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('commonUrl', {
@@ -438,6 +470,11 @@
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'
@@ -445,6 +482,8 @@
return;
}
}
+ // console.log(that.dataList);
+ // return
uni.request({
url: that.baseUrl + '/agvMobile/comb/auth',
data: JSON.stringify({
@@ -513,7 +552,7 @@
@import url('../../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 460rpx;
+ margin-top: 340rpx;
}
.code {
width: 100%;
@@ -526,7 +565,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -558,7 +597,7 @@
width: 100%;
background-color: white;
position: fixed;
- margin-top: 300rpx;
+ margin-top: 210rpx;
z-index: 9;
/* border-top: 1px solid #DCDFE6; */
text-align: center;
--
Gitblit v1.9.1