Commit 35b69ebb authored by 姬鋆屾's avatar 姬鋆屾

推屏蔽窗口类别,并对接接口显示打卡正常的天数显示正常

parent b4cff8d4
...@@ -189,20 +189,25 @@ export default { ...@@ -189,20 +189,25 @@ export default {
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
</el-tooltip> </el-tooltip>
) : arr[index].attendanceSummary == "正常" ? (
<el-tag type={"success"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
) : ( ) : (
<el-tag type={"danger"} size="mini"> <el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
) )
) : ( ) : (
"正常" "--"
); );
} else { } else {
if (currentTime < timestampToTime(new Date(), 3)) { return "--";
return "正常"; // if (currentTime < timestampToTime(new Date(), 3)) {
} else { // return "正常";
return "--"; // } else {
} // return "--";
// }
// return "正常"; // return "正常";
} }
}, },
...@@ -229,11 +234,12 @@ export default { ...@@ -229,11 +234,12 @@ export default {
) { ) {
return this.handleArr(row.attendanceStaffStatEntities, item); return this.handleArr(row.attendanceStaffStatEntities, item);
} else { } else {
if (item < timestampToTime(new Date(), 3)) { return "--";
return "正常"; // if (item < timestampToTime(new Date(), 3)) {
} else { // return "正常";
return "--"; // } else {
} // return "--";
// }
} }
}, },
}; };
...@@ -448,14 +454,14 @@ export default { ...@@ -448,14 +454,14 @@ export default {
show: true, show: true,
}, },
{ //{
label: "窗口类别", // label: "窗口类别",
prop: "windowCategory", // prop: "windowCategory",
fixed: "left", // fixed: "left",
width: 100, //width: 100,
formatter: this.formatter, //formatter: this.formatter,
show: true, //show: true,
}, //},
{ {
label: "员工姓名", label: "员工姓名",
......
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