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

推每日打卡页面改版及考勤汇总添加文字提示;

parent 01daa54f
...@@ -168,18 +168,22 @@ export default { ...@@ -168,18 +168,22 @@ export default {
let index = arr.findIndex((item) => item.createTime == currentTime); let index = arr.findIndex((item) => item.createTime == currentTime);
if (index > -1) { if (index > -1) {
return arr[index].attendanceSummary ? ( return arr[index].attendanceSummary ? (
arr[index].remark ? (
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content={ content={arr[index].content}
arr[index].createTime + " " + arr[index].attendanceSummary
}
placement="top-start" placement="top-start"
> >
<el-tag type={"danger"} size="mini"> <el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
</el-tooltip> </el-tooltip>
) : (
<el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
)
) : ( ) : (
"-" "-"
); );
...@@ -229,6 +233,22 @@ export default { ...@@ -229,6 +233,22 @@ export default {
) { ) {
element.attendanceStaffStatEntities.forEach((item1) => { element.attendanceStaffStatEntities.forEach((item1) => {
item1.createTime = timestampToTime(item1.createTime, 3); item1.createTime = timestampToTime(item1.createTime, 3);
let Arr = [];
item1.remark && item1.remark.length > 0
? (Arr = JSON.parse(item1.remark))
: "";
Arr && Arr.length > 0
? (item1.content = Arr.map((v) => {
return (
<p>
上班{v.orderNum}打卡时间:
{(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
{" "} 下班{v.orderNum}打卡时间:
{(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
</p>
);
}))
: "";
}); });
} }
}); });
......
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