Commit b4197700 authored by 姬鋆屾's avatar 姬鋆屾

fixed:提交考勤汇总正常考勤信息显示样式为异常的问题

parent 66697a54
......@@ -178,32 +178,47 @@ export default {
let index = arr.findIndex((item) => item.createTime == currentTime);
if (index > -1) {
return arr[index].attendanceSummary ? (
arr[index].remark ? (
arr[index].remark && arr[index].remark != "" ? (
<el-tooltip
class="item"
effect="light"
content={arr[index].content}
placement="top-start"
>
<el-tag type={"danger"} size="mini">
<el-tag
type={
arr[index].attendanceSummary.includes("缺卡") ||
arr[index].attendanceSummary.includes("迟到") ||
arr[index].attendanceSummary.includes("早退")
? "danger"
: "success"
}
size="mini"
>
{arr[index].attendanceSummary}
</el-tag>
</el-tooltip>
) : (
) : arr[index].attendanceSummary.includes("缺卡") ||
arr[index].attendanceSummary.includes("迟到") ||
arr[index].attendanceSummary.includes("早退") ? (
<el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
) : (
<el-tag type={"success"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
)
) : (
"正常"
"--"
);
} else {
if (currentTime < timestampToTime(new Date(), 3)) {
return "正常";
} else {
return "--";
}
// return "正常";
// if (currentTime < timestampToTime(new Date(), 3)) {
// return "正常";
// } else {
// return "--";
// }
return "--";
}
},
restTable() {
......
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