From fe8fb74ce94e7bee23ed47b7175236248ac93b98 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 16:24:04 +0800
Subject: [PATCH] Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda
---
pages/order/zlOrderPakin.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue
index c47a329..eb010d0 100644
--- a/pages/order/zlOrderPakin.vue
+++ b/pages/order/zlOrderPakin.vue
@@ -208,7 +208,10 @@
}
},
onLoad() {
-
+ // this.dataList = uni.getStorageSync('zlPakinDataList')
+ // if (this.dataList === '') {
+ // this.dataList = []
+ // }
},
onShow() {
this.baseUrl = uni.getStorageSync('baseUrl');
@@ -287,7 +290,7 @@
}, 100);
},
// 妫�楠屽綋鍓嶇墿鏂欐槸鍚︽槸鍦ㄥ綋鍓岯om琛ㄤ腑
- checkBom() {
+ checkBom(mat) {
let _this = this
uni.request({
url: _this.baseUrl + '/mobile/pda/decrees/check',
@@ -303,7 +306,8 @@
if (res.code === 200) {
switch(res.data.status) {
case 1:
- _this.findMat()
+ // _this.findMat()
+ _this.checkMat(mat)
break;
case 2:
// 鐩稿悓鍒朵护璐х墿琛ヨ揣
@@ -393,7 +397,7 @@
selectMat() {
let that = this
uni.navigateTo({
- url: "../mat/matQuery",
+ url: "../mat/matQueryByOrder",
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
res.eventChannel.emit('commonUrl', {
@@ -403,12 +407,10 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- that.matnr = data.data
- that.checkBom(that.matnr)
+ that.matnr = data.data.matnr
+ that.checkBom(data.data)
},
},
-
-
});
that.matnr = ''
},
@@ -453,6 +455,7 @@
}
this.$forceUpdate() // 寮哄埗鍒锋柊
this.maxAnfme = ''
+ uni.setStorageSync('zlPakinDataList', this.dataList);
},
// 淇敼鎵瑰彿
revise(item, i) {
@@ -553,6 +556,9 @@
const innerAudioContext = uni.createInnerAudioContext();
innerAudioContext.src = '/static/music/pakinOk.mp3';
innerAudioContext.play()
+ that.dataList = []
+ uni.setStorageSync('zlPakinDataList', that.dataList);
+ uni.showToast({ title: '缁勬墭鎴愬姛', icon: "success", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
setTimeout(() => {
--
Gitblit v1.9.1