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})} />
-
}
)
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 (
+