From cdc490658e982241e295078ed4ec4f0777d9ef0f Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 08 十月 2024 16:25:21 +0800 Subject: [PATCH] Merge branch 'nbncPda' of http://47.97.1.152:5880/r/wms_app into nbncPda --- pages/order/zlOrderPakin.vue | 74 ++++++++++++++---------------------- 1 files changed, 29 insertions(+), 45 deletions(-) diff --git a/pages/order/zlOrderPakin.vue b/pages/order/zlOrderPakin.vue index 67c56be..fb75a3a 100644 --- a/pages/order/zlOrderPakin.vue +++ b/pages/order/zlOrderPakin.vue @@ -28,6 +28,7 @@ <view class="item"> <view class="code-decs">鐗╂枡鐮�:</view> <input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="checkBom()"> + <uni-icons type="close" color="#c1c1c1" @click="clearMatnr"></uni-icons> <view class="item-right"> <button></button> <text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text> @@ -207,7 +208,10 @@ } }, onLoad() { - + this.dataList = uni.getStorageSync('zlPakinDataList') + if (this.dataList === '') { + this.dataList = [] + } }, onShow() { this.baseUrl = uni.getStorageSync('baseUrl'); @@ -222,6 +226,10 @@ }, methods: { back() { uni.navigateBack({}) }, + clearMatnr() { + // this.matnr = '' + this.focuss() + }, // 鏄惁婊℃澘 isFullPlt() { var temp = this.ck1 @@ -256,11 +264,7 @@ setTimeout(() => { var len = this.barcode.length if (len != 8) { - uni.showToast({ - title: '鎵樼洏鐮佹湁璇閲嶈瘯', - icon: "none", - position: 'top' - }); + uni.showToast({ title: '鎵樼洏鐮佹湁璇閲嶈瘯', icon: "none", position: 'top' }); this.barcodeFocuss() return; } @@ -294,7 +298,7 @@ method: 'POST', header: { 'token': uni.getStorageSync('token'), - 'content-type' : 'application/x-www-form-urlencoded' + 'content-type' : 'application/x-www-form-urlencoded' }, success(res) { // console.log(res); @@ -347,12 +351,8 @@ let that = this 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) { @@ -381,22 +381,12 @@ }, }); } else if (result.code == 403) { - uni.showToast({ - title: result.msg, - icon: "none", - position: 'top' - }) + uni.showToast({ title: result.msg, icon: "none", position: 'top' }) setTimeout(() => { - uni.reLaunch({ - url: '../login/login' - }); + uni.reLaunch({ url: '../login/login' }); }, 1000); } else { - uni.showToast({ - title: result.msg, - icon: "none", - position: 'top' - }) + uni.showToast({ title: result.msg, icon: "none", position: 'top' }) } } @@ -466,6 +456,7 @@ } this.$forceUpdate() // 寮哄埗鍒锋柊 this.maxAnfme = '' + uni.setStorageSync('zlPakinDataList', this.dataList); }, // 淇敼鎵瑰彿 revise(item, i) { @@ -491,8 +482,7 @@ }, // 纭绉婚櫎 removeConfirm() { - this.messageText = "绉婚櫎鎴愬姛" - this.messageToggle('success') + uni.showToast({ title: "绉婚櫎鎴愬姛", icon: "success", position: 'top' }) this.dataList.splice(this.removeNum, 1) }, // 鍙栨秷绉婚櫎 @@ -504,8 +494,7 @@ this.dataList[this.rowNum].batch = this.batch this.dataList[this.rowNum].weight = this.weight this.matnr = '' - this.messageText = "淇敼鎴愬姛" - this.messageToggle('success') + uni.showToast({ title: "淇敼鎴愬姛", icon: "success", position: 'top' }) this.$refs.revise.close() }, reviseClose() { @@ -534,19 +523,16 @@ uni.vibrateShort(); let that = this; if (that.barcode === '') { - this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�" - this.messageToggle('error') + uni.showToast({ title: "璇锋壂鎻忔墭鐩樻潯鐮�", icon: "error", position: 'top' }) return; } if (that.dataList.length === 0) { - this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�" - this.messageToggle('error') + uni.showToast({ title: "璇锋坊鍔犲晢鍝佸垪琛�", icon: "error", position: 'top' }) 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.messageToggle('error') + uni.showToast({ title: "缁勬墭鏁伴噺涓嶈兘涓�0", icon: "error", position: 'top' }) return; } } @@ -554,6 +540,7 @@ url: that.baseUrl + '/mobile/comb/auth', data: JSON.stringify({ fullPlt: that.fullPlt, + owner: that.storeId, barcode: that.barcode, combMats: that.dataList }), @@ -570,17 +557,15 @@ const innerAudioContext = uni.createInnerAudioContext(); innerAudioContext.src = '/static/music/pakinOk.mp3'; innerAudioContext.play() + that.dataList = [] + uni.setStorageSync('zlPakinDataList', that.dataList); } else if (res.code == 403) { - that.messageText = res.msg - that.messageToggle('error') + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) setTimeout(() => { - uni.reLaunch({ - url: '../login/login' - }); + uni.reLaunch({ url: '../login/login' }); }, 1000); } else { - that.messageText = res.msg - that.messageToggle('error') + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) } } }); @@ -596,8 +581,7 @@ this.dataList = [] this.barcode = '' this.bomCode = '' - this.messageText = "閲嶇疆瀹屾垚" - this.messageToggle('success') + uni.showToast({ title: "閲嶇疆瀹屾垚", icon: "success", position: 'top' }) this.bomFocuss() }, // 鍙栨秷閲嶇疆 -- Gitblit v1.9.1