@@ -281,39 +281,39 @@ const DiurnalStatisticsOne = React.createClass({
}
- },
- {
- title: '部门',
- dataIndex: 'depName',
- key: 'depName',
+ },{
+ title: '姓名',
fixed:false,
+ dataIndex: 'name',
+ key: 'name',
render:(text,record)=>{
if(!record.theNumber){
- return text&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
+ return text
}else{
return {
children: text,
props: {
- colSpan:0
+ colSpan:3
},
- },{
- title: '姓名',
+ },
+ {
+ title: '部门',
+ dataIndex: 'depName',
+ key: 'depName',
- dataIndex: 'name',
- key: 'name',
- return text
+ return text&&text.length>6?<span title={text}>{text.substr(0,6)+'…'}</span>:text
- colSpan:3
+ colSpan:0