From bfa02885853cdff21ed738768b3042a9b9351fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 27 Feb 2024 14:26:34 +0800
Subject: [PATCH] =?UTF-8?q?release/2.10.1.2402.01-=E4=B8=AA=E7=A8=8E=20?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A7=93=E5=90=8D=E5=85=B3=E9=94=AE=E5=AD=97=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/declareDetail/index.js    |  9 +++--
 .../pages/employeedeclareDetail/index.js      | 11 ++++--
 .../pages/employeedeclareDetail/index.less    | 39 ++++++++++++-------
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/declareDetail/index.js b/pc4mobx/hrmSalary/pages/declareDetail/index.js
index d628d610..280bfc5b 100644
--- a/pc4mobx/hrmSalary/pages/declareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/declareDetail/index.js
@@ -50,7 +50,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      tabs: [], selectedKey: "", columns: [], dataSource: [], editTabVisible: false,
+      tabs: [], selectedKey: "", columns: [], dataSource: [], editTabVisible: false, keyword: "",
       loading: {
         query: false, refresh: false, declare: false, feedback: false,
         correct: false, cancel: false, cancelFeedback: false, refreshingPay: false,
@@ -154,10 +154,10 @@ class Index extends Component {
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n, declareStatus }), "*");
   };
   getDetailList = () => {
-    const { loading, pageInfo, selectedKey } = this.state;
+    const { loading, pageInfo, selectedKey, keyword } = this.state;
     const [incomeCategory, taxDeclarationId] = selectedKey.split("%%");
     const payload = {
-      ...pageInfo, incomeCategory, taxDeclarationId,
+      ...pageInfo, incomeCategory, taxDeclarationId, keyword,
       taxDeclareRecordId: getQueryString("id")
     };
     this.setState({ loading: { ...loading, query: true } });
@@ -420,6 +420,9 @@ class Index extends Component {
             datas={tabs} keyParam="viewcondition" selectedKey={selectedKey} showAddBtn buttons={btns}
             type="editable-inline" onEdit={this.handleTabEdit} leftStyle={{ width: "calc(100% - 450px)" }}
             onChange={(v) => this.setState({ selectedKey: v }, () => this.getDetailList())}
+            searchType={["base"]} searchsBasePlaceHolder={getLabel(26919, "请输入姓名")}
+            onSearchChange={keyword => this.setState({ keyword })}
+            onSearch={this.getDetailList}
           />
           {/*个税申报表-新增编辑框*/}
           <IncomeTaxDeclarationPersonnelSlide
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
index d6e68376..dc55b42f 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js
@@ -430,10 +430,13 @@ class Index extends Component {
       </Menu>
     );
     const buttons = [
-      <WeaDatePicker arrow type="month" className="pickerDateCustom flex a-center" value={taxCycle}
-                     onChange={val => this.setState({
-                       taxCycle: val, pageInfo: { ...pageInfo, current: 1 }
-                     }, () => this.queryEmployeeList())}/>,
+      <div className="taxPeriod-div">
+        <span className="title">{getLabel(542240, "税款所属期")}：</span>
+        <WeaDatePicker arrow type="month" className="pickerDateCustom flex a-center" value={taxCycle}
+                       onChange={val => this.setState({
+                         taxCycle: val, pageInfo: { ...pageInfo, current: 1 }
+                       }, () => this.queryEmployeeList())}/>
+      </div>,
       <Button type="primary" onClick={this.employeedeclareDeclare}
               loading={loading.declare}>{getLabel(111, "全部报送")}</Button>,
       <Button type="ghost" onClick={this.getDeclareFeedback}
diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
index af9ffbdc..15b3044b 100644
--- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.less
@@ -50,24 +50,33 @@
   }
 }
 
-.pickerDateCustom {
-  .icon-coms-Browse-box-delete, .icon-coms-Browse-box-Add-to {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid #e5e5e5;
-    background: transparent;
-    cursor: pointer;
-    outline: none;
-    padding: 0 6px;
-    height: 30px;
-    top: auto;
+.taxPeriod-div {
+  display: flex;
+  align-items: center;
+
+  .title {
+    margin-right: 5px;
   }
 
-  .icon-coms-Browse-box-delete:hover, .icon-coms-Browse-box-Add-to:hover {
-    color: #5d9cec;
-  }
+  .pickerDateCustom {
+    .icon-coms-Browse-box-delete, .icon-coms-Browse-box-Add-to {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid #e5e5e5;
+      background: transparent;
+      cursor: pointer;
+      outline: none;
+      padding: 0 6px;
+      height: 30px;
+      top: auto;
+    }
 
+    .icon-coms-Browse-box-delete:hover, .icon-coms-Browse-box-Add-to:hover {
+      color: #5d9cec;
+    }
+
+  }
 }
 
 .declareTable {