gm-printer-label 3.3.5-beta.0 → 3.3.5-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/printer/block.js +36 -4
package/package.json
CHANGED
package/src/printer/block.js
CHANGED
|
@@ -464,20 +464,52 @@ class Block extends React.Component {
|
|
|
464
464
|
/>
|
|
465
465
|
)
|
|
466
466
|
} else if (type === 'customer_barcode') {
|
|
467
|
-
|
|
467
|
+
console.log(isStation, 'isStationisStationisStation')
|
|
468
|
+
// : (
|
|
469
|
+
// <div
|
|
470
|
+
// data-productionbarcode={template(customer_barcode, data)}
|
|
471
|
+
// data-name={index}
|
|
472
|
+
// data-title={'客户码'}
|
|
473
|
+
// style={{ width: '100%', height: '100%' }}
|
|
474
|
+
// >
|
|
475
|
+
// <svg
|
|
476
|
+
// style={{ height: '100%', width: '100%' }}
|
|
477
|
+
// data-productionbarcode={template(customer_barcode, data)}
|
|
478
|
+
// // 需要减去14才能打印出正确高度
|
|
479
|
+
// data-doublepage={doublePage}
|
|
480
|
+
// data-height={parseInt(style.height) - 14}
|
|
481
|
+
// data-name={index}
|
|
482
|
+
// id={`production${template(customer_barcode, data)}`}
|
|
483
|
+
// />
|
|
484
|
+
// </div>
|
|
485
|
+
// )
|
|
486
|
+
// content = isStation ? (
|
|
468
487
|
content = (
|
|
469
488
|
<BarCode
|
|
470
489
|
value={template(customer_barcode, data)}
|
|
471
490
|
textMargin={0}
|
|
472
491
|
margin={0}
|
|
473
|
-
height={parseInt(style.height)}
|
|
474
|
-
width={2}
|
|
475
|
-
svgWidth={style.width}
|
|
492
|
+
height={parseInt(style.height) - 14}
|
|
493
|
+
width={doublePage ? 2.4 : 1.2}
|
|
476
494
|
displayValue={false}
|
|
477
495
|
dataName={customer_barcode}
|
|
478
496
|
background='transparent'
|
|
479
497
|
/>
|
|
480
498
|
)
|
|
499
|
+
// )
|
|
500
|
+
// /** 浏览器端的货位标签打印 */
|
|
501
|
+
// content = (
|
|
502
|
+
// <BarCode
|
|
503
|
+
// value={template(customer_barcode, data)}
|
|
504
|
+
// textMargin={0}
|
|
505
|
+
// margin={0}
|
|
506
|
+
// height={parseInt(style.height) - 14}
|
|
507
|
+
// width={doublePage ? 2.4 : 1.2}
|
|
508
|
+
// displayValue={false}
|
|
509
|
+
// dataName={customer_barcode}
|
|
510
|
+
// background='transparent'
|
|
511
|
+
// />
|
|
512
|
+
// )
|
|
481
513
|
} else if (type === 'package_order_qrcode') {
|
|
482
514
|
content = isStation ? (
|
|
483
515
|
<QrCode
|