From acadba0946b06cdc97252fd0fa658cb9917b9870 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, 17 Aug 2023 10:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E7=A8=8E=E5=AF=B9=E6=8E=A5-=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AA=E7=A8=8E=E7=94=B3=E6=8A=A5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ledgerPage/components/incomeTaxFields.js  |  4 +-
 .../components/ledgerFieldsItemPopver.js      | 42 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

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 (
       <Popover content={
         <ul className="income_result_wrapper">
@@ -79,18 +91,12 @@ class LedgerFieldsItemPopver extends Component {
                visible={record.visible}
                onVisibleChange={(visible) => onChangeSwitch(visible, record.id)}
       >
-        <InputGroup className="incomeSearchGroup">
-          <Input placeholder={getLabel(18214, "请选择")} value={keywords}
-                 onFocus={() => onChangeSwitch(true, record.id)} style={{ width: "auto" }}
-                 onChange={(e) => this.setState({ keywords: e.target.value }, () => this.handleSearch())}
-          />
-          <Button icon="search"/>
-        </InputGroup>
-        {/*<WeaInputSearch*/}
-        {/*  style={{ width: 200 }} placeholder={getLabel(18214, "请选择")}*/}
-        {/*  onFocusChange={(visible) => this.setState({ keywords: visible ? "" : salaryItemName }, () => onChangeSwitch(visible, record.id))}*/}
-        {/*  value={keywords} onChange={(keywords) => this.setState({ keywords }, () => this.handleSearch())}*/}
-        {/*/>*/}
+        <WeaInputSearch
+          style={{ width: 200 }} placeholder={getLabel(18214, "请选择")}
+          onFocusChange={this.handleFocusChange}
+          value={keywords} onSearchChange={this.handleChange}
+          onSearch={() => alert(1)}
+        />
       </Popover>
     );
   }