From 814eefa1de7252a1f22918acad1daa988ddd7bce 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, 10 Jan 2023 13:51:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=EF=BC=8C?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BC=B4=E7=BA=B3=E6=9C=88=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socialSecurityBenefits/archives/index.js  | 11 +++----
 .../standingBookDetail/components/normal.js   | 29 +++++++++++++------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
index c288edd4..c27a6439 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
@@ -252,18 +252,15 @@ export default class Archives extends React.Component {
   };
 
   // 导入
-  handleBtnImport(runStatus) {
+  handleBtnImport = (runStatus) => {
     this.setState({ importVisible: true, runStatus });
-  }
+  };
 
   // 模板点击
   handleTemplateLinkClick = (exportData) => {
     const { selectedKey } = this.state;
-    const { archivesStore: { exportTempateDownload } } = this.props;
-    exportTempateDownload({
-      exportData,
-      runStatuses: selectedKey === "pending" ? ["1"] : ["2", "3"]
-    });
+    let url = `/api/bs/hrmsalary/scheme/template/export?exportData=${exportData}&runStatuses=${selectedKey === "pending" ? "1" : "2,3"}`;
+    window.open(`${window.location.origin}${url}`);
   };
 
   // 导入预览
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index c85b5dab..9887e3f9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -440,7 +440,21 @@ export default class NormalIndex extends Component {
     this.setState({
       returnEditPersonSlide: { ...returnEditPersonSlide, visible: false, title: "", editId: "" }
     }, () => {
-      refreshList && this.getNormalList();
+      if (refreshList) {
+        const { current } = this.state;
+        const { billMonth, selectedKey, paymentOrganization } = this.props;
+        selectedKey === "1"
+          ? this.getNormalList({
+            billMonth,
+            paymentOrganization,
+            current
+          })
+          : this.getSupplementaryList({
+            billMonth,
+            paymentOrganization,
+            current
+          });
+      }
     });
   };
 
@@ -515,14 +529,11 @@ export default class NormalIndex extends Component {
         render: (text, record) => {
           return (
             <div className="optWrapper">
-              {
-                selectedKey === "3" &&
-                <a
-                  href="javascript:void(0);"
-                  className="mr10"
-                  onClick={() => this.handleEditNormalStandingBook(record)}
-                >编辑</a>
-              }
+              <a
+                href="javascript:void(0);"
+                className="mr10"
+                onClick={() => this.handleEditNormalStandingBook(record)}
+              >编辑</a>
             </div>
           );
         }