From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/personnelManagement/attendanceCheckin/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/views/personnelManagement/attendanceCheckin/index.vue b/src/views/personnelManagement/attendanceCheckin/index.vue
index f2d8776..168a71d 100644
--- a/src/views/personnelManagement/attendanceCheckin/index.vue
+++ b/src/views/personnelManagement/attendanceCheckin/index.vue
@@ -170,6 +170,7 @@
<script setup>
import { ref, reactive, computed, onMounted, onBeforeUnmount } from "vue";
+ import { useRouter } from "vue-router";
import { ElMessage, ElMessageBox } from "element-plus";
import {
createPersonalAttendanceRecord,
@@ -178,9 +179,10 @@
} from "@/api/personnelManagement/personalAttendanceRecords.js";
import Pagination from "@/components/Pagination/index.vue";
import { deptTreeSelect } from "@/api/system/user.js";
- import { Refresh, Search } from "@element-plus/icons-vue";
+ import { Refresh, Search, ArrowLeft } from "@element-plus/icons-vue";
const { proxy } = getCurrentInstance();
+ const router = useRouter();
const tableLoading = ref(false);
// 鍒嗛〉鍙傛暟
const page = reactive({
@@ -453,6 +455,9 @@
</script>
<style scoped lang="scss">
+.table_list {
+ margin-top: unset;
+}
.mb16 {
margin-bottom: 16px;
}
@@ -495,7 +500,7 @@
color: #333;
}
- ::v-deep(.row-abnormal) {
+ :deep(.row-abnormal) {
background-color: #fff5f5;
}
--
Gitblit v1.9.3