|
|
@@ -5,7 +5,7 @@
|
|
|
<div slot="dateCell" slot-scope="data" class="calendar-cell" @click="setRightRow(data.data.day)">
|
|
|
<!-- <div>{{ dayjs(data.date).format("dddd") }}</div> -->
|
|
|
<div>{{ weekMap[dayjs(data.date).format("dddd")] }}</div>
|
|
|
- <div class="calendar-cell-text" :style="`color: ${getDateRow(data.data.day).color}`">{{ getDateRow(data.data.day).attendanceTypeName }}</div>
|
|
|
+ <div class="calendar-cell-text" :style="`color: ${getDateRow(data.data.day).color}`">{{ getDateRow(data.data.day).attendanceTypeName}}{{ (getDateRow(data.data.day).hasOverTime?'加班':'') }}</div>
|
|
|
</div>
|
|
|
</el-calendar>
|
|
|
</div>
|
|
|
@@ -13,7 +13,7 @@
|
|
|
<template v-if="personnelAttendanceRowList.attendanceTypeName">
|
|
|
<div class="list">考勤时间：{{ personnelAttendanceRowList.clockDate }}</div>
|
|
|
<!-- <div class="list" v-if="personnelAttendanceRowList.clockStartTime && personnelAttendanceRowList.clockEndTime">打卡时间：{{ personnelAttendanceRowList.clockStartTime }} - {{ personnelAttendanceRowList.clockEndTime }} ({{ personnelAttendanceRowList.workHour }}h)</div> -->
|
|
|
- <div class="list">考勤状态：<span :style="`color: ${personnelAttendanceRowList.color || '#000'}`">{{ personnelAttendanceRowList.attendanceTypeName }}</span></div>
|
|
|
+ <div class="list">考勤状态：<span :style="`color: ${personnelAttendanceRowList.color || '#000'}`">{{ personnelAttendanceRowList.attendanceTypeName }}{{personnelAttendanceRowList.hasOverTime?'加班':'' }}</span></div>
|
|
|
<div class="list" v-for="(item, index) in personnelAttendanceRowList.maplist || []" :key="index">
|
|
|
{{ item.msg }} <span :style="`color: ${item.color || '#000'}`">{{ item.res }}</span>
|
|
|
</div>
|
