zelian_wu
/
ckt-leble-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

20240925

dev
qiezi 1 year ago
parent
c0641afba9
commit
6f152f146d
8 changed files with 57 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/printFormat/RF_RFID.js
  2. 12
      src/printFormat/alphaHardTagPrintFormat.js
  3. 11
      src/printFormat/antenna.js
  4. 2
      src/views/main-navbar.vue
  5. 2
      src/views/modules/label/QrCode.vue
  6. 27
      src/views/modules/label/printer.vue
  7. 28
      src/views/modules/label/record.vue
  8. 2
      src/views/modules/part/external.vue

11
src/printFormat/RF_RFID.js
View File

@ -18,12 +18,15 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名 LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名
for (let i = 0; i < printList.length; i++) { for (let i = 0; i < printList.length; i++) {
let row = printList[i] let row = printList[i]
console.log(row.qrCode)
//如果打印正常的标签 //如果打印正常的标签
LODOP.NewPage(); LODOP.NewPage();
LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINTER_INDEXA(printerName)
LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); 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,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
// 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",`<img src="${row.qrCode}" style="width: 21mm;height: 21mm;object-fit: contain"/>`);
LODOP.ADD_PRINT_IMAGE(4,255,90,16,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.ADD_PRINT_TEXT(20,126,40,20,"REF"); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",18); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);

12
src/printFormat/alphaHardTagPrintFormat.js
View File

@ -19,13 +19,15 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
//批量循环打印 //批量循环打印
for(let i = 0; i < printList.length; i++){ for(let i = 0; i < printList.length; i++){
let row = printList[i]; let row = printList[i];
console.log(row.qrCode)
//如果打印正常的标签 //如果打印正常的标签
LODOP.NewPage(); LODOP.NewPage();
LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINTER_INDEXA(printerName)
LODOP.SET_PRINT_PAGESIZE(0,1100,512,""); 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,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
// 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",`<img src="${row.qrCode}" style="width: 21mm;height: 21mm;object-fit: contain"/>`);
LODOP.ADD_PRINT_IMAGE(4,255,90,16,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.ADD_PRINT_TEXT(17,126,40,20,"REF"); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",18); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);

11
src/printFormat/antenna.js
View File

@ -18,12 +18,15 @@ export const printAntennaLabel = (printList, icons, printerName) => {
LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名 LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')//为每个打印单独设置任务名
for (let i = 0; i < printList.length; i++) { for (let i = 0; i < printList.length; i++) {
let row = printList[i] let row = printList[i]
console.log(row.qrCode)
//如果打印正常的标签 //如果打印正常的标签
LODOP.NewPage() LODOP.NewPage()
LODOP.SET_PRINTER_INDEXA(printerName) LODOP.SET_PRINTER_INDEXA(printerName)
LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '') 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, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
// 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",`<img src="${row.qrCode}" style="width: 21mm;height: 21mm;object-fit: contain"/>`);
LODOP.ADD_PRINT_IMAGE(4,255,90,16, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2) LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2)
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.ADD_PRINT_TEXT(17, 126, 40, 20, 'REF') 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",18); 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, 'FontName', 'Arial')
LODOP.SET_PRINT_STYLEA(0,"FontSize",10); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",14); LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Alignment",3);

2
src/views/main-navbar.vue
View File

@ -120,7 +120,7 @@ export default {
}, },
{ {
functionId: "systemInformation", functionId: "systemInformation",
languageValue: '首页',
languageValue: 'Home',
objectId: 'homePage', objectId: 'homePage',
objectType: "label", objectType: "label",
tableId: "systemInformation" tableId: "systemInformation"

2
src/views/modules/label/QrCode.vue
View File

@ -27,7 +27,7 @@ export default {
}, },
generateQRCodeSync(text) { generateQRCodeSync(text) {
let base64 = '' let base64 = ''
QRCode.toDataURL(text, { errorCorrectionLevel: 'H' }, (err, url) => {
QRCode.toDataURL(text, { errorCorrectionLevel: 'M' }, (err, url) => {
if (err) { if (err) {
console.error(err) console.error(err)
return return

27
src/views/modules/label/printer.vue
View File

@ -759,23 +759,26 @@ export default {
} }
return params 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,}}) let icons = this.base64List.map((item)=>{return{icon: item,}})
if (!this.printerSetupList.includes(label.defaultPrinterName)) { if (!this.printerSetupList.includes(label.defaultPrinterName)) {
notFound.push(label.defaultPrinterName) notFound.push(label.defaultPrinterName)
continue 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){ if (notFound.length > 0){
this.$message.warning(`The printer ${notFound.join(',')} is not found`) this.$message.warning(`The printer ${notFound.join(',')} is not found`)

28
src/views/modules/label/record.vue
View File

@ -11,6 +11,7 @@ import {selectLabelFormatUserDefaultPrintListByUserId} from '../../../api/label/
import getLodop from '@/utils/LodopFuncs.js' import getLodop from '@/utils/LodopFuncs.js'
import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table' import {getTableDefaultListLanguage, getTableUserListLanguage} from '../../../api/table'
import {Decimal} from 'decimal.js' import {Decimal} from 'decimal.js'
import QrCode from './QrCode.vue'
const printRecord = { const printRecord = {
customerNo: '', customerNo: '',
@ -22,7 +23,7 @@ const printRecord = {
} }
export default { export default {
name: 'record', name: 'record',
components: {SelectionTable, CustomerInfo, ExternalPart},
components: {QrCode, SelectionTable, CustomerInfo, ExternalPart},
props: { props: {
height: { height: {
type: [Number,String], type: [Number,String],
@ -417,7 +418,12 @@ export default {
} }
return params 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 = []; let notFound = [];
for (let i = 0; i < prints.length; i++) { for (let i = 0; i < prints.length; i++) {
let print = prints[i] let print = prints[i]
@ -436,13 +442,15 @@ export default {
notFound.push(str[0]) notFound.push(str[0])
continue 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() this.$refs.table.clearSelection()
@ -583,7 +591,7 @@ export default {
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<qr-code ref="qrCode"></qr-code>
<el-table :data="printLabelRecordList" ref="table" @selection-change="handleSelectionChange" <el-table :data="printLabelRecordList" ref="table" @selection-change="handleSelectionChange"
style="width: 100%;margin-top: 10px" border :height="height"> style="width: 100%;margin-top: 10px" border :height="height">
<el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column> <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>

2
src/views/modules/part/external.vue
View File

@ -278,7 +278,7 @@ export default {
serialNumber: '10002TableFreeInfo2', serialNumber: '10002TableFreeInfo2',
tableId: "10002Table", tableId: "10002Table",
tableName: "Part Table", tableName: "Part Table",
columnProp: "OOC",
columnProp: "freeInfo2",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "Free Info2", columnLabel: "Free Info2",

Write Preview
Loading…
Cancel
Save