新增考勤补卡导入功能并优化考勤日期选择

- 在考勤记录页面添加补卡导入按钮和相关功能
- 将考勤日期选择从单日期改为日期范围- 新增参数配置页面和相关 API

src/api/attendance/params.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询参数配置列表
+export function listParams(query) {
+  return request({
+    url: '/attendance/param/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询参数配置详细
+export function getParams(id) {
+  return request({
+    url: '/attendance/param/' + id,
+    method: 'get'
+  })
+}
+
+// 新增参数配置
+export function addParams(data) {
+  return request({
+    url: '/attendance/param',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改参数配置
+export function updateParams(data) {
+  return request({
+    url: '/attendance/param',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参数配置
+export function delParams(id) {
+  return request({
+    url: '/attendance/param/' + id,
+    method: 'delete'
+  })
+}

src/views/attendance/attendance/index.vue

@@ -4,12 +4,17 @@
       <el-form-item label="员工姓名" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入员工姓名" @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="考勤日期：" prop="attendanceDate">
+      <el-form-item label="考勤日期：">
-        <el-date-picker clearable
+        <el-date-picker
-                        v-model="queryParams.attendanceDate"
+          v-model="timeRange"
-                        type="date"
+          type="daterange"
-                        value-format="yyyy-MM-dd"
+          align="right"
-                        placeholder="请选择考勤日期">
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          clearable>
         </el-date-picker>
       </el-form-item>
       <el-form-item label="上班状态：" prop="workSum">
@@ -50,6 +55,16 @@
           v-hasPermi="['attendance:attendance:edit']"
         >批量处理</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImPort"
+          v-hasPermi="['attendance:attendance:importData']"
+        >补卡导入</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -84,6 +99,26 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        class="upload-demo"
+        drag
+        :action="upload.url"
+        :headers="{ 'Authorization': token }"
+        :on-success="handleImportSuccess"
+        :on-error="handleImportError"
+        name="file"
+        accept=".xlsx,.xls"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">只能上传 Excel 文件</div>
+      </el-upload>
+       <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 添加或修改考勤记录对话框 -->
     <el-dialog :title="title" v-dialog-drag :visible.sync="open" width="400px" append-to-body>
@@ -140,17 +175,21 @@
 
 <script>
 import { listAttendance, getAttendance, updateAttendance,updateBatchAttendance } from "@/api/attendance/attendance";
+import { getToken } from '@/utils/auth'
+import { parseTime } from '../../../utils/ruoyi'
 
 export default {
   name: "Attendance",
   data() {
     return {
+
       // 遮罩层
       loading: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
+      token: getToken(),
       // 考勤记录表格数据
       attendanceList: [],
       // 弹出层标题
@@ -167,20 +206,64 @@ export default {
         workSum: null,
         ycsFlag: null,
         name: null,
+        //搜索考勤开始的时间
+        startTime: null,
+        //搜索考勤结束的时间
+        endTime: null,
       },
+      timeRange: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+      },
+      upload: {
+        open: false, // 控制弹窗是否显示
+        title: "考勤补卡导入",
+        url: process.env.VUE_APP_BASE_API + "attendance/attendance/importData"
       }
     };
   },
+  watch:{
+    timeRange(val){
+      if(val && val.length===2){
+        this.queryParams.startTime = val[0];
+        this.queryParams.endTime = val[1];
+      }else{
+        this.queryParams.startTime = '';
+        this.queryParams.endTime ='';
+      }
+    }
+  },
   created() {
     var param = this.$route.query
     this.queryParams.staffId = param.staffId;
     this.getList();
   },
   methods: {
+    parseTime,
+      // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    handleImPort(){
+      this.upload.title = "考勤补卡导入";
+      this.upload.open = true;
+      this.upload.file = null; // 清空之前的文件选择
+    },
+// 上传成功回调
+    handleImportSuccess(response, file) {
+      this.$message.success("文件上传成功");
+      this.upload.isUploading = false;
+      this.upload.open = false;
+      this.getList(); // 刷新数据列表
+    },
+
+// 上传失败回调
+    handleImportError(error, file) {
+      this.$message.error("文件上传失败：" + error.message);
+      this.upload.isUploading = false;
+    },
     /** 查询考勤记录列表 */
     getList() {
       this.loading = true;

src/views/attendance/param/index.vue

@@ -0,0 +1,284 @@
+<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="paramName">
+        <el-input
+          v-model="queryParams.paramName"
+          placeholder="请输入参数名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="参数码" prop="paramCode">
+        <el-input
+          v-model="queryParams.paramCode"
+          placeholder="请输入参数码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item-->
+      <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-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['attendance:params:add']"
+        >新增</el-button>
+      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['attendance:params:edit']"
+        >修改</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['attendance:params:remove']"
+        >删除</el-button>
+      </el-col>-->
+<!--      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['attendance:params:export']"
+        >导出</el-button>
+      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="paramsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="主键ID" align="center" prop="id" />-->
+      <el-table-column label="参数名" align="center" prop="paramName" />
+<!--      <el-table-column label="参数码" align="center" prop="paramCode" />-->
+      <el-table-column label="参数值" align="center" prop="paramValue" />
+      <el-table-column label="说明" align="center" prop="description" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['param:params:edit']"
+          >修改</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改参数配置对话框 -->
+    <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="paramName">
+          <el-input v-model="form.paramName" placeholder="请输入参数名" />
+        </el-form-item>
+<!--        <el-form-item label="参数码" prop="paramCode">
+          <el-input v-model="form.paramCode" placeholder="请输入参数码" />
+        </el-form-item>-->
+        <el-form-item label="参数值" prop="paramValue">
+          <el-input v-model="form.paramValue" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="说明" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listParams, getParams, delParams, addParams, updateParams } from "@/api/attendance/params";
+
+export default {
+  name: "Param",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 参数配置表格数据
+      paramsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        paramName: null,
+        paramCode: null,
+        paramValue: null,
+        description: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        paramName: [
+          { required: true, message: "参数名不能为空", trigger: "blur" }
+        ],
+       /*  paramCode: [
+          { required: true, message: "参数码不能为空", trigger: "blur" }
+        ],
+        createBy: [
+          { required: true, message: "创建者不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ], */
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询参数配置列表 */
+    getList() {
+      this.loading = true;
+      listParams(this.queryParams).then(response => {
+        this.paramsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        paramName: null,
+        paramCode: null,
+        paramValue: null,
+        description: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加参数配置";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getParams(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改参数配置";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateParams(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addParams(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除参数配置编号为"' + ids + '"的数据项？').then(function() {
+        return delParams(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('attendance/params/export', {
+        ...this.queryParams
+      }, `params_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/attendance/statistical/index.vue

@@ -360,6 +360,7 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+    
   </div>
 </template>