推

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

@@ -153,7 +153,9 @@ export default {
         };
         addobjArr.push(obj);
       });
-      this.config.columns = [...this.initalArr, ...addobjArr];
+      let arr1 = this.initalArr.slice(0, 8);
+      let arr2 = this.initalArr.slice(8);
+      this.config.columns = [...arr1, ...addobjArr, ...arr2];
       this.$forceUpdate();
     },
     beforeRender(row) {
@@ -287,8 +289,17 @@ export default {
 
           { label: "员工姓名", prop: "staffName", fixed: "left", width: 100 },
           { label: "部门", prop: "deptName" },
-          { label: "出勤天数", prop: "goTimes", formatter: this.formatter },
-
+          { label: "应到", prop: "workDays", formatter: this.formatter },
+          { label: "实到", prop: "goTimes", formatter: this.formatter },
+          {
+            label: "出勤率%",
+            prop: "attendanceRate",
+            formatter: (row) => {
+              return row.attendanceRate
+                ? (Number(row.attendanceRate) * 100).toFixed(2) + "%"
+                : "--";
+            },
+          },
           {
             label: "缺卡次数",
             prop: "morningTimes",
@@ -341,16 +352,6 @@ export default {
 
           { label: "其他（天）", prop: "otherDays" },
 
-          {
-            label: "出勤率%",
-            prop: "attendanceRate",
-            formatter: (row) => {
-              return row.attendanceRate
-                ? (Number(row.attendanceRate) * 100).toFixed(2) + "%"
-                : "--";
-            },
-          },
-
           { label: "未按规定打卡（含忘记打卡）", prop: "nonCompliancePunch" },
 
           { label: "迟到（次）", prop: "lateTimes" },