diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index f69a26e3..2ba68c64 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -63,7 +63,7 @@ 导出 - + 批量打印标签 @@ -345,6 +345,10 @@ export default { type: Boolean, default: false, }, + canExportAll: { + type: Boolean, + default: false, + } }, data() { return { @@ -822,8 +826,8 @@ export default { const paperHeightMm = 100; // 留白:左右约 4mm;上下更小一些,避免底部空得太多 const marginXmm = 4; - const marginTopMm = 2; - const marginBottomMm = 1; + const marginTopMm = 0; + const marginBottomMm = 0; const pageWidthPt = paperWidthMm * mmToPt; const pageHeightPt = paperHeightMm * mmToPt; @@ -873,7 +877,9 @@ export default { const x = marginXPt + (contentWidthPt - drawW) / 2; const y = marginBottomPt + (contentHeightPt - drawH) / 2; - page.drawImage(pngImage, { x, y, width: drawW, height: drawH }); + console.log(pngImage) + + page.drawImage(pngImage, { x, y: y - 20, width: drawW, height: drawH + 20 }); } const pdfBytes = await pdfDoc.save(); diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue index 319bacc8..1a52b42a 100644 --- a/klp-ui/src/views/wms/coil/product.vue +++ b/klp-ui/src/views/wms/coil/product.vue @@ -4,7 +4,9 @@ :labelType="labelType" :showStatus="showStatus" :hideType="hideType" - :showLength="showLength" /> + :showLength="showLength" + :canExportAll="canExportAll" + />