Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税

# Conflicts:
#	pc4mobx/hrmSalary/apis/index.js

pc4mobx/hrmSalary/apis/index.js

@@ -35,6 +35,11 @@ export const getDetailChanges = params => {
   };
   return postFetch("/api/bs/hrmsalary/elog/getDetailChanges", payload);
 };
+//获取薪资账套全列表
+export const getSalarysobListAll = params => {
+  return postFetch("/api/bs/hrmsalary/salarysob/listAll", params);
+};
+
 
 // 薪资账套-浏览按钮数据
 export const commonBrowserData = (params) => {

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js

@@ -6,6 +6,7 @@
  */
 import React, { Component } from "react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
+import { Dropdown, Menu } from "antd";
 import { statisticsEmployeeList } from "../../../apis/statistics";
 import "../index.less";
 
@@ -57,8 +58,17 @@ class EmployeeDetails extends Component {
               return <React.Fragment>
                 <a target="_blank" style={{ marginRight: 10 }}
                    href={`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/analysisOfSalaryStatistics/${record.id}?name=${record.name}&dept=${record.department || ""}`}>{getLabel(111, "查看")}</a>
-                <a href="javascript:void(0)"
+                <Dropdown
-                   onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                  overlay={
+                    <Menu>
+                      <Menu.Item>
+                        <a href="javascript:void(0);"
+                           onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                      </Menu.Item>
+                    </Menu>
+                  }>
+                  <a href="javascript:void(0)"><i className="icon-coms-more"/></a>
+                </Dropdown>
               </React.Fragment>;
             }
           }]

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

@@ -31,7 +31,7 @@ import {
 } from "../../../apis/statistics";
 import { commonEnumList } from "../../../apis/ruleconfig";
 import { getTaxAgentSelectList } from "../../../apis/taxAgent";
-import { getPayrollTemplateLedgerList } from "../../../apis/payroll";
+import { getSalarysobListAll } from "../../../apis";
 import { condition } from "./condition";
 import cs from "classnames";
 import "../index.less";
@@ -70,7 +70,7 @@ class StatisticalMicroSettingsSlide extends Component {
   }
 
   getTaxAgentSelectList = async (props) => {
-    const { data: salarySobList } = await getPayrollTemplateLedgerList();
+    const { data: salarySobList } = await getSalarysobListAll();
     getTaxAgentSelectList(true).then(({ status, data }) => {
       if (status) {
         const conditions = _.map(condition, item => {
@@ -85,7 +85,7 @@ class StatisticalMicroSettingsSlide extends Component {
               } else if (getKey(child) === "salarySob") {
                 return {
                   ...child, viewAttr: props.isShare ? 1 : child.viewAttr,
-                  options: _.map(salarySobList, o => ({ key: o.id, showname: o.content }))
+                  options: _.map(salarySobList, o => ({ key: String(o.id), showname: o.name }))
                 };
               }
               return { ...child, viewAttr: props.isShare ? 1 : child.viewAttr };