From c8de15e0616e12fc642d75da3e90d05d72fece67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 10 Oct 2023 14:38:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=89=BE=E5=BF=97-=E7=A4=BE=E4=BF=9D=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E5=85=B6=E4=BB=96=E7=A6=8F=E5=88=A9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/socialSecurityBenefits/archives/index.js | 2 +- .../pages/socialSecurityBenefits/archives/otherForm.js | 6 +++--- .../pages/socialSecurityBenefits/programme/index.js | 4 ++-- .../standingBookDetail/components/inputPaymentAmount.js | 2 +- .../standingBookDetail/components/regAddEmployee.js | 2 +- .../standingBookDetail/components/regEditDetial.js | 2 +- .../standingBookDetail/components/supplementarySlide.js | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 08c62e88..c39f283b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/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} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js index fed359de..bbcadf48 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js +++ b/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 (
} items={otherItems} col={2} showGroup needTigger={false}/> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js index c3673fae..7b48db57 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/index.js +++ b/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" } ]; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js index ea62431c..0c0a849b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/inputPaymentAmount.js @@ -71,7 +71,7 @@ class InputPaymentAmount extends Component { } { !_.isEmpty(otherPayment) && - {this.renderInputItem(otherPayment, "otherPayment")} }
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js index c311d035..a0cb40cd 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regAddEmployee.js +++ b/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, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js index e904adb9..c7b1120c 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js +++ b/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") { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js index 4beb586f..561a8242 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js +++ b/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: "医疗保险" } ],