From dbc68102dd4b15f5543bba41bdcda7ffdec2a4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 7 Mar 2024 09:48:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A5=E5=BF=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/employeeDetails.js                  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
index 17a73140..48816b74 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
+++ b/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)"
-                   onClick={() => this.props.onFilterLog("log", record.id)}>{getLabel(545781, "操作日志")}</a>
+                <Dropdown
+                  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>;
             }
           }]

From d1f8f5d9aa68a555b51c169a1ae331b649eaaa3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 7 Mar 2024 10:10:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=96=AA=E9=85=AC=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/index.js                              | 5 +++++
 .../reportView/components/statisticalMicroSettingsSlide.js   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/index.js b/pc4mobx/hrmSalary/apis/index.js
index eabea534..668d2591 100644
--- a/pc4mobx/hrmSalary/apis/index.js
+++ b/pc4mobx/hrmSalary/apis/index.js
@@ -35,3 +35,8 @@ export const getDetailChanges = params => {
   };
   return postFetch("/api/bs/hrmsalary/elog/getDetailChanges", payload);
 };
+//获取薪资账套全列表
+export const getSalarysobListAll = params => {
+  return postFetch("/api/bs/hrmsalary/salarysob/listAll", params);
+};
+
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 8065a654..738e1fb6 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/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 => {

From 3b0f7bd5ce67e1658e4069196c48f66c9bc79472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 7 Mar 2024 10:31:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=96=AA=E9=85=AC=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportView/components/statisticalMicroSettingsSlide.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 738e1fb6..71baa2f7 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -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 };