Merge remote-tracking branch 'origin/master'

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

@@ -171,7 +171,7 @@ export default {
           arr[index].remark ? (
             <el-tooltip
               class="item"
-              effect="dark"
+              effect="light"
               content={arr[index].content}
               placement="top-start"
             >
@@ -241,10 +241,36 @@ export default {
               ? (item1.content = Arr.map((v) => {
                   return (
                     <p>
-                      上班{v.orderNum}打卡时间：
-                      {(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
-                      {"  "} 下班{v.orderNum}打卡时间：
-                      {(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
+                      {v.goWorkResult == 1 ? (
+                        <span style="marginRight:10px">
+                          打卡时间：
+                          {(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
+                          {"  "} 打卡结果：
+                          {this.tableData.dict.goWorkResult[v.goWorkResult]}
+                        </span>
+                      ) : (
+                        <span style="color:red;marginRight:10px">
+                          打卡时间：
+                          {(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
+                          {"  "} 打卡结果：
+                          {this.tableData.dict.goWorkResult[v.goWorkResult]}
+                        </span>
+                      )}
+                      {v.offWorkResult == 1 ? (
+                        <span>
+                          打卡时间：
+                          {(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
+                          {"  "} 打卡结果：
+                          {this.tableData.dict.offWorkResult[v.offWorkResult]}
+                        </span>
+                      ) : (
+                        <span style="color:red">
+                          打卡时间：
+                          {(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
+                          {"  "} 打卡结果：
+                          {this.tableData.dict.offWorkResult[v.offWorkResult]}
+                        </span>
+                      )}
                     </p>
                   );
                 }))