Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/Pagination.vue

@@ -7,7 +7,7 @@
       @size-change="handleSizeChange"
       :current-page="currPage"
       :page-size="currSize"
-      :page-sizes="[10, 20, 50, 100, 200]"
+      :page-sizes="[10, 20, 50, 100, 200, 500]"
       layout="sizes, total, prev, pager, next, jumper"
       :total="total"
     >

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

@@ -191,9 +191,12 @@ export default {
                 type={
                   arr[index].attendanceSummary.includes("缺卡")
                     ? "danger"
-                    : arr[index].attendanceSummary.includes("迟到") ||
-                      arr[index].attendanceSummary.includes("早退")
+                    : arr[index].attendanceSummary.includes("迟到")
                     ? "warning"
+                    : arr[index].attendanceSummary.includes("早退")
+                    ? "info"
+                    : arr[index].attendanceSummary.includes("假")
+                    ? ""
                     : "success"
                 }
                 size="mini"
@@ -205,11 +208,18 @@ export default {
             <el-tag type={"danger"} size="mini">
               {arr[index].attendanceSummary}
             </el-tag>
-          ) : arr[index].attendanceSummary.includes("迟到") ||
-            arr[index].attendanceSummary.includes("早退") ? (
+          ) : arr[index].attendanceSummary.includes("迟到") ? (
             <el-tag type={"warning"} size="mini">
               {arr[index].attendanceSummary}
             </el-tag>
+          ) : arr[index].attendanceSummary.includes("早退") ? (
+            <el-tag type={"info"} size="mini">
+              {arr[index].attendanceSummary}
+            </el-tag>
+          ) : arr[index].attendanceSummary.includes("假") ? (
+            <el-tag type={""} size="mini">
+              {arr[index].attendanceSummary}
+            </el-tag>
           ) : (
             <el-tag type={"success"} size="mini">
               {arr[index].attendanceSummary}
@@ -509,7 +519,6 @@ export default {
           {
             label: "实到",
             prop: "goTimes",
-            formatter: this.formatter,
             show: true,
           },
           {