修复Select Order Status后切换Order时，Shop Order的状态和Sales Order状态一致。

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

@@ -336,7 +336,7 @@
         }
         
         // Check For Saved Order 不能合并
-        if(self.init_style==OL_OPEN) {
+        if(self.init_style==OL_OPEN || self.orderType == 1) {
             if ([items containsObject:self.mergeListButton]) { // 显示button
                 [items removeObject:self.mergeListButton];
             }
@@ -1899,8 +1899,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle  forRowAtIndexPath:
             }
         }
         
-        self.status_cadedate = nil;
-        [self loadfilter];
+        self.status_cadedate = self.shop_order_filter;
         [self ReloadData];
         
         [self.table_order setEditing:NO animated:YES];