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

pref:修改考勤汇总手动汇总的时间选择由日期范围选择改为月度选择

parent 535663f8
...@@ -136,9 +136,16 @@ ...@@ -136,9 +136,16 @@
> >
<div class="fresh_box" v-if="showContent"> <div class="fresh_box" v-if="showContent">
<div class="title_box" style="margin-bottom: 20px"> <div class="title_box" style="margin-bottom: 20px">
仅支持手动更新前一天及当日的打卡数据,请选择需要更新的时间段: 仅支持手动更新近一个月的打卡数据,请选择需要更新的时间段:
</div> </div>
<el-date-picker <el-date-picker
v-model="freshDate"
type="month"
placeholder="选择月"
value-format="yyyy-MM"
>
</el-date-picker>
<!-- <el-date-picker
v-model="freshDate" v-model="freshDate"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -147,7 +154,7 @@ ...@@ -147,7 +154,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
> >
</el-date-picker> </el-date-picker> -->
</div> </div>
<div class="fresh_box" v-else> <div class="fresh_box" v-else>
<div <div
...@@ -156,7 +163,7 @@ ...@@ -156,7 +163,7 @@
v-if="showTip" v-if="showTip"
> >
请确认是否开始进行{{ 请确认是否开始进行{{
freshDate[0] + "" + freshDate[1] freshDate + ""
}}的考勤数据重新汇总;此过程预计需要 }}的考勤数据重新汇总;此过程预计需要
<span style="color: #ff0000">10</span> 分钟左右,请勿关闭或刷新页面 <span style="color: #ff0000">10</span> 分钟左右,请勿关闭或刷新页面
</div> </div>
...@@ -165,9 +172,7 @@ ...@@ -165,9 +172,7 @@
style="margin-bottom: 20px; line-height: 30px" style="margin-bottom: 20px; line-height: 30px"
v-else v-else
> >
正在进行{{ 正在进行{{ freshDate + "" }}的考勤数据重新汇总;此过程预计还需要
freshDate[0] + "" + freshDate[1]
}}的考勤数据重新汇总;此过程预计还需要
<span style="color: #ff0000">{{ restTime }}</span> <span style="color: #ff0000">{{ restTime }}</span>
分钟左右,请勿关闭或刷新页面 分钟左右,请勿关闭或刷新页面
</div> </div>
...@@ -251,8 +256,8 @@ export default { ...@@ -251,8 +256,8 @@ export default {
if (this.freshDate) { if (this.freshDate) {
this.submitLoad = true; this.submitLoad = true;
this.$post("/attendance/stat/summary", { this.$post("/attendance/stat/summary", {
attendanceDateStart: this.freshDate[0], attendanceDateStart: this.freshDate + "-01",
attendanceDateEnd: this.freshDate[1], attendanceDateEnd: this.freshDate + "-31",
}) })
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
...@@ -273,7 +278,7 @@ export default { ...@@ -273,7 +278,7 @@ export default {
this.freshDate = ""; this.freshDate = "";
}); });
} else { } else {
this.$message.error("请选择时间范围"); this.$message.error("请选择时间!");
} }
}, },
cancleFresh() { cancleFresh() {
...@@ -567,7 +572,7 @@ export default { ...@@ -567,7 +572,7 @@ export default {
pickerOptions0: { pickerOptions0: {
disabledDate(v) { disabledDate(v) {
let limitDate = let limitDate =
v.getTime() < new Date().getTime() - 2 * 86400000 || v.getTime() < new Date().getTime() - 31 * 86400000 ||
v.getTime() > Date.now(); v.getTime() > Date.now();
return limitDate; return limitDate;
7; 7;
......
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