|
@@ -16,7 +16,7 @@
|
|
|
</span>
|
|
|
</p>-->
|
|
|
<div
|
|
|
- v-for="(item,n) in attendanceDetailsData"
|
|
|
+ v-for="(item,n) in attendanceDetailsData2"
|
|
|
:key="item.workStartTime+n"
|
|
|
v-if="item.workStartTime == data.day"
|
|
|
>
|
|
@@ -274,6 +274,7 @@ export default {
|
|
|
return {
|
|
|
//日历数组
|
|
|
attendanceDetailsData: [],
|
|
|
+ attendanceDetailsData2: [],
|
|
|
// 弹框的显示与隐藏
|
|
|
open: false,
|
|
|
title: null,
|
|
@@ -324,15 +325,16 @@ export default {
|
|
|
peopleList().then(res => {
|
|
|
this.worktaskplanList = [];
|
|
|
let workStartTimedata = [];
|
|
|
+ this.attendanceDetailsData = res.rows;
|
|
|
res.rows.forEach((item, i) => {
|
|
|
if (workStartTimedata.indexOf(item.workStartTime) === -1) {
|
|
|
- this.attendanceDetailsData.push({
|
|
|
+ this.attendanceDetailsData2.push({
|
|
|
workStartTime: item.workStartTime,
|
|
|
data: [item]
|
|
|
});
|
|
|
workStartTimedata.push(item.workStartTime);
|
|
|
} else {
|
|
|
- this.attendanceDetailsData.forEach(n => {
|
|
|
+ this.attendanceDetailsData2.forEach(n => {
|
|
|
if (n.workStartTime == item.workStartTime) {
|
|
|
n.data.push(item);
|
|
|
}
|