From f86a7c412ee59bc60179446f88f9f188fefca61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 23 Jul 2024 11:12:06 +0800
Subject: [PATCH] =?UTF-8?q?release/2.15.1.2407.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/declare.js             |  2 +-
 .../pages/adjustSalaryManage/index.js         |  2 +-
 .../components/taxDeclarationInfo.js          | 28 +++++++++----------
 .../hrmSalary/pages/declareDetail/index.js    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/declare.js b/pc4mobx/hrmSalary/apis/declare.js
index 746bcf99..7574b18a 100644
--- a/pc4mobx/hrmSalary/apis/declare.js
+++ b/pc4mobx/hrmSalary/apis/declare.js
@@ -254,7 +254,7 @@ export const employeedeclareExportTemplate = params => {
 };
 //个税申报表申报数据-下载申报内置算税结果
 export const exportGetDeclareTaxResultFeedback = params => {
-  return postExportFetch("/api/bs/hrmsalary/taxdeclaration/exportGetDeclareTaxResultFeedback", params);
+  return postExportFetch("/api/bs/hrmsalary/taxdeclaration/exportGetCompanyIncomes", params);
 };
 //个税申报表申报数据-数据导入
 export const taxdeclarationImportData = (params) => {
diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
index d2c71fb3..d1fd2bb9 100644
--- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
+++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/index.js
@@ -97,7 +97,7 @@ class Index extends Component {
           effectiveTime: effectiveTime1 ? `${effectiveTime1},${effectiveTime2}` : "",
           operateTime: operateTime1 ? `${operateTime1},${operateTime2}` : ""
         };
-        window.open(`${window.location.origin}/api/bs/hrmsalary/salaryArchive/adjustRecord/exportSalaryItemList?${convertToUrlString(payload)}`, "_target");
+        window.open(`${window.location.origin}/api/bs/hrmsalary/salaryArchive/adjustRecord/exportSalaryItemList?${convertToUrlString(payload)}`, "_blank");
         this.handleDebounce = null;
       }, 500);
     }
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
index 16eb0b9b..ec5edc9c 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/components/taxDeclarationInfo.js
@@ -55,20 +55,20 @@ class TaxDeclarationInfo extends Component {
     ];
     let dropMenuDatas = [];
     if (["DECLARE_SUCCESS_NO_PAY", "DECLARE_SUCCESS_UNPAID", "DECLARE_SUCCESS_PAID", "DECLARE_SUCCESS_PAYING"].includes(declareInfo.declareStatus)) {
-      // dropMenuDatas = dropMenuDatas.concat([
-      //   {
-      //     key: "exportGetDeclareTaxResultFeedback",
-      //     icon: <i className="icon-coms-download2"/>,
-      //     content: getLabel(111, "下载申报内置算税结果"),
-      //     onClick: onOperate
-      //   },
-      //   {
-      //     key: "onlineComparison",
-      //     icon: <i className="icon-coms-Journal-o"/>,
-      //     content: getLabel(111, "在线对比"),
-      //     onClick: onOperate
-      //   }
-      // ]);
+      dropMenuDatas = dropMenuDatas.concat([
+        {
+          key: "exportGetDeclareTaxResultFeedback",
+          icon: <i className="icon-coms-download2"/>,
+          content: getLabel(111, "下载申报内置算税结果"),
+          onClick: onOperate
+        },
+        {
+          key: "onlineComparison",
+          icon: <i className="icon-coms-Journal-o"/>,
+          content: getLabel(111, "在线对比"),
+          onClick: onOperate
+        }
+      ]);
     }
     return (
       <div className="taxDeclarationInfo_layout">
diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
index a1372b00..cfedcd29 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -315,7 +315,7 @@ class Index extends Component {
   };
   onlineComparison = () => {
     const [__, taxDeclarationId] = this.state.selectedKey.split("%%");
-    window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/declareDetail/${taxDeclarationId}`, "_target");
+    window.open(`${window.location.origin}/spa/hrmSalary/static/index.html#/main/hrmSalary/declareDetail/${taxDeclarationId}`, "_blank");
   };
   handleTabEdit = (tabKey, type) => {
     if (type === "remove") {