From fe167dd71a1300aeae07522db990d6b3fdb77a0e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 12 三月 2026 13:26:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_中兴实强
---
src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue b/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
index d84a3d0..58d4b4f 100644
--- a/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
+++ b/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
@@ -56,6 +56,7 @@
<el-table :data="tableData"
border
v-loading="tableLoading"
+ height="calc(100vh - 18.5em)"
style="width: 100%"
row-key="id">
<el-table-column type="index"
@@ -65,6 +66,11 @@
<el-table-column label="閮ㄩ棬">
<template #default="scope">
{{ getDeptNameById(scope.row.sysDeptId) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鐝">
+ <template #default="scope">
+ {{ getShiftNameByValue(scope.row.shift) }}
</template>
</el-table-column>
<el-table-column prop="locationName"
@@ -137,6 +143,7 @@
getAttendanceRules,
deleteAttendanceRule,
} from "@/api/personnelManagement/attendanceRules.js";
+ import { useDict } from "@/utils/dict";
const { proxy } = getCurrentInstance();
@@ -159,6 +166,8 @@
// 閮ㄩ棬閫夐」
const deptOptions = ref([]);
+ // 鑾峰彇鐝瀛楀吀鍊�
+ const { shifts_list } = useDict("shifts_list");
// 寮圭獥鎺у埗
const dialogVisible = ref(false);
@@ -173,6 +182,13 @@
return `${String(date.getHours()).padStart(2, "0")}:${String(
date.getMinutes()
).padStart(2, "0")}`;
+ };
+
+ // 鏍规嵁鐝鍊艰幏鍙栫彮娆″悕绉�
+ const getShiftNameByValue = value => {
+ if (!value) return "";
+ const shift = shifts_list.value.find(item => item.value === value);
+ return shift ? shift.label : value;
};
// 鑾峰彇閮ㄩ棬鍒楄〃
@@ -297,4 +313,4 @@
.mt10 {
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3