|
|
@@ -269,6 +269,7 @@
|
|
|
//日考勤历史记录
|
|
|
const clockRecords = ref([])
|
|
|
|
|
|
+ const totalPage = ref(0)
|
|
|
//获取日考勤历史
|
|
|
function getDayAttHistory() {
|
|
|
const params = {
|
|
|
@@ -280,6 +281,7 @@
|
|
|
p: 1
|
|
|
}
|
|
|
getMyQDQtAttendance(params).then(({returnParams}) => {
|
|
|
+ totalPage.value = Math.ceil(returnParams.total / pSize.value)
|
|
|
const list = returnParams.list.map(item => {
|
|
|
return {
|
|
|
date: item.att_date.substring(0, 10),
|
|
|
@@ -288,6 +290,7 @@
|
|
|
}
|
|
|
});
|
|
|
clockRecords.value = list;
|
|
|
+
|
|
|
complete(clockRecords.value, returnParams.total, returnParams.current)
|
|
|
})
|
|
|
}
|
|
|
@@ -326,18 +329,12 @@
|
|
|
evening: item.time.split(',')[item.type.split(',').indexOf("2")],
|
|
|
}
|
|
|
});
|
|
|
- // console.log('list', list);
|
|
|
-
|
|
|
// clockRecords.value.push(...list);
|
|
|
// complete(list,returnParams.total,pageNo)
|
|
|
-
|
|
|
- // 去重逻辑
|
|
|
- const existingDates = new Set(clockRecords.value.map(record => record.date));
|
|
|
- const newRecords = list.filter(item => !existingDates.has(item.date));
|
|
|
- // 更新 clockRecords
|
|
|
- clockRecords.value.push(...newRecords);
|
|
|
- // 调用 complete 函数,传入新记录和总数
|
|
|
- complete(newRecords, returnParams.total, pageNo);
|
|
|
+ if(pageNo<=totalPage.value){
|
|
|
+ clockRecords.value.push(...list);
|
|
|
+ }
|
|
|
+ complete(list,returnParams.total,pageNo)
|
|
|
|
|
|
})
|
|
|
}
|