Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/group/banciTable/index.vue

@@ -133,8 +133,8 @@ export default {
         padding: 0 20px;
     }
     tr{
-        height: 50px;
-        line-height: 50px;
+        height: 90px;
+        line-height: 30px;
         padding: 0 20px;
     }
     .t1{

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

@@ -189,10 +189,11 @@ export default {
             >
               <el-tag
                 type={
-                  arr[index].attendanceSummary.includes("缺卡") ||
-                  arr[index].attendanceSummary.includes("迟到") ||
-                  arr[index].attendanceSummary.includes("早退")
+                  arr[index].attendanceSummary.includes("缺卡")
                     ? "danger"
+                    : arr[index].attendanceSummary.includes("迟到") ||
+                      arr[index].attendanceSummary.includes("早退")
+                    ? "warning"
                     : "success"
                 }
                 size="mini"
@@ -200,12 +201,15 @@ export default {
                 {arr[index].attendanceSummary}
               </el-tag>
             </el-tooltip>
-          ) : arr[index].attendanceSummary.includes("缺卡") ||
-            arr[index].attendanceSummary.includes("迟到") ||
-            arr[index].attendanceSummary.includes("早退") ? (
+          ) : arr[index].attendanceSummary.includes("缺卡") ? (
             <el-tag type={"danger"} size="mini">
               {arr[index].attendanceSummary}
             </el-tag>
+          ) : arr[index].attendanceSummary.includes("迟到") ||
+            arr[index].attendanceSummary.includes("早退") ? (
+            <el-tag type={"warning"} size="mini">
+              {arr[index].attendanceSummary}
+            </el-tag>
           ) : (
             <el-tag type={"success"} size="mini">
               {arr[index].attendanceSummary}
@@ -266,7 +270,15 @@ export default {
     },
     beforeRender(row) {
       this.tableData.dict = row.dict;
-
+      console.log(this.tableData.dict);
+      this.tableData.dict["summaryTypeList"] = {
+        正常: "正常",
+        假: "请假",
+        缺卡: "缺卡",
+        迟到: "迟到",
+        早退: "早退",
+        其他: "其他",
+      };
       row.data.forEach((element) => {
         if (
           element.attendanceStaffStatEntities &&
@@ -427,12 +439,13 @@ export default {
             label: "部门",
             fuzzy: false,
           },
-          // {
-          //   name: "groupId",
-          //   type: "select",
-          //   label: "全部考勤组",
-          //   fuzzy: false,
-          // },
+          {
+            name: "summaryTypeList",
+            type: "select",
+            label: "状态",
+            fuzzy: false,
+            multiple: true,
+          },
           // {
           //   name: "classId",
           //   type: "select",