From e9b6fd32b6d55e8debaf75777105fa78b033affb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 2 Mar 2023 09:34:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js   | 3 ++-
 pc4mobx/hrmSalary/pages/dataAcquisition/layout.js            | 5 ++---
 .../pages/dataAcquisition/specialAddDeduction/index.js       | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 54853601..d3568f47 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -17,7 +17,7 @@ import DataTables from "../dataTables";
 import AddItems from "../addItems";
 import ImportFormCom from "./components/importFormCom";
 import TableRecord from "../components/tableRecord";
-import { dataCollectCondition } from "./columns";
+import { dataCollectCondition, modalColumns } from "./columns";
 import { removePropertyCondition } from "../../../util/response";
 import Layout from "../layout";
 import moment from "moment";
@@ -509,6 +509,7 @@ class Index extends Component {
               onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
               importPayload={importPayload} onImportFile={this.handleImportFile}
               onPreviewImport={this.handlePreviewImport} detailOptBtns={this.getDetailOptBtns()}
+              columns={modalColumns}
       >
         <DataTables
           ref={dom => this.tableRef = dom}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index 3fe21509..ed2969e8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -9,7 +9,6 @@ import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
 import ImportModal from "../../components/importModal";
-import { modalColumns } from "./cumDeduct/columns";
 import SlideModalTitle from "../../components/slideModalTitle";
 import { getSearchs } from "../../util";
 import "./index.less";
@@ -57,7 +56,7 @@ class Layout extends Component {
       title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
       slidePayload, onClose, onSave, slideLoading, form, condition,
       onAdSearch, onCancel, importPayload, onImportSetStep, onImportFile,
-      onPreviewImport, detailOptBtns
+      onPreviewImport, detailOptBtns, columns
     } = this.props;
     const { visible, title: subtitle, children: slideChildren } = slidePayload;
     const {
@@ -87,7 +86,7 @@ class Layout extends Component {
           {/*导入弹框*/}
           <ImportModal
             needimportSelected //下载模板需要带上导入所选项
-            columns={modalColumns}
+            columns={columns}
             params={importOpts}
             step={step}
             setStep={onImportSetStep}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
index be34822b..2629381c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
@@ -20,6 +20,7 @@ import ImportFormCom from "../cumDeduct/components/importFormCom";
 import { condition } from "./components/condition";
 import AddItems from "../addItems";
 import TableRecord from "../components/tableRecord";
+import { specialModalColumns } from "../cumDeduct/columns";
 
 @inject("taxAgentStore", "specialAddStore")
 @observer
@@ -425,6 +426,7 @@ class Index extends Component {
               onImportSetStep={this.handleImportSetStep} onCancel={this.handleCloseImport}
               importPayload={importPayload} onImportFile={this.handleImportFile}
               onPreviewImport={this.handlePreviewImport} detailOptBtns={[]}
+              columns={specialModalColumns}
       >
         <DataTables
           ref={dom => this.tableRef = dom}