Commit d8e5be81 authored by AvatarC's avatar AvatarC

收货单筛选状态添加:,@"提交系统处理",@"系统处理失败",nil

parent 1510915d
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
#define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1] #define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1]
//********阿里云内部测试环境******** //********阿里云内部测试环境********
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest" #define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//********现场测试环境******** //********现场测试环境********
//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest" //#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
//********现场正式环境********* //********现场正式环境*********
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest" // #define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
// HTTP // HTTP
......
...@@ -205,7 +205,8 @@ ...@@ -205,7 +205,8 @@
//收货单 //收货单
#define RECEIVE_STATE_SAVE @"save" //保存 #define RECEIVE_STATE_SAVE @"save" //保存
#define RECEIVE_STATE_RECEIVE @"receive" //收货 #define RECEIVE_STATE_RECEIVE @"receive" //收货
#define RECEIVE_STATE_PROCESS @"process"//提交系统处理
#define RECEIVE_STATE_PROCESSFAIL @"processFail"//系统处理失败
//权限列表vendorapprove 采购单 //权限列表vendorapprove 采购单
......
...@@ -254,7 +254,7 @@ typedef enum : NSUInteger { ...@@ -254,7 +254,7 @@ typedef enum : NSUInteger {
_boltView.backgroundColor = XXFBgColor; _boltView.backgroundColor = XXFBgColor;
_boltView.delegate = self; _boltView.delegate = self;
_boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"待收货",@"已收货",nil]; _boltView.dataArr = [[NSMutableArray alloc]initWithObjects:@"待收货",@"已收货",@"提交系统处理",@"系统处理失败",nil];
[_maskView addSubview:_boltView]; [_maskView addSubview:_boltView];
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
CGRect sortFrame = _boltView.frame; CGRect sortFrame = _boltView.frame;
......
...@@ -45,7 +45,15 @@ ...@@ -45,7 +45,15 @@
_currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0]; _currentIndexPath = [NSIndexPath indexPathForRow:0 inSection:0];
}else if ([self.state isEqualToString:TRANSPORT_STATE_RECEIVED]) { }else if ([self.state isEqualToString:TRANSPORT_STATE_RECEIVED]) {
_currentIndexPath = [NSIndexPath indexPathForRow:1 inSection:0]; _currentIndexPath = [NSIndexPath indexPathForRow:1 inSection:0];
}else if ([self.state isEqualToString:TRANSPORT_STATE_PROCESS]) {
_currentIndexPath = [NSIndexPath indexPathForRow:2 inSection:0];
}else if ([self.state isEqualToString:TRANSPORT_STATE_PROCESSFAIL]) {
_currentIndexPath = [NSIndexPath indexPathForRow:3 inSection:0];
} else {
} }
} }
#pragma mark - 创建视图 #pragma mark - 创建视图
...@@ -146,7 +154,13 @@ ...@@ -146,7 +154,13 @@
stateStr = TRANSFER_STATE_UNRECEIVED; stateStr = TRANSFER_STATE_UNRECEIVED;
}else if(indexPath.row == 1){ }else if(indexPath.row == 1){
stateStr = TRANSFER_STATE_RECEIVED; stateStr = TRANSFER_STATE_RECEIVED;
}else if(indexPath.row == 2){
stateStr = TRANSFER_STATE_PROCESS;
}else if(indexPath.row == 3){
stateStr = TRANSFER_STATE_PROCESSFAIL;
} }
[self.delegate getBoltValueSelectRow:stateStr]; [self.delegate getBoltValueSelectRow:stateStr];
} }
......
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