|
|
|
|
@ -192,6 +192,7 @@ export default {
|
|
|
|
|
// 处理 row.remark 字段
|
|
|
|
|
if (row.remark && typeof row.remark === 'object') {
|
|
|
|
|
const leaveTypeMap = {
|
|
|
|
|
"overtime_days":"加班",
|
|
|
|
|
"personal_leave": "事假",
|
|
|
|
|
"sick_leave": "病假",
|
|
|
|
|
"annual_leave_days": "年休假",
|
|
|
|
|
@ -213,13 +214,14 @@ export default {
|
|
|
|
|
value !== null &&
|
|
|
|
|
value !== undefined &&
|
|
|
|
|
value !== '' &&
|
|
|
|
|
value !== 0 &&
|
|
|
|
|
leaveTypeMap[key]
|
|
|
|
|
)
|
|
|
|
|
.map(([key, value]) => `${leaveTypeMap[key]}${value}小时`)
|
|
|
|
|
|
|
|
|
|
console.log("allItems", allItems)
|
|
|
|
|
|
|
|
|
|
// 显示所有项目(包括0小时的)
|
|
|
|
|
// 只显示非0小时的项目
|
|
|
|
|
if (allItems.length > 0) {
|
|
|
|
|
result += allItems.join(',')
|
|
|
|
|
}
|
|
|
|
|
|