From a0cd885fc7bdb25e4e16b43275833665324cb09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 1 Jun 2026 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/attendance):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=88=E4=BB=BD=E9=80=89=E6=8B=A9=E5=92=8C?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 重构syncRecords接口，支持传入开始和结束时间参数并新增60s超时配置
2. 升级考勤同步页面：新增同步弹窗、月份选择器，替换原有基于最后同步时间的同步逻辑
3. 优化搜索表单和详情表单的标签与占位符，调整表单宽度提升可读性
4. 移除无用的最后同步时间查询逻辑
---
 klp-ui/src/api/wms/attendance.js             |   6 +-
 klp-ui/src/views/wms/hrm/attendance/sync.vue | 153 +++++++++++--------
 2 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/klp-ui/src/api/wms/attendance.js b/klp-ui/src/api/wms/attendance.js
index ee4765b6..8de38d68 100644
--- a/klp-ui/src/api/wms/attendance.js
+++ b/klp-ui/src/api/wms/attendance.js
@@ -45,12 +45,14 @@ export function delRecords(id) {
 }
 
 // 同步考勤记录
-export function syncRecords(starttime) {
+export function syncRecords({ starttime, endtime }) {
   return attendanceRequest({
     url: '/sync_attendance',
     method: 'post',
+    timeout: 60000,
     data: {
-      starttime
+      starttime,
+      endtime
     }
   })
 }
diff --git a/klp-ui/src/views/wms/hrm/attendance/sync.vue b/klp-ui/src/views/wms/hrm/attendance/sync.vue
index f1019ce8..ec31b126 100644
--- a/klp-ui/src/views/wms/hrm/attendance/sync.vue
+++ b/klp-ui/src/views/wms/hrm/attendance/sync.vue
@@ -1,66 +1,66 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="" prop="pin">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="员工编号" prop="pin">
         <el-input
           v-model="queryParams.pin"
-          placeholder="请输入"
+          placeholder="请输入员工编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="ename">
+      <el-form-item label="姓名" prop="ename">
         <el-input
           v-model="queryParams.ename"
-          placeholder="请输入"
+          placeholder="请输入姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="deptname">
+      <el-form-item label="部门" prop="deptname">
         <el-input
           v-model="queryParams.deptname"
-          placeholder="请输入"
+          placeholder="请输入部门"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="sn">
+      <el-form-item label="考勤编号" prop="sn">
         <el-input
           v-model="queryParams.sn"
-          placeholder="请输入"
+          placeholder="请输入考勤编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="checktime">
+      <el-form-item label="打卡日期" prop="checktime">
         <el-date-picker clearable
           v-model="queryParams.checktime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择">
+          placeholder="请选择打卡日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="verify">
+      <el-form-item label="验证状态" prop="verify">
         <el-input
           v-model="queryParams.verify"
-          placeholder="请输入"
+          placeholder="请输入验证状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="stateno">
+      <el-form-item label="状态编码" prop="stateno">
         <el-input
           v-model="queryParams.stateno"
-          placeholder="请输入"
+          placeholder="请输入状态编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="state">
+      <el-form-item label="状态" prop="state">
         <el-input
           v-model="queryParams.state"
-          placeholder="请输入"
+          placeholder="请输入状态"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -68,7 +68,7 @@
       <el-form-item>
         <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 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>
 
@@ -124,42 +124,42 @@
 
     <!-- 添加或修改考勤记录对话框 -->
     <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-item label="" prop="pin">
-          <el-input v-model="form.pin" placeholder="请输入" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="员工编号" prop="pin">
+          <el-input v-model="form.pin" placeholder="请输入员工编号" />
         </el-form-item>
-        <el-form-item label="" prop="ename">
-          <el-input v-model="form.ename" placeholder="请输入" />
+        <el-form-item label="姓名" prop="ename">
+          <el-input v-model="form.ename" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="" prop="deptname">
-          <el-input v-model="form.deptname" placeholder="请输入" />
+        <el-form-item label="部门" prop="deptname">
+          <el-input v-model="form.deptname" placeholder="请输入部门" />
         </el-form-item>
-        <el-form-item label="" prop="sn">
-          <el-input v-model="form.sn" placeholder="请输入" />
+        <el-form-item label="考勤编号" prop="sn">
+          <el-input v-model="form.sn" placeholder="请输入考勤编号" />
         </el-form-item>
-        <el-form-item label="" prop="checktime">
+        <el-form-item label="打卡时间" prop="checktime">
           <el-date-picker clearable
             v-model="form.checktime"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择">
+            placeholder="请选择打卡时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="" prop="verify">
-          <el-input v-model="form.verify" placeholder="请输入" />
+        <el-form-item label="验证状态" prop="verify">
+          <el-input v-model="form.verify" placeholder="请输入验证状态" />
         </el-form-item>
-        <el-form-item label="" prop="stateno">
-          <el-input v-model="form.stateno" placeholder="请输入" />
+        <el-form-item label="状态编码" prop="stateno">
+          <el-input v-model="form.stateno" placeholder="请输入状态编码" />
         </el-form-item>
-        <el-form-item label="" prop="state">
-          <el-input v-model="form.state" placeholder="请输入" />
+        <el-form-item label="状态" prop="state">
+          <el-input v-model="form.state" placeholder="请输入状态" />
         </el-form-item>
-        <el-form-item label="" prop="createdAt">
+        <el-form-item label="创建时间" prop="createdAt">
           <el-date-picker clearable
             v-model="form.createdAt"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择">
+            placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -168,12 +168,30 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </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>
 </template>
 
 <script>
 import { listRecords, getRecords, delRecords, addRecords, updateRecords, syncRecords } from "@/api/wms/attendance";
-import { getConfigKey, updateConfigByKey } from '@/api/system/config'
 
 export default {
   name: "Records",
@@ -181,6 +199,18 @@ export default {
     return {
       // 按钮loading
       buttonLoading: false,
+      // 同步loading
+      syncLoading: false,
+      // 同步弹窗
+      syncDialogVisible: false,
+      // 同步表单
+      syncFormData: {
+        syncMonth: ""
+      },
+      // 同步表单校验
+      syncRules: {
+        syncMonth: [{ required: true, message: "请选择同步月份", trigger: "change" }]
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -215,20 +245,12 @@ export default {
       },
       // 表单参数
       form: {},
-      lastSyncTime: undefined
     };
   },
   created() {
-    this.getLastSyncTime();
     this.getList();
   },
   methods: {
-    // 最后同步时间
-    getLastSyncTime() {
-      getConfigKey('hrm.attendance.lastsync').then(response => {
-        this.lastSyncTime = response.msg
-      })
-    },
     /** 查询考勤记录列表 */
 
     getList() {
@@ -246,23 +268,32 @@ export default {
     },
     // 同步按钮
     handleSync() {
-      this.buttonLoading = true;
-      if (!this.lastSyncTime) {
-        this.$modal.msgError("请先查询最后同步时间");
-        return;
-      }
-      this.$modal.confirm('确认同步吗？', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        syncRecords(this.lastSyncTime).then(response => {
-          console.log(response)
-          updateConfigByKey('hrm.attendance.lastsync', response.endtime)
-          this.$modal.msgSuccess("同步成功");
+      this.syncFormData.syncMonth = "";
+      this.syncDialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs.syncForm && this.$refs.syncForm.clearValidate();
+      });
+    },
+    // 执行同步
+    doSync() {
+      this.$refs.syncForm.validate(valid => {
+        if (!valid) return;
+        const { syncMonth } = this.syncFormData;
+        const [year, month] = syncMonth.split('-');
+        const lastDay = new Date(year, month, 0).getDate();
+        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();
+        }).catch(() => {
+          this.syncLoading = false;
         });
-        this.buttonLoading = false;
       });
     },
     // 表单重置