From cff964c7f1f44709a9a856734c428daffebc5e72 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, 16 Jul 2024 11:10:48 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.14.5.2406.03-=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/payroll.js                     |  7 ++++++-
 .../pages/payroll/payrollDetail/payrollDetail.js      | 11 +++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index 8ca9fab7..48fcecb2 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -1,5 +1,5 @@
 import { WeaTools } from "ecCom";
-import { postFetch } from "../util/request";
+import { postExportFetch, postFetch } from "../util/request";
 import { convertToUrlString } from "../util/url";
 
 //工资单-工资单发放列表
@@ -248,3 +248,8 @@ export const genPdfBeforeExport = (params) => {
 export const salaryBillPreview = (params) => {
   return postFetch("/api/bs/hrmsalary/salaryBill/preview", params);
 };
+// 工资单查看详情导出-重构
+export const exportDetailList_reconfig = (params) => {
+  return postExportFetch("/api/bs/hrmsalary/salaryBill/send/exportDetailList", params);
+};
+
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
index 835d6f2b..a0c9e495 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
@@ -9,7 +9,8 @@
 */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaLocaleProvider, WeaTop } from "ecCom";
+import { toJS } from "mobx";
+import { WeaLoadingGlobal, WeaLocaleProvider, WeaTop } from "ecCom";
 import { Button } from "antd";
 import AdvanceInputBtn from "./components/advanceInputBtn";
 import SalaryMonthHelpfulTip from "./components/salaryMonthHelpfulTip";
@@ -50,14 +51,16 @@ class PayrollDetail extends Component {
   }
 
   handleExportAll = () => {
+    const { payrollStore: { salaryTableStore } } = this.props;
+    const columns = _.filter(toJS(salaryTableStore.columns), (item) => item.display === "true");
+    WeaLoadingGlobal.start();
     const salarySendId = getQueryString("id");
-    const url = `${window.location.origin}/api/bs/hrmsalary/salaryBill/send/exportDetailList?salarySendId=${salarySendId}`;
-    window.open(url, "_blank");
+    const promise = API.exportDetailList_reconfig({ salarySendId, columns: _.map(columns, it => it.dataIndex) });
   };
 
   render() {
     const { salarySendDetailBaseInfo, showSearchAd, conditions, isQuery, showTotalCell } = this.state;
-    const { taxAgentStore: { showOperateBtn }, payrollStore: { salaryTableStore } } = this.props;
+    const { taxAgentStore: { showOperateBtn } } = this.props;
     const { salaryMonth, template } = salarySendDetailBaseInfo;
     const dropMenuDatas = [
       {