修复编辑状态出错。

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

@@ -1567,13 +1567,41 @@
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     NSString* order_status= [self.content_data[indexPath.row] valueForKey:@"order_status"];
     
+    
     if(appDelegate.user_type==USER_ROLE_CUSTOMER) {
         // saved && ((type==0 && merge_permission) || type == 1 || can_cancel)
-        if ([order_status isEqualToString:@"Saved Order"] && (([Singleton sharedInstance].permissions_merge_order && self.orderType == 0) || self.orderType == 1 || appDelegate.can_cancel_order)) {
-            NSLog(@"%d Yes",indexPath.row);
-            return YES;
-        } else {
-            return NO;
+//        if ([order_status isEqualToString:@"Saved Order"] && (([Singleton sharedInstance].permissions_merge_order && self.orderType == 0) || self.orderType == 1 || appDelegate.can_cancel_order)) {
+//            NSLog(@"%d Yes",indexPath.row);
+//            return YES;
+//        } else {
+//            return NO;
+//        }
+        BOOL isSavedOrder = [order_status isEqualToString:@"Saved Order"];
+        switch (self.orderType) {
+            case 0:{ // Shop Order
+                
+                if (!isSavedOrder) {
+                    return NO;
+                } else {
+                    if ([Singleton sharedInstance].permissions_merge_order || appDelegate.can_cancel_order) {
+                        return YES;
+                    } else {
+                        return NO;
+                    }
+                }
+                
+            }
+                break;
+            case 1:{ // Sales Order
+                if (isSavedOrder && appDelegate.can_cancel_order) {
+                    return YES;
+                }
+                return NO;
+            }
+                break;
+                
+            default:
+                break;
         }
         
     } else {