release/2.18.2.2412.02-个税

pc4mobx/hrmSalary/components/FormInfo/index.js

@@ -49,7 +49,7 @@ export default class FormInfo extends Component {
           }, textAreaProps, form, formParams);
         }
         Object.assign(itemProps, { label, error: form.getError(field) });
-        let col = 1;
+        let col = colCount ? colCount : 1;
         if (multiColumn != null) {//检查有哪些字段需要一行显示多个
           const idx = _.findIndex(multiColumn, item => item.key === field.domkey[0]);
           if (idx > -1) {

pc4mobx/hrmSalary/pages/dataAcquisition/addItems.js

@@ -5,7 +5,9 @@
  */
 import React, { Component } from "react";
 import { WeaBrowser, WeaFormItem } from "ecCom";
-import { getDomkes, getSearchs } from "../../util";
+import { WeaSwitch } from "comsMobx";
+import { getDomkes, toDecimal_n } from "../../util";
+import FormInfo from "../../components/FormInfo";
 import "./index.less";
 
 class AddItems extends Component {
@@ -60,9 +62,207 @@ class AddItems extends Component {
 
   render() {
     const { form, condition = [] } = this.props;
+    const itemRender = {
+      // 累计专项附加扣除
+      addUpChildEducation: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpChildEducation: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpContinuingEducation: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpContinuingEducation: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpHousingLoanInterest: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpHousingLoanInterest: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpHousingRent: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpHousingRent: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpSupportElderly: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpSupportElderly: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpIllnessMedical: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpIllnessMedical: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpInfantCare: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpInfantCare: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      //专项附加扣除
+      childrenEducation: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ childrenEducation: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      continuingEducation: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ continuingEducation: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      housingLoanInterest: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ housingLoanInterest: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      housingRent: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ housingRent: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      supportingElder: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ supportingElder: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      seriousIllnessTreatment: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ seriousIllnessTreatment: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      infantCare: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ infantCare: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      //往期累计情况（工资、薪金）
+      addUpIncome: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpIncome: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpSubtraction: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpSubtraction: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpSocialSecurityTotal: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpSocialSecurityTotal: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpAccumulationFundTotal: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpAccumulationFundTotal: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpEnterpriseAndOther: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpEnterpriseAndOther: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpOtherDeduction: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpOtherDeduction: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpTaxExemptIncome: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpTaxExemptIncome: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpAllowedDonation: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpAllowedDonation: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpTaxSavings: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpTaxSavings: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpAdvanceTax: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpAdvanceTax: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      actualAddUpAdvanceTax: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ actualAddUpAdvanceTax: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      taxAdjustment: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ taxAdjustment: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      addUpTaxableIncome: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                           form={form} formParams={formParams}
+                           onBlur={(v) => v && form.updateFields({ addUpTaxableIncome: { value: toDecimal_n(v, 2) } })}/>);
+      },
+      // 其他免税扣除
+      freeIncome: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ freeIncome: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      businessHealthyInsurance: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ businessHealthyInsurance: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      taxDelayEndowmentInsurance: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ taxDelayEndowmentInsurance: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      deductionAllowedDonation: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ deductionAllowedDonation: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      derateDeduction: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ derateDeduction: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      otherDeduction: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ otherDeduction: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      },
+      privatePension: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }}
+                     form={form} formParams={formParams}
+                     onBlur={(v) => v && form.updateFields({ privatePension: { value: toDecimal_n(v, 2) } })}/>
+          {field.extraDom && field.extraDom}
+        </React.Fragment>);
+      }
+    };
     return (
       <div className="addItemsWrapper form-dialog-layout">
-        {getSearchs(form, condition, 2, false)}
+        <FormInfo center={false} form={form} formFields={condition} colCount={2} custLabelCol={8}
+                  itemRender={itemRender}/>
         <Tips><span>若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据</span></Tips>
       </div>
     );

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

@@ -254,8 +254,9 @@ export const dataCollectCondition = [
         domkey: ["taxAdjustment"],
         fieldcol: 14,
         label: "个税调差",
-        helpfulTitle: "1、【个税调差】=【实际累计已预扣预缴税额】-【累计已预扣预缴税额】。\n" +
+        helpfulTip: "1、【个税调差】=【实际累计已预扣预缴税额】-【累计已预扣预缴税额】。\n" +
           "2、直接输入或导入【个税调差】值，则以输入/导入为准，公式失效。再次编辑减数或被减数，会再次按公式自动计算。",
+        helpfulTipLanId: 111,
         labelcol: 8,
         value: "",
         precision: 2,
@@ -270,7 +271,7 @@ export const dataCollectCondition = [
         value: "",
         precision: 2,
         viewAttr: 2
-      },
+      }
 
       // {
       //   conditionType: "INPUTNUMBER",