Skip to content

万
万科
Commit 990cc969 authored by Sandy's avatar Sandy
Browse files
Options

修复bug

parent 6de087fe
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 148 deletions
vanke/3rd/CalculateHelper.h
View file @ 990cc969
......@@ -36,12 +36,19 @@ typedef NS_ENUM(NSInteger, CalculateType) {
* @return 结算结果
*/
+ (NSDecimalNumber *)calculateNum1:(id)num1 num2:(id)num2 type:(CalculateType)type roundingType:(NSRoundingMode)roundingType cutLenth:(NSInteger)coutLenth;
+ (NSDecimalNumber *)calculateNum1:(id)num1 num2:(id)num2 type:(CalculateType)type;
/** 一百倍 */
+ (NSDecimalNumber *)oneHundredTimes:(id)num;
/** 计算百分比 */
+ (NSString *)getPercent:(id)num1 num:(id)num2;
/** 获取金额 */
+ (NSString *)getMoneyStringFrom:(id)num;
/** 获取金额 */
+ (NSString *)getMoneyStringFrom:(id)num Lenth:(NSInteger)cutLenth isSeparate:(BOOL)isSeparate;
+ (NSString *)getMoneyStringFromString:(NSString *)originString;
+ (NSString *)getABSValue:(NSString *)string;
+ (NSString *)separateMoney:(NSDecimalNumber *)num;
@end
vanke/3rd/CalculateHelper.m
View file @ 990cc969
......@@ -13,17 +13,11 @@
+ (NSDecimalNumber *)calculateNum1:(id)num1 num2:(id)num2 type:(CalculateType)type roundingType:(NSRoundingMode)roundingType cutLenth:(NSInteger)coutLenth {
NSDecimalNumberHandler *roundUp = [NSDecimalNumberHandler
decimalNumberHandlerWithRoundingMode:roundingType
scale:coutLenth
raiseOnExactness:NO
raiseOnOverflow:NO
raiseOnUnderflow:NO
raiseOnDivideByZero:YES];
NSDecimalNumber *decimalNum1 = [self changeType:num1];
NSDecimalNumber *decimalNum2 = [self changeType:num2];
......@@ -34,6 +28,7 @@
NSDecimalNumber *decimalResult;
NSString *result;
switch (type) {
case CalculateTypeAdd: {
decimalResult = [decimalNum1 decimalNumberByAdding:decimalNum2 withBehavior:roundUp];
......@@ -66,17 +61,64 @@
return decimalResult;
}
+ (NSDecimalNumber *)calculateNum1:(id)num1 num2:(id)num2 type:(CalculateType)type {
NSDecimalNumber *decimalNum1 = [self changeType:num1];
NSDecimalNumber *decimalNum2 = [self changeType:num2];
if (decimalNum1 == nil || decimalNum2 == nil) {
return nil;
}
NSDecimalNumber *decimalResult;
NSString *result;
switch (type) {
case CalculateTypeAdd: {
decimalResult = [decimalNum1 decimalNumberByAdding:decimalNum2];
result = [decimalResult stringValue];
break;
}
case CalculateTypeSub: {
decimalResult = [decimalNum1 decimalNumberBySubtracting:decimalNum2 ];
result = [decimalResult stringValue];
break;
}
case CalculateTypeMul: {
decimalResult = [decimalNum1 decimalNumberByMultiplyingBy:decimalNum2];
result = [decimalResult stringValue];
break;
}
case CalculateTypeDiv: {
if ([decimalNum2 isEqualToNumber:@0]) {
decimalResult = [NSDecimalNumber decimalNumberWithString:@"0"];
}else{
decimalResult = [decimalNum1 decimalNumberByDividingBy:decimalNum2];
result = [decimalResult stringValue];
}
break;
}
}
return decimalResult;
}
//把传入的类型变成NSDecimalNumber
+ (NSDecimalNumber *)changeType:(id)num1 {
NSDecimalNumber *decimalNum1;
if ([num1 isKindOfClass:[NSDecimalNumber class]]) {
decimalNum1 = num1;
}else if([num1 isKindOfClass:[NSString class]]){
decimalNum1 = [NSDecimalNumber decimalNumberWithString:num1];
if([num1 isEqualToString:@""]){
decimalNum1 = [NSDecimalNumber decimalNumberWithString:@"0"];
}else{
decimalNum1 = [NSDecimalNumber decimalNumberWithString:num1];
}
}else if ([num1 isKindOfClass:[NSNumber class]]){
decimalNum1 = [NSDecimalNumber decimalNumberWithDecimal:[num1 decimalValue]];
}else{
return nil;
}else if(num1 == nil){
decimalNum1 = [NSDecimalNumber decimalNumberWithString:@"0"];
}
return decimalNum1;
}
......@@ -91,21 +133,27 @@
return [NSString stringWithFormat:@"%@%%",[self getMoneyStringFromString:result.stringValue]];
}
+ (NSString *)getMoneyStringFrom:(id)num Lenth:(NSInteger)cutLenth {
+ (NSString *)getMoneyStringFrom:(id)num Lenth:(NSInteger)cutLenth isSeparate:(BOOL)isSeparate {
NSDecimalNumberHandler *roundUp = [NSDecimalNumberHandler
decimalNumberHandlerWithRoundingMode:NSRoundBankers
scale:cutLenth ? cutLenth : 2
scale:cutLenth
raiseOnExactness:NO
raiseOnOverflow:NO
raiseOnUnderflow:NO
raiseOnDivideByZero:YES];
NSDecimalNumber *decimal = [self changeType:num];
NSDecimalNumber *result = [decimal decimalNumberByAdding:[NSDecimalNumber decimalNumberWithString:@"0"] withBehavior:roundUp];
return [result stringValue];
if (isSeparate) {
return [self separateMoney:result];
}else{
return [result stringValue];
}
}
+ (NSString *)getMoneyStringFrom:(id)num{
NSString *originString = [self getMoneyStringFrom:num Lenth:2];
NSString *originString = [self getMoneyStringFrom:num Lenth:2 isSeparate:NO];
return [self getMoneyStringFromString:originString];
}
......@@ -128,6 +176,25 @@
}
}
return result;
}
+ (NSString *)getABSValue:(NSString *)string {
if ([string hasPrefix:@"-"] && ![string hasPrefix:@"--"]) {
NSString *absString = [string substringWithRange:NSMakeRange(1, string.length - 1)];
return absString;
}else{
return string;
}
}
+ (NSString *)separateMoney:(NSDecimalNumber *)num {
NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc]init];
numberFormatter.locale = [NSLocale currentLocale];// this ensure the right separator behavior
numberFormatter.numberStyle = NSNumberFormatterDecimalStyle;
numberFormatter.usesGroupingSeparator = YES;
// example for writing the number object into a label
NSString *string = [numberFormatter stringFromNumber:num];
return string;
}
@end
vanke/Info.plist
View file @ 990cc969
......@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.3.4</string>
<string>1.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
vanke/VankeConfig.h
View file @ 990cc969
......@@ -21,15 +21,15 @@
// 百度天气服务地址
#define VANKE_BAIDU_WEATHER_SERVER_URL @"http://api.map.baidu.com/telematics/v3/weather"
// //正式环境
//#define VANKE_SERVER_BASE_URL @"http://140.206.62.178:8080/wanke-server/rest" //正式
// //后台多媒体文件基准地址
//#define VANKE_SERVER_MEDIA_BASE_URL @"http://140.206.62.178:8080" //正式
//正式环境
#define VANKE_SERVER_BASE_URL @"http://140.206.62.178:8080/wanke-server/rest" //正式
//后台多媒体文件基准地址
#define VANKE_SERVER_MEDIA_BASE_URL @"http://140.206.62.178:8080" //正式
// 测试环境
#define VANKE_SERVER_BASE_URL @"http://139.196.39.77:8080/wanke-server/rest"
#define VANKE_SERVER_MEDIA_BASE_URL @"http://139.196.39.77:8080"
//#define VANKE_SERVER_BASE_URL @"http://139.196.39.77:8080/wanke-server/rest"
//#define VANKE_SERVER_MEDIA_BASE_URL @"http://139.196.39.77:8080"
// 后台服务企业认证码
......
vanke/view_iPhone/templates/report/ReportViewController.m
View file @ 990cc969
......@@ -95,7 +95,7 @@ ON_CREATE_VIEWS( signal )
[self bulidLayout];
UIBarButtonItem *searchItem = [[UIBarButtonItem alloc]initWithTitle:@"历史" style:UIBarButtonItemStyleDone target:self action:@selector(customSegTwoClick:)];
self.navigationItem.rightBarButtonItem = searchItem;
self.automaticallyAdjustsScrollViewInsets = NO;
self.dayType = @"day";
self.scopeType = [IBTCommon stringFromDateWithFormat:[NSDate date] format:@"yyyy-MM-dd"];
......@@ -292,6 +292,11 @@ ON_CREATE_VIEWS( signal )
if (indexPath) {
[self actionTableView:indexPath];
}
if (indexPath == nil && self.dataArr.count > 0) {
NSIndexPath *index = [NSIndexPath indexPathForRow:0 inSection:0];
[[NSNotificationCenter defaultCenter]postNotificationName:KNOTIFICATION_GetNextDetailData object:nil userInfo:@{@"indexPath":index}];
}
}else{
[IBTLoadingView showTips:message];
}
......@@ -329,7 +334,7 @@ ON_CREATE_VIEWS( signal )
self.segView.delegate = self;
[self.view addSubview:self.segView];
self.scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, self.segView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT - 49 - 64- self.segView.bottom)];
self.scrollView = [[UIScrollView alloc]initWithFrame:CGRectMake(0, self.segView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT- self.segView.bottom)];
self.scrollView.delegate = self;
self.scrollView.showsHorizontalScrollIndicator = NO;
self.scrollView.showsVerticalScrollIndicator = NO;
......@@ -348,7 +353,7 @@ ON_CREATE_VIEWS( signal )
// gvc = [GrossRateViewController new];
// [self addChildViewController:gvc];
rect = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT - 49 - 64- self.segView.bottom);
rect = CGRectMake(0, 0, SCREEN_WIDTH, self.scrollView.height + 64);
svc.view.frame = rect;
[self.scrollView addSubview:svc.view];
......
vanke/view_iPhone/templates/report/SaleViewController.m
View file @ 990cc969
......@@ -49,14 +49,13 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
NSLog(@"%f---------",self.view.height);
rect = CGRectMake(0, 0, self.view.width, self.view.height- 158);
rect = CGRectMake(0, 0, self.view.width, self.view.height - 49 - 64);
self.tableView = [[UITableView alloc]initWithFrame:rect style:UITableViewStylePlain];
self.tableView.delegate = self;
self.tableView.dataSource = self;
[self.tableView registerClass:[SaleViewCell class] forCellReuseIdentifier:saleCellIdentify];
[self.tableView registerClass:[SaleHeaderView class] forHeaderFooterViewReuseIdentifier:saleHeaderIdentify];
self.tableView.tableHeaderView = self.rsaleView;
[self.view addSubview:self.tableView];
}
......
vanke/view_iPhone/templates/report/Views/RSaleView.m
View file @ 990cc969
......@@ -168,14 +168,21 @@
self.dateLabel.text = compass.dataScope?[NSString stringWithFormat:@"%@%@累计销售额",compass.dataScope,weekday]:@"无";
//销售额
NSString *strSale = [IBTCommon countNumAndChangeformat:[IBTCommon stringDisposeWithFloat:[compass.sales floatValue]]];
self.centerLabel.text = compass.sales?[CalculateHelper getMoneyStringFromString:strSale] :@"---";
NSString *strSales = [CalculateHelper getMoneyStringFrom:compass.sales Lenth:0 isSeparate:YES];
self.centerLabel.text = compass.sales?strSales :@"---";
//销售环比变化率 比上周
NSDecimalNumber *saleDifference = [CalculateHelper calculateNum1:compass.sales num2:compass.salesChain type:CalculateTypeSub roundingType:NSRoundBankers cutLenth:4];
NSDecimalNumber *decimalSaleRate = [CalculateHelper calculateNum1:saleDifference num2:compass.salesChain type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:4];
decimalSaleRate = [CalculateHelper oneHundredTimes:decimalSaleRate];
NSString *salesChainRateStr = decimalSaleRate?[NSString stringWithFormat:@"%@%%", [CalculateHelper getMoneyStringFromString:[decimalSaleRate stringValue]]]:@"---";
if (!compass) {
salesChainRateStr = @"---";
}
if ([compass.salesChain isEqualToNumber:@0]) {
salesChainRateStr = @"---";
}
if (![salesChainRateStr hasPrefix:@"-"] && ![salesChainRateStr isEqualToString:@"0"] && ![salesChainRateStr hasPrefix:@"--"]) {
[self.lastWeekLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
......@@ -187,7 +194,7 @@
[self.lastWeekLabel setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
[self.lastWeekLabel setImage:nil forState:UIControlStateNormal];
}
[self.lastWeekLabel setTitle:salesChainRateStr forState:UIControlStateNormal];
[self.lastWeekLabel setTitle:[CalculateHelper getABSValue:salesChainRateStr] forState:UIControlStateNormal];
//销售同比变化率 比上年
NSDecimalNumber *decimalSalesYoYDifference = [CalculateHelper calculateNum1:compass.sales num2:compass.salesYoY type:CalculateTypeSub roundingType:NSRoundBankers cutLenth:4];
......@@ -195,7 +202,13 @@
decimalSalesYoY = [CalculateHelper oneHundredTimes:decimalSalesYoY];
NSString *salesYoStr = decimalSalesYoY?[NSString stringWithFormat:@"%@%%",[decimalSalesYoY stringValue ]]:@"---";
if ([compass.salesYoY isEqualToNumber:@0]) {
salesYoStr = @"---";
}
if (!compass) {
salesYoStr = @"---";
}
if (![salesYoStr hasPrefix:@"-"] && ![salesYoStr isEqualToString:@"0"] && ![salesYoStr hasPrefix:@"--"]) {
[self.lastYearLabel setImage:[UIImage imageNamed:ReportChainPlusImage] forState:UIControlStateNormal];
[self.lastYearLabel setTitleColor:ReportContentColor forState:UIControlStateNormal];
......@@ -207,7 +220,7 @@
[self.lastYearLabel setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
}
[self.lastYearLabel setTitle:salesYoStr forState:UIControlStateNormal];
[self.lastYearLabel setTitle:[CalculateHelper getABSValue:salesYoStr] forState:UIControlStateNormal];
//坪效
NSDecimalNumber *groundEffect = [CalculateHelper calculateNum1:compass.sales num2:compass.area type:CalculateTypeDiv roundingType:NSRoundBankers cutLenth:2];
......
vanke/view_iPhone/templates/report/Views/SaleHeaderView.m
View file @ 990cc969
......@@ -49,7 +49,7 @@
//右侧共几家 jv
rect = CGRectMake(10, 0, 110, Sale_Header_Height);
rect = CGRectMake(10, 0, 115, Sale_Header_Height);
UILabel *searLabel = [IBTCommon labelWithTitle:@"共280家" frame:rect textFont:self.textFont];
searLabel.textColor = ReportTitleColor;
[self.contentView addSubview:searLabel];
......@@ -58,7 +58,7 @@
CGFloat width = (SCREEN_WIDTH - searLabel.right - 4)/4;
rect = CGRectMake(searLabel.right, 0, width, Sale_Header_Height);
rect = CGRectMake(searLabel.right, 0, width + 15, Sale_Header_Height);
UILabel * xsBtn = [IBTCommon labelWithTitle:@"销售额" frame:rect textFont:self.textFont];
xsBtn.textColor = ReportTitleColor;
[self.contentView addSubview:xsBtn];
......
vanke/view_iPhone/templates/report/Views/SaleViewCell.m
View file @ 990cc969
......@@ -70,7 +70,8 @@
CGFloat width = (SCREEN_WIDTH - self.dqLabel.right - 4)/4;
rect = CGRectMake(self.dqLabel.right , 0, width, Sale_Cell_Height);
//销售额
rect = CGRectMake(self.dqLabel.right , 0, width + 15, Sale_Cell_Height);
self.saleLabel = [IBTCommon labelWithTitle:@"56,080" frame:rect textFont:self.textFont];
[self.contentView addSubview:self.saleLabel];
......@@ -90,7 +91,7 @@
[self.contentView addSubview:self.rateLabel];
//日均销售
self.dailySaleLabel = [IBTCommon labelWithTitle:@"23" frame:CGRectMake(self.rateLabel.right+10, 0, width, Sale_Cell_Height) textFont:self.textFont];
self.dailySaleLabel = [IBTCommon labelWithTitle:@"23" frame:CGRectMake(self.rateLabel.right+10, 0, width - 15, Sale_Cell_Height) textFont:self.textFont];
self.dailySaleLabel.textColor = GXF_COMMIT_COLOR;
[self.contentView addSubview:self.dailySaleLabel];
......@@ -133,7 +134,7 @@
self.saleLabel.textColor = GXF_NAVIGAYION_COLOR;
}
//销售额
self.saleLabel.text = sale.sales?[CalculateHelper getMoneyStringFrom:sale.sales] : @"0";
self.saleLabel.text = sale.sales?[CalculateHelper getMoneyStringFrom:sale.sales Lenth:0 isSeparate:NO] : @"0";
NSString *salesYoStr = [NSString stringWithFormat:@"%@%%",[CalculateHelper getMoneyStringFrom:sale.salesChainRate]];
[self.lastWeekLabel setTitle:salesYoStr forState:UIControlStateNormal];
......@@ -142,7 +143,7 @@
self.rateLabel.text = salesTargetRateStr;
//日均销售
self.dailySaleLabel.text = [NSString stringWithFormat:@"%@", [CalculateHelper getMoneyStringFrom:sale.dailysalesPerStore]];
self.dailySaleLabel.text = [NSString stringWithFormat:@"%@", [CalculateHelper getMoneyStringFrom:sale.dailysalesPerStore Lenth:0 isSeparate:NO]];
[self setColorAndFont:sale.level];
......
vanke/view_iPhone/templates/salesInput/Controller/HistoryViewController.m
View file @ 990cc969
......@@ -25,7 +25,7 @@
@property (nonatomic, strong) UIScrollView *scrollView;
@property (nonatomic, strong) HistoryTopView *topView;
@property (nonatomic, strong) NSArray *arrRecords;
@property (nonatomic, strong) UIImageView *imageNoData;
@end
@implementation HistoryViewController
......@@ -50,14 +50,20 @@
self.topView.labelShopName.text = [NSString stringWithFormat:@"%@【%@】", self.shop.name, self.shop.code];
if (self.shop == nil) {
self.topView.labelShopName.text = @"";
self.topView.labelShopName.text = @"请选择店铺";
}else{
self.topView.labelShopName.text = [NSString stringWithFormat:@"%@【%@】", self.shop.name, self.shop.code];
}
}
- (void)dealloc {
- (UIImageView *)imageNoData {
if (!_imageNoData) {
_imageNoData = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 300, 300)];
_imageNoData.center = self.view.center;
_imageNoData.contentMode = UIViewContentModeScaleToFill;
_imageNoData.image = [UIImage imageNamed:@"no_data@3x"];
}
return _imageNoData;
}
- (void)chooseShopAction {
......@@ -78,6 +84,7 @@
[self.view addSubview:self.scrollView];
}
- (void)setUpScrollViewWithDataArr:(NSArray *)array bottomArr:(NSArray *)bottomArr{
[self.scrollView removeAllSubviews];
self.scrollView.contentOffset = CGPointMake(0, 0);
......@@ -153,6 +160,10 @@
}
picVC.title = self.arrRecords[row][@"salesDate"];
picVC.attachmentUuid = self.arrRecords[row][@"attachmentUuid"];
NSArray *attachments = self.arrRecords[row][@"attachments"];
// if (attachments.count == 0) {
// picVC.attachmentUuid = nil;
// }
[self.navigationController pushViewController:picVC animated:YES];
}
......@@ -356,6 +367,7 @@
[weakSelf setUpScrollViewWithDataArr:arrData bottomArr:arrBottom];
[hud hide:YES];
NSLog(@"d");
} failure:^(id data) {
[hud hide:YES];
}];
......
vanke/view_iPhone/templates/salesInput/Controller/SaleInputPicCollectionViewController.m
View file @ 990cc969
......@@ -11,7 +11,8 @@
#import "ICRHTTPController.h"
#import "AttachmentModel.h"
#import "GalleryViewController.h"
@interface SaleInputPicCollectionViewController ()
#import "UIScrollView+EmptyDataSet.h"
@interface SaleInputPicCollectionViewController ()<DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
@property (weak, nonatomic) IBOutlet UICollectionViewFlowLayout *flowLayout;
@end
......@@ -25,12 +26,32 @@ static NSString * const reuseIdentifier = @"saleInputCollection";
self.flowLayout.itemSize = CGSizeMake((SCREEN_WIDTH - 20) / 3, 110.0 / 375 * SCREEN_WIDTH);
self.flowLayout.minimumLineSpacing = 5;
self.flowLayout.minimumInteritemSpacing = 5;
self.collectionView.emptyDataSetSource = self;
self.collectionView.emptyDataSetDelegate = self;
[self setUpData];
}
#pragma mark - empty state
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView {
return [UIImage imageNamed:@"no_data"];
}
- (CAAnimation *)imageAnimationForEmptyDataSet:(UIScrollView *)scrollView {
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath: @"transform"];
animation.fromValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeRotation(M_PI_2, 0.0, 0.0, 1.0)];
animation.duration = 1;
animation.cumulative = YES;
animation.repeatCount = MAXFLOAT;
return animation;
}
- (void)setUpData {
NSString *url = [NSString stringWithFormat:@"attachment/get_urls?entity_type=salesInput&entity_uuid=%@",self.attachmentUuid];
NSString *url = [NSString stringWithFormat:@"attachment/get_urls?entity_type=salesInput&entity_uuid=%@", [self.attachmentUuid isKindOfClass:[NSString class]] ? self.attachmentUuid : nil];
__weak typeof(self)weakSelf = self;
[[ICRHTTPController sharedController] getUrl:url params:nil success:^(id data) {
......
vanke/view_iPhone/templates/salesInput/Controller/SalesInPut.storyboard
View file @ 990cc969
......@@ -12,7 +12,7 @@
<collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="jdx-se-vyN">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.91719922220000005" green="0.95656324439999996" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Trd-2Q-pij">
<size key="itemSize" width="152" height="111"/>
<size key="headerReferenceSize" width="0.0" height="0.0"/>
......@@ -33,7 +33,7 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.90196079019999997" green="0.90196079019999997" blue="0.90196079019999997" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="joQ-K1-fla" secondAttribute="bottom" id="6vL-nq-IUF"/>
<constraint firstAttribute="trailing" secondItem="joQ-K1-fla" secondAttribute="trailing" id="JEP-Mb-Shp"/>
......
vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m
View file @ 990cc969
......@@ -25,24 +25,13 @@
#import "TZImagePickerController.h"
#import "UIImage+Helper.h"
#import "NSDate+FormatterAdditions.h"
#import "CalculateHelper.h"
#define kCellCount 20
#define kCellID @"SalesInputTableViewCell.h"
#define kPicCellId @"SaleInputPictureTableViewCell.h"
#define kAutoValue(value) (float)value / 375 * self.view.frame.size.width
/**
* colors
*/
#define kSysWhite [UIColor whiteColor]
//红 #ED1B23
#define kMainRedColor [UIColor colorWithRed:0.929 green:0.106 blue:0.137 alpha:1.000];
//蓝 #478FF1
#define kMainBlueColor [UIColor colorWithRed:0.278 green:0.561 blue:0.945 alpha:1.000];
//橙 #EA6402
#define kMainOrangeColor [UIColor colorWithRed:0.918 green:0.392 blue:0.008 alpha:1.000];
//紫 #5435AD
#define kMainPurpleColor [UIColor colorWithRed:0.329 green:0.208 blue:0.678 alpha:1.000];
#define kTabbarColor [UIColor colorWithWhite:0.973 alpha:1.000];
@interface SalesInputViewController ()<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate>
@property (nonatomic, strong) UITableView *tableView;
......@@ -93,7 +82,7 @@
}
if (self.shop == nil) {
[self.topView setShopName:@""];
[self.topView setShopName:@"请选择店铺"];
}else{
[self.topView setShopName:[NSString stringWithFormat:@"%@【%@】", self.shop.name, self.shop.code]];
}
......@@ -347,21 +336,17 @@ ON_WILL_APPEAR( signal )
}
- (void)countTotalMonney {
CGFloat count = 0;
NSDecimalNumber *count = [NSDecimalNumber decimalNumberWithString:@"0"];
for (NSIndexPath *obj in self.cellDataDic.allKeys) {
NSArray *array = [self.cellDataDic objectForKey:obj];
CGFloat monney = [array[0] floatValue];
count = count + monney;
count = [CalculateHelper calculateNum1:count num2:array[0] type:CalculateTypeAdd roundingType:NSRoundBankers cutLenth:2];
}
self.totalView.labelTotal.text = [NSString stringWithFormat:@"%.0f",count];
self.totalView.labelTotal.text = [count stringValue];
self.totalView.labelTotalAmount.text = [NSString stringWithFormat:@"%.0f", count + [self.todayTotalAmount floatValue]];
self.totalView.labelTotalAmount.text = [[CalculateHelper calculateNum1:count num2:self.todayTotalAmount type:CalculateTypeAdd roundingType:NSRoundBankers cutLenth:2] stringValue];
}
- (id)viewWithNibName:(NSString *)viewName {
NSArray* nibView = [[NSBundle mainBundle] loadNibNamed:viewName owner:nil options:nil];
return [nibView objectAtIndex:0];
......@@ -430,15 +415,16 @@ ON_WILL_APPEAR( signal )
ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
NSString *string = [NSString stringWithFormat:@"attachment/upload_by_file?entity_type=%@&entity_uuid=%@",@"salesInput",[NSString stringWithFormat:@"%@%@",self.shop.code, self.topView.textfieldDate.text]];
WS(weakSelf);
[self.arrPics removeLastObject];
[httpCtrl POST:string pictures:self.arrPics param:nil complete:^(id responseObject, NSError *error) {
NSMutableArray *pics = [self.arrPics mutableCopy];
[pics removeLastObject];
[httpCtrl POST:string pictures:pics param:nil complete:^(id responseObject, NSError *error) {
NSMutableArray *arrUuid = [NSMutableArray array];
for (NSDictionary *data in responseObject[@"data"]) {
[arrUuid addObject:data[@"uuid"]];
}
NSString *entityUuid = responseObject[@"data"][0][@"entityUuid"];
ICRHTTPController *httpCtrl = [ICRHTTPController sharedController];
NSDictionary *params = [weakSelf getParamsAttachmentUuid:entityUuid pictureUuids:arrUuid];
NSDictionary *params = [weakSelf getParamsAttachmentUuid:[NSString stringWithFormat:@"%@%@",weakSelf.shop.code, weakSelf.topView.textfieldDate.text] pictureUuids:arrUuid];
NSString *url = [NSString stringWithFormat:@"salesinput/submit?time=%@&operId=%@&operName=%@",[[NSDate date] httpParameterString], [[[VankeCommonModel sharedInstance] getLoginInfo] user_uuid], [[[VankeCommonModel sharedInstance] getLoginInfo] user_name]];
NSString *utf8String = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
......@@ -468,19 +454,29 @@ ON_WILL_APPEAR( signal )
PaymentTypeModel *model = self.arrPaymentType[i];
NSDictionary *pay = @{@"payment" : model.name,
@"sortNumber" : model.sortNumber,
@"transactions" : [NSNumber numberWithFloat: [bill floatValue]],
@"amount" : [NSNumber numberWithFloat: [amount floatValue]]};
@"transactions" : [NSDecimalNumber decimalNumberWithString:bill],
@"amount" : [NSDecimalNumber decimalNumberWithString:amount]};
[lines addObject:pay];
}
NSDictionary *myDictionary = @{@"projectId" : self.authorizedOrg.code,
@"shopCode" : self.shop.code,
@"shopName" : self.shop.name,
@"salesDate" : self.topView.textfieldDate.text,
@"attachments" : pictures ? pictures : [NSNull null],
@"attachmentUuid" : attachmentUuid ? attachmentUuid : [NSNull null],
@"lines" : lines};
NSDictionary *myDictionary;
if (attachmentUuid) {
myDictionary = @{@"projectId" : self.authorizedOrg.code,
@"shopCode" : self.shop.code,
@"shopName" : self.shop.name,
@"salesDate" : self.topView.textfieldDate.text,
@"attachments" : pictures,
@"attachmentUuid" : attachmentUuid ? attachmentUuid : [NSNull null],
@"lines" : lines};
}else{
myDictionary = @{@"projectId" : self.authorizedOrg.code,
@"shopCode" : self.shop.code,
@"shopName" : self.shop.name,
@"salesDate" : self.topView.textfieldDate.text,
@"lines" : lines};
}
return myDictionary;
}
......
vanke/view_iPhone/templates/salesInput/View/GalleryCollectionViewCell.m
View file @ 990cc969
......@@ -23,7 +23,7 @@
- (void)setUpCellWithModel:(AttachmentModel *)model {
NSString *imageUrl;
if (model.fileUrl.length < 3) {
imageUrl = @"inspect_result_noupload";
imageUrl = @"floor-def";
}else{
imageUrl = [NSString stringWithFormat:@"%@%@",VANKE_SERVER_MEDIA_BASE_URL, model.fileUrl];
}
......
vanke/view_iPhone/templates/statements/Statement.storyboard
View file @ 990cc969
......@@ -204,10 +204,11 @@
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zqy-Jj-Iug">
<rect key="frame" x="189" y="0.0" width="186" height="135"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="共0家" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lKf-LH-THs">
<rect key="frame" x="4" y="4" width="47" height="25"/>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lKf-LH-THs">
<rect key="frame" x="4" y="4" width="2" height="25"/>
<constraints>
<constraint firstAttribute="height" constant="25" id="7Bl-NY-SSV"/>
<constraint firstAttribute="width" constant="2" id="VZe-yB-dfk"/>
<constraint firstAttribute="height" constant="21" id="ZeM-3H-z5T"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
......@@ -228,8 +229,8 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="252" text="已缴:253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bf-tO-CaQ">
<rect key="frame" x="4" y="64" width="154" height="36"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="252" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bf-tO-CaQ">
<rect key="frame" x="40" y="64" width="118" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -243,8 +244,8 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="未缴:253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xYD-uh-jS6">
<rect key="frame" x="4" y="100" width="154" height="35"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xYD-uh-jS6">
<rect key="frame" x="40" y="100" width="118" height="35"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.92941176469999998" green="0.1058823529" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -258,8 +259,8 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="60.00%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7wc-Tg-iC6">
<rect key="frame" x="60" y="6" width="127" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="0.00%" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7wc-Tg-iC6">
<rect key="frame" x="70" y="6" width="117" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="yJE-JC-DRq"/>
</constraints>
......@@ -267,11 +268,11 @@
<color key="textColor" red="0.25098039220000001" green="0.50196078430000002" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EGs-m2-n8k">
<rect key="frame" x="55" y="6" width="5" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="缴款率:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EGs-m2-n8k">
<rect key="frame" x="4" y="6" width="66" height="21"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="H9f-em-mxz"/>
<constraint firstAttribute="width" constant="5" id="Hat-py-scU"/>
<constraint firstAttribute="width" constant="66" id="Hat-py-scU"/>
<constraint firstAttribute="height" constant="25" id="IY4-v9-MLO"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
......@@ -284,20 +285,39 @@
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="应缴:1253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iAE-TG-QRU">
<rect key="frame" x="4" y="29" width="154" height="35"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iAE-TG-QRU">
<rect key="frame" x="40" y="29" width="118" height="35"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="应缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EBJ-aN-TEm">
<rect key="frame" x="4" y="37" width="37" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="已缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="af3-nd-7ld">
<rect key="frame" x="4" y="72" width="37" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="未缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R4u-zP-TdS">
<rect key="frame" x="4" y="108" width="37" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.92941176469999998" green="0.1058823529" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="lKf-LH-THs" firstAttribute="top" secondItem="Zqy-Jj-Iug" secondAttribute="top" constant="4" id="2mk-OS-LjG"/>
<constraint firstItem="OLq-gm-qMR" firstAttribute="leading" secondItem="1bf-tO-CaQ" secondAttribute="trailing" constant="1" id="3L7-ig-ksv"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="centerY" secondItem="Zqy-Jj-Iug" secondAttribute="centerY" constant="15" id="6lI-ZA-ziN"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" id="9tf-qH-bf1"/>
<constraint firstItem="EBJ-aN-TEm" firstAttribute="centerY" secondItem="iAE-TG-QRU" secondAttribute="centerY" id="A9m-lF-0Qv"/>
<constraint firstAttribute="bottom" secondItem="xYD-uh-jS6" secondAttribute="bottom" constant="5" id="AX7-jL-Qbm"/>
<constraint firstItem="lKf-LH-THs" firstAttribute="leading" secondItem="iAE-TG-QRU" secondAttribute="leading" id="B5a-ZF-WY7"/>
<constraint firstItem="lKf-LH-THs" firstAttribute="leading" secondItem="iAE-TG-QRU" secondAttribute="leading" constant="-36" id="B5a-ZF-WY7"/>
<constraint firstItem="xYD-uh-jS6" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" id="CsO-3w-Yw6"/>
<constraint firstAttribute="trailing" secondItem="Yxo-8I-MDG" secondAttribute="trailing" constant="8" id="DZT-Xd-WKy"/>
<constraint firstItem="iAE-TG-QRU" firstAttribute="centerY" secondItem="Zqy-Jj-Iug" secondAttribute="centerY" id="Fi6-it-fMZ"/>
......@@ -306,24 +326,29 @@
<constraint firstItem="xYD-uh-jS6" firstAttribute="top" secondItem="1bf-tO-CaQ" secondAttribute="bottom" id="KFM-RY-WoR"/>
<constraint firstItem="7wc-Tg-iC6" firstAttribute="leading" secondItem="EGs-m2-n8k" secondAttribute="trailing" id="KZt-ml-xMZ"/>
<constraint firstItem="EGs-m2-n8k" firstAttribute="centerY" secondItem="7wc-Tg-iC6" secondAttribute="centerY" id="M3J-LG-STi"/>
<constraint firstItem="af3-nd-7ld" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" constant="4" id="RLq-3n-wXc"/>
<constraint firstAttribute="trailing" secondItem="cmV-Nl-JTX" secondAttribute="trailing" constant="8" id="TGY-uO-pmu"/>
<constraint firstItem="Yxo-8I-MDG" firstAttribute="centerY" secondItem="iAE-TG-QRU" secondAttribute="centerY" id="TSa-8P-aow"/>
<constraint firstItem="7wc-Tg-iC6" firstAttribute="centerY" secondItem="lKf-LH-THs" secondAttribute="centerY" id="Tz2-VF-eoi"/>
<constraint firstItem="EBJ-aN-TEm" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" constant="4" id="V4f-lk-qqS"/>
<constraint firstItem="cmV-Nl-JTX" firstAttribute="centerY" secondItem="xYD-uh-jS6" secondAttribute="centerY" id="W2v-nY-YID"/>
<constraint firstItem="af3-nd-7ld" firstAttribute="centerY" secondItem="1bf-tO-CaQ" secondAttribute="centerY" id="X2s-ez-gS0"/>
<constraint firstItem="OLq-gm-qMR" firstAttribute="centerY" secondItem="1bf-tO-CaQ" secondAttribute="centerY" id="Y0A-4e-22c"/>
<constraint firstAttribute="trailing" secondItem="7wc-Tg-iC6" secondAttribute="trailing" id="YRV-NE-L8T"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="height" secondItem="iAE-TG-QRU" secondAttribute="height" id="YpG-xA-2Jv"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="height" secondItem="iAE-TG-QRU" secondAttribute="height" constant="1" id="YpG-xA-2Jv"/>
<constraint firstAttribute="bottom" secondItem="xYD-uh-jS6" secondAttribute="bottom" id="ZBs-mr-2Rv"/>
<constraint firstItem="xYD-uh-jS6" firstAttribute="leading" secondItem="1bf-tO-CaQ" secondAttribute="leading" id="axv-MT-miv"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="top" secondItem="iAE-TG-QRU" secondAttribute="bottom" id="c6L-6e-EQg"/>
<constraint firstItem="iAE-TG-QRU" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" constant="4" id="dQa-vc-AiD"/>
<constraint firstItem="iAE-TG-QRU" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" constant="40" id="dQa-vc-AiD"/>
<constraint firstItem="Yxo-8I-MDG" firstAttribute="leading" secondItem="iAE-TG-QRU" secondAttribute="trailing" constant="1" id="eCw-DO-M8i"/>
<constraint firstItem="R4u-zP-TdS" firstAttribute="leading" secondItem="Zqy-Jj-Iug" secondAttribute="leading" constant="4" id="g1L-9k-nNF"/>
<constraint firstItem="1bf-tO-CaQ" firstAttribute="leading" secondItem="iAE-TG-QRU" secondAttribute="leading" id="l4R-Y0-UVp"/>
<constraint firstItem="xYD-uh-jS6" firstAttribute="height" secondItem="iAE-TG-QRU" secondAttribute="height" id="mkx-dC-DZf"/>
<constraint firstItem="EGs-m2-n8k" firstAttribute="leading" secondItem="lKf-LH-THs" secondAttribute="trailing" constant="4" id="mxC-gY-Gly"/>
<constraint firstItem="EGs-m2-n8k" firstAttribute="leading" secondItem="lKf-LH-THs" secondAttribute="trailing" constant="-2" id="mxC-gY-Gly"/>
<constraint firstItem="EGs-m2-n8k" firstAttribute="height" secondItem="7wc-Tg-iC6" secondAttribute="height" id="sCG-y6-gSx"/>
<constraint firstItem="xYD-uh-jS6" firstAttribute="top" secondItem="1bf-tO-CaQ" secondAttribute="bottom" constant="4" id="t0g-tj-V0H"/>
<constraint firstAttribute="trailing" secondItem="7wc-Tg-iC6" secondAttribute="trailing" id="tkQ-ZG-9fa"/>
<constraint firstItem="R4u-zP-TdS" firstAttribute="centerY" secondItem="xYD-uh-jS6" secondAttribute="centerY" id="xaI-Ld-Cwe"/>
<constraint firstItem="iAE-TG-QRU" firstAttribute="top" secondItem="lKf-LH-THs" secondAttribute="bottom" id="xpv-Mi-7V7"/>
</constraints>
<variation key="default">
......@@ -688,8 +713,8 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="应缴:22253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eJv-sv-XDs">
<rect key="frame" x="5" y="34" width="153" height="34"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eJv-sv-XDs">
<rect key="frame" x="42" y="34" width="116" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="IY4-HW-dzZ"/>
</constraints>
......@@ -702,8 +727,8 @@
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="未缴:253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QgT-zZ-E08">
<rect key="frame" x="5" y="101" width="153" height="34"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QgT-zZ-E08">
<rect key="frame" x="42" y="101" width="116" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="jPt-o7-riX"/>
</constraints>
......@@ -716,52 +741,72 @@
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="已缴:253623.90" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7SS-iX-tyV">
<rect key="frame" x="5" y="68" width="153" height="33"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="缴款率:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Glk-rK-jEl">
<rect key="frame" x="5" y="0.0" width="56" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="21" id="9ge-AY-vga"/>
<constraint firstAttribute="height" constant="41" id="etL-HG-Fo7"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="9ge-AY-vga"/>
<exclude reference="etL-HG-Fo7"/>
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="缴款率:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Glk-rK-jEl">
<rect key="frame" x="5" y="0.0" width="56" height="34"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00%" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BWq-Ig-eYR">
<rect key="frame" x="61" y="0.0" width="48" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="etL-HG-Fo7"/>
<constraint firstAttribute="height" constant="41" id="NhJ-JI-C1E"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="etL-HG-Fo7"/>
<exclude reference="NhJ-JI-C1E"/>
</mask>
</variation>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="34%" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BWq-Ig-eYR">
<rect key="frame" x="61" y="0.0" width="34" height="34"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="应缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XvZ-L3-Qxb">
<rect key="frame" x="4" y="40" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="已缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K2k-F7-4cH">
<rect key="frame" x="4" y="74" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="未缴:" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xwx-ii-Mth">
<rect key="frame" x="4" y="108" width="39" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.92941176469999998" green="0.1058823529" blue="0.13725490200000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7SS-iX-tyV">
<rect key="frame" x="42" y="68" width="116" height="33"/>
<constraints>
<constraint firstAttribute="height" constant="41" id="NhJ-JI-C1E"/>
<constraint firstAttribute="height" constant="21" id="9ge-AY-vga"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.25098040700000002" green="0.50196081400000003" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<variation key="default">
<mask key="constraints">
<exclude reference="NhJ-JI-C1E"/>
<exclude reference="9ge-AY-vga"/>
</mask>
</variation>
</label>
</subviews>
<constraints>
<constraint firstItem="daL-Yf-tTB" firstAttribute="centerY" secondItem="QgT-zZ-E08" secondAttribute="centerY" id="0FM-qi-RsA"/>
<constraint firstItem="K2k-F7-4cH" firstAttribute="centerY" secondItem="7SS-iX-tyV" secondAttribute="centerY" id="1EE-WN-PlI"/>
<constraint firstItem="QgT-zZ-E08" firstAttribute="leading" secondItem="eJv-sv-XDs" secondAttribute="leading" id="2GU-ps-iTu"/>
<constraint firstItem="XvZ-L3-Qxb" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" constant="4" id="2kd-6s-aHP"/>
<constraint firstItem="jyd-PI-c1m" firstAttribute="top" secondItem="Glk-rK-jEl" secondAttribute="bottom" id="2qu-Ns-ugW"/>
<constraint firstItem="eJv-sv-XDs" firstAttribute="centerY" secondItem="jZY-CC-1TB" secondAttribute="centerY" id="2t8-n4-qhY"/>
<constraint firstItem="BWq-Ig-eYR" firstAttribute="height" secondItem="Glk-rK-jEl" secondAttribute="height" id="3jW-of-ext"/>
......@@ -770,9 +815,11 @@
<constraint firstItem="daL-Yf-tTB" firstAttribute="leading" secondItem="QgT-zZ-E08" secondAttribute="trailing" constant="1" id="Aen-hb-7K7"/>
<constraint firstItem="QgT-zZ-E08" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" id="Dob-X6-Kj0"/>
<constraint firstItem="eJv-sv-XDs" firstAttribute="top" secondItem="Glk-rK-jEl" secondAttribute="bottom" id="H93-Ot-cCq"/>
<constraint firstItem="K2k-F7-4cH" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" constant="4" id="HF1-ws-Dl5"/>
<constraint firstItem="QgT-zZ-E08" firstAttribute="height" secondItem="eJv-sv-XDs" secondAttribute="height" id="HXC-He-CPE"/>
<constraint firstItem="XvZ-L3-Qxb" firstAttribute="centerY" secondItem="eJv-sv-XDs" secondAttribute="centerY" constant="-1" id="I1u-gw-UK2"/>
<constraint firstAttribute="bottom" secondItem="QgT-zZ-E08" secondAttribute="bottom" constant="5" id="J4g-bf-ln9"/>
<constraint firstItem="Glk-rK-jEl" firstAttribute="leading" secondItem="eJv-sv-XDs" secondAttribute="leading" id="Mai-Hk-3Fr"/>
<constraint firstItem="Glk-rK-jEl" firstAttribute="leading" secondItem="eJv-sv-XDs" secondAttribute="leading" constant="-37" id="Mai-Hk-3Fr"/>
<constraint firstAttribute="bottom" secondItem="QgT-zZ-E08" secondAttribute="bottom" id="N8h-ED-7kA"/>
<constraint firstAttribute="trailing" secondItem="daL-Yf-tTB" secondAttribute="trailing" constant="8" id="TuY-sp-1IN"/>
<constraint firstItem="7SS-iX-tyV" firstAttribute="centerY" secondItem="jZY-CC-1TB" secondAttribute="centerY" constant="5" id="Vn2-vv-KKi"/>
......@@ -785,10 +832,12 @@
<constraint firstItem="7SS-iX-tyV" firstAttribute="top" secondItem="eJv-sv-XDs" secondAttribute="bottom" id="fFh-Sz-yLG"/>
<constraint firstItem="BWq-Ig-eYR" firstAttribute="leading" secondItem="Glk-rK-jEl" secondAttribute="trailing" id="g3Z-G8-Guw"/>
<constraint firstItem="eJv-sv-XDs" firstAttribute="top" secondItem="jZY-CC-1TB" secondAttribute="top" constant="30" id="it3-ds-Dx4"/>
<constraint firstItem="eJv-sv-XDs" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" constant="5" id="mPx-L9-FYr"/>
<constraint firstItem="Xwx-ii-Mth" firstAttribute="centerY" secondItem="QgT-zZ-E08" secondAttribute="centerY" id="lqQ-nP-o9t"/>
<constraint firstItem="eJv-sv-XDs" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" constant="42" id="mPx-L9-FYr"/>
<constraint firstItem="jyd-PI-c1m" firstAttribute="leading" secondItem="eJv-sv-XDs" secondAttribute="trailing" constant="1" id="oNt-fe-HiL"/>
<constraint firstItem="QgT-zZ-E08" firstAttribute="top" secondItem="7SS-iX-tyV" secondAttribute="bottom" id="pjl-bP-ivR"/>
<constraint firstItem="7SS-iX-tyV" firstAttribute="height" secondItem="eJv-sv-XDs" secondAttribute="height" id="s6A-Jy-qof"/>
<constraint firstItem="7SS-iX-tyV" firstAttribute="height" secondItem="eJv-sv-XDs" secondAttribute="height" constant="-1" id="s6A-Jy-qof"/>
<constraint firstItem="Xwx-ii-Mth" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" constant="4" id="sJ2-ve-C7i"/>
<constraint firstItem="Trd-Yd-Gm3" firstAttribute="leading" secondItem="7SS-iX-tyV" secondAttribute="trailing" constant="1" id="sWy-Wi-Uwi"/>
<constraint firstItem="7SS-iX-tyV" firstAttribute="leading" secondItem="jZY-CC-1TB" secondAttribute="leading" id="tF3-4D-MC7"/>
<constraint firstAttribute="trailing" secondItem="jyd-PI-c1m" secondAttribute="trailing" constant="8" id="v2e-PC-nBI"/>
......
vanke/view_iPhone/templates/statements/ViewControllers/StatementDetailViewController.m
View file @ 990cc969
......@@ -43,12 +43,16 @@
- (void)viewDidLoad {
[super viewDidLoad];
self.title = self.record.shopName;
NSDate *selectStart = [self getDateFromString:self.startDate];
NSDate *selectEnd = [self getDateFromString:self.endDate];
[self setStart:selectStart];
[self setEnd:selectEnd];
self.textFieldStart.delegate = self;
self.textFieldEnd.delegate = self;
self.tableView.emptyDataSetSource = self;
self.tableView.emptyDataSetDelegate = self;
self.tableView.tableFooterView = [UIView new];
[self setUpDatePicker];
[self setUpData];
}
......@@ -99,10 +103,10 @@
[[ICRHTTPController sharedController] getUrl:url params:nil success:^(id data) {
NSDictionary *dic = data;
weakSelf.detailModel = [StatementDetailModel modelObjectWithDictionary:dic[@"data"]];
weakSelf.title = weakSelf.detailModel.shopName;
weakSelf.labelShoudPay.text = [NSString stringWithFormat:@"应缴:%.2f", weakSelf.detailModel.amount];
weakSelf.labelPaid.text = [NSString stringWithFormat:@"已缴:%.2f",weakSelf.detailModel.paid];
weakSelf.labelUnpaid.text = [NSString stringWithFormat:@"未缴:%.2f",weakSelf.detailModel.unpaid];
weakSelf.labelShoudPay.text = [NSString stringWithFormat:@"%.2f", weakSelf.detailModel.amount];
weakSelf.labelPaid.text = [NSString stringWithFormat:@"%.2f",weakSelf.detailModel.paid];
weakSelf.labelUnpaid.text = [NSString stringWithFormat:@"%.2f",weakSelf.detailModel.unpaid];
//缴款率
NSString *paidRate = [CalculateHelper getPercent:[NSNumber numberWithDouble:weakSelf.detailModel.paid] num:[NSNumber numberWithDouble:weakSelf.detailModel.amount]];
......@@ -155,6 +159,9 @@
return animation;
}
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView {
return -100;
}
#pragma mark - textfield delegate
- (void)textFieldDidEndEditing:(UITextField *)textField {
......
vanke/view_iPhone/templates/statements/ViewControllers/StatementViewController.m
View file @ 990cc969
......@@ -43,7 +43,7 @@
@property (weak, nonatomic) IBOutlet UILabel *labelFinishMonth;
@property (weak, nonatomic) IBOutlet UISearchBar *searchBar;
@property (nonatomic, strong) NSArray *arrFilter;
@property (nonatomic, strong) NSMutableArray *arrClear;
@property (nonatomic, strong) NSMutableArray *arrUnClear;
@property (weak, nonatomic) IBOutlet UIButton *btnIsClear;
......@@ -62,13 +62,15 @@
- (void)viewDidLoad {
[super viewDidLoad];
[[VankeAppBoard_iPhone sharedInstance] hideMenu];
self.btnIsClear.selected = YES;
[self setDefaults];
[self setUpDatePicker];
self.paramModel = [[StatementListParamModel alloc] init];
self.title = @"商铺对账单";
self.tableView.emptyDataSetSource = self;
self.tableView.emptyDataSetDelegate = self;
self.paramModel.pageSize = 999;
self.tableView.tableFooterView = [UIView new];
self.paramModel.pageSize = 9999;
self.paramModel.pageNumber = 0;
[self setUpData];
// Do any additional setup after loading the view.
......@@ -102,8 +104,48 @@
- (IBAction)showSettleShop:(UIButton *)sender {
sender.selected = !sender.isSelected;
[self.tableView reloadData];
[self calculateTop];
}
/** 计算顶部 */
- (void)calculateTop {
NSDecimalNumber *totalPaid = nil;
NSDecimalNumber *totalUpPaid = nil;
NSDecimalNumber *totalAmount = nil;
if (self.searchBar.text.length > 0) {
for (int i = 0; i < self.arrFilter.count; i++) {
StatementRecords *record = self.arrFilter[i];
totalPaid = [CalculateHelper calculateNum1:totalPaid num2:[NSNumber numberWithDouble:record.paid] type:CalculateTypeAdd];
totalUpPaid = [CalculateHelper calculateNum1:totalUpPaid num2:[NSNumber numberWithDouble:record.unpaid] type:CalculateTypeAdd];
totalAmount = [CalculateHelper calculateNum1:totalAmount num2:[NSNumber numberWithDouble:record.amount] type:CalculateTypeAdd];
}
}else if(!self.btnIsClear.isSelected){
for (int i = 0; i < self.arrUnClear.count; i++) {
StatementRecords *record = self.arrUnClear[i];
totalPaid = [CalculateHelper calculateNum1:totalPaid num2:[NSNumber numberWithDouble:record.unpaid] type:CalculateTypeAdd];
totalUpPaid = [CalculateHelper calculateNum1:totalUpPaid num2:[NSNumber numberWithDouble:record.unpaid] type:CalculateTypeAdd];
totalAmount = [CalculateHelper calculateNum1:totalAmount num2:[NSNumber numberWithDouble:record.amount] type:CalculateTypeAdd];
}
}else{
self.labelTotalShouldPay.text = [CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:self.statementModel.amount]];
self.labelTotalPaidIn.text = [CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:self.statementModel.paidTotal]];
self.labelTotalUnPaid.text = [CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:self.statementModel.unpaidTotal]];
self.labelTotalPaidPercent.text = [CalculateHelper getPercent:[NSNumber numberWithDouble:self.statementModel.paidTotal] num:[NSNumber numberWithDouble:self.statementModel.amount]];
return;
}
self.labelTotalShouldPay.text = [CalculateHelper getMoneyStringFrom:totalAmount];
self.labelTotalPaidIn.text = [CalculateHelper getMoneyStringFrom:totalPaid];
self.labelTotalUnPaid.text = [CalculateHelper getMoneyStringFrom:totalUpPaid];
self.labelTotalPaidPercent.text = [CalculateHelper getPercent:totalPaid num:totalAmount];
}
#pragma mark - SRMonthPickerDelegate
- (void)monthPickerDidChangeDate:(SRMonthPicker *)monthPicker {
NSString *strDate = [monthPicker.date stringWithFormatter:@"%Y%m"];
......@@ -131,12 +173,14 @@
- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
NSPredicate *pred = [NSPredicate predicateWithFormat:@"shopName contains [cd] %@ OR shopCode contains [cd] %@", searchText, searchText];
self.arrFilter = [self.statementModel.records filteredArrayUsingPredicate:pred];
[self calculateTop];
[self.tableView reloadData];
}
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
searchBar.showsCancelButton = NO;
searchBar.text = nil;
[self calculateTop];
[self.tableView reloadData];
HIDE_KEYBOARD;
}
......@@ -149,25 +193,25 @@
/** 网络请求 */
- (void)setUpData {
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
NSString *url = [NSString stringWithFormat:@"statement/query/%@~%@?authorizedOrgIn=%@&pageNumber=%@&pageSize=%@", self.startDate, self.endDate, self.org.code, @0, @999];
NSString *url = [NSString stringWithFormat:@"statement/query/%@~%@?authorizedOrgIn=%@&pageNumber=%@&pageSize=%@", self.startDate, self.endDate, self.org.code, @0, @9999];
WS(weakSelf);
[[ICRHTTPController sharedController] getUrl:url params:nil success:^(id data) {
NSDictionary *dict = data;
CLog(@"%@", dict.JSONString);
[IBTLoadingView showTips:data[@"message"]];
weakSelf.statementModel = [StatementModel modelObjectWithDictionary:dict[@"data"]];
weakSelf.labelTotalShop.text = [NSString stringWithFormat:@"共%@家",[NSNumber numberWithDouble:weakSelf.statementModel.paging.recordCount]];
weakSelf.labelTotalShouldPay.text = [NSString stringWithFormat:@"应缴:%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:weakSelf.statementModel.amount]]];
weakSelf.labelTotalPaidIn.text = [NSString stringWithFormat:@"已缴:%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:weakSelf.statementModel.paidTotal]]];
weakSelf.labelTotalUnPaid.text = [NSString stringWithFormat:@"未缴:%@",[CalculateHelper getMoneyStringFrom:[NSNumber numberWithDouble:weakSelf.statementModel.unpaidTotal]]];
// weakSelf.labelTotalShop.text = [NSString stringWithFormat:@"共%@家",[NSNumber numberWithDouble:weakSelf.statementModel.paging.recordCount]];
[weakSelf calculateTop];
weakSelf.labelTotalPaidPercent.text = [CalculateHelper getPercent:[NSNumber numberWithDouble:weakSelf.statementModel.paidTotal] num:[NSNumber numberWithDouble:weakSelf.statementModel.amount]];
[weakSelf.tableView reloadData];
[weakSelf.arrUnClear removeAllObjects];
for (StatementRecords *records in weakSelf.statementModel.records) {
if (records.unpaid == 0) {
[weakSelf.arrClear addObject:records];
if (records.unpaid != 0) {
[weakSelf.arrUnClear addObject:records];
}
}
[hud hide:YES];
} failure:^(id data) {
[hud hide:YES];
......@@ -175,25 +219,25 @@
}
#pragma mark - tableView DataSource
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if (self.searchBar.isFirstResponder) {
if (self.searchBar.text.length > 0) {
return self.arrFilter.count;
}else if(self.btnIsClear.isSelected){
return self.arrClear.count;
}else if(!self.btnIsClear.isSelected){
return self.arrUnClear.count;
}else{
return self.statementModel.records.count;
}
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
StatementTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"StatementCell" forIndexPath:indexPath];
if (self.searchBar.isFirstResponder) {
if (self.searchBar.text.length > 0) {
[cell setUpCellWithArray:self.arrFilter index:indexPath];
}else if(self.btnIsClear.isSelected){
[cell setUpCellWithArray:self.arrClear index:indexPath];
}else if(!self.btnIsClear.isSelected){
[cell setUpCellWithArray:self.arrUnClear index:indexPath];
}else{
[cell setUpCellWithArray:self.statementModel.records index:indexPath];
}
......@@ -208,13 +252,14 @@
StatementDetailViewController *detailVC = [self controllerWithIdentifier:@"StatementDetailViewController"];
detailVC.startDate = self.startDate;
detailVC.endDate = self.endDate;
if (self.searchBar.isFirstResponder) {
if (self.searchBar.text.length > 0) {
detailVC.record = self.arrFilter[indexPath.row];
}else if(self.btnIsClear.isSelected){
detailVC.record = self.arrClear[indexPath.row];
}else if(!self.btnIsClear.isSelected){
detailVC.record = self.arrUnClear[indexPath.row];
}else{
detailVC.record = self.statementModel.records[indexPath.row];
}
[self.navigationController pushViewController:detailVC animated:YES];
}
......@@ -234,7 +279,7 @@
animation.fromValue = [NSValue valueWithCATransform3D:CATransform3DIdentity];
animation.toValue = [NSValue valueWithCATransform3D:CATransform3DMakeRotation(M_PI_2, 0.0, 0.0, 1.0)];
animation.duration = 0.25;
animation.duration = 1;
animation.cumulative = YES;
animation.repeatCount = MAXFLOAT;
......@@ -247,11 +292,11 @@
#pragma mark - lazyloading
- (NSMutableArray *)arrClear {
if (!_arrClear) {
_arrClear = [NSMutableArray array];
- (NSMutableArray *)arrUnClear {
if (!_arrUnClear) {
_arrUnClear = [NSMutableArray array];
}
return _arrClear;
return _arrUnClear;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
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