打印页面关闭margin和padding

one_stop_public/Table/index.jsx

@@ -12,7 +12,6 @@ import moment from 'moment';
 import TableCom from '../tableCompon';
 import IsNewTable from './isNewMobileTable';
 import maintain from '../assets/maintain.png';
-
 export default class ZdyTable extends Component {
   constructor(props) {
     super(props);
@@ -442,6 +441,8 @@ export default class ZdyTable extends Component {
       taskAssignee,
       userId,
       isDynamic, // 是否为大数据页面
+      isWebPrint, // 打印界面
+      isWebPrintEnd,
     } = this.props;
     let style = {};
     if (formConfig.style != null) {
@@ -482,18 +483,19 @@ export default class ZdyTable extends Component {
           // overflowY: isDynamic && 'auto',
           width: '100%',
           height: this.props.height,
-          paddingBottom: paddingBottom != null ? paddingBottom : '10px',
+          paddingBottom: paddingBottom != null ? paddingBottom : isWebPrint ? 0 : '10px',
         }
       : {
           overflow: isDynamic ? 'hidden' : 'auto',
           // overflowY: isDynamic && 'auto',
           width: '100%',
-          paddingBottom: paddingBottom != null ? paddingBottom : '10px',
+          paddingBottom: paddingBottom != null ? paddingBottom : isWebPrint ? 0 : '10px',
         };
     if (!isReady) return <></>;
     if (this.props.postData?.isUpdate) {
       updateTime = moment(+this.props.postData?.updateTime).format('llll');
     }
+    console.log(isWebPrintEnd);
     switch (get) {
       case 'web':
         return (
@@ -557,7 +559,7 @@ export default class ZdyTable extends Component {
                           style={{
                             overflow: 'auto',
                             margin: max * width > 550 ? 'auto' : '',
-                            marginBottom: '5px',
+                            marginBottom: isWebPrint ? (isWebPrintEnd ? '5px' : 0) : '1px',
                             ...style,
                           }}
                           border={border}
@@ -617,6 +619,8 @@ export default class ZdyTable extends Component {
                                         }}
                                       >
                                         <TableCom
+                                          isWebPrintEnd={isWebPrintEnd}
+                                          isWebPrint={isWebPrint}
                                           isPrint={this.props.isPrint}
                                           formCode={formCode} // 当前表单code
                                           modalInit={modalInit}

one_stop_public/tableCompon/index.jsx

@@ -1474,6 +1474,7 @@ export default class tableCom extends Component {
           })(<Input type="hidden" />)}{' '}
           <ZdyTable
             taskAssignee={taskAssignee}
+            isWebPrint={this.props.isWebPrint || false}
             userId={userId}
             key={fk}
             modalInit={modalInit}
@@ -1659,7 +1660,6 @@ export default class tableCom extends Component {
           (json.isMobileLabel == null && json.isLabel)
         ) {
           if (obj && obj.defaultValues && obj.defaultValues[formKey]) {
-            
             return (
               <MobileItem
                 labelCol={{ span: json.labelSpan }}
@@ -1669,7 +1669,6 @@ export default class tableCom extends Component {
                 {cm}
               </MobileItem>
             );
-            
           } else {
             return (
               <>
@@ -3221,13 +3220,17 @@ export default class tableCom extends Component {
           ) : (
             ''
           )}
-         {json.isMobileLabel&&!isEdit&&get=="mobile"?    <MobileItem
+          {json.isMobileLabel && !isEdit && get == 'mobile' ? (
+            <MobileItem
               labelCol={{ span: json.labelSpan }}
               wrapperCol={{ span: json.wrapperSpan }}
               label={title}
             >
               {cm}
-                </MobileItem>:cm}
+            </MobileItem>
+          ) : (
+            cm
+          )}
         </>
       );
     }