pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js

@@ -62,7 +62,7 @@ class Index extends Component {
             if (o.dataIndex === "username") {
               return { ...o, width: 150, fixed: "left" };
             }
-            return { ...o, width: 150, render: (v) => (<span title={v}>{v}</span>) };
+            return { ...o, width: 150 };
           }), {
             dataIndex: "options", title: getLabel(30585, "操作"),
             width: 120, render: (_, record) => (

pc4mobx/hrmSalary/pages/adjustSalaryManage/index.less

@@ -43,15 +43,5 @@
 
     }
   }
-
-  .wea-new-table {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      width: 100%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-  }
 }
 

pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js

@@ -125,18 +125,17 @@ class EditCalcTable extends Component {
           }, 500);
         });
         const { routeParams: { salaryAcctRecordId } } = this.props;
-        updateLockStatus({ ...payload, salaryAcctRecordId, acctEmpIds: this.state.selectedRowKeys })
-          .then(({ status, errormsg }) => {
-            if (status) {
-              clearInterval(this.timerLock);
-              this.setState({
-                progressVisible: false,
-                progress: 0
-              }, () => this.queryCalcResultList());
-            } else {
-              message.error(errormsg);
-            }
-          });
+        updateLockStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
+          if (status) {
+            clearInterval(this.timerLock);
+            this.setState({
+              progressVisible: false,
+              progress: 0
+            }, () => this.queryCalcResultList());
+          } else {
+            message.error(errormsg);
+          }
+        });
       }
     });
   };
@@ -342,4 +341,4 @@ const traverse = (arr, calcDetail) => {
       };
     }
   });
-};
+};

pc4mobx/hrmSalary/pages/declare/generateDeclarationDetail.js

@@ -2,7 +2,6 @@ import React from "react";
 import { inject, observer } from "mobx-react";
 import { WeaLocaleProvider, WeaTable, WeaTop } from "ecCom";
 import { getQueryString } from "../../util/url";
-import { sysinfo } from "../../apis/ruleconfig";
 import * as API from "../../apis/declare";
 import { Button } from "antd";
 import "./index.less";
@@ -15,21 +14,15 @@ export default class GenerateDeclarationDetail extends React.Component {
     super(props);
     this.state = {
       loading: false, dataSource: [], columns: [], declareInfo: {},
-      pageInfo: { current: 1, pageSize: 10, total: 0 }, sysinfo: {}
+      pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
   componentDidMount() {
     this.getDetailList();
     this.getDeclareInfo();
-    this.getSysinfo();
   }
 
-  getSysinfo = () => {
-    sysinfo().then(({ status, data: sysinfo }) => {
-      if (status) this.setState({ sysinfo });
-    });
-  };
   getDetailList = () => {
     const { pageInfo } = this.state;
     const payload = {
@@ -71,10 +64,9 @@ export default class GenerateDeclarationDetail extends React.Component {
     window.open(url, "_self");
   };
   renderTitle = () => {
-    const { declareInfo, sysinfo } = this.state;
-    const title = sysinfo["TAX_DECLARATION_DATE_TYPE"] === "1" ? getLabel(111, "税款所属期") : getLabel(111, "薪资所属月");
+    const { declareInfo } = this.state;
     return (<React.Fragment>
-      <span>{title}：{declareInfo.salaryMonth}</span>
+      <span>{getLabel(111, "薪资所属月")}：{declareInfo.salaryMonth}</span>
       <span style={{ marginLeft: "10px" }}>{getLabel(111, "个税扣缴义务人")}：{declareInfo.taxAgentName}</span>
     </React.Fragment>);
   };

pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js

@@ -13,7 +13,6 @@ import Content from "../../components/pcTemplate/content";
 import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
 import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
-import { getQueryString } from "../../util/url";
 
 const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
 const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
@@ -85,18 +84,7 @@ class MySalaryView extends Component {
     const { captchaVisible, mySalaryStore } = this.state;
     const { params: { salaryInfoId } } = this.props;
     if (_.isEmpty(mySalaryStore)) {
-      return <div>
-        <CaptchaModal
-          visible={captchaVisible} id={salaryInfoId}
-          onCancel={() => this.setState({ captchaVisible: false })}
-          onConfirm={() => {
-            this.props.mySalaryStore.setInitEmVerify();
-            this.props.mySalaryStore.getMySalaryBill(Number(salaryInfoId)).then(data => {
-              this.setState({ mySalaryStore: data });
-            });
-          }}
-        />
-      </div>;
+      return <div></div>;
     }
     const { salaryTemplate, salaryGroups, employeeInformation, sendTime } = mySalaryStore;
     const salaryProps = {
@@ -118,6 +106,11 @@ class MySalaryView extends Component {
             </Content>
           </div>
         </Authority>
+        <CaptchaModal
+          visible={captchaVisible} id={salaryInfoId}
+          onCancel={() => this.setState({ captchaVisible: false })}
+          onConfirm={() => mySalaryStore.setInitEmVerify()}
+        />
       </React.Fragment>
     );
   }

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js

@@ -22,9 +22,6 @@ export const socialAccountConditions = [
         lanId: 537996,
         labelcol: 6,
         options: [],
-        otherParams: {
-          showSearch: true, optionFilterProp: "children"
-        },
         rules: "required|string",
         viewAttr: 3
       },