zhangjie 1 năm trước cách đây
mục cha
commit
aaeece4aab

+ 8 - 0
src/components/common/status-tag/config.js

@@ -4,6 +4,7 @@ import {
   warnFlowStatusFilter,
   violationFlowStatusFilter,
   publishStatusFilter,
+  attendanceResultFilter,
 } from '@/utils/filter';
 
 const configs = {
@@ -45,6 +46,13 @@ const configs = {
     },
     valFilter: publishStatusFilter,
   },
+  attendanceResult: {
+    themeDict: {
+      NORMAL: 'success',
+      EXCEPTION: 'danger',
+    },
+    valFilter: attendanceResultFilter,
+  },
 };
 export function getConfig(type) {
   return configs[type] || { themeDict: {}, valFilter: (val) => val };

+ 6 - 7
src/views/work-hours/work-hours-manage/work-attendance-detail/index.vue

@@ -44,7 +44,10 @@
           {{ timestampFilter(row[col.colKey]) }}
         </template>
         <template #status="{ col, row }">
-          {{ attendanceResultFilter(row[col.colKey]) }}
+          <status-tag
+            :value="row[col.colKey]"
+            type="attendanceResult"
+          ></status-tag>
         </template>
         <template #type="{ col, row }">
           {{ attendanceTypeFilter(row[col.colKey]) }}
@@ -64,11 +67,7 @@ import {
   workAttendanceDetailListApi,
   workStatisticsDetailInfoApi,
 } from '@/api/work-hours';
-import {
-  timestampFilter,
-  attendanceResultFilter,
-  attendanceTypeFilter,
-} from '@/utils/filter';
+import { timestampFilter, attendanceTypeFilter } from '@/utils/filter';
 import { ATTENDANCE_RESULT, ATTENDANCE_TYPE } from '@/config/constants';
 import { dictToOptionList } from '@/utils/tool';
 
@@ -210,7 +209,7 @@ const columns = [
   { colKey: 'type', title: '考勤类型', cell: 'type', width: 100 },
   { colKey: 'signTime', title: '打卡时间', cell: 'sign-time', width: 180 },
   { colKey: 'address', title: '打卡地址', minWidth: 200 },
-  { colKey: 'status', title: '考勤结果', cell: 'status', width: 100 },
+  { colKey: 'status', title: '考勤结果', fixed: 'right', width: 100 },
 ];
 const { pagination, tableData, search, onChange } = useFetchTable(
   workAttendanceDetailListApi,