diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js index be71c342..4d41561a 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/incomeTaxFields.js @@ -17,7 +17,7 @@ class IncomeTaxFields extends Component { super(props); this.state = { selectedKey: "", tabs: [], - incomeTaxFields: [], + incomeTaxFields: [] }; } @@ -65,7 +65,7 @@ class IncomeTaxFields extends Component { ...it, taxReportRules: _.map(it.taxReportRules, child => { if (child.id === recordRuleId) { - return { ...child, visible: false, salaryItem: [salaryItem] }; + return { ...child, visible: false, salaryItem }; } return { ...child, visible: false }; }) diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js index 1d206a80..74c28141 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerFieldsItemPopver.js @@ -5,12 +5,11 @@ * Date: 2023/8/16 */ import React, { Component } from "react"; -import { Button, Icon, Input, Popover } from "antd"; -import { WeaLocaleProvider } from "ecCom"; +import { Icon, Popover } from "antd"; +import { WeaInputSearch, WeaLocaleProvider } from "ecCom"; import { commonBrowserData } from "../../../apis"; const { getLabel } = WeaLocaleProvider; -const InputGroup = Input.Group; class LedgerFieldsItemPopver extends Component { constructor(props) { @@ -26,10 +25,24 @@ class LedgerFieldsItemPopver extends Component { if (nextProps.record !== this.props.record && nextProps.record.visible) { this.commonBrowserData(nextProps); } else { - this.setState({ dataList: [] }); + const { record } = nextProps; + const salaryItemName = record.salaryItem[0] ? record.salaryItem[0].name : ""; + this.setState({ dataList: [], keywords: salaryItemName }); } } + handleFocusChange = (visible) => { + const { keywords } = this.state; + const { record, onChangeSwitch } = this.props; + visible && onChangeSwitch(visible, record.id); + if (visible && keywords) { + this.setState({ keywords: "" }); + } + }; + handleChange = (keywords) => { + this.setState({ keywords }, () => this.handleSearch()); + !keywords && this.props.onChange([], this.props.record.id); + }; commonBrowserData = (props) => { const { salarySobId } = props; const { keywords } = this.state; @@ -56,13 +69,12 @@ class LedgerFieldsItemPopver extends Component { handleClickItem = (item) => { this.setState({ keywords: item.name - }, () => this.props.onChange(item, this.props.record.id)); + }, () => this.props.onChange([item], this.props.record.id)); }; render() { const { keywords, dataList } = this.state; const { record, onChangeSwitch } = this.props; - const salaryItemName = record.salaryItem[0] ? record.salaryItem[0].name : ""; return ( @@ -79,18 +91,12 @@ class LedgerFieldsItemPopver extends Component { visible={record.visible} onVisibleChange={(visible) => onChangeSwitch(visible, record.id)} > - - onChangeSwitch(true, record.id)} style={{ width: "auto" }} - onChange={(e) => this.setState({ keywords: e.target.value }, () => this.handleSearch())} - /> -