产品-工资单水印预览和查看不一致的问题处理，账套项目预览隐藏分组未实现， 数据采集查看明细时页面显示不对齐问题处理

pc4mobx/hrmSalary/pages/dataAcquisition/components/index.less

@@ -2,12 +2,12 @@
   .accumulated {
     .wea-form-cell-wrapper {
       & > div:first-child {
-        width: 10% !important;
+        height: 46px !important;
         line-height: 46px;
       }
 
       & > div:nth-child(2) {
-        width: 40% !important;
+        //width: 40% !important;
 
         .wea-form-item-wrapper {
           display: flex !important;
@@ -20,7 +20,7 @@
       }
 
       & > div:last-child {
-        width: 40% !important;
+        //width: 40% !important;
       }
     }
   }

pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js

@@ -18,6 +18,7 @@ class TableRecord extends Component {
       loading: {
         query: false
       },
+      width: 0,
       dataSource: [],
       columns: [],
       selectedRowKeys: [],
@@ -37,13 +38,23 @@ class TableRecord extends Component {
   }
 
   componentDidMount() {
+    this.setState({ width: window.innerWidth });
     this.convertData(this.props);
+    window.addEventListener("resize", this.resizeWidth);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener("resize", this.resizeWidth);
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
     this.convertData(nextProps);
   }
 
+  resizeWidth = (e) => {
+    this.setState({ width: e.target.innerWidth });
+  };
+
   convertData = (props) => {
     const { recordPayload } = this.state;
     const { record, screenParams } = props;
@@ -116,7 +127,7 @@ class TableRecord extends Component {
 
   render() {
     const { className, screenParams, taxAgentOption, record } = this.props;
-    const { columns, dataSource, loading, selectedRowKeys, pageInfo, recordPayload } = this.state;
+    const { columns, dataSource, loading, selectedRowKeys, pageInfo, recordPayload, width } = this.state;
     const rowSelection = {
       selectedRowKeys,
       onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
@@ -172,7 +183,7 @@ class TableRecord extends Component {
       <div className="tableRecordWrapper">
         {
           !_.isEmpty(screenParams) &&
-          <WeaSearchGroup className={className} showGroup needTigger={false} items={items} col={3}/>
+          <WeaSearchGroup className={className} showGroup needTigger={false} items={items} col={width > 1280 ? 3 : 2}/>
         }
         <UnifiedTable
           rowKey="id"

pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js

@@ -304,7 +304,7 @@ export default class SlideBaseForm extends React.Component {
                   <WeaCheckbox
                     value={true}
                     viewAttr={1}
-                    content="【入职日期≤薪资周期止】且【离职日期≥薪资周期起】"
+                    content="【起薪日期≤薪资周期止】且【最后发薪日期≥薪资周期起】"
                   />
                 </Col>
               </Row>

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js

@@ -184,7 +184,7 @@ class LedgerBaseSetting extends Component {
                         type === "CHECKBOX" ?
                           <React.Fragment>
                             <WeaCheckbox value={true} viewAttr={1}
-                                         content="【入职日期≤薪资周期止】且【离职日期≥薪资周期起】"/>
+                                         content="【起薪日期≤薪资周期止】且【最后发薪日期≥薪资周期起】"/>
                             <WeaHelpfulTip width={200} title="提示：最后发薪日期为空，默认为无穷大" placement="topLeft"/>
                           </React.Fragment> :
                           type === "SELECT" ?

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js

@@ -23,7 +23,7 @@ export default class LedgerSalaryItemPreviewModal extends React.Component {
           };
         })
       };
-      columns.push(columnItem);
+      columnItem.children.length > 0 && columns.push(columnItem);
     });
     return { columns };
   };

pc4mobx/hrmSalary/pages/payroll/watermarkPreview.js

@@ -19,7 +19,7 @@ class WatermarkPreview extends Component {
   salaryBillBaseSetPreviewWaterMark = (payload) => {
     salaryBillBaseSetPreviewWaterMark(payload).then(({ status, data }) => {
       if (status) {
-        const { wmHeight: height, wmWidth: width, wmNoTransparent, wmRotate } = payload;
+        const { wmSetting: { wmHeight: height, wmWidth: width, wmNoTransparent, wmRotate } } = payload;
         watermark({
           text: data,
           src: "",