From 1e40a94e41a811a30b49150b5feabe9b7797948a Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期二, 14 五月 2024 08:23:06 +0800 Subject: [PATCH] # --- pages/phyz/order/orderCar.vue | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pages/phyz/order/orderCar.vue b/pages/phyz/order/orderCar.vue index 15adeaf..cb99ab8 100644 --- a/pages/phyz/order/orderCar.vue +++ b/pages/phyz/order/orderCar.vue @@ -60,14 +60,15 @@ </template> <script> + // todo: 璐墿杞︿紭鍖�,瀛樺偍璐墿杞﹀唴瀹�,閫�鍑洪〉闈㈠啀杩涘悗璐墿杞﹁繕鍦� export default { data() { return { orderCarList: [], count: 0, index: 0, - barcode: '100997', - agvDevp: 'DI_01F2', + barcode: '', + agvDevp: '', } }, onShow() { @@ -134,21 +135,16 @@ return; } } - let combMat = { - orderNo:'', - barcode: '', - locNo: '', - combMats: [] - } + let combMat = { orderNo:'', barcode: '', locNo: '', combMats: [] } let combMats = [] for (let item of _this.orderCarList) { combMat.orderNo = item.orderNo combMat.barcode = _this.barcode combMat.locNo = _this.agvDevp combMat.combMats = [] - let combMat = {csocode: '',isoseq: '',matnr: '',batch: '',anfme: '',maktx: '',specs: ''} - combMat.combMats.push(item) - combMats.push(combMat) + let combM = {csocode: item.threeCode,isoseq: item.deadTime,matnr: item.matnr,batch: item.batch,anfme: item.pakinQty,maktx: item.maktx,specs: item.specs} + combMat.combMats.push(combM) + combMats.push({...combMat}) } this.comb(combMats) @@ -159,6 +155,7 @@ url: _this.baseUrl + '/agvMobile/start/pakin/auth', data: JSON.stringify({ barcode: _this.barcode, + containerCode: _this.barcode, devNo: _this.agvDevp, combParams: combMats }), @@ -169,8 +166,18 @@ success(result) { var res = result.data if (res.code === 200) { + _this.orderCarList = [] + _this.$refs.agvStart.close() + uni.showToast({ title: '鍚姩鎴愬姛锛�', icon: "success", position: 'top' }) + setTimeout(()=> { + _this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: 1}); + uni.navigateBack({}) + },1000) } else if (res.code == 403) { + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) + setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000); } else { + uni.showToast({ title: res.msg, icon: "error", position: 'top' }) } } }); -- Gitblit v1.9.1