feature/2.9.10.2312.02-社保档案个人和公司基数设置

pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js

@@ -4,10 +4,12 @@
  * Description:
  */
 import React, { Component } from "react";
-import { WeaBrowser, WeaFormItem } from "ecCom";
+import { WeaBrowser, WeaFormItem, WeaLocaleProvider } from "ecCom";
 import { getDomkes, getSearchs } from "../../util";
 import "./index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 class AddItems extends Component {
   componentDidMount() {
     const { editId, condition, form } = this.props;
@@ -63,7 +65,7 @@ class AddItems extends Component {
     return (
       <div className="addItemsWrapper">
         {getSearchs(form, condition)}
-        <Tips><span>若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据</span></Tips>
+        <Tips><span>{getLabel(543350, "若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据")}</span></Tips>
       </div>
     );
   }
@@ -89,7 +91,7 @@ export const Tips = payload => {
   const { children } = payload;
   return (
     <div className="tipWrapper">
-      <div className="title">小提示</div>
+      <div className="title">{getLabel(543177, "小提示")}</div>
       <div className="content">{children}</div>
     </div>
   );

pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js

@@ -464,6 +464,7 @@ export const dataCollectCondition = [
         domkey: ["addUpChildEducation"],
         fieldcol: 14,
         label: "累计子女教育",
+        lanId: 542158,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -474,6 +475,7 @@ export const dataCollectCondition = [
         domkey: ["addUpContinuingEducation"],
         fieldcol: 14,
         label: "累计继续教育",
+        lanId: 542159,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -484,6 +486,7 @@ export const dataCollectCondition = [
         domkey: ["addUpHousingLoanInterest"],
         fieldcol: 14,
         label: "累计住房贷款利息",
+        lanId: 542160,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -494,6 +497,7 @@ export const dataCollectCondition = [
         domkey: ["addUpHousingRent"],
         fieldcol: 14,
         label: "累计住房租金",
+        lanId: 542161,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -504,6 +508,7 @@ export const dataCollectCondition = [
         domkey: ["addUpSupportElderly"],
         fieldcol: 14,
         label: "累计赡养老人",
+        lanId: 542162,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -514,6 +519,7 @@ export const dataCollectCondition = [
         domkey: ["addUpIllnessMedical"],
         fieldcol: 14,
         label: "累计大病医疗",
+        lanId: 542163,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -524,6 +530,7 @@ export const dataCollectCondition = [
         domkey: ["addUpInfantCare"],
         fieldcol: 14,
         label: "累计婴幼儿照护",
+        lanId: 537990,
         labelcol: 8,
         value: "",
         precision: 2,

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

@@ -325,11 +325,8 @@ class Index extends Component {
     addForm.initFormFields(conditions);
     this.setState({
       slidePayload: {
-        ...slidePayload,
-        visible: true,
-        title,
-        data: editId,
-        children: title.length <= 2 ?
+        ...slidePayload, visible: true, title, data: editId,
+        children: title !== getLabel(543348, "累计专项附加扣除记录") ?
           <AddItems
             ref={(dom) => this.addItemRef = dom}
             taxAgentOption={taxAgentOption}

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

@@ -149,6 +149,7 @@ export const dataCollectCondition = [
         domkey: ["addUpIncome"],
         fieldcol: 14,
         label: "累计收入额",
+        lanId: 542230,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -159,6 +160,7 @@ export const dataCollectCondition = [
         domkey: ["addUpSubtraction"],
         fieldcol: 14,
         label: "累计减除费用",
+        lanId: 542231,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -169,6 +171,7 @@ export const dataCollectCondition = [
         domkey: ["addUpSocialSecurityTotal"],
         fieldcol: 14,
         label: "累计社保个人合计",
+        lanId: 542232,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -179,6 +182,7 @@ export const dataCollectCondition = [
         domkey: ["addUpAccumulationFundTotal"],
         fieldcol: 14,
         label: "累计公积金个人合计",
+        lanId: 542233,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -189,6 +193,7 @@ export const dataCollectCondition = [
         domkey: ["addUpChildEducation"],
         fieldcol: 14,
         label: "累计子女教育",
+        lanId: 542158,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -199,6 +204,7 @@ export const dataCollectCondition = [
         domkey: ["addUpContinuingEducation"],
         fieldcol: 14,
         label: "累计继续教育",
+        lanId: 542159,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -209,6 +215,7 @@ export const dataCollectCondition = [
         domkey: ["addUpHousingLoanInterest"],
         fieldcol: 14,
         label: "累计住房贷款利息",
+        lanId: 542160,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -219,6 +226,7 @@ export const dataCollectCondition = [
         domkey: ["addUpHousingRent"],
         fieldcol: 14,
         label: "累计住房租金",
+        lanId: 542161,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -229,6 +237,7 @@ export const dataCollectCondition = [
         domkey: ["addUpSupportElderly"],
         fieldcol: 14,
         label: "累计赡养老人",
+        lanId: 542162,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -239,6 +248,7 @@ export const dataCollectCondition = [
         domkey: ["addUpIllnessMedical"],
         fieldcol: 14,
         label: "累计大病医疗",
+        lanId: 542163,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -249,6 +259,7 @@ export const dataCollectCondition = [
         domkey: ["addUpEnterpriseAndOther"],
         fieldcol: 14,
         label: "累计企业（职业）年金及其他福利",
+        lanId: 542234,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -259,6 +270,7 @@ export const dataCollectCondition = [
         domkey: ["addUpOtherDeduction"],
         fieldcol: 14,
         label: "累计其他免税扣除",
+        lanId: 543361,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -269,6 +281,7 @@ export const dataCollectCondition = [
         domkey: ["addUpTaxExemptIncome"],
         fieldcol: 14,
         label: "累计免税收入",
+        lanId: 542236,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -279,6 +292,7 @@ export const dataCollectCondition = [
         domkey: ["addUpAllowedDonation"],
         fieldcol: 14,
         label: "累计准予扣除的捐赠额",
+        lanId: 542237,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -289,6 +303,7 @@ export const dataCollectCondition = [
         domkey: ["addUpTaxSavings"],
         fieldcol: 14,
         label: "累计减免税额",
+        lanId: 542238,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -299,6 +314,7 @@ export const dataCollectCondition = [
         domkey: ["addUpAdvanceTax"],
         fieldcol: 14,
         label: "累计已预扣预缴税额",
+        lanId: 542239,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -309,6 +325,7 @@ export const dataCollectCondition = [
         domkey: ["addUpInfantCare"],
         fieldcol: 14,
         label: "累计婴幼儿照护",
+        lanId: 537990,
         labelcol: 8,
         value: "",
         precision: 2,

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

@@ -215,11 +215,8 @@ class Index extends Component {
     addForm.initFormFields(conditions);
     this.setState({
       slidePayload: {
-        ...slidePayload,
-        visible: true,
-        title,
-        data: editId,
-        children: title.length <= 2 ?
+        ...slidePayload, visible: true, title, data: editId,
+        children: title !== getLabel(543370, "往期累计情况（工资、薪金）记录") ?
           <AddItems
             ref={(dom) => this.addItemRef = dom}
             taxAgentOption={taxAgentOption}

pc4mobx/hrmSalary/pages/dataAcquisition/layout.js

@@ -7,12 +7,14 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
-import { WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
 import ImportModal from "../../components/importModal";
 import SlideModalTitle from "../../components/slideModalTitle";
 import { getSearchs } from "../../util";
 import "./index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 @inject("taxAgentStore")
 @observer
 class Layout extends Component {
@@ -116,9 +118,21 @@ class Layout extends Component {
                 subtitle={subtitle}
                 loading={slideLoading}
                 onSave={onSave}
-                editable={subtitle.length <= 2}
+                editable={(
+                  subtitle !== getLabel(543348, "累计专项附加扣除记录") &&
+                  subtitle !== getLabel(543385, "专项附加扣除记录") &&
+                  subtitle !== getLabel(543365, "其他免税扣除记录") &&
+                  subtitle !== getLabel(543370, "往期累计情况（工资、薪金）记录")
+                )}
                 showOperateBtn={showOperateBtn}
-                customOperate={subtitle.length <= 2 ? [] : detailOptBtns}
+                customOperate={
+                  (
+                    subtitle !== getLabel(543348, "累计专项附加扣除记录") &&
+                    subtitle !== getLabel(543385, "专项附加扣除记录") &&
+                    subtitle !== getLabel(543365, "其他免税扣除记录") &&
+                    subtitle !== getLabel(543370, "往期累计情况（工资、薪金）记录")
+                  ) ? [] : detailOptBtns
+                }
               />
             }
             content={slideChildren}

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

@@ -134,6 +134,7 @@ export const dataCollectCondition = [
         domkey: ["businessHealthyInsurance"],
         fieldcol: 14,
         label: "商业健康保险",
+        lanId: 542292,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -144,6 +145,7 @@ export const dataCollectCondition = [
         domkey: ["taxDelayEndowmentInsurance"],
         fieldcol: 14,
         label: "税延养老保险",
+        lanId: 542293,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -154,6 +156,7 @@ export const dataCollectCondition = [
         domkey: ["otherDeduction"],
         fieldcol: 14,
         label: "其他",
+        lanId: 25740,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -164,6 +167,7 @@ export const dataCollectCondition = [
         domkey: ["deductionAllowedDonation"],
         fieldcol: 14,
         label: "准予扣除的捐赠额",
+        lanId: 542294,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -174,6 +178,7 @@ export const dataCollectCondition = [
         domkey: ["privatePension"],
         fieldcol: 14,
         label: "个人养老金",
+        lanId: 542295,
         labelcol: 8,
         value: "",
         precision: 2,

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

@@ -318,11 +318,8 @@ class Index extends Component {
     addForm.initFormFields(conditions);
     this.setState({
       slidePayload: {
-        ...slidePayload,
-        visible: true,
-        title,
-        data: editId,
-        children: title.length <= 2 ?
+        ...slidePayload, visible: true, title, data: editId,
+        children: title !== getLabel(543365, "其他免税扣除记录") ?
           <AddItems
             ref={(dom) => this.addItemRef = dom}
             taxAgentOption={taxAgentOption}

pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/components/condition.js

@@ -56,6 +56,7 @@ export const condition = [
         domkey: ["childrenEducation"],
         fieldcol: 14,
         label: "子女教育",
+        lanId: 503173,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -66,6 +67,7 @@ export const condition = [
         domkey: ["continuingEducation"],
         fieldcol: 14,
         label: "继续教育",
+        lanId: 503174,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -76,6 +78,7 @@ export const condition = [
         domkey: ["housingLoanInterest"],
         fieldcol: 14,
         label: "住房贷款利息",
+        lanId: 503175,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -86,6 +89,7 @@ export const condition = [
         domkey: ["housingRent"],
         fieldcol: 14,
         label: "住房租金",
+        lanId: 503176,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -96,6 +100,7 @@ export const condition = [
         domkey: ["supportingElder"],
         fieldcol: 14,
         label: "赡养老人",
+        lanId: 503177,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -106,6 +111,7 @@ export const condition = [
         domkey: ["seriousIllnessTreatment"],
         fieldcol: 14,
         label: "大病医疗",
+        lanId: 542550,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -116,6 +122,7 @@ export const condition = [
         domkey: ["infantCare"],
         fieldcol: 14,
         label: "婴幼儿照护",
+        lanId: 537983,
         labelcol: 8,
         value: "",
         precision: 2,

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

@@ -326,11 +326,8 @@ class Index extends Component {
     addForm.initFormFields(conditions);
     this.setState({
       slidePayload: {
-        ...slidePayload,
-        visible: true,
-        title,
-        data: editId,
-        children: title.length <= 2 ?
+        ...slidePayload, visible: true, title, data: editId,
+        children: title !== getLabel(543385, "专项附加扣除记录") ?
           <AddItems
             ref={(dom) => this.addItemRef = dom}
             taxAgentOption={taxAgentOption}

pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js

@@ -24,7 +24,7 @@ class Index extends Component {
                 <span>{`${getLabel(15323, "第")}${it.acctTimes}${getLabel(18929, "次")}`}</span>
               </div>
               <div className="sendTime">
-                <span>{getLabel(111, "发放时间")}</span>
+                <span>{getLabel(542610, "发放时间")}</span>
                 <span>{moment(it.sendTime).format("YYYY-MM")}</span>
               </div>
               <a href="javascript:void(0);">{`${getLabel(33564, "查看")}>`}</a>

pc4mobx/hrmSalary/pages/mySalaryMobile/index.js

@@ -82,7 +82,7 @@ class Index extends Component {
       <div id="mySalaryMobile" className="salary-mobile-list-wrapper">
         <div className="salary-mobile-list-tab">
           <WeaTab
-            datas={[{ title: getLabel(111, "工资单"), viewcondition: "Payroll" }]}
+            datas={[{ title: getLabel(503, "工资单"), viewcondition: "Payroll" }]}
             keyParam="viewcondition" selectedKey="Payroll"
           />
         </div>

pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js

@@ -75,8 +75,13 @@ class PovitpivotChartModal extends Component {
   postMessageToChild = (payload) => {
     const childFrameObj = document.getElementById("commonTable");
     const { dataSource, showSum = false, pageInfo, columns } = payload;
+    const i18n = {
+      "总计": getLabel(523, "总计"), "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"), "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+    };
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
-      dataSource, columns, showSum, pageInfo
+      dataSource, columns, showSum, pageInfo, i18n
     }), "*");
   };
   getDataPerspective = (payload) => {

pc4mobx/hrmSalary/pages/ruleConfig/index.js

@@ -302,7 +302,7 @@ export default class Index extends Component {
               break;
             case "salaryAcctFixedColumns":
               this.saveSysOperate({
-                title: getLabel(111, "薪资核算固定列头数"),
+                title: getLabel(545791, "薪资核算固定列头数"),
                 module: "basic", confKey: key,
                 confValue: !_.isNil(val) ? val.toString() : "0"
               });
@@ -405,8 +405,8 @@ export default class Index extends Component {
               />
             </WeaFormItem>
           </WeaSearchGroup>
-          <WeaSearchGroup title={getLabel(111, "薪资核算固定列头数")} showGroup center>
-            <WeaFormItem label={getLabel(111, "固定数")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
+          <WeaSearchGroup title={getLabel(545791, "薪资核算固定列头数")} showGroup center>
+            <WeaFormItem label={getLabel(545792, "固定数")} labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
               <WeaInputNumber min={0} value={salaryAcctFixedColumns}
                               onChange={v => this.setState({
                                 saveParams: { ...saveParams, salaryAcctFixedColumns: v }

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

@@ -39,7 +39,7 @@ class AddCompensationPersonnelDialog extends Component {
             items: _.map(o.items, g => ({
               ...g, label: getLabel(g.lanId, g.label)
             })),
-            title: getLabel(111, "补差人员")
+            title: getLabel(545790, "补差人员")
           };
         })
       }, () => addCPForm.initFormFields(this.state.conditions));
@@ -69,7 +69,7 @@ class AddCompensationPersonnelDialog extends Component {
           ]
         });
       } else {
-        message.error(getLabel(111, "数据不存在！"));
+        message.error(getLabel(542148, "数据不存在！"));
         this.setState({
           paymentList: [
             { title: getLabel(538967, "社保"), titleSign: "social", payment: [] },
@@ -186,7 +186,7 @@ class AddCompensationPersonnelDialog extends Component {
     const { conditions, paymentList, loading } = this.state;
     const { standingBookStore: { addCPForm } } = this.props;
     return (
-      <WeaDialog {...this.props} scalable title={getLabel(111, "添加补差人员")} initLoadCss
+      <WeaDialog {...this.props} scalable title={getLabel(545789, "添加补差人员")} initLoadCss
                  className="add-comp-per-dialog"
                  buttons={[<Button type="primary" onClick={this.save}
                                    loading={loading}>{getLabel(826, "确定")}</Button>]}

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

@@ -14,8 +14,6 @@ import { toDecimal_n } from "../../../../util";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-const getLabel = WeaLocaleProvider.getLabel;
-
 class RegEditDetial extends Component {
   constructor(props) {
     super(props);

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareEditArchiveSlide/index.js

@@ -144,7 +144,7 @@ class Index extends Component {
       fundPayload = this.covertPayload("ACCUMULATION_FUND", "fund", getConditionDomkeys(this.props.fundBase.items)),
       otherPayload = this.covertPayload("OTHER", "other", getConditionDomkeys(this.props.otherBase.items));
     if (!(socailPayload.validate && fundPayload.validate && otherPayload.validate)) {
-      message.warning(getLabel(111, "请维护起始缴纳月！"));
+      message.warning(getLabel(545938, "请维护起始缴纳月！"));
       return;
     }
     this.setState({ loading: true });

pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js

@@ -610,8 +610,8 @@ export const welfareConditions = [
         conditionType: "SELECT",
         domkey: ["otherSchemeId"],
         fieldcol: 14,
-        label: "其它福利名称",
-        lanId: 111,
+        label: "其他福利方案名称",
+        lanId: 542271,
         labelcol: 10,
         value: "",
         options: [],
@@ -623,7 +623,7 @@ export const welfareConditions = [
         domkey: ["otherUnderTake"],
         fieldcol: 14,
         label: "其它福利个人实际承担方",
-        lanId: 111,
+        lanId: 543872,
         labelcol: 10,
         value: "",
         options: [],