Commit 55ef0705 authored by 姬鋆屾's avatar 姬鋆屾

fixed:提交绩效汇总备注2最后一级删除数据无法覆盖的问题

parent b32e612c
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
if (data.remarkAdd && data.remarkAdd.length > 0) { if (data.remarkAdd && data.remarkAdd.length > 0) {
data.remarkAdd = JSON.stringify(data.remarkAdd); data.remarkAdd = JSON.stringify(data.remarkAdd);
} else { } else {
data.remarkAdd = "--"; data.remarkAdd = JSON.stringify([{ name: "", score: 0 }]);
} }
data.remark == "迟到:0 次,\n早退:0 次,\n缺卡:0 次,\n请假:0 次" data.remark == "迟到:0 次,\n早退:0 次,\n缺卡:0 次,\n请假:0 次"
? (data.remark = "") ? (data.remark = "")
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
:show-close="false" :show-close="false"
> >
<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
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<div class="fresh_box" v-else> <div class="fresh_box" v-else>
<div <div
class="title_box" class="title_box"
style="margin-bottom: 20px;line-height: 30px;" style="margin-bottom: 20px; line-height: 30px"
v-if="showTip" v-if="showTip"
> >
请确认是否开始进行{{ freshDate }}的绩效数据重新汇总;此过程预计需要 请确认是否开始进行{{ freshDate }}的绩效数据重新汇总;此过程预计需要
<span style="color:#ff0000 ;">15</span> 分钟,请勿关闭或刷新页面 <span style="color: #ff0000">15</span> 分钟,请勿关闭或刷新页面
</div> </div>
<div <div
class="title_box" class="title_box"
style="margin-bottom: 20px;line-height: 30px;" style="margin-bottom: 20px; line-height: 30px"
v-else v-else
> >
正在进行{{ freshDate }}的绩效数据重新汇总;此过程预计还需要 正在进行{{ freshDate }}的绩效数据重新汇总;此过程预计还需要
<span style="color:#ff0000 ;">{{ restTime }}</span> <span style="color: #ff0000">{{ restTime }}</span>
分钟,请勿关闭或刷新页面 分钟,请勿关闭或刷新页面
</div> </div>
</div> </div>
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
} else { } else {
this.percent = this.percent + 1; this.percent = this.percent + 1;
let that = this; let that = this;
setTimeout(function() { setTimeout(function () {
that.countDown(); that.countDown();
}, 200); }, 200);
} }
...@@ -293,7 +293,7 @@ export default { ...@@ -293,7 +293,7 @@ export default {
this.getData(); this.getData();
return; return;
} }
setTimeout(function() { setTimeout(function () {
that.countdown(); that.countdown();
}, 1000); }, 1000);
} }
...@@ -636,7 +636,9 @@ export default { ...@@ -636,7 +636,9 @@ export default {
label: "备注2", label: "备注2",
prop: "remarkAddDesc", prop: "remarkAddDesc",
formatter: (row) => { formatter: (row) => {
return row.remarkAddDesc && row.remarkAddDesc != "" ? ( return row.remarkAddDesc &&
row.remarkAddDesc != "" &&
row.remarkAddDesc != "(0);" ? (
row.remarkAddDesc row.remarkAddDesc
) : ( ) : (
<span style="color:#409eff">添加备注2</span> <span style="color:#409eff">添加备注2</span>
......
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