Merge branch 'feature/v2-数据采集-1024' into develop

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js

@@ -829,7 +829,7 @@ export default class Attendance extends React.Component {
                 setFieldSettingAttendList(value);
               }}
               items={fieldSettingAttendList}
-              title={"考勤模块"}
+              title="考勤模块"
             />
             <SelectItemsWrapper
               onChange={value => {
@@ -886,7 +886,7 @@ export default class Attendance extends React.Component {
             className="slideOuterWrapper"
             visible={slideVisiable}
             top={0}
-            width={40}
+            width={60}
             height={100}
             direction={"right"}
             measure={"%"}

pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js

@@ -1,13 +1,7 @@
 import React from "react";
-import { Row, Col, Table, DatePicker } from "antd";
+import { Col, DatePicker, Row } from "antd";
 import { inject, observer } from "mobx-react";
-import {
-  WeaInput,
-  WeaTextarea,
-  WeaSearchGroup,
-  WeaSelect,
-  WeaTable,
-} from "ecCom";
+import { WeaTable } from "ecCom";
 import "./editSlideContent.less";
 import moment from "moment";
 
@@ -21,7 +15,7 @@ let emptyItem = {
   taxableIncomeLl: "0.00",
   taxableIncomeUl: "0.00",
   taxRate: "0.00",
-  taxDeduction: "0.00",
+  taxDeduction: "0.00"
 };
 
 @inject("cumDeductStore", "taxAgentStore")
@@ -34,21 +28,21 @@ export default class EditSlideContent extends React.Component {
       startDate: "",
       endDate: "",
       editable:
-        this.props.editable === undefined ? "true" : this.props.editable,
+        this.props.editable === undefined ? "true" : this.props.editable
     };
   }
 
   componentWillMount() {
     // 初始化渲染页面
     const {
-      taxAgentStore: { fetchTaxAgentOption },
+      taxAgentStore: { fetchTaxAgentOption }
     } = this.props;
     fetchTaxAgentOption();
   }
 
   addItem() {
     const {
-      taxRateStore: { setDataSource },
+      taxRateStore: { setDataSource }
     } = this.props;
     let dataSource = [...this.props.taxRateStore.dataSource];
     let indexNum = 1;
@@ -78,7 +72,7 @@ export default class EditSlideContent extends React.Component {
       declareMonth.push(endDate);
     }
     let item = {
-      taxAgentId: taxAgentId,
+      taxAgentId: taxAgentId
     };
     if (declareMonth.length != 0) {
       item.declareMonth = declareMonth;
@@ -93,7 +87,7 @@ export default class EditSlideContent extends React.Component {
 
   render() {
     const {
-      taxAgentStore: { taxAgentOption },
+      taxAgentStore: { taxAgentOption }
     } = this.props;
     const { cumDeductStore } = this.props;
     const {
@@ -103,7 +97,7 @@ export default class EditSlideContent extends React.Component {
       slidePageObj,
       slideTableDataSource,
       setSlidePageObj,
-      slideLoading,
+      slideLoading
     } = cumDeductStore;
     const { startDate, endDate, taxAgentId } = this.state;
 
@@ -118,24 +112,14 @@ export default class EditSlideContent extends React.Component {
         setSlidePageObj({
           ...slidePageObj,
           current,
-          pageSize: slidePageObj.pageSize,
+          pageSize: slidePageObj.pageSize
         });
-      },
-    };
-    const newColumns = _.map([...slideColumns], (item) => {
-      if (item.dataIndex === "declareMonth") {
-        return {
-          ...item,
-          width: 120,
-          fixed: "left",
-        };
-      } else {
-        return { ...item };
       }
-    });
+    };
+    const newColumns = _.map([...slideColumns], (item) => ({ ...item }));
     const rowSelection = {
       selectedRowKeys: this.props.slideSelectedKey,
-      onChange: this.onSelectChange,
+      onChange: this.onSelectChange
     };
     return (
       <div className="cumDeductSlide">

pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js

@@ -1,14 +1,7 @@
 import React from "react";
-import { Row, Col, Table, DatePicker } from "antd";
+import { Col, DatePicker, Row } from "antd";
 import { inject, observer } from "mobx-react";
-import {
-  WeaInput,
-  WeaTextarea,
-  WeaSearchGroup,
-  WeaSelect,
-  WeaTable,
-} from "ecCom";
-import { slideColumns } from "./columns";
+import { WeaTable } from "ecCom";
 import "./editSlideContent.less";
 import moment from "moment";
 
@@ -22,7 +15,7 @@ let emptyItem = {
   taxableIncomeLl: "0.00",
   taxableIncomeUl: "0.00",
   taxRate: "0.00",
-  taxDeduction: "0.00",
+  taxDeduction: "0.00"
 };
 
 @inject("cumSituationStore", "taxAgentStore")
@@ -35,21 +28,21 @@ export default class EditSlideContent extends React.Component {
       startDate: "",
       endDate: "",
       editable:
-        this.props.editable === undefined ? "true" : this.props.editable,
+        this.props.editable === undefined ? "true" : this.props.editable
     };
   }
 
   componentWillMount() {
     // 初始化渲染页面
     const {
-      taxAgentStore: { fetchTaxAgentOption },
+      taxAgentStore: { fetchTaxAgentOption }
     } = this.props;
     fetchTaxAgentOption();
   }
 
   addItem() {
     const {
-      taxRateStore: { setDataSource },
+      taxRateStore: { setDataSource }
     } = this.props;
     let dataSource = [...this.props.taxRateStore.dataSource];
     let indexNum = 1;
@@ -79,7 +72,7 @@ export default class EditSlideContent extends React.Component {
       declareMonth.push(endDate);
     }
     let item = {
-      taxAgentId: taxAgentId,
+      taxAgentId: taxAgentId
     };
     if (declareMonth.length != 0) {
       item.taxYearMonth = declareMonth;
@@ -94,7 +87,7 @@ export default class EditSlideContent extends React.Component {
 
   render() {
     const {
-      taxAgentStore: { taxAgentOption },
+      taxAgentStore: { taxAgentOption }
     } = this.props;
     const { cumSituationStore } = this.props;
     const {
@@ -104,7 +97,7 @@ export default class EditSlideContent extends React.Component {
       slidePageObj,
       slideTableDataSource,
       setSlidePageObj,
-      slideLoading,
+      slideLoading
     } = cumSituationStore;
     const { startDate, endDate, taxAgentId } = this.state;
 
@@ -119,24 +112,14 @@ export default class EditSlideContent extends React.Component {
         setSlidePageObj({
           ...slidePageObj,
           current,
-          pageSize: slidePageObj.pageSize,
+          pageSize: slidePageObj.pageSize
         });
-      },
-    };
-    const newColumns = _.map([...slideColumns], (item) => {
-      if (item.dataIndex === "declareMonth") {
-        return {
-          ...item,
-          width: 120,
-          fixed: "left",
-        };
-      } else {
-        return { ...item };
       }
-    });
+    };
+    const newColumns = _.map([...slideColumns], (item) => ({ ...item }));
     const rowSelection = {
       selectedRowKeys: this.props.slideSelectedKey,
-      onChange: this.onSelectChange,
+      onChange: this.onSelectChange
     };
     return (
       <div className="cumDeductSlide">
@@ -213,7 +196,7 @@ export default class EditSlideContent extends React.Component {
             dataSource={slideTableDataSource}
             pagination={pagination}
             loading={slideLoading}
-            scroll={{ x:  newColumns ? newColumns.length * 150 : 900}}
+            scroll={{ x: newColumns ? newColumns.length * 150 : 900 }}
           />
         </div>
       </div>

pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js

@@ -122,17 +122,7 @@ export default class EditSlideContent extends React.Component {
         });
       },
     };
-    const newColumns = _.map([...slideColumns], (item) => {
-      if (item.dataIndex === "declareMonth") {
-        return {
-          ...item,
-          width: 120,
-          fixed: "left",
-        };
-      } else {
-        return { ...item };
-      }
-    });
+    const newColumns = _.map([...slideColumns], (item) => ({ ...item }));
     const rowSelection = {
       selectedRowKeys: this.props.slideSelectedKey,
       onChange: this.onSelectChange,