Sfoglia il codice sorgente

feat(考勤记录): 添加大队名称字段到考勤和岗位记录

在考勤记录和岗位记录页面中添加大队名称字段,包括查询条件和表格展示列,以支持按大队名称进行筛选和查看
huoyi 4 mesi fa
parent
commit
070f4e37f2

+ 9 - 0
src/views/attendance/attendanceRecord/index.vue

@@ -25,6 +25,14 @@
25 25
           @keyup.enter="handleQuery"
26 26
         />
27 27
       </el-form-item>
28
+       <el-form-item label="大队名称" prop="brigadeName">
29
+        <el-input
30
+          v-model="queryParams.brigadeName"
31
+          placeholder="请输入大队名称"
32
+          clearable
33
+          @keyup.enter="handleQuery"
34
+        />
35
+      </el-form-item>
28 36
       <el-form-item label="考勤日期" prop="attendanceDate">
29 37
         <el-date-picker clearable
30 38
           v-model="queryParams.attendanceDateRange"
@@ -88,6 +96,7 @@
88 96
     <el-table v-loading="loading" :data="attendanceRecordList" @selection-change="handleSelectionChange">
89 97
       <el-table-column type="selection" width="55" align="center" />
90 98
       <el-table-column label="用户名称" align="center" prop="userName" />
99
+      <el-table-column label="大队名称" align="center" prop="brigadeName" />
91 100
       <el-table-column label="科室名称" align="center" prop="departmentName" />
92 101
       <el-table-column label="班组名称" align="center" prop="teamName" />
93 102
       <el-table-column label="考勤日期" align="center" prop="attendanceDate" width="180" />

+ 9 - 0
src/views/attendance/postRecord/index.vue

@@ -25,6 +25,14 @@
25 25
           @keyup.enter="handleQuery"
26 26
         />
27 27
       </el-form-item>
28
+       <el-form-item label="大队名称" prop="attendanceBrigadeName">
29
+        <el-input
30
+          v-model="queryParams.attendanceBrigadeName"
31
+          placeholder="请输入大队名称"
32
+          clearable
33
+          @keyup.enter="handleQuery"
34
+        />
35
+      </el-form-item>
28 36
       <el-form-item label="考勤日期" prop="attendanceDate">
29 37
         <el-date-picker
30 38
           clearable
@@ -114,6 +122,7 @@
114 122
       <el-table-column label="用户姓名" align="center" prop="userName" width="80" />
115 123
       <el-table-column label="班组名称" align="center" prop="attendanceTeamName" width="80" />
116 124
       <el-table-column label="科室名称" align="center" prop="attendanceDepartmentName" width="80" />
125
+      <el-table-column label="大队名称" align="center" prop="attendanceBrigadeName" width="80" /> 
117 126
       <el-table-column label="考勤日期" align="center" prop="attendanceDate" width="100" />
118 127
       <el-table-column label="上岗时间" align="center" prop="checkInTime" width="155" />
119 128
       <el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155" >