Commit 109ae142 authored by Sandy's avatar Sandy

1、单据全部都已对账,全选状态下点击对账,直接取消对账。2、没有数据隐藏底部的对账面板

parent dd4b7448
...@@ -1063,6 +1063,7 @@ ...@@ -1063,6 +1063,7 @@
</barButtonItem> </barButtonItem>
</navigationItem> </navigationItem>
<connections> <connections>
<outlet property="bottomBoard" destination="60m-IE-dYi" id="1cC-2f-x1D"/>
<outlet property="btnCheck" destination="pkB-KR-wBr" id="iuK-wQ-xGq"/> <outlet property="btnCheck" destination="pkB-KR-wBr" id="iuK-wQ-xGq"/>
<outlet property="btnSelectAll" destination="bmf-kc-sf9" id="2Uw-gN-QDj"/> <outlet property="btnSelectAll" destination="bmf-kc-sf9" id="2Uw-gN-QDj"/>
<outlet property="constraintTop" destination="Ogv-fa-3jp" id="Pko-jE-pfh"/> <outlet property="constraintTop" destination="Ogv-fa-3jp" id="Pko-jE-pfh"/>
......
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
@property (strong, nonatomic) NSMutableSet *setBillToCheck; @property (strong, nonatomic) NSMutableSet *setBillToCheck;
@property (weak, nonatomic) IBOutlet UILabel *labelCount; @property (weak, nonatomic) IBOutlet UILabel *labelCount;
@property (weak, nonatomic) IBOutlet UILabel *labelAmount; @property (weak, nonatomic) IBOutlet UILabel *labelAmount;
/**
底部的面板
*/
@property (weak, nonatomic) IBOutlet UIView *bottomBoard;
@property (strong, nonatomic) TradeStatisticsResult *total; @property (strong, nonatomic) TradeStatisticsResult *total;
@end @end
...@@ -31,6 +36,7 @@ ...@@ -31,6 +36,7 @@
[self httpRequest]; [self httpRequest];
self.constraintTop.constant = 0; self.constraintTop.constant = 0;
[self.view layoutIfNeeded]; [self.view layoutIfNeeded];
self.view.backgroundColor = [UIColor whiteColor];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(actionNoti:) name:kNotiSelectBill object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(actionNoti:) name:kNotiSelectBill object:nil];
} }
...@@ -59,6 +65,7 @@ ...@@ -59,6 +65,7 @@
} }
[weakSelf.arrData addObject:model]; [weakSelf.arrData addObject:model];
} }
weakSelf.bottomBoard.hidden = weakSelf.arrData.count == 0;
[weakSelf listTableViewReloadData]; [weakSelf listTableViewReloadData];
} else { } else {
...@@ -91,7 +98,7 @@ ...@@ -91,7 +98,7 @@
[super tableView:tableView didSelectRowAtIndexPath:indexPath]; [super tableView:tableView didSelectRowAtIndexPath:indexPath];
kDebugIndex(indexPath); // kDebugIndex(indexPath);
} }
- (void)listDidSelect:(id)model { - (void)listDidSelect:(id)model {
...@@ -132,6 +139,11 @@ ...@@ -132,6 +139,11 @@
[self.view layoutIfNeeded]; [self.view layoutIfNeeded];
}]; }];
} else { } else {
if (self.btnSelectAll.isSelected && self.setBillToCheck.count == 0) {
[self actionCancelCheck:nil];
return;
}
if (self.setBillToCheck.count == 0) { if (self.setBillToCheck.count == 0) {
[MBProgressHUD j_error:@"请选择对账的单据!" complete:nil]; [MBProgressHUD j_error:@"请选择对账的单据!" complete:nil];
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment