release/2.10.1.2402.01-个税

人员信息报送添加姓名关键字搜索

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

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}

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 {