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;