Browse Source

refactor(attendance): 统一将班组相关表述修改为小组

1. 调整查询表单、表格列的标签文本为小组名称
2. 修改弹窗表单的标签与占位符为小组
3. 更新校验提示语和注释文案
4. 修复导出接口缺失时间参数的问题
5. 调整代码缩进格式优化可读性
huoyi 5 days ago
parent
commit
2cab354e27
1 changed files with 16 additions and 14 deletions
  1. 16 14
      src/views/attendance/postRecord/index.vue

+ 16 - 14
src/views/attendance/postRecord/index.vue

@@ -4,8 +4,8 @@
4 4
       <el-form-item label="用户名称" prop="userName">
5 5
         <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
6 6
       </el-form-item>
7
-      <el-form-item label="组名称" prop="attendanceTeamName">
8
-        <el-input v-model="queryParams.attendanceTeamName" placeholder="请输入组名称" clearable @keyup.enter="handleQuery" />
7
+      <el-form-item label="组名称" prop="attendanceTeamName">
8
+        <el-input v-model="queryParams.attendanceTeamName" placeholder="请输入组名称" clearable @keyup.enter="handleQuery" />
9 9
       </el-form-item>
10 10
       <el-form-item label="主管名称" prop="attendanceDepartmentName">
11 11
         <el-input v-model="queryParams.attendanceDepartmentName" placeholder="请输入主管名称" clearable
@@ -66,9 +66,9 @@
66 66
     <el-table v-loading="loading" :data="postRecordList" @selection-change="handleSelectionChange">
67 67
       <el-table-column type="selection" width="55" align="center" />
68 68
       <el-table-column label="用户姓名" align="center" prop="userName" width="80" />
69
-      <el-table-column label="组名称" align="center" prop="attendanceTeamName" width="80" />
70
-      <el-table-column label="主管名称" align="center" prop="attendanceDepartmentName" width="80" />
71
-      <el-table-column label="大队名称" align="center" prop="attendanceBrigadeName" width="80" />
69
+      <el-table-column label="组名称" align="center" prop="attendanceTeamName" width="80" />
70
+      <el-table-column label="班组名称" align="center" prop="attendanceDepartmentName" width="80" />
71
+      <el-table-column label="部门名称" align="center" prop="attendanceBrigadeName" width="80" />
72 72
       <el-table-column label="考勤日期" align="center" prop="attendanceDate" width="100" />
73 73
       <el-table-column label="上岗时间" align="center" prop="checkInTime" width="155" />
74 74
       <el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155">
@@ -97,10 +97,10 @@
97 97
       v-model:limit="queryParams.pageSize" @pagination="getList" />
98 98
 
99 99
     <!-- 添加或修改上岗记录对话框 -->
100
-    <el-dialog :title="title" v-model="open" width="400px" append-to-body>
100
+    <el-dialog :title="title" v-model="open" width="400px" append-to-body destroy-on-close="true">
101 101
       <el-form ref="postRecordRef" :model="form" :rules="rules" label-width="80px">
102
-        <el-form-item label="组" prop="attendanceTeamId" clearable>
103
-          <el-select v-model="form.attendanceTeamId" filterable placeholder="请选择组" style="width: 288px"
102
+        <el-form-item label="组" prop="attendanceTeamId" clearable>
103
+          <el-select v-model="form.attendanceTeamId" filterable placeholder="请选择组" style="width: 288px"
104 104
             @change="handleTeamChange">
105 105
             <el-option v-for="item in teamOptions" :key="item.value" :label="item.label" :value="item.value" />
106 106
           </el-select>
@@ -268,7 +268,7 @@ const data = reactive({
268 268
       { required: true, message: "加班时长(分钟)不能为空", trigger: "blur" }
269 269
     ],
270 270
     attendanceTeamName: [
271
-      { required: true, message: "考勤组名称不能为空", trigger: "blur" }
271
+      { required: true, message: "考勤组名称不能为空", trigger: "blur" }
272 272
     ],
273 273
     attendanceDepartmentId: [
274 274
       { required: true, message: "考勤主管ID不能为空", trigger: "blur" }
@@ -330,11 +330,11 @@ const { queryParams, form, rules } = toRefs(data)
330 330
 const handleTeamChange = async (newTeamId) => {
331 331
 
332 332
   if (newTeamId) {
333
-    // 当班组ID变化时,获取该班组的成员
333
+    // 当小组ID变化时,获取该小组的成员
334 334
     try {
335 335
       const response = await selectUserListByCondition({
336 336
         deptId: newTeamId, roleKeyList: [
337
-          "xiaozuzhang","SecurityCheck"
337
+          "xiaozuzhang", "SecurityCheck"
338 338
         ],
339 339
       })
340 340
       // 获取团队成员的用户ID列表
@@ -342,7 +342,7 @@ const handleTeamChange = async (newTeamId) => {
342 342
       // 将团队成员的用户ID赋值给form.userId
343 343
       form.value.userIdList = teamUserIds
344 344
     } catch (error) {
345
-      console.error('获取组成员失败:', error)
345
+      console.error('获取组成员失败:', error)
346 346
     }
347 347
   }
348 348
 }
@@ -384,7 +384,7 @@ const fetchTeamData = async () => {
384 384
       }
385 385
     }
386 386
   } catch (error) {
387
-    console.error('获取组数据失败:', error)
387
+    console.error('获取组数据失败:', error)
388 388
   }
389 389
 }
390 390
 
@@ -524,7 +524,9 @@ function handleDelete(row) {
524 524
 /** 导出按钮操作 */
525 525
 function handleExport() {
526 526
   proxy.download('attendance/postRecord/export', {
527
-    ...queryParams.value
527
+    ...queryParams.value,
528
+    beginTime: dateRange.value[0],
529
+    endTime: dateRange.value[1],
528 530
   }, `postRecord_${new Date().getTime()}.xlsx`)
529 531
 }
530 532