|
@@ -148,10 +148,13 @@ const Runtime: React.FC = () => {
|
|
|
timeList.push(timeStrArr);
|
|
|
});
|
|
|
}
|
|
|
- if (ritem.hasOwnProperty('overTimeStartTime')) {
|
|
|
- var timeStrArr = [ritem.overTimeStartTime, ritem.overTimeEndTime];
|
|
|
- timeList.push(timeStrArr);
|
|
|
+ if (ritem.hasOwnProperty('overTime')) {
|
|
|
ritem.runTimeStatus = 'overtimeWork'; //加班
|
|
|
+
|
|
|
+ ritem.overTime.forEach((overitem) => {
|
|
|
+ var timeStrArr = [overitem.overTimeStartTime, overitem.overTimeEndTime];
|
|
|
+ timeList.push(timeStrArr);
|
|
|
+ });
|
|
|
}
|
|
|
ritem.showTimeList = timeList;
|
|
|
//console.log('timeList', timeList);
|