From 5e9a9c28220d4576ffff166359e3b50acd733ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 28 Feb 2024 15:48:22 +0800
Subject: [PATCH] =?UTF-8?q?hotfix/2.10.1.2402.01=20=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E8=AE=BE=E7=BD=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/reportView/components/condition.js     | 13 +++++++++++++
 .../components/statisticalMicroSettingsSlide.js  | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index 9d141953..d4f8417f 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/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: {},
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index f5237045..8065a654 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/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"