Authored by weiqingting

Merge commit 'f08e9d2b' into release/1.6

... ... @@ -68,10 +68,10 @@ var ENUM={
HtmArr.push('<a href="JavaScript:;" data-index="'+ item.__index+'" class="btn btn-primary btn-xs btn-submit">提交</a>');
}
if(btnAuthority.resetlock&&item.isFreeze=="Y"&&item.status=="300"){
if(btnAuthority.resetlock&&item.isFreeze=="Y"&&(item.status=="300"||item.status=="900")){
HtmArr.push('<a href="javascript:;" data-index="'+ item.__index+'" class="btn btn-warning btn-xs btn-recovery">恢复</a>');
}
if(btnAuthority.resetlock&&item.isFreeze=="N"&&item.status=="300"){
if(btnAuthority.resetlock&&item.isFreeze=="N"&&(item.status=="300"||item.status=="900")){
HtmArr.push('<a href="javascript:;" data-index="'+ item.__index+'" class="btn btn-danger btn-xs btn-freeze">冻结</a>');
}
... ...