gm-printer-label 3.3.5-beta.0 → 3.3.5-beta.1

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gm-printer-label",
3
- "version": "3.3.5-beta.0",
3
+ "version": "3.3.5-beta.1",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -464,20 +464,49 @@ class Block extends React.Component {
464
464
  />
465
465
  )
466
466
  } else if (type === 'customer_barcode') {
467
- /** 浏览器端的货位标签打印 */
468
- content = (
467
+ content = isStation ? (
469
468
  <BarCode
470
469
  value={template(customer_barcode, data)}
471
470
  textMargin={0}
472
471
  margin={0}
473
- height={parseInt(style.height)}
474
- width={2}
475
- svgWidth={style.width}
472
+ height={parseInt(style.height) - 14}
473
+ width={doublePage ? 2.4 : 1.2}
476
474
  displayValue={false}
477
475
  dataName={customer_barcode}
478
476
  background='transparent'
479
477
  />
478
+ ) : (
479
+ <div
480
+ data-productionbarcode={template(customer_barcode, data)}
481
+ data-name={index}
482
+ // 内标里叫做"PDA出入库条码"
483
+ data-title={'PDA出入库条码'}
484
+ style={{ width: '100%', height: '100%' }}
485
+ >
486
+ <svg
487
+ style={{ height: '100%', width: '100%' }}
488
+ data-productionbarcode={template(customer_barcode, data)}
489
+ // 需要减去14才能打印出正确高度
490
+ data-doublepage={doublePage}
491
+ data-height={parseInt(style.height) - 14}
492
+ data-name={index}
493
+ id={`production${template(customer_barcode, data)}`}
494
+ />
495
+ </div>
480
496
  )
497
+ // /** 浏览器端的货位标签打印 */
498
+ // content = (
499
+ // <BarCode
500
+ // value={template(customer_barcode, data)}
501
+ // textMargin={0}
502
+ // margin={0}
503
+ // height={parseInt(style.height) - 14}
504
+ // width={doublePage ? 2.4 : 1.2}
505
+ // displayValue={false}
506
+ // dataName={customer_barcode}
507
+ // background='transparent'
508
+ // />
509
+ // )
481
510
  } else if (type === 'package_order_qrcode') {
482
511
  content = isStation ? (
483
512
  <QrCode