产品-系统多语言合并

pc4mobx/hrmSalary/pages/payrollFiles/config/index.js

@@ -4,6 +4,7 @@ export const tabCondition = [
     groupid: "PENDING",
     showcount: true,
     title: "待定薪",
+    lanId: 542689,
     viewcondition: "pending"
   },
   {
@@ -11,6 +12,7 @@ export const tabCondition = [
     groupid: "FIXED",
     showcount: true,
     title: "发薪员工",
+    lanId: 111,
     viewcondition: "fixed"
   },
   {
@@ -18,6 +20,7 @@ export const tabCondition = [
     groupid: "SUSPEND",
     showcount: true,
     title: "待停薪",
+    lanId: 542691,
     viewcondition: "suspend"
   },
   {
@@ -25,6 +28,7 @@ export const tabCondition = [
     groupid: "STOP",
     showcount: true,
     title: "停薪员工",
+    lanId: 111,
     viewcondition: "stop"
   },
   {
@@ -32,6 +36,7 @@ export const tabCondition = [
     groupid: "EXT",
     showcount: true,
     title: "非系统人员",
+    lanId: 542679,
     viewcondition: "ext"
   }
 ];

pc4mobx/hrmSalary/pages/payrollFiles/index.js

@@ -552,7 +552,7 @@ class Index extends Component {
               this.setState({ selectedRowKeys: [] });
             }}/>
         }>
-          <Button type="primary">导入<i className="icon-coms-down2" style={{
+          <Button type="primary">{getLabel(32935, "导入")}<i className="icon-coms-down2" style={{
             marginLeft: 8,
             verticalAlign: "middle"
           }}/></Button>
@@ -803,7 +803,11 @@ class Index extends Component {
           dropMenuDatas={rightMenu}
         >
           <WeaTab
-            datas={(extEmpsWitch === "0" || !extEmpsWitch) ? _.dropRight(tabCondition) : tabCondition}
+            datas={
+              (extEmpsWitch === "0" || !extEmpsWitch) ?
+                _.map(_.dropRight(tabCondition), it=> ({...it, title: getLabel(it.lanId, it.title)})) :
+                _.map(tabCondition, it=> ({...it, title: getLabel(it.lanId, it.title)}))
+            }
             counts={tabCount}
             className="payrollFilesTab"
             keyParam="viewcondition" //主键

pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js

@@ -1,6 +1,7 @@
 import React from "react";
 import { Button, Col, message, Row } from "antd";
 import { WeaDatePicker, WeaDialog, WeaInput, WeaLocaleProvider, WeaSelect, WeaTable } from "ecCom";
+import { toJS } from "mobx";
 import { inject, observer } from "mobx-react";
 import moment from "moment";
 import "./index.less";
@@ -78,6 +79,7 @@ export default class ChangeSalaryModal extends React.Component {
     const { salaryFileStore: { salaryItemChangeForm }, recordId } = this.props;
     const { salaryItemList } = salaryItemChangeForm;
     let { columns } = salaryItemChangeForm;
+    console.log(toJS(columns));
     return columns.map(item => {
       item = { ...item };
       if (item.dataIndex == "salaryItem") {

pc4mobx/hrmSalary/pages/taxAgent/editModal.js

@@ -139,7 +139,7 @@ export default class EditModal extends React.Component {
         initLoadCss
         className="taxagentModalWrapper"
         visible={visible}
-        style={{ width: 800, height: 450 }}
+        style={{ width: 860, height: 450 }}
         hasScroll>
         {title.indexOf(getLabel(501169, "编辑")) >= 0 && (
           <WeaTab