Commit 44037b97 authored by 姬鋆屾's avatar 姬鋆屾

feated:优化考勤汇总表格显示;表头内容文字展示处理

No related merge requests found
......@@ -321,16 +321,16 @@ export default {
// 处理
handleArr(arr, currentTime) {
// 处理createTime相同的数据
for (let i = 0; i < arr.length; i++) {
for (let j = i + 1; j < arr.length; j++) {
if (arr[i]["createTime"] == arr[j]["createTime"]) {
if (arr[i]["attendanceSummary"].indexOf("; ") == -1) {
arr[i]["attendanceSummary"] =
arr[i]["attendanceSummary"] + "; " + arr[j].attendanceSummary;
}
}
}
}
// for (let i = 0; i < arr.length; i++) {
// for (let j = i + 1; j < arr.length; j++) {
// if (arr[i]["createTime"] == arr[j]["createTime"]) {
// if (arr[i]["attendanceSummary"].indexOf("; ") == -1) {
// arr[i]["attendanceSummary"] =
// arr[i]["attendanceSummary"] + "; " + arr[j].attendanceSummary;
// }
// }
// }
// }
let index = arr.findIndex((item) => item.createTime == currentTime);
if (index > -1) {
......@@ -770,7 +770,7 @@ export default {
{ label: "上网耍手机(次)", prop: "surfingMobileTimes", show: true },
{ label: "溜班(次)", prop: "overtimeTimes", show: true },
{ label: "溜班/早退(次)", prop: "overtimeTimes", show: true },
{ label: "空岗(次)", prop: "vacancy", show: true },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment