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} > 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 { {/*导入弹框*/} this.tableRef = dom}