|
|
@@ -11,8 +11,11 @@
|
|
|
{{datetime}}年度
|
|
|
</div>
|
|
|
<div style="text-align: center;margin-top: 10px;">
|
|
|
- <span style="font-size: 13px;color: #FFFFFF;">年假总天数:</span><span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">{{yearDay}}天</span>
|
|
|
+ <span style="font-size: 13px;color: #FFFFFF;">历年年假剩余天数:</span><span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">{{lyearDay}}天</span>
|
|
|
<span style="margin-left:10px;border-left: 2px solid #ccc;font-size: 13px;"></span>
|
|
|
+ <span style="font-size: 13px;color: #FFFFFF;margin-left:10px ;">当年年假总天数:</span><span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">{{yearDay}}天</span>
|
|
|
+ </br>
|
|
|
+ </br>
|
|
|
<span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">剩余年假天数:</span><span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">{{availableDay}}天</span>
|
|
|
<span style="margin-left:10px;border-left: 2px solid #ccc;font-size: 13px;"></span>
|
|
|
<span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">剩余可调休:</span><span style="margin-left:10px ;font-size: 13px;color: #FFFFFF;">{{txcount}}小时</span>
|
|
|
@@ -65,9 +68,10 @@
|
|
|
return {
|
|
|
userUrl:'/sys/weixin/myVacation',
|
|
|
datetime:null,
|
|
|
- yearDay:null,
|
|
|
- txcount:null,
|
|
|
- availableDay:null,
|
|
|
+ yearDay:0,
|
|
|
+ lyearDay:0,
|
|
|
+ txcount:0,
|
|
|
+ availableDay:0,
|
|
|
data:[],
|
|
|
}
|
|
|
},
|
|
|
@@ -85,6 +89,7 @@
|
|
|
this.yearDay=res.data.yearCount;
|
|
|
this.availableDay=res.data.syYearCount;
|
|
|
this.txcount=res.data.txCount;
|
|
|
+ this.lyearDay=res.data.lsyYearCount;
|
|
|
if(""!=res.data.vacationsBody &&res.data.vacationsBody!=null){
|
|
|
this.data=res.data.vacationsBody;
|
|
|
}
|
LiGuang