From af30e5448508e586af40216890fa3cf1cddad9b0 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 16:59:44 +0800
Subject: [PATCH] #
---
pages/tzsk/AGV/AGVPakin.vue | 40 ++++++++++++++++++++++++----------------
pages/mat/matSelected.vue | 1 +
pages/mat/matQuery.vue | 4 ++++
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index e3713f5..da55e82 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -153,6 +153,7 @@
if (tagId == null || tagId == '' || tagId == undefined) {
return;
}
+ uni.showLoading({})
uni.request({
url: that.baseUrl + '/mat/list/pda/page/auth',
data: {
@@ -168,6 +169,7 @@
that.tagList = null
var res = result.data
if (res.code === 200) {
+ uni.hideLoading()
if (res.data.records != null && res.data.records.length > 0) {
let list = res.data.records
that.matList = that.reload ? list : that.matList.concat(list);
@@ -178,6 +180,7 @@
}
that.baColor = "background-color: #1cbbb4;"
} else if (res.code === 403 ) {
+ uni.hideLoading()
uni.showToast({title: res.msg, icon: "none", position: 'top'})
setTimeout(() => {
uni.reLaunch({
@@ -185,6 +188,7 @@
});
}, 1000);
} else {
+ uni.hideLoading()
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
diff --git a/pages/mat/matSelected.vue b/pages/mat/matSelected.vue
index a0d2b69..c9cba16 100644
--- a/pages/mat/matSelected.vue
+++ b/pages/mat/matSelected.vue
@@ -61,6 +61,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('mat', function(data) {
+ console.log(data);
that.mat = data.data
that.mat.anfme = 0
})
diff --git a/pages/tzsk/AGV/AGVPakin.vue b/pages/tzsk/AGV/AGVPakin.vue
index a5e9d63..9627810 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>
@@ -163,6 +163,7 @@
orderNoFocus: false,
matData: '',
removeNum: 0,
+ tempOrderInfo: {csocode: '',isoseq: ''}
}
},
onLoad() {
@@ -184,9 +185,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) {
+ for (var 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({
@@ -266,12 +277,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 +286,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 +328,7 @@
selectMat() {
let that = this
uni.navigateTo({
- url: "../mat/matQuery",
+ url: "../../mat/matQuery",
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('commonUrl', {
@@ -513,7 +521,7 @@
@import url('../../../static/css/wms.css/wms.css');
.list:first-child {
- margin-top: 460rpx;
+ margin-top: 340rpx;
}
.code {
width: 100%;
@@ -526,7 +534,7 @@
.item {
display: flex;
align-items: center;
- height: 100rpx;
+ height: 70rpx;
margin-left: 20rpx;
border-bottom: 1px solid #DCDFE6;
}
@@ -558,7 +566,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