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

feated:优化实到数据展示

parent e448511b
......@@ -84,7 +84,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>
......@@ -103,7 +103,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>
......@@ -120,7 +120,9 @@
<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>
......@@ -135,7 +137,7 @@
:show-close="false"
>
<div class="fresh_box" v-if="showContent">
<div class="title_box" style="margin-bottom: 20px">
<div class="title_box" style="margin-bottom: 20px;">
仅支持手动更新前一天及当日的打卡数据,请选择需要更新的时间段:
</div>
<el-date-picker
......@@ -152,23 +154,23 @@
<div class="fresh_box" v-else>
<div
class="title_box"
style="margin-bottom: 20px; line-height: 30px"
style="margin-bottom: 20px;line-height: 30px;"
v-if="showTip"
>
请确认是否开始进行{{
freshDate[0] + "" + freshDate[1]
}}的考勤数据重新汇总;此过程预计需要
<span style="color: #ff0000">10</span> 分钟左右,请勿关闭或刷新页面
<span style="color:#ff0000 ;">10</span> 分钟左右,请勿关闭或刷新页面
</div>
<div
class="title_box"
style="margin-bottom: 20px; line-height: 30px"
style="margin-bottom: 20px;line-height: 30px;"
v-else
>
正在进行{{
freshDate[0] + "" + freshDate[1]
}}的考勤数据重新汇总;此过程预计还需要
<span style="color: #ff0000">{{ restTime }}</span>
<span style="color:#ff0000 ;">{{ restTime }}</span>
分钟左右,请勿关闭或刷新页面
</div>
</div>
......@@ -241,7 +243,7 @@ export default {
this.getData();
return;
}
setTimeout(function () {
setTimeout(function() {
that.countdown();
}, 1000);
}
......@@ -673,9 +675,9 @@ export default {
},
{
label: "实到",
prop: "goWorks",
prop: "goTimes",
formatter: (row) => {
return row.goWorks == 0 ? 0 : row.goWorks ? row.goWorks : "--";
return row.goTimes == 0 ? 0 : row.goTimes ? row.goTimes : "--";
},
show: true,
},
......
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