|
@@ -4,8 +4,8 @@
|
|
4
|
<el-form-item label="用户名称" prop="userName">
|
4
|
<el-form-item label="用户名称" prop="userName">
|
|
5
|
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
|
5
|
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
|
|
6
|
</el-form-item>
|
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
|
</el-form-item>
|
9
|
</el-form-item>
|
|
10
|
<el-form-item label="主管名称" prop="attendanceDepartmentName">
|
10
|
<el-form-item label="主管名称" prop="attendanceDepartmentName">
|
|
11
|
<el-input v-model="queryParams.attendanceDepartmentName" placeholder="请输入主管名称" clearable
|
11
|
<el-input v-model="queryParams.attendanceDepartmentName" placeholder="请输入主管名称" clearable
|
|
@@ -66,9 +66,9 @@
|
|
66
|
<el-table v-loading="loading" :data="postRecordList" @selection-change="handleSelectionChange">
|
66
|
<el-table v-loading="loading" :data="postRecordList" @selection-change="handleSelectionChange">
|
|
67
|
<el-table-column type="selection" width="55" align="center" />
|
67
|
<el-table-column type="selection" width="55" align="center" />
|
|
68
|
<el-table-column label="用户姓名" align="center" prop="userName" width="80" />
|
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
|
<el-table-column label="考勤日期" align="center" prop="attendanceDate" width="100" />
|
72
|
<el-table-column label="考勤日期" align="center" prop="attendanceDate" width="100" />
|
|
73
|
<el-table-column label="上岗时间" align="center" prop="checkInTime" width="155" />
|
73
|
<el-table-column label="上岗时间" align="center" prop="checkInTime" width="155" />
|
|
74
|
<el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155">
|
74
|
<el-table-column label="离岗时间" align="center" prop="checkOutTime" width="155">
|
|
@@ -97,10 +97,10 @@
|
|
97
|
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
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
|
<el-form ref="postRecordRef" :model="form" :rules="rules" label-width="80px">
|
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
|
@change="handleTeamChange">
|
104
|
@change="handleTeamChange">
|
|
105
|
<el-option v-for="item in teamOptions" :key="item.value" :label="item.label" :value="item.value" />
|
105
|
<el-option v-for="item in teamOptions" :key="item.value" :label="item.label" :value="item.value" />
|
|
106
|
</el-select>
|
106
|
</el-select>
|
|
@@ -268,7 +268,7 @@ const data = reactive({
|
|
268
|
{ required: true, message: "加班时长(分钟)不能为空", trigger: "blur" }
|
268
|
{ required: true, message: "加班时长(分钟)不能为空", trigger: "blur" }
|
|
269
|
],
|
269
|
],
|
|
270
|
attendanceTeamName: [
|
270
|
attendanceTeamName: [
|
|
271
|
- { required: true, message: "考勤班组名称不能为空", trigger: "blur" }
|
|
|
|
|
|
271
|
+ { required: true, message: "考勤小组名称不能为空", trigger: "blur" }
|
|
272
|
],
|
272
|
],
|
|
273
|
attendanceDepartmentId: [
|
273
|
attendanceDepartmentId: [
|
|
274
|
{ required: true, message: "考勤主管ID不能为空", trigger: "blur" }
|
274
|
{ required: true, message: "考勤主管ID不能为空", trigger: "blur" }
|
|
@@ -330,11 +330,11 @@ const { queryParams, form, rules } = toRefs(data)
|
|
330
|
const handleTeamChange = async (newTeamId) => {
|
330
|
const handleTeamChange = async (newTeamId) => {
|
|
331
|
|
331
|
|
|
332
|
if (newTeamId) {
|
332
|
if (newTeamId) {
|
|
333
|
- // 当班组ID变化时,获取该班组的成员
|
|
|
|
|
|
333
|
+ // 当小组ID变化时,获取该小组的成员
|
|
334
|
try {
|
334
|
try {
|
|
335
|
const response = await selectUserListByCondition({
|
335
|
const response = await selectUserListByCondition({
|
|
336
|
deptId: newTeamId, roleKeyList: [
|
336
|
deptId: newTeamId, roleKeyList: [
|
|
337
|
- "xiaozuzhang","SecurityCheck"
|
|
|
|
|
|
337
|
+ "xiaozuzhang", "SecurityCheck"
|
|
338
|
],
|
338
|
],
|
|
339
|
})
|
339
|
})
|
|
340
|
// 获取团队成员的用户ID列表
|
340
|
// 获取团队成员的用户ID列表
|
|
@@ -342,7 +342,7 @@ const handleTeamChange = async (newTeamId) => {
|
|
342
|
// 将团队成员的用户ID赋值给form.userId
|
342
|
// 将团队成员的用户ID赋值给form.userId
|
|
343
|
form.value.userIdList = teamUserIds
|
343
|
form.value.userIdList = teamUserIds
|
|
344
|
} catch (error) {
|
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
|
} catch (error) {
|
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
|
function handleExport() {
|
525
|
function handleExport() {
|
|
526
|
proxy.download('attendance/postRecord/export', {
|
526
|
proxy.download('attendance/postRecord/export', {
|
|
527
|
- ...queryParams.value
|
|
|
|
|
|
527
|
+ ...queryParams.value,
|
|
|
|
528
|
+ beginTime: dateRange.value[0],
|
|
|
|
529
|
+ endTime: dateRange.value[1],
|
|
528
|
}, `postRecord_${new Date().getTime()}.xlsx`)
|
530
|
}, `postRecord_${new Date().getTime()}.xlsx`)
|
|
529
|
}
|
531
|
}
|
|
530
|
|
532
|
|