diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js index e43f46f..c32c8e8 100644 --- a/src/printFormat/RF_RFID.js +++ b/src/printFormat/RF_RFID.js @@ -18,12 +18,15 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名 for (let i = 0; i < printList.length; i++) { let row = printList[i] + console.log(row.qrCode) //如果打印正常的标签 LODOP.NewPage(); LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); - LODOP.ADD_PRINT_BARCODE(12,33,115,83,"QRCode",row.qrCode); - LODOP.ADD_PRINT_IMAGE(4,275,96,20,""); + // LODOP.ADD_PRINT_BARCODE(12,33,115,80,"QRCode",row.qrCode); + // LODOP.SET_PRINT_STYLEA(0,"FontSize",7); + LODOP.ADD_PRINT_IMAGE(5,33,"21mm","21mm",``); + LODOP.ADD_PRINT_IMAGE(4,255,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.ADD_PRINT_TEXT(20,126,40,20,"REF"); @@ -54,10 +57,10 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",18); } - LODOP.ADD_PRINT_TEXT(42,274,40,20,"UoM"); + LODOP.ADD_PRINT_TEXT(42,271,60,20,"UoM"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); - LODOP.ADD_PRINT_TEXT(32,301,70,20,row.uom); + LODOP.ADD_PRINT_TEXT(32,281,70,20,row.uom); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js index e2e0cc8..fc83a6e 100644 --- a/src/printFormat/alphaHardTagPrintFormat.js +++ b/src/printFormat/alphaHardTagPrintFormat.js @@ -19,13 +19,15 @@ export function printAlphaHardTagLabel (printList, icons, printerName) { //批量循环打印 for(let i = 0; i < printList.length; i++){ let row = printList[i]; + console.log(row.qrCode) //如果打印正常的标签 LODOP.NewPage(); LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); - LODOP.ADD_PRINT_BARCODE(12,33,115,83,"QRCode",row.qrCode); - LODOP.SET_PRINT_STYLEA(0,"FontSize",7); - LODOP.ADD_PRINT_IMAGE(4,275,96,20,""); + // LODOP.ADD_PRINT_BARCODE(12,33,100,80,"QRCode",row.qrCode); + // LODOP.SET_PRINT_STYLEA(0,"FontSize",7); + LODOP.ADD_PRINT_IMAGE(5,33,"21mm","21mm",``); + LODOP.ADD_PRINT_IMAGE(4,255,90,16,""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.ADD_PRINT_TEXT(17,126,40,20,"REF"); @@ -58,10 +60,10 @@ export function printAlphaHardTagLabel (printList, icons, printerName) { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",18); } - LODOP.ADD_PRINT_TEXT(34,274,40,20,"UoM"); + LODOP.ADD_PRINT_TEXT(34,271,60,20,"UoM"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); - LODOP.ADD_PRINT_TEXT(32,301,70,20,row.uom); + LODOP.ADD_PRINT_TEXT(32,281,70,20,row.uom); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js index 68b8ba5..3c5a0cc 100644 --- a/src/printFormat/antenna.js +++ b/src/printFormat/antenna.js @@ -18,12 +18,15 @@ export const printAntennaLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名 for (let i = 0; i < printList.length; i++) { let row = printList[i] + console.log(row.qrCode) //如果打印正常的标签 LODOP.NewPage() LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '') - LODOP.ADD_PRINT_BARCODE(12, 33, 115, 83, 'QRCode', row.qrCode) - LODOP.ADD_PRINT_IMAGE(4, 275, 96, 20, '') + // LODOP.ADD_PRINT_BARCODE(12, 33, 115,80, 'QRCode', row.qrCode) + // LODOP.SET_PRINT_STYLEA(0,"FontSize",7); + LODOP.ADD_PRINT_IMAGE(5,33,"21mm","21mm",``); + LODOP.ADD_PRINT_IMAGE(4,255,90,16, '') LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.ADD_PRINT_TEXT(17, 126, 40, 20, 'REF') @@ -55,10 +58,10 @@ export const printAntennaLabel = (printList, icons, printerName) => { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",18); } - LODOP.ADD_PRINT_TEXT(35, 274, 40, 20, 'UoM') + LODOP.ADD_PRINT_TEXT(35, 271, 60, 20, 'UoM') LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial') LODOP.SET_PRINT_STYLEA(0,"FontSize",10); - LODOP.ADD_PRINT_TEXT(32,301,70,20,row.uom); + LODOP.ADD_PRINT_TEXT(32,281,70,20,row.uom); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"Alignment",3); diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index c041266..9ea089b 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -120,7 +120,7 @@ export default { }, { functionId: "systemInformation", - languageValue: '首页', + languageValue: 'Home', objectId: 'homePage', objectType: "label", tableId: "systemInformation" diff --git a/src/views/modules/label/QrCode.vue b/src/views/modules/label/QrCode.vue index f56ad4c..1969ab8 100644 --- a/src/views/modules/label/QrCode.vue +++ b/src/views/modules/label/QrCode.vue @@ -27,7 +27,7 @@ export default { }, generateQRCodeSync(text) { let base64 = '' - QRCode.toDataURL(text, { errorCorrectionLevel: 'H' }, (err, url) => { + QRCode.toDataURL(text, { errorCorrectionLevel: 'M' }, (err, url) => { if (err) { console.error(err) return diff --git a/src/views/modules/label/printer.vue b/src/views/modules/label/printer.vue index 9961f6a..b8e28e4 100644 --- a/src/views/modules/label/printer.vue +++ b/src/views/modules/label/printer.vue @@ -759,23 +759,26 @@ export default { } return params }); - // let value = this.printCurrentPart.totalShipQty % this.printCurrentPart.qtyPerCarton - // if (value !== 0){ - // prints[prints.length-1].qty = value; - // } - // console.log(prints) + let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{ + return item.qrCode + })) + for (let i = 0; i < qrCodeList.length; i++) { + prints[i].qrCode = qrCodeList[i] + } let icons = this.base64List.map((item)=>{return{icon: item,}}) if (!this.printerSetupList.includes(label.defaultPrinterName)) { notFound.push(label.defaultPrinterName) continue } - if (label.printType === 'Alpha/Hard Tag'){ - printAlphaHardTagLabel(prints,icons,label.defaultPrinterName) - }else if (label.printType === 'Hardware(Antenna)'){ - printAntennaLabel(prints,icons,label.defaultPrinterName) - }else if (label.printType === 'RF' || this.currentPart.category === 'RFID'){ - printRF_RFIDLabel(prints,icons,label.defaultPrinterName) - } + this.$nextTick(()=>{ + if (label.printType === 'Alpha/Hard Tag'){ + printAlphaHardTagLabel(prints,icons,label.defaultPrinterName) + }else if (label.printType === 'Hardware(Antenna)'){ + printAntennaLabel(prints,icons,label.defaultPrinterName) + }else if (label.printType === 'RF' || this.currentPart.category === 'RFID'){ + printRF_RFIDLabel(prints,icons,label.defaultPrinterName) + } + }) } if (notFound.length > 0){ this.$message.warning(`The printer ${notFound.join(',')} is not found`) diff --git a/src/views/modules/label/record.vue b/src/views/modules/label/record.vue index 4ea3e59..4004772 100644 --- a/src/views/modules/label/record.vue +++ b/src/views/modules/label/record.vue @@ -11,6 +11,7 @@ import {selectLabelFormatUserDefaultPrintListByUserId} from '../../../api/label/ import getLodop from '@/utils/LodopFuncs.js' import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table' import {Decimal} from 'decimal.js' +import QrCode from './QrCode.vue' const printRecord = { customerNo: '', @@ -22,7 +23,7 @@ const printRecord = { } export default { name: 'record', - components: {SelectionTable, CustomerInfo, ExternalPart}, + components: {QrCode, SelectionTable, CustomerInfo, ExternalPart}, props: { height: { type: [Number,String], @@ -417,7 +418,12 @@ export default { } return params }) - + let qrCodeList = this.$refs.qrCode.init(prints.map((item)=>{ + return item.qrCode + })) + for (let i = 0; i < qrCodeList.length; i++) { + prints[i].qrCode = qrCodeList[i] + } let notFound = []; for (let i = 0; i < prints.length; i++) { let print = prints[i] @@ -436,13 +442,15 @@ export default { notFound.push(str[0]) continue } - if (str[1] === 'Alpha/Hard Tag'){ - printAlphaHardTagLabel(dataList,base64List,str[0]) - }else if (str[1] === 'Hardware(Antenna)'){ - printAntennaLabel(dataList,base64List,str[0]) - }else if (str[1] === 'RF' || str[1] === 'RFID'){ - printRF_RFIDLabel(dataList,base64List,str[0]) - } + this.$nextTick(()=>{ + if (str[1] === 'Alpha/Hard Tag'){ + printAlphaHardTagLabel(dataList,base64List,str[0]) + }else if (str[1] === 'Hardware(Antenna)'){ + printAntennaLabel(dataList,base64List,str[0]) + }else if (str[1] === 'RF' || str[1] === 'RFID'){ + printRF_RFIDLabel(dataList,base64List,str[0]) + } + }) } } this.$refs.table.clearSelection() @@ -583,7 +591,7 @@ export default { - + diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue index 34e4d7c..2b25772 100644 --- a/src/views/modules/part/external.vue +++ b/src/views/modules/part/external.vue @@ -278,7 +278,7 @@ export default { serialNumber: '10002TableFreeInfo2', tableId: "10002Table", tableName: "Part Table", - columnProp: "OOC", + columnProp: "freeInfo2", headerAlign: "center", align: "left", columnLabel: "Free Info2",