|
|
@@ -1365,7 +1365,6 @@
|
|
|
<span v-if="scope.row.leaveDays || scope.row.leaveTimes">
|
|
|
<span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
|
|
|
<span v-if="user.userNameNeedTranslate == '1'"><TranslationOpenDataText type='userName' :openid='scope.row.label'></TranslationOpenDataText></span>
|
|
|
- <span>{{scope.row.leaveDays.toFixed(1) ? '(' + leaveTypeName[scope.row.leaveType] + ')' : '(' + leaveTypeName[scope.row.leaveType] + ')'}}</span>
|
|
|
</span>
|
|
|
<span v-else>
|
|
|
<span v-if="user.userNameNeedTranslate != '1'">{{scope.row.label}}</span>
|
|
|
@@ -4770,7 +4769,7 @@
|
|
|
let leaveList = []
|
|
|
let unleaveList = []
|
|
|
for(let i in this.fillMembList){
|
|
|
- if(this.fillMembList[i].leaveDays >= 1 || this.fillMembList[i].leaveTimes >= this.user.timeType.allday){
|
|
|
+ if((this.fillMembList[i].leaveDays && this.fillMembList[i].leaveDays >= 1) || this.fillMembList[i].leaveTimes >= this.user.timeType.allday){
|
|
|
leaveList.push(this.fillMembList[i])
|
|
|
}else{
|
|
|
unleaveList.push(this.fillMembList[i])
|
