|
|
@@ -1889,7 +1889,7 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:
|
|
|
|
|
|
if (self.table_order.isEditing) {
|
|
|
// 结束选择时恢复
|
|
|
- if ([Singleton sharedInstance].customer_can_see_sales_Order) { // 有查看Sales order 权限
|
|
|
+ if ([Singleton sharedInstance].customer_can_see_sales_Order && ![Singleton sharedInstance].global_lock) { // 有查看Sales order 权限,并且app没有锁
|
|
|
if (self.orderTypeSegmentControl.numberOfSegments == 1) {
|
|
|
[self.orderTypeSegmentControl insertSegmentWithTitle:@"Purchase Order" atIndex:1 animated:YES];
|
|
|
}
|
|
|
@@ -2020,9 +2020,14 @@ commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:
|
|
|
- (void)handleUserLogin:(NSNotification *)notification {
|
|
|
AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
|
self.orderType = 0;
|
|
|
+ if (self.table_order.isEditing) {
|
|
|
+ [self.table_order setEditing:NO animated:YES];
|
|
|
+ self.editOrderListButton.title = @"Select";
|
|
|
+ }
|
|
|
if (appDelegate.user_type == USER_ROLE_CUSTOMER) {
|
|
|
self.orderTypeSegmentControl.selectedSegmentIndex = 0;
|
|
|
[Singleton sharedInstance].customer_order_type = 0;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|