diff --git a/src/views/modules/label/logisticLabelRecord.vue b/src/views/modules/label/logisticLabelRecord.vue index 039146a..8db0a93 100644 --- a/src/views/modules/label/logisticLabelRecord.vue +++ b/src/views/modules/label/logisticLabelRecord.vue @@ -269,7 +269,7 @@ export default { let row = { ...this.selectionDataList[i], qty:this.selectionDataList[i].unitQtyPerPallet, - qrCode: `(00)${this.selectionDataList[i].partNo? this.selectionDataList[i].partNo : ''}(01)${this.selectionDataList[i].unitQtyPerPallet? this.selectionDataList[i].unitQtyPerPallet : ''}(02)${this.selectionDataList[i].umName? this.selectionDataList[i].umName : ''}(03)(04)(05)(06)(07)(08)(09)(10)${this.selectionDataList[i].poNo? this.selectionDataList[i].poNo : ''}`, + qrCode: `(00)${this.selectionDataList[i].partNo? this.selectionDataList[i].partNo : ''}(01)${this.selectionDataList[i].unitQtyPerPallet? this.selectionDataList[i].unitQtyPerPallet : ''}(02)${this.selectionDataList[i].umName? this.selectionDataList[i].umName : ''}(03)${this.selectionDataList[i].manufacturerDate ? this.selectionDataList[i].manufacturerDate : ''}(04)(05)(06)(07)(08)(09)(10)${this.selectionDataList[i].poNo? this.selectionDataList[i].poNo : ''}`, } let qrCodeList = this.$refs.qrCode.init([row.qrCode]) row.qrCode = qrCodeList[0] diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue index cd94930..0c88214 100644 --- a/src/views/modules/label/printer.vue +++ b/src/views/modules/label/printer.vue @@ -1078,7 +1078,7 @@ export default { let labelList = this.labelFormatList.filter((item)=> item.labelType === 'Logistic Label') for (let i = 0; i < this.currentPartLogistic.countOfPallets; i++) { let row = { - qrCode: `(00)${this.currentPartLogistic.partNo? this.currentPartLogistic.partNo : ''}(01)${this.currentPartLogistic.unitQtyPerPallet? this.currentPartLogistic.unitQtyPerPallet : ''}(02)${this.currentPartLogistic.umName? this.currentPartLogistic.umName : ''}(03)(04)(05)(06)(07)(08)(09)(10)${this.currentPartLogistic.poNo? this.currentPartLogistic.poNo : ''}`, + qrCode: `(00)${this.currentPartLogistic.partNo? this.currentPartLogistic.partNo : ''}(01)${this.currentPartLogistic.unitQtyPerPallet? this.currentPartLogistic.unitQtyPerPallet : ''}(02)${this.currentPartLogistic.umName? this.currentPartLogistic.umName : ''}(03)${data.row.manufacturerDate? data.row.manufacturerDate : ''}(04)(05)(06)(07)(08)(09)(10)${this.currentPartLogistic.poNo? this.currentPartLogistic.poNo : ''}`, partNo:this.currentPartLogistic.partNo, partDesc:this.currentPartLogistic.partDesc, poNo:this.currentPartLogistic.poNo,