|
|
@ -36,6 +36,7 @@ const leaveStatistics = (props) => { |
|
|
|
{ name: "在职状态", value: "inStatus" }, |
|
|
|
{ name: "合计请假时长", value: "vacateDayStatisticDuration" }, |
|
|
|
{ name: "合计请假次数", value: "vacateCount" }, |
|
|
|
{ name: "备注", value: "remark" }, |
|
|
|
{ name: "操作", value: "operate" }, |
|
|
|
] |
|
|
|
}]);//表格属性 |
|
|
@ -43,7 +44,7 @@ const leaveStatistics = (props) => { |
|
|
|
localStorage.getItem(LEAVESTATISTICS) == null |
|
|
|
? localStorage.setItem( |
|
|
|
LEAVESTATISTICS, |
|
|
|
JSON.stringify(['userName', 'departmrnt', 'roleName', 'inStatus', 'vacateCount', 'vacateDayStatisticDuration', 'operate']) |
|
|
|
JSON.stringify(['userName', 'departmrnt', 'roleName', 'inStatus', 'vacateCount', 'vacateDayStatisticDuration', 'remark', 'operate']) |
|
|
|
) |
|
|
|
: ""; |
|
|
|
getAttendanceVacateTypeList() |
|
|
@ -248,16 +249,24 @@ const leaveStatistics = (props) => { |
|
|
|
return (r.vacateCount ? r.vacateCount : '0') |
|
|
|
}, |
|
|
|
}) |
|
|
|
column.push({ |
|
|
|
title: '备注', |
|
|
|
width: 160, |
|
|
|
dataIndex: "remark", |
|
|
|
key: "remark", |
|
|
|
render: (_, r, index) => { |
|
|
|
// return (r.vacateCount ? r.vacateCount : '0') |
|
|
|
}, |
|
|
|
}) |
|
|
|
column.push({ |
|
|
|
title: '操作', |
|
|
|
width: 160, |
|
|
|
dataIndex: "operate", |
|
|
|
key: "operate", |
|
|
|
sorter: (a, b) => { }, |
|
|
|
render: (_, r, index) => { |
|
|
|
return ( |
|
|
|
<div> |
|
|
|
<span style={{ color: '#1890FF', cursor: 'pointer' }}>备注</span> |
|
|
|
<span style={{ color: '#1890FF', cursor: 'pointer' }}>添加备注</span> |
|
|
|
</div> |
|
|
|
) |
|
|
|
}, |
|
|
@ -450,7 +459,7 @@ const leaveStatistics = (props) => { |
|
|
|
<Setup |
|
|
|
tableType={LEAVESTATISTICS} |
|
|
|
tableList={tableList} |
|
|
|
length={7 + mytypeList.length} |
|
|
|
length={8 + mytypeList.length} |
|
|
|
close={() => { |
|
|
|
setSetup(false); |
|
|
|
attribute(mytypeList); |
|
|
|