|
@@ -18,7 +18,8 @@
|
|
|
<br>
|
|
<br>
|
|
|
<span style="font-size:10px;text-align:center;color:#999;">{{item.weekDay}}</span>
|
|
<span style="font-size:10px;text-align:center;color:#999;">{{item.weekDay}}</span>
|
|
|
<span class="chooseDate" v-if="index == choseDay"></span>
|
|
<span class="chooseDate" v-if="index == choseDay"></span>
|
|
|
- <el-tooltip v-if="item.exceedCardTime" effect="dark" content="填报时长超过北森考勤时长" placement="top-start">
|
|
|
|
|
|
|
+ <!--针对景昱-->
|
|
|
|
|
+ <el-tooltip v-if="user.companyId == 5978 && item.exceedCardTime == 1" effect="dark" content="填报时长异常" placement="top-start">
|
|
|
<i class="el-icon-warning" style="color:red;"></i>
|
|
<i class="el-icon-warning" style="color:red;"></i>
|
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
|
</div>
|
|
</div>
|
|
@@ -4403,16 +4404,14 @@
|
|
|
var fillInfo = null;
|
|
var fillInfo = null;
|
|
|
d.state = null;
|
|
d.state = null;
|
|
|
this.fillStatusList.forEach(s=>{
|
|
this.fillStatusList.forEach(s=>{
|
|
|
- // console.log(d)
|
|
|
|
|
var d1 = s.createDate.split('-')[2];
|
|
var d1 = s.createDate.split('-')[2];
|
|
|
var d2 = d.date.split(this.$t('weekDay.month'))[1].split(this.$t('weekDay.day'))[0];
|
|
var d2 = d.date.split(this.$t('weekDay.month'))[1].split(this.$t('weekDay.day'))[0];
|
|
|
- // console.log(d2, '我被执行了')
|
|
|
|
|
if (d1.indexOf('0') == 0) {
|
|
if (d1.indexOf('0') == 0) {
|
|
|
d1 = d1.substring(1,d1.length);
|
|
d1 = d1.substring(1,d1.length);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
if (d1 == d2) {
|
|
if (d1 == d2) {
|
|
|
d.state = s.state;
|
|
d.state = s.state;
|
|
|
|
|
+ d.exceedCardTime = s.exceedCardTime
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
