From 2d0784d71b313660cc32e2d876d4966dbe5f6762 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Fri, 18 Mar 2022 14:47:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payroll/index.js      |  1 -
 pc4mobx/hrmSalary/pages/salaryItem/columns.js | 18 +++++---
 pc4mobx/hrmSalary/pages/salaryItem/index.js   | 43 ++++++++++++++++---
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index 06e7aed5..411f2ba3 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -258,7 +258,6 @@ export default class Payroll extends React.Component {
           onClose={() => this.setState({editSlideVisible: false})}
           showMask={true}
           closeMaskOnClick={() => this.setState({editSlideVisible: false})} />
-
       }
       </div>
     )
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index 76da5691..60529c65 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -16,13 +16,13 @@ export const columns = [
     },
     {
         title: "薪资档案引用",
-        dataIndex: 'title',
-        key: 'title',
+        dataIndex: 'refere',
+        key: 'refere',
     },
     {
         title: "默认使用",
-        dataIndex: 'title',
-        key: 'title',
+        dataIndex: 'refere',
+        key: 'refere',
     },
     {
         title: "进位规则",
@@ -46,13 +46,17 @@ export const columns = [
     },
     {
         title: "操作",
-        dataIndex: 'title',
-        key: 'title',
+        dataIndex: 'cz',
+        key: 'cz',
     }
 ]
 
 
-export const dataSource = [];
+export const dataSource = [
+    {
+        title: "测试"
+    }
+];
 
 
 
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 7ed75fa2..2a979268 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -2,9 +2,9 @@ import React from 'react';
 import { inject, observer } from 'mobx-react';
 import { toJS } from 'mobx';
 
-import { Button, Table, DatePicker } from 'antd';
+import { Button, Table, DatePicker, Switch, Menu, Dropdown } from 'antd';
 
-import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable } from 'ecCom';
+import { WeaTop, WeaTab, WeaRightMenu, WeaRangePicker, WeaTable, WeaInputSearch } from 'ecCom';
 
 import { renderNoright, getSearchs } from '../../util'; // 渲染form数据的方法：因为多个页面都会使用，所以抽的公共方法在util中
 import CustomTab from '../../components/customTab';
@@ -23,6 +23,24 @@ export default class SalaryItem extends React.Component {
       value: "",
       selectedKey: "0"
     }
+    columns.map(item => {
+      if(item.dataIndex == "refere") {
+        item.render = () => {
+          return (
+            <Switch />
+          )
+        }
+      } else if(item.dataIndex == 'cz') {
+        item.render = () => {
+            return (<div>
+              <a style={{marginRight: "10px"}}>编辑</a>
+              <a style={{marginRight: "10px"}}>删除</a>
+              <a>操作日志</a>
+            </div>)
+        }
+          
+      }
+    })
   }
   render() {
     const { baseTableStore } = this.props;
@@ -54,10 +72,20 @@ export default class SalaryItem extends React.Component {
     ];
 
     const topTab = [
-      ];
+    ];
 
-    const renderSearchOperationItem = () => {
-      return <div></div>
+    const menu = (
+      <Menu>
+        <Menu.Item key="1">系统薪资项</Menu.Item>
+        <Menu.Item key="2">自定义薪资项</Menu.Item>
+      </Menu>
+    );
+
+    const renderRightOperation = () => {
+      return (<div style={{display: "inline-block"}}>
+        <Dropdown.Button overlay={menu} type="primary" style={{marginRight: "10px"}}>新增</Dropdown.Button>
+        <WeaInputSearch />
+      </div>)
      
     }
 
@@ -75,6 +103,11 @@ export default class SalaryItem extends React.Component {
             dropMenuDatas={rightMenu} // 下拉菜单（和页面的右键菜单相同）
             dropMenuProps={{ collectParams }} // 收藏功能: 配置之后显示 收藏、帮助、显示页面地址 这3个功能
           >
+            <CustomTab 
+                searchOperationItem={
+                  renderRightOperation()
+                }
+              />
             <WeaTable columns={columns} dataSource={dataSource}/>
           </WeaTop>
         </WeaRightMenu>