Merge branch 'custom-艾志工业' into custom-艾志工业-合并个税

pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js

@@ -868,7 +868,7 @@ export default class Archives extends React.Component {
                 subtitle={"员工福利档案"}
                 tabs={[
                   { title: "基础设置", key: 0 }, { title: "社保", key: 1 },
-                  { title: "公积金", key: 2 }, { title: "企业年金及其他福利", key: 3 }]
+                  { title: "公积金", key: 2 }, { title: "劳务固定费", key: 3 }]
                 }
                 editable={false}
                 selectedTab={selectedTab}

pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js

@@ -116,7 +116,7 @@ export default class OtherForm extends React.Component {
       {
         com: SocialDatePicker({
           key: "otherStartTime",
-          label: "其他福利起始缴纳月",
+          label: "劳务固定费起始缴纳月",
           viewAttr: otherSchemeId ? 3 : 2,
           value: otherStartTime,
           disabledDate: (current) => {
@@ -128,7 +128,7 @@ export default class OtherForm extends React.Component {
       {
         com: SocialDatePicker({
           key: "otherEndTime",
-          label: "其他福利最后缴纳月",
+          label: "劳务固定费最后缴纳月",
           value: otherEndTime,
           disabledDate: (current) => {
             return current && otherStartTime && current.getTime() < new Date(otherStartTime).getTime();
@@ -140,7 +140,7 @@ export default class OtherForm extends React.Component {
     return (
       <div className="socialFormWrapper">
         <WeaSearchGroup
-          title="其他福利基础信息"
+          title="劳务固定费基础信息"
           customComponent={<SocialTitle keyname="nonPayment" value={!_.isNil(nonPayment) ? nonPayment.toString() : "0"}
                                         onChange={this.handleFormChange}/>}
           items={otherItems} col={2} showGroup needTigger={false}/>

pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js

@@ -222,7 +222,7 @@ export default class Programme extends React.Component {
         viewcondition: "ACCUMULATION_FUND"
       },
       {
-        title: "企业年金及其他福利",
+        title: "劳务固定费",
         viewcondition: "OTHER"
       },
       {
@@ -245,7 +245,7 @@ export default class Programme extends React.Component {
         key: "ACCUMULATION_FUND"
       },
       {
-        showname: "企业年金及其他福利",
+        showname: "劳务固定费",
         key: "OTHER"
       }
     ];

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js

@@ -71,7 +71,7 @@ class InputPaymentAmount extends Component {
         }
         {
           !_.isEmpty(otherPayment) &&
-          <WeaSearchGroup title="企业年金及其他福利" showGroup
+          <WeaSearchGroup title="劳务固定费" showGroup
                           col={1}>{this.renderInputItem(otherPayment, "otherPayment")}</WeaSearchGroup>
         }
       </div>

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js

@@ -89,7 +89,7 @@ class RegAddEmployee extends Component {
           options: [
             { key: "1", showname: "社保" },
             { key: "2", showname: "公积金" },
-            { key: "3", showname: "企业年金及其他福利" }
+            { key: "3", showname: "劳务固定费" }
           ],
           detailtype: 2,
           valueAll: baseInfo.itemsAll,

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js

@@ -65,7 +65,7 @@ class RegEditDetial extends Component {
         },
         {
           key: "other",
-          label: "企业年金及其他福利",
+          label: "劳务固定费",
           dataSource: [],
           columns: _.map(regColumns, item => {
             if (item.dataIndex === "personalPaymentAmount" || item.dataIndex === "companyPaymentAmount") {

pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js

@@ -280,7 +280,7 @@ class SupplementarySlide extends Component {
           options: [
             { key: "1", showname: "社保" },
             { key: "2", showname: "公积金" },
-            { key: "3", showname: "企业年金及其他福利" },
+            { key: "3", showname: "劳务固定费" },
             { key: "4", showname: "养老保险" },
             { key: "5", showname: "医疗保险" }
           ],