DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms/attendance): 优化考勤同步功能，新增月份选择和超时配置

Browse Source 
1. 重构syncRecords接口，支持传入开始和结束时间参数并新增60s超时配置
2. 升级考勤同步页面：新增同步弹窗、月份选择器，替换原有基于最后同步时间的同步逻辑
3. 优化搜索表单和详情表单的标签与占位符，调整表单宽度提升可读性
4. 移除无用的最后同步时间查询逻辑
This commit is contained in:
砂糖
2026-06-01 14:12:06 +08:00
parent 481188f654
commit a0cd885fc7
2 changed files with 96 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-ui/src/api/wms/attendance.js
View File

@@ -45,12 +45,14 @@ export function delRecords(id) {
} }
// 同步考勤记录 // 同步考勤记录
export function syncRecords(starttime) { export function syncRecords({ starttime, endtime }) {
return attendanceRequest({ return attendanceRequest({
url: '/sync_attendance', url: '/sync_attendance',
method: 'post', method: 'post',
timeout: 60000,
data: { data: {
starttime starttime,
endtime
} }
}) })
} }

153
klp-ui/src/views/wms/hrm/attendance/sync.vue
View File

@@ -1,66 +1,66 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="" prop="pin"> <el-form-item label="员工编号" prop="pin">
<el-input <el-input
v-model="queryParams.pin" v-model="queryParams.pin"
placeholder="请输入" placeholder="请输入员工编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="ename"> <el-form-item label="姓名" prop="ename">
<el-input <el-input
v-model="queryParams.ename" v-model="queryParams.ename"
placeholder="请输入" placeholder="请输入姓名"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="deptname"> <el-form-item label="部门" prop="deptname">
<el-input <el-input
v-model="queryParams.deptname" v-model="queryParams.deptname"
placeholder="请输入" placeholder="请输入部门"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="sn"> <el-form-item label="考勤编号" prop="sn">
<el-input <el-input
v-model="queryParams.sn" v-model="queryParams.sn"
placeholder="请输入" placeholder="请输入考勤编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="checktime"> <el-form-item label="打卡日期" prop="checktime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.checktime" v-model="queryParams.checktime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择"> placeholder="请选择打卡日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="" prop="verify"> <el-form-item label="验证状态" prop="verify">
<el-input <el-input
v-model="queryParams.verify" v-model="queryParams.verify"
placeholder="请输入" placeholder="请输入验证状态"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="stateno"> <el-form-item label="状态编码" prop="stateno">
<el-input <el-input
v-model="queryParams.stateno" v-model="queryParams.stateno"
placeholder="请输入" placeholder="请输入状态编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="state"> <el-form-item label="状态" prop="state">
<el-input <el-input
v-model="queryParams.state" v-model="queryParams.state"
placeholder="请输入" placeholder="请输入状态"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@@ -68,7 +68,7 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="warning" icon="el-icon-upload" size="mini" :disabled="!lastSyncTime" @click="handleSync">同步</el-button> <el-button type="warning" icon="el-icon-upload" size="mini" @click="handleSync">同步</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -124,42 +124,42 @@
<!-- 添加或修改考勤记录对话框 --> <!-- 添加或修改考勤记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="" prop="pin"> <el-form-item label="员工编号" prop="pin">
<el-input v-model="form.pin" placeholder="请输入" /> <el-input v-model="form.pin" placeholder="请输入员工编号" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="ename"> <el-form-item label="姓名" prop="ename">
<el-input v-model="form.ename" placeholder="请输入" /> <el-input v-model="form.ename" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="deptname"> <el-form-item label="部门" prop="deptname">
<el-input v-model="form.deptname" placeholder="请输入" /> <el-input v-model="form.deptname" placeholder="请输入部门" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="sn"> <el-form-item label="考勤编号" prop="sn">
<el-input v-model="form.sn" placeholder="请输入" /> <el-input v-model="form.sn" placeholder="请输入考勤编号" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="checktime"> <el-form-item label="打卡时间" prop="checktime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.checktime" v-model="form.checktime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择"> placeholder="请选择打卡时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="" prop="verify"> <el-form-item label="验证状态" prop="verify">
<el-input v-model="form.verify" placeholder="请输入" /> <el-input v-model="form.verify" placeholder="请输入验证状态" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="stateno"> <el-form-item label="状态编码" prop="stateno">
<el-input v-model="form.stateno" placeholder="请输入" /> <el-input v-model="form.stateno" placeholder="请输入状态编码" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="state"> <el-form-item label="状态" prop="state">
<el-input v-model="form.state" placeholder="请输入" /> <el-input v-model="form.state" placeholder="请输入状态" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="createdAt"> <el-form-item label="创建时间" prop="createdAt">
<el-date-picker clearable <el-date-picker clearable
v-model="form.createdAt" v-model="form.createdAt"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择"> placeholder="请选择创建时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -168,12 +168,30 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 同步对话框 -->
<el-dialog title="同步考勤数据" :visible.sync="syncDialogVisible" width="420px" append-to-body>
<el-form ref="syncForm" :model="syncFormData" :rules="syncRules" label-width="80px">
<el-form-item label="同步月份" prop="syncMonth">
<el-date-picker
v-model="syncFormData.syncMonth"
type="month"
value-format="yyyy-MM"
placeholder="请选择同步月份"
style="width: 100%">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="syncLoading" type="primary" @click="doSync">确定同步</el-button>
<el-button @click="syncDialogVisible = false">取消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listRecords, getRecords, delRecords, addRecords, updateRecords, syncRecords } from "@/api/wms/attendance"; import { listRecords, getRecords, delRecords, addRecords, updateRecords, syncRecords } from "@/api/wms/attendance";
import { getConfigKey, updateConfigByKey } from '@/api/system/config'
export default { export default {
name: "Records", name: "Records",
@@ -181,6 +199,18 @@ export default {
return { return {
// 按钮loading // 按钮loading
buttonLoading: false, buttonLoading: false,
// 同步loading
syncLoading: false,
// 同步弹窗
syncDialogVisible: false,
// 同步表单
syncFormData: {
syncMonth: ""
},
// 同步表单校验
syncRules: {
syncMonth: [{ required: true, message: "请选择同步月份", trigger: "change" }]
},
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@@ -215,20 +245,12 @@ export default {
}, },
// 表单参数 // 表单参数
form: {}, form: {},
lastSyncTime: undefined
}; };
}, },
created() { created() {
this.getLastSyncTime();
this.getList(); this.getList();
}, },
methods: { methods: {
// 最后同步时间
getLastSyncTime() {
getConfigKey('hrm.attendance.lastsync').then(response => {
this.lastSyncTime = response.msg
})
},
/** 查询考勤记录列表 */ /** 查询考勤记录列表 */
getList() { getList() {
@@ -246,23 +268,32 @@ export default {
}, },
// 同步按钮 // 同步按钮
handleSync() { handleSync() {
this.buttonLoading = true; this.syncFormData.syncMonth = "";
if (!this.lastSyncTime) { this.syncDialogVisible = true;
this.$modal.msgError("请先查询最后同步时间"); this.$nextTick(() => {
return; this.$refs.syncForm && this.$refs.syncForm.clearValidate();
} });
this.$modal.confirm('确认同步吗？', { },
confirmButtonText: '确定', // 执行同步
cancelButtonText: '取消', doSync() {
type: 'warning' this.$refs.syncForm.validate(valid => {
}).then(() => { if (!valid) return;
syncRecords(this.lastSyncTime).then(response => { const { syncMonth } = this.syncFormData;
console.log(response) const [year, month] = syncMonth.split('-');
updateConfigByKey('hrm.attendance.lastsync', response.endtime) const lastDay = new Date(year, month, 0).getDate();
this.$modal.msgSuccess("同步成功"); const starttime = `${syncMonth}-01 00:00:00`;
const endtime = `${syncMonth}-${String(lastDay).padStart(2, '0')} 23:59:59`;
this.syncLoading = true;
syncRecords({ starttime, endtime }).then(res => {
const msg = `${res.message}（同步区间：${res.starttime} ~ ${res.endtime}，共 ${res.records_synced} 条记录）`;
this.$modal.msgSuccess(msg);
this.syncLoading = false;
this.syncDialogVisible = false;
this.getList(); this.getList();
}).catch(() => {
this.syncLoading = false;
}); });
this.buttonLoading = false;
}); });
}, },
// 表单重置 // 表单重置