Commit e0831efc authored by Sandy's avatar Sandy

在发运单、收货单的“未收货”的状态下,出现“作废”按钮,且不控制作废权限

parent c9e63bfa
...@@ -203,11 +203,13 @@ typedef enum : NSUInteger { ...@@ -203,11 +203,13 @@ typedef enum : NSUInteger {
if ([self.transfer.state isEqualToString:TRANSFER_STATE_UNRECEIVED]) { if ([self.transfer.state isEqualToString:TRANSFER_STATE_UNRECEIVED]) {
if ([IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]) { NSMutableArray *arr = [NSMutableArray array];
[self createBtnWithArr:@[@"保存",@"收货"]]; if ([IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]) {//如果有收货权,则显示收货按钮
}else{ [arr addObjectsFromArray:@[@"保存",@"收货"]];
[self hiddenBottom];
} }
//这里作废不受权限控制
[arr addObject:@"作废"];
[self createBtnWithArr:arr];
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_RECEIVED]) { }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_RECEIVED]) {
if ([IBTCommon checkIsPermission:TRANSFER_ACTION_ABORT]) { if ([IBTCommon checkIsPermission:TRANSFER_ACTION_ABORT]) {
[self createBtnWithArr:@[@"作废"]]; [self createBtnWithArr:@[@"作废"]];
...@@ -215,11 +217,13 @@ typedef enum : NSUInteger { ...@@ -215,11 +217,13 @@ typedef enum : NSUInteger {
[self hiddenBottom]; [self hiddenBottom];
} }
}else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) { }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]) {
if ([IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]) { NSMutableArray *arr = [NSMutableArray array];
[self createBtnWithArr:@[@"作废",@"收货"]]; if ([IBTCommon checkIsPermission:RECEIVE_ACTION_RECEIVE]) {//如果有
}else{ [arr addObjectsFromArray:@[@"保存",@"收货"]];
[self hiddenBottom];
} }
[arr addObject:@"作废"];
[self createBtnWithArr:arr];
}else{ }else{
[self hiddenBottom]; [self hiddenBottom];
......
...@@ -411,9 +411,14 @@ typedef enum : NSUInteger { ...@@ -411,9 +411,14 @@ typedef enum : NSUInteger {
}else{ }else{
[self createBtnWithArr:arr]; [self createBtnWithArr:arr];
} }
}else if ([self.transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED] && !self.isWms && [IBTCommon checkIsPermission:TRANSPORT_ACTION_RECEIVE]){ }else if ([self.transport.state isEqualToString:TRANSPORT_STATE_UNRECEIVED] && !self.isWms){
NSMutableArray *arr = [NSMutableArray array];
[self createBtnWithArr:@[@"保存",@"收货"]]; if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_RECEIVE]) {//如果有收货权,则显示收货按钮
[arr addObjectsFromArray:@[@"保存",@"收货"]];
}
//这里作废不受权限控制
[arr addObject:@"作废"];
[self createBtnWithArr:arr];
}else{ }else{
[self hiddenAllBtn]; [self hiddenAllBtn];
......
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