Commit cd8001d6 authored by 姬鋆屾's avatar 姬鋆屾

fixed:提交考勤汇总按月导出,不能跨月导出考勤数据

parent 46afead9
......@@ -509,7 +509,12 @@ export default {
if (this.$route.name == "attendance/stat/list") {
if (this.form.summaryTimeStart && this.form.summaryTimeEnd) {
this.form.summaryTimeStart = this.form.summaryTimeStart + "-01";
let startValue = Date.parse(this.form.summaryTimeStart);
this.form.summaryTimeEnd = this.form.summaryTimeStart.replace(
"-01",
"-31"
);
let endValue = Date.parse(this.form.summaryTimeEnd);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
......
......@@ -66,7 +66,7 @@
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
<div class="mt20" style="text-align:right">
<div class="mt20" style="text-align: right">
<el-button @click="handleCancel(1)">取消</el-button>
<el-button type="primary" @click="handleSubmit(1)">确定</el-button>
</div>
......@@ -85,7 +85,7 @@
{{ item.label }}
</el-checkbox>
</el-checkbox-group>
<div class="mt20" style="text-align:right">
<div class="mt20" style="text-align: right">
<el-button @click="handleCancel(2)">取消</el-button>
<el-button type="primary" @click="handleSubmit(2)">确定</el-button>
</div>
......@@ -102,9 +102,7 @@
<div>打卡记录汇总</div>
<el-button type="text">导出成功</el-button>
</div>
<div class="times">
导出时间:2020-08-13
</div>
<div class="times">导出时间:2020-08-13</div>
</div>
</div>
</el-drawer>
......@@ -132,6 +130,7 @@ export default {
this.query.summaryTimeStart = getFirstDay();
this.query.summaryTimeEnd = getLastDay();
this.initalArr = this.config.columns;
},
methods: {
// 表格设置弹窗取消操作
......@@ -422,16 +421,22 @@ export default {
// },
{
name: "summaryTimeStart",
type: "date",
label: "考勤开始时间",
fuzzy: false,
},
{
name: "summaryTimeEnd",
type: "date",
label: "考勤结束时间",
type: "month",
label: "考勤时间",
fuzzy: false,
},
// {
// name: "summaryTimeStart",
// type: "date",
// label: "考勤开始时间",
// fuzzy: false,
//},
//{
// name: "summaryTimeEnd",
// type: "date",
// label: "考勤结束时间",
// fuzzy: false,
// },
{
name: "staffName",
type: "text",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment