diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js index 766594f7..9f8a3084 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js @@ -2,6 +2,7 @@ import React from "react"; import ImportModal from "../../../../components/importModal"; import { Badge, Button, message } from "antd"; import { inject, observer } from "mobx-react"; +import SelectFieldModal from "./selectFieldModal"; import { getQueryString } from "../../../../util/url"; import AddHeaderFieldsModal from "./addHeaderFieldsModal"; @@ -118,12 +119,55 @@ export default class AcctResultImportModal extends React.Component { // 选择表单字段 handleSelectedField = () => { + if (window.location.hash.indexOf("calculateDetail") !== -1) { + this.setState({ + addHeadFields: { + ...this.state.addHeadFields, + visible: true + } + }); + } else { + this.setState({ + selectFieldVisible: true + }); + } + }; + + // 添加表头字段 + handleAdd = (fieldDate) => { + let salaryItemIdsList = []; + if (!_.isEmpty(fieldDate.formulaItems)) { + fieldDate.formulaItems.map(item => { + if (item.checked) { + salaryItemIdsList.push(item.salaryItemId); + } + }); + } + if (!_.isEmpty(fieldDate.inputItems)) { + fieldDate.inputItems.map(item => { + if (item.checked) { + salaryItemIdsList.push(item.salaryItemId); + } + }); + } + if (!_.isEmpty(fieldDate.sqlItems)) { + fieldDate.sqlItems.map(item => { + if (item.checked) { + salaryItemIdsList.push(item.salaryItemId); + } + }); + } + let salaryItemIds = ""; + if (salaryItemIdsList.length > 0) { + salaryItemIds = salaryItemIdsList.join(","); + } + + let modalParam = { ...this.state.modalParam }; + modalParam.salaryItemIds = salaryItemIds; this.setState({ - addHeadFields: { - ...this.state.addHeadFields, - visible: true - } + modalParam }); + this.props.onAdd(fieldDate); }; // 初始化Import数据 @@ -172,7 +216,7 @@ export default class AcctResultImportModal extends React.Component { importInsuranceAcctDetail, importBalanceInsuranceDetail } = standingBookStore; - const { step, modalParam, addHeadFields } = this.state; + const { step, modalParam, selectFieldVisible, addHeadFields } = this.state; return (
{ @@ -211,6 +255,23 @@ export default class AcctResultImportModal extends React.Component { }} /> } + { + selectFieldVisible && { + this.handleAdd(fieldDate); + }} + onCancel={() => { + this.setState({ + selectFieldVisible: false + }); + }} + /> + } this.setState({ addHeadFields: { ...addHeadFields, visible: false } })} onAdd={(salaryItemIds) => this.setState({