gm-printer-label 3.3.5-beta.1 → 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 +22 -19
package/package.json
CHANGED
package/src/printer/block.js
CHANGED
|
@@ -464,7 +464,27 @@ 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 ? (
|
|
487
|
+
content = (
|
|
468
488
|
<BarCode
|
|
469
489
|
value={template(customer_barcode, data)}
|
|
470
490
|
textMargin={0}
|
|
@@ -475,25 +495,8 @@ class Block extends React.Component {
|
|
|
475
495
|
dataName={customer_barcode}
|
|
476
496
|
background='transparent'
|
|
477
497
|
/>
|
|
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>
|
|
496
498
|
)
|
|
499
|
+
// )
|
|
497
500
|
// /** 浏览器端的货位标签打印 */
|
|
498
501
|
// content = (
|
|
499
502
|
// <BarCode
|