提交 bfd24016 authored 作者: 钟是志's avatar 钟是志

打印纸张高度 宽度配置单位修改为厘米了

上级 ef296829
......@@ -9,6 +9,8 @@
import React, { Fragment, Component } from 'react';
import styles from './index.less';
import { imageStyleAll, A4Height, A4Width } from './ViewPrint/config';
export default class Index extends Component {
constructor(props) {
......@@ -124,8 +126,8 @@ export default class Index extends Component {
} = this.props;
const imageStyle = {
height: high || '902px',
width: wide || 'auto',
height: `${high}cm` || A4Height,
width: `${wide}cm` || A4Width,
};
return (
......@@ -143,10 +145,7 @@ export default class Index extends Component {
id={'dropZone'}
draggable={false}
className={styles.bgimage}
style={{
width: 'auto',
height: '100%',
}}
style={imageStyleAll}
alt={'背景图'}
/>
{config.map((item, index) => {
......
export const A4Height = '29.6cm';
export const A4Width = '20.9cm';
export const imageStyleAll = {
width: '100%',
height: '100%',
};
......@@ -8,6 +8,7 @@ import ButtonDiy from '@/baseComponent/ButtonDiy';
import router from 'umi/router';
import styles from '../index.less';
import DetailDom from './DetailDom';
import { imageStyleAll, A4Width, A4Height } from './config';
export default class ViewPrint extends Component {
constructor(props) {
......@@ -101,7 +102,8 @@ export default class ViewPrint extends Component {
const ids = selectedRows.map((x) => {
return x.id;
});
if (configAll.callUrl && false) { // 暂时关闭调用这个接口 不通知后台是否打印了
if (configAll.callUrl && false) {
// 暂时关闭调用这个接口 不通知后台是否打印了
getInfo({ ids: ids.join(',') }, configAll.callUrl).then((x) => {
if (x) {
this.setState({ showWindowPrint: true }, () => {
......@@ -136,9 +138,10 @@ export default class ViewPrint extends Component {
}
const { hasPrintBackground, backgroundUrl, wide, high } = configAll;
const imageStyle = {
height: high || '902px',
width: wide || 'auto',
height: `${high}cm` || A4Height,
width: `${wide}cm` || A4Width,
};
return (
<Fragment>
<Shell styleShell={{ marginTop: '0', marginBottom: '20px' }}>
......@@ -176,21 +179,18 @@ export default class ViewPrint extends Component {
<div>
{viewData.map((info, index) => {
return (
<div className={styles.outSideDivPrint}
<div
className={styles.outSideDivPrint}
key={index + 'divKey'}
style={{
...imageStyle,
}}
>
}}>
<img
src={backgroundUrl}
draggable={false}
className={styles.bgimagePrint}
alt={'背景图'}
style={{
width: 'auto',
height: '100%',
}}
style={imageStyleAll}
/>
{this.detailDom(info)}
</div>
......@@ -204,7 +204,7 @@ export default class ViewPrint extends Component {
<div
ref={(node) => (this.content = node)}
style={{
display: showWindowPrint ? 'block' : 'none',
display: showWindowPrint /*|| true*/ ? 'block' : 'none',
}}>
{viewData.map((info, index) => {
return (
......@@ -213,18 +213,15 @@ export default class ViewPrint extends Component {
key={`${index}divKey`}
style={{
...imageStyle,
}}
>
}}>
{hasPrintBackground ? (
<img
src={backgroundUrl}
draggable={false}
className={styles.bgimagePrint}
alt={'背景图'}
style={{
width: 'auto',
height: '100%',
}}/>
style={imageStyleAll}
/>
) : null}
{this.detailDom(info)}
......
......@@ -25,7 +25,7 @@
.outSideDivPrint{
position: relative;
width: auto;
margin-bottom: 10px;
//margin-bottom: 10px;
page-break-after: always;
.bgimagePrint{
height: auto;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论