Commit 60f094c8 by zhangzhen

细节优化

parent 6445240d
...@@ -382,12 +382,15 @@ ...@@ -382,12 +382,15 @@
if(start < endDateStemp && start >= startDateStemp && item.status ==1 ){ if(start < endDateStemp && start >= startDateStemp && item.status ==1 ){
if(this.onCheckHourUse(item.startHoldTime,item.endHoldTime)){ if(this.onCheckHourUse(item.startHoldTime,item.endHoldTime)){
continueStatus = false; continueStatus = false;
console.log(1)
}else{ }else{
if( startDateStemp >= moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){ if( startDateStemp >= moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){
continueStatus = false; continueStatus = false;
}else if( endDateStemp > moment(item.startHoldTime).valueOf()){ console.log(2)
}else if(startDateStemp < start && endDateStemp >= moment(item.startHoldTime).valueOf()){
continueStatus = false; continueStatus = false;
console.log(3)
} }
} }
...@@ -417,7 +420,7 @@ ...@@ -417,7 +420,7 @@
if( startDateStemp >= moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){ if( startDateStemp >= moment(item.startHoldTime).valueOf() && startDateStemp < moment(item.endHoldTime).valueOf()){
continueStatus = false; continueStatus = false;
}else if( endDateStemp > moment(item.startHoldTime).valueOf()){ }else if( startDateStemp < start && endDateStemp >= moment(item.startHoldTime).valueOf()){
continueStatus = false; continueStatus = false;
} }
......
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