From 729cd59a42b8fa53604053b09051984b98671f55 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 7 May 2025 13:11:32 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E4=BA=94=E9=99=A2=E6=9D=AD=E5=B7=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/advanceInputBtn/index.less |  2 +-
 .../doCalc/components/salaryApproval/index.js    |  2 +-
 .../doCalc/components/salaryDiffence/index.js    | 16 ++++++++++------
 .../hrmSalary/pages/calculate/doCalc/index.js    |  2 ++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less
index 1a3d7283..584a47a2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/advanceInputBtn/index.less
@@ -5,7 +5,7 @@
   top: -2.5px;
 
   .wea-advanced-search {
-    top: 2px;
+    top: 1px!important;
     left: -1px;
     height: 28px;
     line-height: 1;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
index a967a73d..d2eb9fc0 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryApproval/index.js
@@ -133,7 +133,7 @@ class Index extends Component {
           onToggleSwitch={this.openAdvanceSearch}
           onAdSearch={this.onAdSearch}/>
       </div>
-      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, maxHeight: "678px" }}>
+      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "356px", maxHeight: "678px" }}>
         <Spin spinning={loading}>
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
index bf6b0c10..b2fd6f74 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryDiffence/index.js
@@ -8,10 +8,10 @@
   * @description:
 */
 import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaLoadingGlobal, WeaLocaleProvider } from "ecCom";
 import { Spin } from "antd";
 import EditCalcAdvanceSearchPannel from "../salaryEditCalc/editCalcAdvanceSearchPannel";
-import { postFetch } from "../../../../../util/request";
+import { postExportFetch, postFetch } from "../../../../../util/request";
 import { traverse } from "../salaryEditCalc/editCalcTable";
 import cs from "classnames";
 
@@ -22,7 +22,7 @@ class Index extends Component {
     super(props);
     this.state = {
       showSearchAd: false, showTotalCell: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
-      loading: false
+      loading: false, payload: {}
     };
   }
 
@@ -65,13 +65,13 @@ class Index extends Component {
     };
     postFetch("/api/bs/hrmsalary/salaryArchive/wy/compareDifferentList", payload)
       .then(({ status, data }) => {
-        this.setState({ loading: false });
+        this.setState({ loading: false, payload });
         if (status && !_.isEmpty(data)) {
           const { columns, pageInfo: { pageNum: current, pageSize, total, list: dataSource } } = data;
           this.setState({ pageInfo: { current, pageSize, total } }, () => {
             const { pageInfo } = this.state;
             this.postMessageToChild({
-              dataSource, pageInfo, showTotalCell: false, sumRowlistUrl: "", calcDetail: true, tableScrollHeight: 179,
+              dataSource, pageInfo, showTotalCell: false, sumRowlistUrl: "", calcDetail: true, tableScrollHeight: 120,
               columns: _.every(traverse(columns, true), (it, idx) => !it.fixed) ? _.map(traverse(columns, true), (it, idx) => ({
                 ...it, fixed: idx < 2 ? "left" : false
               })) : traverse(columns, true)
@@ -93,6 +93,10 @@ class Index extends Component {
     const childFrameObj = document.getElementById("diffenceTable");
     childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
+  exportDifferenctList = () => {
+    WeaLoadingGlobal.start();
+    const promise = postExportFetch("/api/bs/hrmsalary/salaryArchive/wy/exportCompareDifferentList", this.state.payload);
+  };
 
   render() {
     const { showSearchAd, loading, pageInfo } = this.state, { routeParams: { salaryAcctRecordId } } = this.props;
@@ -105,7 +109,7 @@ class Index extends Component {
           onToggleSwitch={this.openAdvanceSearch}
           onAdSearch={this.onAdSearch}/>
       </div>
-      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, maxHeight: "678px" }}>
+      <div style={{ height: `calc((39px * ${columnNum}) + 188.53px)`, minHeight: "287px", maxHeight: "678px" }}>
         <Spin spinning={loading}>
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index d6d91fd7..5ff5c2ca 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -200,6 +200,8 @@ class Index extends Component {
         break;
       case "diffence":
         isOpenApproval && (reqBtns = [
+          <Button type="primary"
+                  onClick={() => this.calcDiffence && this.calcDiffence.exportDifferenctList()}>{getLabel(111, "导出")}</Button>,
           <AdvanceInputBtn onOpenAdvanceSearch={() => this.calcDiffence.openAdvanceSearch()}
                            onAdvanceSearch={() => this.calcDiffence.onAdSearch(false)}/>
         ]);