Skip to content

A
attendance-performance-platform
Commit a34a7334 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c9903513 0a3406d8
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue
View file @ a34a7334
...@@ -325,7 +325,7 @@ export default { ...@@ -325,7 +325,7 @@ export default {
property === "offWorkResult" property === "offWorkResult"
) { ) {
let val = arr[index][property]; let val = arr[index][property];
return val == 1 ? ( return val == 1 || val == 2 ? (
this.tableData.dict.goWorkResult[val] this.tableData.dict.goWorkResult[val]
) : ( ) : (
<el-tag type={"danger"} size="mini"> <el-tag type={"danger"} size="mini">
......
attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
View file @ a34a7334
...@@ -191,12 +191,14 @@ export default { ...@@ -191,12 +191,14 @@ export default {
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
</el-tooltip> </el-tooltip>
) : arr[index].attendanceSummary == "正常" ? ( ) : arr[index].attendanceSummary.includes("缺卡") ||
<el-tag type={"success"} size="mini"> arr[index].attendanceSummary.includes("迟到") ||
arr[index].attendanceSummary.includes("早退") ? (
<el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
) : ( ) : (
<el-tag type={"danger"} size="mini"> <el-tag type={"success"} size="mini">
{arr[index].attendanceSummary} {arr[index].attendanceSummary}
</el-tag> </el-tag>
) )
......
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