From ae1b25dd19e8d025e40a04b165d201d53a4c6595 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Tue, 27 May 2025 15:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=87=BA=E5=8B=A4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/requireAttendanceReport/index.vue     | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/pay/requireAttendanceReport/index.vue b/ruoyi-ui/src/views/pay/requireAttendanceReport/index.vue
index 2a212af..20fbe3d 100644
--- a/ruoyi-ui/src/views/pay/requireAttendanceReport/index.vue
+++ b/ruoyi-ui/src/views/pay/requireAttendanceReport/index.vue
@@ -117,20 +117,24 @@
 
       <el-table v-loading="loading" :data="requireAttendanceReportList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="年份" align="center" prop="year" />
-        <el-table-column label="月份" align="center" prop="month" />
-        <el-table-column label="员工姓名" align="center" prop="empName" />
-        <el-table-column label="部门名称" align="center" prop="deptName" />
-        <el-table-column label="休息类别" align="center" prop="restType" />
-        <el-table-column label="应出勤天数" align="center" prop="requireDays" />
-        <el-table-column label="出勤天数" align="center" prop="avtiveDays" />
-        <el-table-column label="出勤小时数" align="center" prop="attendanceHours" />
-        <el-table-column label="加班小时数" align="center" prop="overtimeHours" />
-        <el-table-column label="放假天数" align="center" prop="holidays" />
-        <el-table-column label="放假小时数" align="center" prop="holidayHours" />
-        <el-table-column label="请假天数" align="center" prop="leaveDays" />
-        <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200px">
+        <el-table-column label="年份" align="center" prop="year" min-width="80"/>
+        <el-table-column label="月份" align="center" prop="month" min-width="80"/>
+        <el-table-column label="员工姓名" align="center" prop="empName" min-width="140" :show-overflow-tooltip="true"/>
+        <el-table-column label="部门名称" align="center" prop="deptName" min-width="140" :show-overflow-tooltip="true"/>
+        <el-table-column label="休息类型" align="center" prop="restType" min-width="80">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.pay_work_rest_type" :value="scope.row.restType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="应出勤天数" align="center" prop="requireDays" min-width="110"/>
+        <el-table-column label="出勤天数" align="center" prop="avtiveDays" min-width="100"/>
+        <el-table-column label="出勤小时数" align="center" prop="attendanceHours" min-width="100"/>
+        <el-table-column label="加班小时数" align="center" prop="overtimeHours" min-width="100"/>
+        <el-table-column label="放假天数" align="center" prop="holidays" min-width="100"/>
+        <el-table-column label="放假小时数" align="center" prop="holidayHours" min-width="100"/>
+        <el-table-column label="请假天数" align="center" prop="leaveDays" min-width="100"/>
+        <el-table-column label="备注" align="center" prop="remark" min-width="100"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -629,6 +633,7 @@ export default {
       this.form.empName = val.name;
       this.form.deptId = val.deptId;
       this.form.deptName = val.deptName;
+      this.form.restType = val.restType;
       this.emp.open = false;
     },
     /** 导入按钮操作 */
@@ -639,7 +644,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('pay/requireAttendanceReport/import', {
+      this.download('pay/requireAttendanceReport/importTemplate', {
       }, `attendance_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理