|
@@ -150,7 +150,8 @@
|
|
this.isLoading = true;
|
|
this.isLoading = true;
|
|
var p={};
|
|
var p={};
|
|
if(!bl){
|
|
if(!bl){
|
|
- p={level:1};
|
|
|
|
|
|
+ //1 上一层, 2,顶层
|
|
|
|
+ p={level:2};
|
|
}
|
|
}
|
|
API_Leave.approvedList(p).then(response => {
|
|
API_Leave.approvedList(p).then(response => {
|
|
|
|
|
|
@@ -321,7 +322,7 @@
|
|
var i= daysDistance(this.tjForm.startTime,this.tjForm.endTime);
|
|
var i= daysDistance(this.tjForm.startTime,this.tjForm.endTime);
|
|
var day=i+(this.tjForm.endTimeQuantum-this.tjForm.startTimeQuantum)*0.5+0.5
|
|
var day=i+(this.tjForm.endTimeQuantum-this.tjForm.startTimeQuantum)*0.5+0.5
|
|
this.daytime=day+'天';
|
|
this.daytime=day+'天';
|
|
- if(day>=2){
|
|
|
|
|
|
+ if(day>1){
|
|
|
|
|
|
if(!this.approvedByTime){
|
|
if(!this.approvedByTime){
|
|
this.tjForm.approvedId = '';
|
|
this.tjForm.approvedId = '';
|
|
@@ -329,7 +330,7 @@
|
|
if(this.approvedList2.length==0){
|
|
if(this.approvedList2.length==0){
|
|
this.getPsersonList(false);
|
|
this.getPsersonList(false);
|
|
}
|
|
}
|
|
- mui.toast("请假时间大于等于2天,审批人发生变化,请重新选择");
|
|
|
|
|
|
+ mui.toast("请假时间大于1天,审批人发生变化,请重新选择");
|
|
|
|
|
|
}
|
|
}
|
|
this.approvedByTime=true;
|
|
this.approvedByTime=true;
|
|
@@ -338,7 +339,7 @@
|
|
if(this.approvedByTime){
|
|
if(this.approvedByTime){
|
|
this.tjForm.approvedId = '';
|
|
this.tjForm.approvedId = '';
|
|
this.approvalPersonName = '';
|
|
this.approvalPersonName = '';
|
|
- mui.toast("请假时间少于2天,审批人发生变化,请重新选择");
|
|
|
|
|
|
+ mui.toast("请假时间少于等于1天,审批人发生变化,请重新选择");
|
|
}
|
|
}
|
|
this.approvedByTime=false;
|
|
this.approvedByTime=false;
|
|
}
|
|
}
|