diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index e83e95ca..7ff80bb3 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -36,7 +36,9 @@ class SalaryDetails extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.isQuery !== this.props.isQuery) this.getSalaryList(nextProps);
+    if (nextProps.isQuery !== this.props.isQuery) this.setState({
+      pageInfo: { ...this.state.pageInfo, current: 1 }
+    }, () => this.getSalaryList(nextProps));
   }
 
   componentWillUnmount() {
diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
index c9efba65..886900e6 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@@ -331,7 +331,7 @@ class Index extends Component {
     const tabs = [
       { key: "statistics", title: getLabel(111, "统计表") },
       { key: "detail", title: getLabel(111, "员工明细") },
-      // { key: "salaryDetail", title: getLabel(111, "薪资明细") }
+      { key: "salaryDetail", title: getLabel(111, "薪资明细") }
     ];
     return (
       <WeaReqTop
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index 5ae424d3..c95ea59c 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -138,7 +138,7 @@ export const getIframeParentHeight = (selector, total, extraHeight) => {
   const dom = document.querySelector(selector);
   let height = 280;
   if (dom && total > 0) {
-    height = (parseFloat(dom.style.height) > 620 && total === 10) ? total * 48 + 108: total < 10 ? total * 48 + 108 : parseFloat(dom.style.height) - extraHeight;
+    height = (parseFloat(dom.style.height) > 620 && total === 10) ? total * 48 + 108 : total < 10 ? (total + 1) * 48 + 108 : parseFloat(dom.style.height) - extraHeight;
   }
   return height;
 };