From 0628c1499babe44ba38e7a13ae77e566719d29c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 15 Jul 2024 18:42:26 +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

---
 .../payrollDetail/components/salaryDetailList/index.js      | 5 +++--
 .../hrmSalary/pages/payroll/payrollDetail/payrollDetail.js  | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
index cec8fa94..16110dd9 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
@@ -88,7 +88,8 @@ class Index extends Component {
     const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/salaryBill/send/sum" : "";
     if (!_.isEmpty(columns)) {
       this.postMessageToChild({
-        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154,
+        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true,
+        tableScrollHeight: pageInfo.total === 0 ? 90 : 156,
         sumRowlistUrl, payload: { ...payload, updateSum },
         columns: _.map(columns, (it, idx) => ({
           ...it, width: it.oldWidth, fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
@@ -124,7 +125,7 @@ class Index extends Component {
       <div style={{
         height: `calc((39px * ${columnNum}) + 126.84px)`,
         maxHeight: "678px",
-        minHeight: "270px"
+        minHeight: !total ? "270px" : "inherit"
       }}>
         <Spin spinning={loading}>
           <iframe
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
index d54798c1..bbb82e54 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
@@ -49,6 +49,12 @@ class PayrollDetail extends Component {
     }, () => detailListConditionForm.initFormFields(this.state.conditions));
   }
 
+  handleExportAll = () => {
+    const salarySendId = getQueryString("id");
+    const url = `${window.location.origin}/api/bs/hrmsalary/salaryBill/send/exportDetailList?salarySendId=${salarySendId}`;
+    window.open(url, "_self");
+  };
+
   render() {
     const { salarySendDetailBaseInfo, showSearchAd, conditions, isQuery, showTotalCell } = this.state;
     const { taxAgentStore: { showOperateBtn }, payrollStore: { salaryTableStore } } = this.props;