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

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

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