diff --git a/src/pages/palletLabel/bindPalletLabel.vue b/src/pages/palletLabel/bindPalletLabel.vue index f8f94275..89eea381 100644 --- a/src/pages/palletLabel/bindPalletLabel.vue +++ b/src/pages/palletLabel/bindPalletLabel.vue @@ -296,9 +296,11 @@ showCommitSuccessMessage(hint,pointData) { this.$refs.comMessage.showSuccessMessage(hint, res => { this.clearData() - uni.navigateTo({ - url: `/pages/point/index?points=${JSON.stringify(pointData)}` - }); + if(pointData.length>0){ + uni.navigateTo({ + url: `/pages/point/index?points=${JSON.stringify(pointData)}` + }); + } }) }, clearData() { @@ -356,24 +358,26 @@ uni.hideLoading() if (res.data) { let list = [] - res.data.list.forEach(item => { - list.push({ - itemCode: item.itemCode, // 物品代码 - itemName: item.itemName, // 物品名称 - packName: item.packName, // 包装名称 - packageCode: item.toPackingNumber, // 包装号 - batch: item.toBatch, //批次 - parentNumber: item.parentNumber, //父包装号 - itemType: item.itemType, //物料类型 - asnNumber: item.asnNumber, //ASN - supplierCode: item.supplierCode, // 供应商 - qty: item.qty, // 数量 - printTimes: getCurrDateTime(), // 打印时间 - productionLineCode: item.productionLineCode, //生产线 - barcodeString: item.barcodeString, // 标签信息 - barcodeBase64: '', + if(res.data.list){ + res.data.list.forEach(item => { + list.push({ + itemCode: item.itemCode, // 物品代码 + itemName: item.itemName, // 物品名称 + packName: item.packName, // 包装名称 + packageCode: item.toPackingNumber, // 包装号 + batch: item.toBatch, //批次 + parentNumber: item.parentNumber, //父包装号 + itemType: item.itemType, //物料类型 + asnNumber: item.asnNumber, //ASN + supplierCode: item.supplierCode, // 供应商 + qty: item.qty, // 数量 + printTimes: getCurrDateTime(), // 打印时间 + productionLineCode: item.productionLineCode, //生产线 + barcodeString: item.barcodeString, // 标签信息 + barcodeBase64: '', + }) }) - }) + } this.showCommitSuccessMessage("提交成功\n生成" + this.title + "记录\n" + res.data.number,list) @@ -401,7 +405,7 @@ submitItem.fromLocationCode = detail.fromLocationCode; submitItem.fromBatch = detail.batch; submitItem.fromInventoryStatus = detail.inventoryStatus - submitItem.uom == detail.uom + submitItem.uom = detail.uom submitItem.package = null; submitItem.Records = null; submitItem.fromQty = detail.qty;