From 676e73b8780c6cb49596865de81e6d806544ef10 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 09 四月 2026 13:29:28 +0800
Subject: [PATCH] fix: 阳光印刷:添加附件功能，新增时可以上传附件、审核时要求可以预览附件.公司电话为必填项，改为选填 fix:调整供应商管理表单验证及优化知识库文件处理 - 将供应商管理中的公司电话字段改为非必填 - 移除销售报价中未使用的 delLedgerFile 导入 - 优化知识库文件上传组件，添加文件操作按钮和预览功能 - 修复知识库编辑时文件列表显示异常问题 - 统一文件下载和预览的处理逻辑
---
src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue b/src/views/personnelManagement/attendanceCheckin/checkinRules/index.vue
index 9064274..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"
@@ -122,7 +128,14 @@
<script setup>
import { ref, reactive, onMounted } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
- import { Plus, Edit, Delete, Search, Refresh } from "@element-plus/icons-vue";
+ import {
+ Plus,
+ Edit,
+ Delete,
+ Search,
+ Refresh,
+ ArrowLeft,
+ } from "@element-plus/icons-vue";
import Pagination from "@/components/Pagination/index.vue";
import RuleForm from "./components/form.vue";
import { deptTreeSelect } from "@/api/system/user.js";
@@ -130,6 +143,7 @@
getAttendanceRules,
deleteAttendanceRule,
} from "@/api/personnelManagement/attendanceRules.js";
+ import { useDict } from "@/utils/dict";
const { proxy } = getCurrentInstance();
@@ -152,6 +166,8 @@
// 閮ㄩ棬閫夐」
const deptOptions = ref([]);
+ // 鑾峰彇鐝瀛楀吀鍊�
+ const { shifts_list } = useDict("shifts_list");
// 寮圭獥鎺у埗
const dialogVisible = ref(false);
@@ -166,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;
};
// 鑾峰彇閮ㄩ棬鍒楄〃
@@ -290,4 +313,4 @@
.mt10 {
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3