diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js index de0c2871..d476edbd 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js @@ -23,7 +23,7 @@ class LedgerSalaryItemEditSlide extends Component { const key = Object.keys(params)[0]; this.props.onUpdateRequest(request, key); }; - handleShowFormal = () => this.props.onEditFormnul(); + handleShowFormal = (salaryItemName) => this.props.onEditFormnul(salaryItemName); render() { return ( diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 55892da2..123b74ab 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -28,7 +28,8 @@ class LedgerSalaryItemTable extends Component { visible: false, formulaId: "", valueType: "", - dataType: "" + dataType: "", + name: "" } }; } @@ -163,13 +164,13 @@ class LedgerSalaryItemTable extends Component { originSqlContent: ((valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || (valueType.toString() === "1") || (valueType.toString() === "2" && originFormulaContent)) ? " " : originSqlContent }, salaryItemId); }; - handleEditFormnul = () => { + handleEditFormnul = (salaryItemName) => { const { salaryItemPayload, editFormulModal } = this.state; const { record } = salaryItemPayload; const { valueType, formulaId, dataType, originFormulaContent, originSqlContent } = record; this.setState({ editFormulModal: { - ...editFormulModal, visible: true, valueType, dataType, + ...editFormulModal, visible: true, valueType, dataType, name: salaryItemName, formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : "" } }); @@ -180,7 +181,7 @@ class LedgerSalaryItemTable extends Component { editFormulModal: { ...editFormulModal, visible: false, - formulaId: "", + formulaId: "", name: "", valueType: "", dataType: "" } }); diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js index fe601cc5..9e407f56 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js @@ -8,7 +8,8 @@ export default class CustomSalaryItemSlide extends React.Component { super(props); this.state = { showForm: false, - formalModalVisible: false + formalModalVisible: false, + salaryItemName: "" }; } @@ -16,9 +17,10 @@ export default class CustomSalaryItemSlide extends React.Component { this.props.onChange({ ...this.props.request, ...params }); }; - handleShowFormal = () => { + handleShowFormal = (salaryItemName) => { this.setState({ - formalModalVisible: true + formalModalVisible: true, + salaryItemName }); }; @@ -34,12 +36,13 @@ export default class CustomSalaryItemSlide extends React.Component { render() { const { request } = this.props; const { valueType, dataType, formulaId } = request; - const { formalModalVisible } = this.state; + const { formalModalVisible, salaryItemName } = this.state; return (