Merge remote-tracking branch 'origin/master'

gear-ui3/src/api/oa/attendanceSummary.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询考勤汇总列表
+export function listAttendanceSummary(query) {
+  return request({
+    url: '/oa/attendanceSummary/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询考勤汇总详细
+export function getAttendanceSummary(summaryId) {
+  return request({
+    url: '/oa/attendanceSummary/' + summaryId,
+    method: 'get'
+  })
+}
+
+// 新增考勤汇总
+export function addAttendanceSummary(data) {
+  return request({
+    url: '/oa/attendanceSummary',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改考勤汇总
+export function updateAttendanceSummary(data) {
+  return request({
+    url: '/oa/attendanceSummary',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除考勤汇总
+export function delAttendanceSummary(summaryId) {
+  return request({
+    url: '/oa/attendanceSummary/' + summaryId,
+    method: 'delete'
+  })
+}

gear-ui3/src/api/oa/attendanceSummaryDetail.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询考勤汇总明细列表
+export function listAttendanceSummaryDetail(query) {
+  return request({
+    url: '/oa/attendanceSummaryDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询考勤汇总明细详细
+export function getAttendanceSummaryDetail(detailId) {
+  return request({
+    url: '/oa/attendanceSummaryDetail/' + detailId,
+    method: 'get'
+  })
+}
+
+// 新增考勤汇总明细
+export function addAttendanceSummaryDetail(data) {
+  return request({
+    url: '/oa/attendanceSummaryDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改考勤汇总明细
+export function updateAttendanceSummaryDetail(data) {
+  return request({
+    url: '/oa/attendanceSummaryDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除考勤汇总明细
+export function delAttendanceSummaryDetail(detailId) {
+  return request({
+    url: '/oa/attendanceSummaryDetail/' + detailId,
+    method: 'delete'
+  })
+}

gear-ui3/src/components/UserSelect/index.vue

@@ -7,6 +7,7 @@
     searchable
     clearable
     v-bind="$attrs"
+    :multiple="multiple"
     @update:model-value="updateValue"
     @change="handleChange"
   />

gear-ui3/src/views/peoples/attendance/attendance.vue

@@ -1,351 +1,7 @@
 <template>
-  <div class="app-container">
+  <attendance-page record-type="attendance" />
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="用户ID" prop="userId">
-        <user-select
-          v-model="queryParams.userId"
-        />
-      </el-form-item>
-      <el-form-item label="记录日期" prop="recordDate">
-        <el-date-picker clearable
-          v-model="queryParams.recordDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择记录日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['oa:attendanceRecord:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:attendanceRecord:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:attendanceRecord:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['oa:attendanceRecord:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="attendanceRecordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="recordId" v-if="false"/>
-      <el-table-column label="用户" align="center" prop="nickName" />
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.recordDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时长(小时)" align="center" prop="durationHour" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:attendanceRecord:edit']">修改</el-button>
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:attendanceRecord:remove']">删除</el-button>
-          </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改考勤主（含考勤/加班/出差）对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="attendanceRecordRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="用户ID" prop="userId">
-          <user-select
-            v-model="form.userId"
-            placeholder="请选择用户"
-            clearable
-            @input="handleUserSearch"
-          />
-        </el-form-item>
-        <el-form-item label="记录日期" prop="recordDate">
-          <el-date-picker clearable
-            v-model="form.recordDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择记录日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="时长(小时)" prop="durationHour">
-          <el-input-number v-model="form.durationHour" placeholder="请输入时长(小时)" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script setup name="AttendanceRecord">
-import UserSelect from '@/components/UserSelect'
+import attendancePage from './components/attendancePage.vue';
-import { listAttendanceRecord, getAttendanceRecord, delAttendanceRecord, addAttendanceRecord, updateAttendanceRecord } from "@/api/oa/attendanceRecord";
-
-const { proxy } = getCurrentInstance();
-
-const attendanceRecordList = ref([]);
-const open = ref(false);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    userId: undefined,
-    recordDate: undefined,
-    recordType: 'attendance', // 默认考勤
-    // 当天九点
-    startTime: undefined,
-    endTime: undefined,
-    durationHour: 8, // 默认8小时
-  },
-  rules: {
-    userId: [
-      { required: true, message: "用户ID不能为空", trigger: "blur" }
-    ],
-    recordDate: [
-      { required: true, message: "记录日期不能为空", trigger: "blur" }
-    ],
-    recordType: [
-      { required: true, message: "记录类型: attendance(考勤), overtime(加班), travel(出差)不能为空", trigger: "blur" }
-    ],
-    startTime: [
-      { required: true, message: "开始时间不能为空", trigger: "blur" }
-    ],
-    endTime: [
-      { required: true, message: "结束时间不能为空", trigger: "blur" }
-    ],
-    durationHour: [
-      { required: true, message: "时长(小时) - 用于考勤/加班/出差不能为空", trigger: "blur" }
-    ],
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询考勤主（含考勤/加班/出差）列表 */
-function getList() {
-  loading.value = true;
-  listAttendanceRecord(queryParams.value).then(response => {
-    attendanceRecordList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
-}
-
-// 取消按钮
-function cancel() {
-  open.value = false;
-  reset();
-}
-
-// 表单重置
-function reset() {
-  form.value = {
-    recordId: null,
-    userId: null,
-    // 填入格式化的日期 YYYY-MM-DD HH:mm:ss
-    recordDate: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
-    recordType: 'attendance', // 默认考勤
-    startTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 09:00:00'),
-    endTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 18:00:00'),
-    durationHour: 8,
-    status: null,
-    createTime: null,
-    createBy: null,
-    updateTime: null,
-    updateBy: null,
-    delFlag: null,
-    remark: null
-  };
-  proxy.resetForm("attendanceRecordRef");
-}
-
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
-}
-
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.recordId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "添加考勤主（含考勤/加班/出差）";
-}
-
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  loading.value = true
-  reset();
-  const _recordId = row.recordId || ids.value
-  getAttendanceRecord(_recordId).then(response => {
-    loading.value = false;
-    form.value = response.data;
-    open.value = true;
-    title.value = "修改考勤主（含考勤/加班/出差）";
-  });
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["attendanceRecordRef"].validate(valid => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.recordId != null) {
-        updateAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      } else {
-        addAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      }
-    }
-  });
-}
-
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _recordIds = row.recordId || ids.value;
-  proxy.$modal.confirm('是否确认删除考勤主（含考勤/加班/出差）编号为"' + _recordIds + '"的数据项？').then(function() {
-    loading.value = true;
-    return delAttendanceRecord(_recordIds);
-  }).then(() => {
-    loading.value = true;
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {
-  }).finally(() => {
-    loading.value = false;
-  });
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('oa/attendanceRecord/export', {
-    ...queryParams.value
-  }, `attendanceRecord_${new Date().getTime()}.xlsx`)
-}
-
-getList();
 </script>

gear-ui3/src/views/peoples/attendance/calendar.vue

@@ -33,48 +33,19 @@
       </template>
 
       <div class="calendar-container">
-        <el-table :data="calendarData" border style="width: 100%">
+        <attendance-calendar 
-          <!-- 表头-日期列 -->
+          :record-list="attendanceRecords"
-          <el-table-column fixed prop="name" label="人员" width="120" />
+          :start-date="startDate"
-          
+          :end-date="endDate"
-          <!-- 动态生成日期列 -->
+        />
-          <el-table-column
-            v-for="day in daysInMonth"
-            :key="day"
-            :label="formatDay(day)"
-            :width="120"
-          >
-            <template #default="scope">
-              <div class="attendance-cell">
-                <template v-if="scope.row.records[day]">
-                  <div
-                    v-for="(record, index) in scope.row.records[day]"
-                    :key="index"
-                    :class="['attendance-item', record.recordType]"
-                  >
-                    {{ formatTimeRange(record.startTime, record.endTime) }}
-                    <el-tooltip 
-                      :content="getTooltipContent(record)"
-                      placement="top"
-                    >
-                      <span class="attendance-type">
-                        {{ getTypeLabel(record.recordType) }}
-                      </span>
-                    </el-tooltip>
-                  </div>
-                </template>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
       </div>
     </el-card>
   </div>
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue'
+import { ref, computed, onMounted } from 'vue'
-import { ArrowLeft, ArrowRight } from '@element-plus/icons-vue'
+import AttendanceCalendar from './components/calendar.vue'
 import { ElMessage } from 'element-plus'
 import { listAttendanceRecord } from '@/api/oa/attendanceRecord'
 
@@ -82,13 +53,6 @@ import { listAttendanceRecord } from '@/api/oa/attendanceRecord'
 const startDate = ref('')
 const endDate = ref('')
 
-// 考勤类型映射
-const typeLabels = {
-  attendance: '出勤',
-  overtime: '加班',
-  travel: '出差'
-}
-
 // 考勤记录数据
 const attendanceRecords = ref([])
 
@@ -101,8 +65,8 @@ const getAttendanceRecords = async () => {
 
   try {
     const response = await listAttendanceRecord({
-      startTime: startDate.value + ' 00:00:00',
+      startTime: startDate.value,
-      endTime: endDate.value + ' 23:59:59'
+      endTime: endDate.value
     })
     attendanceRecords.value = response.rows
   } catch (error) {
@@ -111,57 +75,14 @@ const getAttendanceRecords = async () => {
   }
 }
 
-// 转换数据格式
-const calendarData = computed(() => {
-  // 按人员分组
-  const groupedData = {}
-  
-  attendanceRecords.value.forEach(record => {
-    if (!groupedData[record.nickName]) {
-      groupedData[record.nickName] = {
-        name: record.nickName,
-        records: {}
-      }
-    }
-    
-    // 获取日期
-    const date = new Date(record.recordDate)
-    const day = date.getDate()
-    
-    if (!groupedData[record.nickName].records[day]) {
-      groupedData[record.nickName].records[day] = []
-    }
-    
-    // 格式化时间
-    const formatTime = (date) => {
-      if (!date) return ''
-      return new Date(date).toLocaleTimeString('zh-CN', {
-        hour: '2-digit',
-        minute: '2-digit'
-      })
-    }
-    
-    groupedData[record.nickName].records[day].push({
-      recordType: record.recordType,
-      startTime: formatTime(record.startTime),
-      endTime: formatTime(record.endTime),
-      status: record.status,
-      durationHour: record.durationHour,
-      remark: record.remark
-    })
-  })
-  
-  return Object.values(groupedData)
-})
-
 // 设置本月日期范围
 const setCurrentMonth = () => {
   const now = new Date()
   const firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
   const lastDay = new Date(now.getFullYear(), now.getMonth() + 1, 0)
   
-  startDate.value = firstDay.toISOString().split('T')[0]
+  startDate.value = firstDay.toISOString().split('T')[0] + ' 00:00:00'
-  endDate.value = lastDay.toISOString().split('T')[0]
+  endDate.value = lastDay.toISOString().split('T')[0] + ' 23:59:59'
   handleSearch()
 }
 
@@ -193,40 +114,6 @@ const daysInMonth = computed(() => {
   
   return days
 })
-
-// 格式化日期显示
-const formatDay = (day) => {
-  const date = new Date(startDate.value)
-  date.setDate(day)
-  const weekDay = ['日', '一', '二', '三', '四', '五', '六'][date.getDay()]
-  return `${day}日(${weekDay})`
-}
-
-// 格式化时间范围
-const formatTimeRange = (start, end) => {
-  return `${start}-${end}`
-}
-
-// 获取考勤类型标签
-const getTypeLabel = (type) => {
-  return typeLabels[type] || type
-}
-
-// 获取提示内容
-const getTooltipContent = (record) => {
-  const status = {
-    'pending': '待审批',
-    'approved': '已通过',
-    'rejected': '已拒绝'
-  }
-  return [
-    `类型：${getTypeLabel(record.recordType)}`,
-    `时间：${formatTimeRange(record.startTime, record.endTime)}`,
-    `时长：${record.durationHour}小时`,
-    `状态：${status[record.status] || record.status}`,
-    record.remark ? `备注：${record.remark}` : ''
-  ].filter(Boolean).join('\n')
-}
 </script>
 
 <style scoped>

gear-ui3/src/views/peoples/attendance/components/attendancePage.vue

@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="用户ID" prop="userId">
+        <user-select v-model="queryParams.userId" />
+      </el-form-item>
+      <el-form-item label="记录日期" prop="recordDate">
+        <el-date-picker clearable
+          v-model="queryParams.recordDate"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择记录日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker clearable
+          v-model="queryParams.startTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择开始时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker clearable
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['oa:attendanceRecord:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:attendanceRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:attendanceRecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['oa:attendanceRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="attendanceRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键id" align="center" prop="recordId" v-if="false"/>
+      <el-table-column label="用户" align="center" prop="nickName" />
+      <el-table-column label="记录日期" align="center" prop="recordDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.recordDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.startTime, '{h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.endTime, '{h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="时长(小时)" align="center" prop="durationHour" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:attendanceRecord:edit']">修改</el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:attendanceRecord:remove']">删除</el-button>
+          </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改考勤主（含考勤/加班/出差）对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="attendanceRecordRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="用户ID" prop="userId">
+          <user-select
+            v-model="form.userId"
+            placeholder="请选择用户"
+            clearable
+            @input="handleUserSearch"
+          />
+        </el-form-item>
+        <el-form-item label="记录日期" prop="recordDate">
+          <el-date-picker clearable
+            v-model="form.recordDate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择记录日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-time-picker
+            v-model="form.startTime"
+            placeholder="请选择开始时间"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59'
+            }"
+            value-format="HH:mm:ss"
+          />
+          <!-- <el-date-picker clearable
+            v-model="form.startTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择开始时间">
+          </el-date-picker> -->
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <!-- <el-date-picker clearable
+            v-model="form.endTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择结束时间">
+          </el-date-picker> -->
+          <el-time-picker
+            v-model="form.endTime"
+            placeholder="请选择结束时间"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59'
+            }"
+            value-format="HH:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item label="时长(小时)" prop="durationHour">
+          <el-input-number v-model="form.durationHour" placeholder="请输入时长(小时)" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="AttendanceRecord">
+import UserSelect from '@/components/UserSelect'
+import { listAttendanceRecord, getAttendanceRecord, delAttendanceRecord, addAttendanceRecord, updateAttendanceRecord } from "@/api/oa/attendanceRecord";
+
+const { proxy } = getCurrentInstance();
+
+const props = defineProps({
+  recordType: {
+    type: String,
+    default: 'attendance' // 默认考勤
+  }
+})
+
+const attendanceRecordList = ref([]);
+const open = ref(false);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    recordDate: undefined,
+    recordType: props.recordType, // 默认考勤
+    // 当天九点
+    startTime: undefined,
+    endTime: undefined,
+    durationHour: 8, // 默认8小时
+  },
+  rules: {
+    userId: [
+      { required: true, message: "用户ID不能为空", trigger: "blur" }
+    ],
+    recordDate: [
+      { required: true, message: "记录日期不能为空", trigger: "blur" }
+    ],
+    recordType: [
+      { required: true, message: "记录类型: attendance(考勤), overtime(加班), travel(出差)不能为空", trigger: "blur" }
+    ],
+    startTime: [
+      { required: true, message: "开始时间不能为空", trigger: "blur" }
+    ],
+    endTime: [
+      { required: true, message: "结束时间不能为空", trigger: "blur" }
+    ],
+    durationHour: [
+      { required: true, message: "时长(小时) - 用于考勤/加班/出差不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询考勤主（含考勤/加班/出差）列表 */
+function getList() {
+  loading.value = true;
+  listAttendanceRecord(queryParams.value).then(response => {
+    attendanceRecordList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    recordId: null,
+    userId: null,
+    // 填入格式化的日期 YYYY-MM-DD HH:mm:ss
+    recordDate: proxy.parseTime(new Date(), '{y}-{m}-{d}'),
+    recordType: props.recordType, // 默认考勤
+    startTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 09:00:00'),
+    endTime: proxy.parseTime(new Date(), '{y}-{m}-{d} 18:00:00'),
+    durationHour: 8,
+    status: null,
+    createTime: null,
+    createBy: null,
+    updateTime: null,
+    updateBy: null,
+    delFlag: null,
+    remark: null
+  };
+  proxy.resetForm("attendanceRecordRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.recordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加考勤主（含考勤/加班/出差）";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  loading.value = true
+  reset();
+  const _recordId = row.recordId || ids.value
+  getAttendanceRecord(_recordId).then(response => {
+    loading.value = false;
+    form.value = {
+      ...response.data,
+      // 只取时间部分 HH:mm:ss
+      startTime: response.data.startTime ? proxy.parseTime(new Date(response.data.startTime),
+        '{h}:{i}:{s}') : null,
+      endTime: response.data.endTime ? proxy.parseTime(new Date(response.data.endTime), '{h}:{i}:{s}') : null,
+    };
+    open.value = true;
+    title.value = "修改考勤主（含考勤/加班/出差）";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["attendanceRecordRef"].validate(valid => {
+    if (valid) {
+      buttonLoading.value = true;
+      const payload = { 
+        ...form.value, 
+        recordDate: form.value.recordDate + ' 00:00:00',
+        startTime: form.value.recordDate + ' ' + form.value.startTime,
+        endTime: form.value.recordDate + ' ' + form.value.endTime 
+      };
+      if (form.value.recordId != null) {
+        updateAttendanceRecord(payload).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      } else {
+        addAttendanceRecord(payload).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _recordIds = row.recordId || ids.value;
+  proxy.$modal.confirm('是否确认删除考勤主（含考勤/加班/出差）编号为"' + _recordIds + '"的数据项？').then(function() {
+    loading.value = true;
+    return delAttendanceRecord(_recordIds);
+  }).then(() => {
+    loading.value = true;
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {
+  }).finally(() => {
+    loading.value = false;
+  });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('oa/attendanceRecord/export', {
+    ...queryParams.value
+  }, `attendanceRecord_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

gear-ui3/src/views/peoples/attendance/components/calendar.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="calendar-container">
+    <el-table :data="calendarData" border style="width: 100%">
+      <!-- 表头-日期列 -->
+      <el-table-column fixed prop="name" label="人员" width="120" />
+
+      <!-- 动态生成日期列 -->
+      <el-table-column v-for="day in daysInMonth" :key="day" :label="formatDay(day)" :width="120">
+        <template #default="scope">
+          <div class="attendance-cell">
+            <template v-if="scope.row.records[day]">
+              <div v-for="(record, index) in scope.row.records[day]" :key="index"
+                :class="['attendance-item', record.recordType]">
+                {{ formatTimeRange(record.startTime, record.endTime) }}
+                <el-tooltip :content="getTooltipContent(record)" placement="top">
+                  <span class="attendance-type">
+                    {{ getTypeLabel(record.recordType) }}
+                  </span>
+                </el-tooltip>
+              </div>
+            </template>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  // 考勤记录列表
+  recordList: {
+    type: Array,
+    default: () => []
+  },
+  startDate: {
+    type: String,
+    default: ''
+  },
+  endDate: {
+    type: String,
+    default: ''
+  }
+})
+
+// 考勤类型映射
+const typeLabels = {
+  attendance: '出勤',
+  overtime: '加班',
+  travel: '出差'
+}
+
+// 转换数据格式
+const calendarData = computed(() => {
+  // 按人员分组
+  const groupedData = {}
+
+  props.recordList.forEach(record => {
+    if (!groupedData[record.nickName]) {
+      groupedData[record.nickName] = {
+        name: record.nickName,
+        records: {}
+      }
+    }
+
+    // 获取日期
+    const date = new Date(record.recordDate)
+    const day = date.getDate()
+
+    if (!groupedData[record.nickName].records[day]) {
+      groupedData[record.nickName].records[day] = []
+    }
+
+    // 格式化时间
+    const formatTime = (date) => {
+      if (!date) return ''
+      return new Date(date).toLocaleTimeString('zh-CN', {
+        hour: '2-digit',
+        minute: '2-digit'
+      })
+    }
+
+    groupedData[record.nickName].records[day].push({
+      recordType: record.recordType,
+      startTime: formatTime(record.startTime),
+      endTime: formatTime(record.endTime),
+      status: record.status,
+      durationHour: record.durationHour,
+      remark: record.remark
+    })
+  })
+
+  return Object.values(groupedData)
+})
+
+// 获取考勤日期范围
+const dateRange = computed(() => {
+  return {
+    start: props.startDate ? new Date(props.startDate) : null,
+    end: props.endDate ? new Date(props.endDate) : null
+  }
+})
+
+// 计算日期范围内的天数
+const daysInMonth = computed(() => {
+  if (!dateRange.value.start || !dateRange.value.end) return []
+
+  const start = dateRange.value.start
+  const end = dateRange.value.end
+  const days = []
+
+  for (let date = new Date(start); date <= end; date.setDate(date.getDate() + 1)) {
+    days.push(date.getDate())
+  }
+
+  return days
+})
+
+// 格式化日期显示
+const formatDay = (day) => {
+  const date = new Date(dateRange.value.start)
+  date.setDate(day)
+  const weekDay = ['日', '一', '二', '三', '四', '五', '六'][date.getDay()]
+  return `${day}日(${weekDay})`
+}
+
+// 格式化时间范围
+const formatTimeRange = (start, end) => {
+  return `${start}-${end}`
+}
+
+// 获取考勤类型标签
+const getTypeLabel = (type) => {
+  return typeLabels[type] || type
+}
+
+// 获取提示内容
+const getTooltipContent = (record) => {
+  return [
+    `类型：${getTypeLabel(record.recordType)}`,
+    `时间：${formatTimeRange(record.startTime, record.endTime)}`,
+    `时长：${record.durationHour}小时`,
+    record.remark ? `备注：${record.remark}` : ''
+  ].filter(Boolean).join('\n')
+}
+</script>
+
+<style scoped>
+.attendance-calendar {
+  padding: 20px;
+}
+
+.calendar-header {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+.month-title {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.calendar-container {
+  margin-top: 20px;
+}
+
+.attendance-cell {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.attendance-item {
+  font-size: 12px;
+  padding: 2px 4px;
+  border-radius: 4px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.attendance-type {
+  font-weight: bold;
+}
+
+/* 考勤类型样式 */
+.attendance {
+  background-color: #e1f3d8;
+  color: #67c23a;
+}
+
+.overtime {
+  background-color: #fdf6ec;
+  color: #e6a23c;
+}
+
+.travel {
+  background-color: #ecf5ff;
+  color: #409eff;
+}
+</style>

gear-ui3/src/views/peoples/attendance/components/snapshotDetail.vue

@@ -0,0 +1,28 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="attendanceSummaryDetailList">
+      <el-table-column label="用户" align="center" prop="nickName" />
+      <el-table-column label="正常出勤小时数" align="center" prop="normalHours" />
+      <el-table-column label="加班小时数" align="center" prop="overtimeHours" />
+      <el-table-column label="出差小时数" align="center" prop="travelHours" />
+    </el-table>
+  </div>
+</template>
+
+<script setup name="AttendanceSummaryDetail">
+import { listAttendanceSummaryDetail } from "@/api/oa/attendanceSummaryDetail";
+import { computed } from "vue";
+
+const props = defineProps({
+  // 考勤汇总ID
+  summaryId: {
+    type: String,
+    required: true
+  }
+})
+
+const loading = ref(false)
+const attendanceSummaryDetailList = computed(() => {
+  return props.summaryId ? listAttendanceSummaryDetail({summaryId: props.summaryId, pageSize: 9999}) : []
+})
+</script>

gear-ui3/src/views/peoples/attendance/dashboard.vue

@@ -0,0 +1,7 @@
+<template>
+  考勤分析
+</template>
+
+<script setup>
+
+</script>

gear-ui3/src/views/peoples/attendance/overtime.vue

@@ -1,349 +1,7 @@
 <template>
-  <div class="app-container">
+  <attendance-page record-type="overtime" />
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="用户" prop="userId">
-        <user-select
-          v-model="queryParams.userId"
-        />
-      </el-form-item>
-      <el-form-item label="记录日期" prop="recordDate">
-        <el-date-picker clearable
-          v-model="queryParams.recordDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择记录日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['oa:attendanceRecord:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:attendanceRecord:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:attendanceRecord:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['oa:attendanceRecord:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="attendanceRecordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="recordId" v-if="false"/>
-      <el-table-column label="用户" align="center" prop="nickName" />
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.recordDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时长(小时)" align="center" prop="durationHour" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:attendanceRecord:edit']">修改</el-button>
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:attendanceRecord:remove']">删除</el-button>
-          </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改考勤主（含考勤/加班/出差）对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="attendanceRecordRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="用户ID" prop="userId">
-          <user-select
-            v-model="form.userId"
-            placeholder="请选择用户"
-            clearable
-            @input="handleUserSearch"
-          />
-        </el-form-item>
-        <el-form-item label="记录日期" prop="recordDate">
-          <el-date-picker clearable
-            v-model="form.recordDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择记录日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="时长(小时)" prop="durationHour">
-          <el-input v-model="form.durationHour" placeholder="请输入时长(小时)" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script setup name="AttendanceRecord">
-import UserSelect from '@/components/UserSelect'
+import attendancePage from './components/attendancePage.vue';
-import { listAttendanceRecord, getAttendanceRecord, delAttendanceRecord, addAttendanceRecord, updateAttendanceRecord } from "@/api/oa/attendanceRecord";
-
-const { proxy } = getCurrentInstance();
-
-const attendanceRecordList = ref([]);
-const open = ref(false);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    userId: undefined,
-    recordDate: undefined,
-    recordType: 'overtime', // 默认考勤
-    startTime: undefined,
-    endTime: undefined,
-    durationHour: undefined,
-  },
-  rules: {
-    userId: [
-      { required: true, message: "用户ID不能为空", trigger: "blur" }
-    ],
-    recordDate: [
-      { required: true, message: "记录日期不能为空", trigger: "blur" }
-    ],
-    recordType: [
-      { required: true, message: "记录类型: attendance(考勤), overtime(加班), travel(出差)不能为空", trigger: "blur" }
-    ],
-    startTime: [
-      { required: true, message: "开始时间不能为空", trigger: "blur" }
-    ],
-    endTime: [
-      { required: true, message: "结束时间不能为空", trigger: "blur" }
-    ],
-    durationHour: [
-      { required: true, message: "时长(小时) - 用于考勤/加班/出差不能为空", trigger: "blur" }
-    ],
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询考勤主（含考勤/加班/出差）列表 */
-function getList() {
-  loading.value = true;
-  listAttendanceRecord(queryParams.value).then(response => {
-    attendanceRecordList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
-}
-
-// 取消按钮
-function cancel() {
-  open.value = false;
-  reset();
-}
-
-// 表单重置
-function reset() {
-  form.value = {
-    recordId: null,
-    userId: null,
-    recordDate: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
-    recordType: 'overtime', // 默认考勤
-    startTime: null,
-    endTime: null,
-    durationHour: null,
-    status: null,
-    createTime: null,
-    createBy: null,
-    updateTime: null,
-    updateBy: null,
-    delFlag: null,
-    remark: null
-  };
-  proxy.resetForm("attendanceRecordRef");
-}
-
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
-}
-
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.recordId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "添加考勤主（含考勤/加班/出差）";
-}
-
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  loading.value = true
-  reset();
-  const _recordId = row.recordId || ids.value
-  getAttendanceRecord(_recordId).then(response => {
-    loading.value = false;
-    form.value = response.data;
-    open.value = true;
-    title.value = "修改考勤主（含考勤/加班/出差）";
-  });
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["attendanceRecordRef"].validate(valid => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.recordId != null) {
-        updateAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      } else {
-        addAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      }
-    }
-  });
-}
-
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _recordIds = row.recordId || ids.value;
-  proxy.$modal.confirm('是否确认删除考勤主（含考勤/加班/出差）编号为"' + _recordIds + '"的数据项？').then(function() {
-    loading.value = true;
-    return delAttendanceRecord(_recordIds);
-  }).then(() => {
-    loading.value = true;
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {
-  }).finally(() => {
-    loading.value = false;
-  });
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('oa/attendanceRecord/export', {
-    ...queryParams.value
-  }, `attendanceRecord_${new Date().getTime()}.xlsx`)
-}
-
-getList();
 </script>

gear-ui3/src/views/peoples/attendance/snapshot.vue

@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="汇总名称" prop="summaryName">
+        <el-input
+          v-model="queryParams.summaryName"
+          placeholder="请输入汇总名称"
+          clearable
+          @keyup.enter="handleQuery"
+          @blur="handleQuery"
+        />
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="attendanceSummaryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="汇总主表ID" align="center" prop="summaryId" v-if="false"/>
+      <el-table-column label="汇总名称" align="center" prop="summaryName" />
+      <el-table-column label="汇总开始日期" align="center" prop="startDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="汇总结束日期" align="center" prop="endDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+              <el-button link type="primary" icon="Edit" @click="handleDetail(scope.row)">查看详情</el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改考勤汇总对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="attendanceSummaryRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="汇总名称" prop="summaryName">
+          <el-input v-model="form.summaryName" placeholder="请输入汇总名称" />
+        </el-form-item>
+        <el-form-item label="开始日期" prop="startDate">
+          <el-date-picker clearable
+            v-model="form.startDate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择汇总开始日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束日期" prop="endDate">
+          <el-date-picker clearable
+            v-model="form.endDate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择汇总结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="选择用户" prop="userIds">
+          <user-select v-model="form.userIds" multiple />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog :title="title" v-model="detailOpen" width="500px" append-to-body>
+      <snapshot-detail :summary-id="form.summaryId" />
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="AttendanceSummary">
+import { listAttendanceSummary, getAttendanceSummary, delAttendanceSummary, addAttendanceSummary, updateAttendanceSummary } from "@/api/oa/attendanceSummary";
+import UserSelect from '@/components/UserSelect/index.vue';
+import { listUser } from "@/api/system/user";
+
+const { proxy } = getCurrentInstance();
+
+const attendanceSummaryList = ref([]);
+const userOptions = ref([]); // 用户选项列表
+const open = ref(false);
+const detailOpen = ref(false);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    summaryName: undefined,
+    startDate: undefined,
+    endDate: undefined,
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询考勤汇总列表 */
+function getList() {
+  loading.value = true;
+  listAttendanceSummary(queryParams.value).then(response => {
+    attendanceSummaryList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    summaryId: null,
+    summaryName: null,
+    startDate: null,
+    endDate: null,
+    createTime: null,
+    createBy: null,
+    updateTime: null,
+    updateBy: null,
+    delFlag: null,
+    remark: null,
+    userIds: []
+  };
+  proxy.resetForm("attendanceSummaryRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.summaryId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  // 获取用户列表
+  listUser().then(response => {
+    userOptions.value = response.rows;
+  });
+  open.value = true;
+  title.value = "添加考勤汇总";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  loading.value = true
+  reset();
+  const _summaryId = row.summaryId || ids.value
+  getAttendanceSummary(_summaryId).then(response => {
+    loading.value = false;
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改考勤汇总";
+  });
+}
+
+function handleDetail(row) {
+  loading.value = true;
+  const _summaryId = row.summaryId || ids.value;
+  getAttendanceSummary(_summaryId).then(response => {
+    loading.value = false;
+    form.value = response.data;
+    detailOpen.value = true;
+    title.value = "考勤汇总详情";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["attendanceSummaryRef"].validate(valid => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.summaryId != null) {
+        updateAttendanceSummary(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      } else {
+        addAttendanceSummary(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        }).finally(() => {
+          buttonLoading.value = false;
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _summaryIds = row.summaryId || ids.value;
+  proxy.$modal.confirm('是否确认删除考勤汇总编号为"' + _summaryIds + '"的数据项？').then(function() {
+    loading.value = true;
+    return delAttendanceSummary(_summaryIds);
+  }).then(() => {
+    loading.value = true;
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {
+  }).finally(() => {
+    loading.value = false;
+  });
+}
+
+getList();
+</script>

gear-ui3/src/views/peoples/attendance/travel.vue

@@ -1,349 +1,7 @@
 <template>
-  <div class="app-container">
+  <attendance-page record-type="travel" />
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="用户" prop="userId">
-        <user-select
-          v-model="queryParams.userId"
-        />
-      </el-form-item>
-      <el-form-item label="记录日期" prop="recordDate">
-        <el-date-picker clearable
-          v-model="queryParams.recordDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择记录日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['oa:attendanceRecord:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:attendanceRecord:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:attendanceRecord:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['oa:attendanceRecord:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="attendanceRecordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="recordId" v-if="false"/>
-      <el-table-column label="用户" align="center" prop="nickName" />
-      <el-table-column label="记录日期" align="center" prop="recordDate" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.recordDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="时长(小时)" align="center" prop="durationHour" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:attendanceRecord:edit']">修改</el-button>
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:attendanceRecord:remove']">删除</el-button>
-          </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改考勤主（含考勤/加班/出差）对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="attendanceRecordRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="用户ID" prop="userId">
-          <user-select
-            v-model="form.userId"
-            placeholder="请选择用户"
-            clearable
-            @input="handleUserSearch"
-          />
-        </el-form-item>
-        <el-form-item label="记录日期" prop="recordDate">
-          <el-date-picker clearable
-            v-model="form.recordDate"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择记录日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="时长(小时)" prop="durationHour">
-          <el-input v-model="form.durationHour" placeholder="请输入时长(小时)" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script setup name="AttendanceRecord">
-import UserSelect from '@/components/UserSelect'
+import attendancePage from './components/attendancePage.vue';
-import { listAttendanceRecord, getAttendanceRecord, delAttendanceRecord, addAttendanceRecord, updateAttendanceRecord } from "@/api/oa/attendanceRecord";
-
-const { proxy } = getCurrentInstance();
-
-const attendanceRecordList = ref([]);
-const open = ref(false);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    userId: undefined,
-    recordDate: undefined,
-    recordType: 'overtime', // 默认考勤
-    startTime: undefined,
-    endTime: undefined,
-    durationHour: undefined,
-  },
-  rules: {
-    userId: [
-      { required: true, message: "用户ID不能为空", trigger: "blur" }
-    ],
-    recordDate: [
-      { required: true, message: "记录日期不能为空", trigger: "blur" }
-    ],
-    recordType: [
-      { required: true, message: "记录类型: attendance(考勤), overtime(加班), travel(出差)不能为空", trigger: "blur" }
-    ],
-    startTime: [
-      { required: true, message: "开始时间不能为空", trigger: "blur" }
-    ],
-    endTime: [
-      { required: true, message: "结束时间不能为空", trigger: "blur" }
-    ],
-    durationHour: [
-      { required: true, message: "时长(小时) - 用于考勤/加班/出差不能为空", trigger: "blur" }
-    ],
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询考勤主（含考勤/加班/出差）列表 */
-function getList() {
-  loading.value = true;
-  listAttendanceRecord(queryParams.value).then(response => {
-    attendanceRecordList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
-}
-
-// 取消按钮
-function cancel() {
-  open.value = false;
-  reset();
-}
-
-// 表单重置
-function reset() {
-  form.value = {
-    recordId: null,
-    userId: null,
-    recordDate: proxy.parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
-    recordType: 'overtime', // 默认考勤
-    startTime: null,
-    endTime: null,
-    durationHour: null,
-    status: null,
-    createTime: null,
-    createBy: null,
-    updateTime: null,
-    updateBy: null,
-    delFlag: null,
-    remark: null
-  };
-  proxy.resetForm("attendanceRecordRef");
-}
-
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
-}
-
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.recordId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "添加考勤主（含考勤/加班/出差）";
-}
-
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  loading.value = true
-  reset();
-  const _recordId = row.recordId || ids.value
-  getAttendanceRecord(_recordId).then(response => {
-    loading.value = false;
-    form.value = response.data;
-    open.value = true;
-    title.value = "修改考勤主（含考勤/加班/出差）";
-  });
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["attendanceRecordRef"].validate(valid => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.recordId != null) {
-        updateAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      } else {
-        addAttendanceRecord(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
-        }).finally(() => {
-          buttonLoading.value = false;
-        });
-      }
-    }
-  });
-}
-
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _recordIds = row.recordId || ids.value;
-  proxy.$modal.confirm('是否确认删除考勤主（含考勤/加班/出差）编号为"' + _recordIds + '"的数据项？').then(function() {
-    loading.value = true;
-    return delAttendanceRecord(_recordIds);
-  }).then(() => {
-    loading.value = true;
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {
-  }).finally(() => {
-    loading.value = false;
-  });
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('oa/attendanceRecord/export', {
-    ...queryParams.value
-  }, `attendanceRecord_${new Date().getTime()}.xlsx`)
-}
-
-getList();
 </script>