Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001

XFFruit/ViewControllers/Transfer/Controllers/TransferDetailViewController.m

@@ -157,6 +157,8 @@ typedef enum : NSUInteger {
             btnTag = AbortTag;
         }else if ([arr[i] isEqualToString:@"收货"]) {
             btnTag = SubmitTag;
+        } else {
+        
         }
         CGRect btnFrame = CGRectMake(LeftMargin + (LeftMargin + btnWidth)*i,  ScreenSize.height  - 64 - BottomHeight +5, btnWidth, 40);
         UIButton *perBtn = [IBTCustomButtom creatButtonWithFrame:btnFrame target:self sel:@selector(btnClick:) tag:btnTag image:nil title:arr[i] titleColor:[UIColor whiteColor] isCorner:YES corner:5 bgColor:GXF_COMMIT_COLOR];
@@ -180,18 +182,18 @@ typedef enum : NSUInteger {
             [self hiddenBottomView];
         }
     }else if ([self.transfer.state isEqualToString:TRANSFER_STATE_PROCESSFAIL]){
-        NSMutableArray *arr = [NSMutableArray array]; //系统处理失败
-        if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
-            [arr addObject:@"作废"];
-        }if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_NEW]) {
-            //[arr addObject:@"提交"];
-            [arr addObject:@"收货"];
-        }
-        if (arr.count == 0) {
-            [self hiddenBottomView];
-        }else{
-            [self createBtnWithArr:arr];
-        }
+//        NSMutableArray *arr = [NSMutableArray array]; //系统处理失败
+//        if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_ABORT]) {
+//            [arr addObject:@"作废"];
+//        }if ([IBTCommon checkIsPermission:TRANSPORT_ACTION_NEW]) {
+//            //[arr addObject:@"提交"];
+//            [arr addObject:@"收货"];
+//        }
+//        if (arr.count == 0) {
+//            [self hiddenBottomView];
+//        }else{
+//            [self createBtnWithArr:arr];
+//        }
     }else{
         [self hiddenBottomView];
     }