tui

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

@@ -66,7 +66,7 @@
           {{ item.label }}
         </el-checkbox>
       </el-checkbox-group>
-      <div class="mt20" style="text-align:right">
+      <div class="mt20" style="text-align: right">
         <el-button @click="handleCancel(1)">取消</el-button>
         <el-button type="primary" @click="handleSubmit(1)">确定</el-button>
       </div>
@@ -85,7 +85,7 @@
           {{ item.label }}
         </el-checkbox>
       </el-checkbox-group>
-      <div class="mt20" style="text-align:right">
+      <div class="mt20" style="text-align: right">
         <el-button @click="handleCancel(2)">取消</el-button>
         <el-button type="primary" @click="handleSubmit(2)">确定</el-button>
       </div>
@@ -102,9 +102,7 @@
             <div>打卡记录汇总</div>
             <el-button type="text">导出成功</el-button>
           </div>
-          <div class="times">
-            导出时间：2020-08-13
-          </div>
+          <div class="times">导出时间：2020-08-13</div>
         </div>
       </div>
     </el-drawer>
@@ -197,10 +195,15 @@ export default {
             </el-tag>
           )
         ) : (
-          "-"
+          "正常"
         );
       } else {
-        return "-";
+        if (currentTime < timestampToTime(new Date(), 3)) {
+          return "正常";
+        } else {
+          return "--";
+        }
+        // return "正常";
       }
     },
     restTable() {
@@ -226,7 +229,11 @@ export default {
             ) {
               return this.handleArr(row.attendanceStaffStatEntities, item);
             } else {
-              return "-";
+              if (item < timestampToTime(new Date(), 3)) {
+                return "正常";
+              } else {
+                return "--";
+              }
             }
           },
         };
@@ -445,6 +452,7 @@ export default {
             prop: "windowCategory",
             fixed: "left",
             width: 100,
+            formatter: this.formatter,
             show: true,
           },
 
@@ -455,8 +463,18 @@ export default {
             width: 100,
             show: true,
           },
-          { label: "大厅", prop: "salaName", show: true },
-          { label: "部门", prop: "deptName", show: true },
+          {
+            label: "大厅",
+            prop: "salaName",
+            formatter: this.formatter,
+            show: true,
+          },
+          {
+            label: "部门",
+            prop: "deptName",
+            formatter: this.formatter,
+            show: true,
+          },
           {
             label: "应到",
             prop: "workDays",