Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

@@ -325,7 +325,7 @@ export default {
           property === "offWorkResult"
         ) {
           let val = arr[index][property];
-          return val == 1 ? (
+          return val == 1 || val == 2 ? (
             this.tableData.dict.goWorkResult[val]
           ) : (
             <el-tag type={"danger"} size="mini">

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -191,12 +191,14 @@ export default {
                 {arr[index].attendanceSummary}
               </el-tag>
             </el-tooltip>
-          ) : arr[index].attendanceSummary == "正常" ? (
-            <el-tag type={"success"} size="mini">
+          ) : 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={"danger"} size="mini">
+            <el-tag type={"success"} size="mini">
               {arr[index].attendanceSummary}
             </el-tag>
           )