修复权限更改后，OrderCell不能编辑。

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -33,7 +33,9 @@
 #define ALERT_RESTORE_FREE 1027
 
 @interface CartViewController ()
-
+{
+    CGRect cancelButtonFrame;
+}
 @property (nonatomic,strong) SortItemViewController *sortItemController;
 @property (nonatomic,assign) int sortIndex;
 @property (nonatomic,strong) SortButton *sortButton;
@@ -468,8 +470,14 @@
             CGFloat x = CGRectGetMaxX(frame1) - frame0.size.width;
             frame0.origin.x = x;
             self.cancelOrderButton.frame = frame0;
-            [self.placeOrderButton removeFromSuperview];
+            self.placeOrderButton.hidden = YES;
+        } else {
+            self.cancelOrderButton.frame = cancelButtonFrame;
+            self.placeOrderButton.hidden = NO;
         }
+    } else {
+        self.cancelOrderButton.frame = cancelButtonFrame;
+        self.placeOrderButton.hidden = NO;
     }
     
 //    [self reload_data]; // 视图没及时刷新
@@ -663,7 +671,7 @@
     self.toolpanel.layer.shadowRadius = 2.0;
     
     
-    
+    cancelButtonFrame = self.cancelOrderButton.frame;
     
     //  CGRect frame =self.orderInfoTableView.tableHeaderView.frame;
     //    self.orderInfoTableView.tableHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, self.orderInfoTableView.bounds.size.width, 0.0001)];

RedAnt ERP Mobile/common/Functions/order/OrderListViewController.m

@@ -266,16 +266,12 @@
     AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
     if(appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         
-        if (![Singleton sharedInstance].permissions_merge_order) {
-            // 没有合并订单的权限
-            [self.mergeListButton removeFromSuperview];
-            self.mergeListButton = nil;
-        }
-        
+        // 合并订单的权限
+        self.mergeListButton.hidden = ![Singleton sharedInstance].permissions_merge_order;
+
     } else {
         
-        [self.mergeListButton removeFromSuperview];
-        self.mergeListButton = nil;
+        self.mergeListButton.hidden = YES;
     }
     
 }
@@ -1385,6 +1381,22 @@
     
 }
 
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+    if(appDelegate.user_type==USER_ROLE_CUSTOMER) {
+        
+        if (![Singleton sharedInstance].permissions_merge_order) {
+            // 没有合并订单的权限
+            return NO;
+        } else {
+            return YES;
+        }
+        
+    } else {
+        return YES;
+    }
+}
 
 - (void)tableView:(UITableView *)tableView
 commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:(NSIndexPath *)indexPath {