From ced585e164066b05c894e55d72717440fdcb3f76 Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Tue, 25 Oct 2022 17:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payrollFiles/components/importMenu.js          | 9 +++++++--
 pc4mobx/hrmSalary/pages/payrollFiles/index.js            | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
index 5e9e6ae0..e3601c05 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/importMenu.js
@@ -113,6 +113,12 @@ class ImportMenu extends Component {
   render() {
     const { importType, refreshList } = this.props;
     const { importParams, previewColumns, previewDataSource } = this.state;
+    let params = "";
+    if (importParams.importType === "init" || importParams.importType === "salaryItemAdjust") {
+      params = importParams.importType + "&listType=FIXED";
+    } else {
+      params = "" + "&listType=" + importParams.importType;
+    }
     return (
       <React.Fragment>
         <Menu className="dropdownMenuWrapper" onClick={this.handleMenuClick}>
@@ -144,8 +150,7 @@ class ImportMenu extends Component {
             previewImport={(params) => this.salaryArchivePreview(params)}
             importFile={(params) => this.handleImportFile(params)}
             templateLink={
-              "/api/bs/hrmsalary/salaryArchive/downloadTemplate?importType=" +
-              importParams.importType
+              "/api/bs/hrmsalary/salaryArchive/downloadTemplate?importType=" + params
             }
             visiable={importParams.visible}
             onCancel={() => {
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 47405cca..e654c674 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -363,7 +363,7 @@ class Index extends Component {
         }}>导入</Button>,
         <Dropdown overlay={<ExportMenu selectedKey={selectedKey} selectedRowKeys={selectedRowKeys}
                                        searchItemsValue={searchItemsValue}/>}>
-          <Button type="primary" style={{ marginLeft: 8 }}>导出<i className="icon-coms-down2" style={{
+          <Button type="primary">导出<i className="icon-coms-down2" style={{
             marginLeft: 8,
             verticalAlign: "middle"
           }}/></Button>
@@ -380,14 +380,14 @@ class Index extends Component {
             }}
           />
         }>
-          <Button type="primary" style={{ marginLeft: 8 }}>批量取消停薪<i className="icon-coms-down2" style={{
+          <Button type="primary">批量取消停薪<i className="icon-coms-down2" style={{
             marginLeft: 8,
             verticalAlign: "middle"
           }}/></Button>
         </Dropdown>,
         <Dropdown overlay={<ExportMenu selectedKey={selectedKey} selectedRowKeys={selectedRowKeys}
                                        searchItemsValue={searchItemsValue}/>}>
-          <Button type="primary" style={{ marginLeft: 8 }}>导出<i className="icon-coms-down2" style={{
+          <Button type="primary">导出<i className="icon-coms-down2" style={{
             marginLeft: 8,
             verticalAlign: "middle"
           }}/></Button>