hotfix/2.10.1.2402.01

薪酬统计报表设置添加薪资账套的设置项

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

@@ -18,6 +18,19 @@ export const condition = [
         multiple: true,
         viewAttr: 2
       },
+      {
+        colSpan: 2,
+        checkbox: false,
+        checkboxValue: false,
+        conditionType: "SELECT",
+        domkey: ["salarySob"],
+        fieldcol: 18,
+        label: getLabel(538010, "薪资账套"),
+        labelcol: 6,
+        options: [],
+        multiple: true,
+        viewAttr: 2
+      },
       {
         browserConditionParam: {
           completeParams: {},

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

@@ -31,6 +31,7 @@ import {
 } from "../../../apis/statistics";
 import { commonEnumList } from "../../../apis/ruleconfig";
 import { getTaxAgentSelectList } from "../../../apis/taxAgent";
+import { getPayrollTemplateLedgerList } from "../../../apis/payroll";
 import { condition } from "./condition";
 import cs from "classnames";
 import "../index.less";
@@ -68,7 +69,8 @@ class StatisticalMicroSettingsSlide extends Component {
     }
   }
 
-  getTaxAgentSelectList = (props) => {
+  getTaxAgentSelectList = async (props) => {
+    const { data: salarySobList } = await getPayrollTemplateLedgerList();
     getTaxAgentSelectList(true).then(({ status, data }) => {
       if (status) {
         const conditions = _.map(condition, item => {
@@ -80,6 +82,11 @@ class StatisticalMicroSettingsSlide extends Component {
                   ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
                   options: _.map(data, o => ({ key: o.id, showname: o.content }))
                 };
+              } else if (getKey(child) === "salarySob") {
+                return {
+                  ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
+                  options: _.map(salarySobList, o => ({ key: o.id, showname: o.content }))
+                };
               }
               return { ...child, viewAttr: props.isShare ? 1 : child.viewAttr };
             })
@@ -124,8 +131,9 @@ class StatisticalMicroSettingsSlide extends Component {
     const { salaryMonth, timeType, dataSource } = this.state;
     const { form, id, dimension, onClose } = this.props;
     const [salaryStartMonth, salaryEndMonth] = salaryMonth;
-    const { department, employee, position, subCompany, taxAgent, ...extra } = form.getFormDatas();
+    const { department, employee, position, subCompany, taxAgent, salarySob, ...extra } = form.getFormDatas();
     const { value, valueSpan } = taxAgent;
+    const { value: sobValue, valueSpan: sobValueSpan } = salarySob;
     if (!salaryEndMonth || !salaryStartMonth) {
       this.refs.weaError.showError();
       return;
@@ -138,6 +146,10 @@ class StatisticalMicroSettingsSlide extends Component {
       // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
       subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })),
       taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [],
+      salarySob: sobValue ? _.map(sobValue.split(","), (it, idx) => ({
+        id: it,
+        name: sobValueSpan.split(",")[idx]
+      })) : [],
       items: dataSource,
       salaryEndMonth: salaryEndMonth + "-01",
       salaryStartMonth: salaryStartMonth + "-01"