diff --git a/src/views/modules/print/print_part_label.js b/src/views/modules/print/print_part_label.js index 88a9b9c..a667e4b 100644 --- a/src/views/modules/print/print_part_label.js +++ b/src/views/modules/print/print_part_label.js @@ -31,7 +31,7 @@ export function printPartLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.ADD_PRINT_TEXT(352,46,100,25,printData.userId); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); - LODOP.ADD_PRINT_LINE(87,5,86,556,0,1); + LODOP.ADD_PRINT_LINE(87,5,86,718,0,1); LODOP.ADD_PRINT_LINE(130,5,129,556,0,1); LODOP.ADD_PRINT_LINE(242,5,241,556,0,1); LODOP.ADD_PRINT_LINE(274,5,273,556,0,1); @@ -46,6 +46,8 @@ export function printPartLabel(printList) { LODOP.ADD_PRINT_LINE(273,379,241,380,0,1); LODOP.ADD_PRINT_LINE(273,452,241,453,0,1); LODOP.ADD_PRINT_LINE(299,264,298,556,0,1); + + LODOP.ADD_PRINT_LINE(43,630,86,631,0,1);// 派工单竖线 LODOP.ADD_PRINT_TEXT(353,254,211,25,"苏州赫艾聚合科技有限公司"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); @@ -68,6 +70,12 @@ export function printPartLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.ADD_PRINT_TEXT(61,470,85,25,printData.qtyRequired); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + // 派工单号 + LODOP.ADD_PRINT_TEXT(61,545,100,25,"派工单号"); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + LODOP.ADD_PRINT_TEXT(61,640,100,25,`${printData.seqNo? printData.seqNo : "N/A"}`); + LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.ADD_PRINT_TEXT(92,12,65,40,"进厂/\r\n生产日期"); LODOP.ADD_PRINT_TEXT(98,77,105,25,printData.sScheduledDate.substring(0,10)); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); @@ -135,9 +143,9 @@ export function printPartLabel(printList) { // LODOP.ADD_PRINT_TEXT(300,333,224,57,printData.remark); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.ADD_PRINT_RECT(43,556,162,308,0,1); - LODOP.ADD_PRINT_TEXT(53,563,100,20,"备注:"); + LODOP.ADD_PRINT_TEXT(102,563,100,20,"备注:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); - LODOP.ADD_PRINT_TEXT(72,564,152,274,printData.remark); + LODOP.ADD_PRINT_TEXT(123,564,152,274,printData.remark); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90); } diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue index dfa0640..fc1c4b5 100644 --- a/src/views/modules/production/soscheduleRouting.vue +++ b/src/views/modules/production/soscheduleRouting.vue @@ -623,6 +623,7 @@ getPartCardPrintData(search).then(({data}) => { if (data && data.code === 0) { data.row.userId=this.$store.state.user.name; + data.row.seqNo=row.seqNo; let array=[]; // data.row.printerName='大标签打印机'; array.push(data.row)