From 3cff712ae950378e8c69a86e432c564245cfee75 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, 20 Aug 2024 10:35:32 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AE=B5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/salaryItem/index.js | 42 ++-------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 8f61de7b..c6729999 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -239,7 +239,6 @@ export default class SalaryItem extends React.Component {
         <Menu.Item key="2">{getLabel(111, "新增系统薪资项")}</Menu.Item>
       </Menu>
     );
-
     let buttons = [
       <Dropdown.Button overlay={menu} type="primary"
                        onClick={() => handleMenuClick({ key: "1" })}>{getLabel(111, "新增自定义薪资项")}</Dropdown.Button>,
@@ -313,49 +312,16 @@ export default class SalaryItem extends React.Component {
       const { salaryItemStore: { setRequest } } = this.props;
       setRequest(value);
     };
-    const rowSelection = {
-      selectedRowKeys,
-      onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }),
-      getCheckboxProps: record => ({
-        disabled: !record.canDelete // Column configuration not to be checked
-      })
-    };
     !(showOperateBtn || showSalaryItemBtn) && (buttons = buttons.slice(-1));
     return (
       <React.Fragment>
         <WeaTop title={getLabel(111, "薪资项目管理")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
                 buttons={buttons} showDropIcon onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}
                 className="salaryProjectManagement">
-          <div className="salaryItems_content"><SalaryItemsTable {...this.props} name={name} isQuery={isQuery}
-                                                                 selectedRowKeys={selectedRowKeys}
-                                                                 onDropMenuClick={this.onDropMenuClick}
-                                                                 onChange={val => this.setState({ selectedRowKeys: val })}/>
-            {/*<WeaNewScroll height="100%">*/}
-            {/*  <CustomPaginationTable*/}
-            {/*    rowKey={record => record.id}*/}
-            {/*    loading={loading}*/}
-            {/*    rowSelection={rowSelection}*/}
-            {/*    dataSource={tableDataSource}*/}
-            {/*    columns={this.getColumns(tableColumns)}*/}
-            {/*    total={this.state.searchParams.total}*/}
-            {/*    current={this.state.searchParams.current}*/}
-            {/*    pageSize={this.state.searchParams.pageSize}*/}
-            {/*    onPageChange={(value) => {*/}
-            {/*      this.handlePageChange(value);*/}
-            {/*    }}*/}
-            {/*    onShowSizeChange={(current, pageSize) => {*/}
-            {/*      this.setState({*/}
-            {/*        searchParams: {*/}
-            {/*          ...this.state.searchParams,*/}
-            {/*          current,*/}
-            {/*          pageSize*/}
-            {/*        }*/}
-            {/*      }, () => {*/}
-            {/*        this.handleShowSizeChange({ name: this.state.searchValue, ...this.state.searchParams });*/}
-            {/*      });*/}
-            {/*    }}*/}
-            {/*  />*/}
-            {/*</WeaNewScroll>*/}
+          <div className="salaryItems_content">
+            <SalaryItemsTable {...this.props} name={name} isQuery={isQuery}
+                              selectedRowKeys={selectedRowKeys} onDropMenuClick={this.onDropMenuClick}
+                              onChange={val => this.setState({ selectedRowKeys: val })}/>
           </div>
         </WeaTop>
         <SyncToSalaryAccountSetDialog