From d664ad27691a37b2f8515a53a61d86fcbaa6243c 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, 20 Sep 2023 17:03:24 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.9.42309.01-=E8=96=AA=E9=85=AC?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=88=86=E4=BA=AB=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=2020230920?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/taxAgent.js             | 18 +++++++-----------
 .../statisticalMicroSettingsSlide.js           |  2 +-
 pc4mobx/hrmSalary/pages/reportView/index.js    |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/taxAgent.js b/pc4mobx/hrmSalary/apis/taxAgent.js
index 25747f12..1b0f58d8 100644
--- a/pc4mobx/hrmSalary/apis/taxAgent.js
+++ b/pc4mobx/hrmSalary/apis/taxAgent.js
@@ -1,5 +1,5 @@
 import { WeaTools } from "ecCom";
-import { formPost, postFetch } from "../util/request";
+import { postFetch } from "../util/request";
 
 //个税扣缴义务人列表
 export const getTaxAgentList = (params) => {
@@ -7,9 +7,9 @@ export const getTaxAgentList = (params) => {
     method: "POST",
     mode: "cors",
     headers: {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
     },
-    body: JSON.stringify(params),
+    body: JSON.stringify(params)
   }).then((res) => res.json());
 };
 //同步人员范围
@@ -18,9 +18,9 @@ export const taxAgentRangeSync = (params) => {
     method: "POST",
     mode: "cors",
     headers: {
-      "Content-Type": "application/json",
+      "Content-Type": "application/json"
     },
-    body: JSON.stringify(params),
+    body: JSON.stringify(params)
   }).then((res) => res.json());
 };
 
@@ -108,12 +108,8 @@ export const taxAgentRangeImportData = (params) => {
 };
 
 //个税扣缴义务人下拉列表
-export const getTaxAgentSelectList = (params) => {
-  return WeaTools.callApi(
-    "/api/bs/hrmsalary/taxAgent/selectList",
-    "GET",
-    params
-  );
+export const getTaxAgentSelectList = (isShare = false) => {
+  return WeaTools.callApi("/api/bs/hrmsalary/taxAgent/selectList", "GET", { isShare });
 };
 
 //当前登录人个税扣缴义务人下拉列表
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 536ad2da..65668107 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -67,7 +67,7 @@ class StatisticalMicroSettingsSlide extends Component {
   }
 
   getTaxAgentSelectList = (props) => {
-    getTaxAgentSelectList().then(({ status, data }) => {
+    getTaxAgentSelectList(true).then(({ status, data }) => {
       if (status) {
         const conditions = _.map(condition, item => {
           return {
diff --git a/pc4mobx/hrmSalary/pages/reportView/index.js b/pc4mobx/hrmSalary/pages/reportView/index.js
index 2db97c5c..ffe5a3db 100644
--- a/pc4mobx/hrmSalary/pages/reportView/index.js
+++ b/pc4mobx/hrmSalary/pages/reportView/index.js
@@ -93,7 +93,7 @@ class Index extends Component {
   exportData = () => {
     const { report } = this.state;
     const { id, dimensionId, isShare } = report;
-    window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}&isShare=${isShare}`, "_self");
+    window.open(`${window.location.origin}/api/bs/hrmsalary/report/statistics/report/exportData?id=${id}&dimensionId=${dimensionId}&isShare=${isShare}`, "_blank");
   };
 
   render() {