Commit b6648fe0 authored by 陈俊俊's avatar 陈俊俊

no message

parent 3e5a97d7
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
// //
#import "SeePurchaseNoticeViewController.h" #import "SeePurchaseNoticeViewController.h"
#import "ProductBillViewController.h"
#import "PurchaseBillProduct.h"
#import "NewPurchaseViewController.h" #import "NewPurchaseViewController.h"
#import "NoticeProduct.h" #import "NoticeProduct.h"
#import "PurchaseNoticeCell.h" #import "PurchaseNoticeCell.h"
...@@ -39,7 +37,6 @@ typedef enum : NSUInteger { ...@@ -39,7 +37,6 @@ typedef enum : NSUInteger {
UIScrollView *_scrollView; UIScrollView *_scrollView;
UIView *_purchaseView; UIView *_purchaseView;
UIView *_bottomView; UIView *_bottomView;
ProductBillViewController *_pvc;
NSArray *_leftArr; NSArray *_leftArr;
UIButton *_endBtn; UIButton *_endBtn;
UIButton *_rejectBtn; UIButton *_rejectBtn;
...@@ -85,7 +82,13 @@ typedef enum : NSUInteger { ...@@ -85,7 +82,13 @@ typedef enum : NSUInteger {
NSDictionary *dictData = data[@"data"]; NSDictionary *dictData = data[@"data"];
PurchaseNotice *purchaseNotice = [[PurchaseNotice alloc]init]; PurchaseNotice *purchaseNotice = [[PurchaseNotice alloc]init];
[purchaseNotice setValuesForKeysWithDictionary:dictData]; [purchaseNotice setValuesForKeysWithDictionary:dictData];
NSMutableArray *productArr = [NSMutableArray array];
for (NSDictionary *billDict in self.purchaseNotice.products) {
NoticeProduct *billProbuct = [NoticeProduct new];
[billProbuct setValuesForKeysWithDictionary:billDict];
[productArr addObject:billProbuct];
}
purchaseNotice.products = productArr;
self.purchaseNotice = purchaseNotice; self.purchaseNotice = purchaseNotice;
[strongSelf fetchtNoticeDetail]; [strongSelf fetchtNoticeDetail];
}else{ }else{
...@@ -120,14 +123,7 @@ typedef enum : NSUInteger { ...@@ -120,14 +123,7 @@ typedef enum : NSUInteger {
self.userLabel.text = [IBTCommon checkString:self.purchaseNotice.purchaserName]; self.userLabel.text = [IBTCommon checkString:self.purchaseNotice.purchaserName];
self.countLabel.text = [NSString stringWithFormat:@"%@",@"222"]; self.countLabel.text = [NSString stringWithFormat:@"%@",@"222"];
self.noteLabel.text = [IBTCommon checkString:self.purchaseNotice.remark]; self.noteLabel.text = [IBTCommon checkString:self.purchaseNotice.remark];
[_shopeArr addObjectsFromArray:self.purchaseNotice.products];
NSMutableArray *productArr = [NSMutableArray array];
for (NSDictionary *billDict in self.purchaseNotice.products) {
NoticeProduct *billProbuct = [NoticeProduct new];
[billProbuct setValuesForKeysWithDictionary:billDict];
[productArr addObject:billProbuct];
}
_shopeArr=productArr;
[mingXiTableView reloadData]; [mingXiTableView reloadData];
[self setNoteHeight]; [self setNoteHeight];
...@@ -142,8 +138,6 @@ typedef enum : NSUInteger { ...@@ -142,8 +138,6 @@ typedef enum : NSUInteger {
_scrollView.backgroundColor = XXFBgColor; _scrollView.backgroundColor = XXFBgColor;
[self.view addSubview:_scrollView]; [self.view addSubview:_scrollView];
[self createBtn]; [self createBtn];
// [self createBottomView];商品明细
[self createPurchaseView]; [self createPurchaseView];
[self createMingXiTableView];//自定义 [self createMingXiTableView];//自定义
...@@ -279,7 +273,7 @@ typedef enum : NSUInteger { ...@@ -279,7 +273,7 @@ typedef enum : NSUInteger {
{ {
_shopeArr=[[NSMutableArray alloc]initWithObjects: nil]; _shopeArr=[[NSMutableArray alloc]initWithObjects: nil];
selectCellAry=[[NSMutableArray alloc]initWithCapacity:1000]; selectCellAry=[[NSMutableArray alloc]initWithCapacity:1000];
mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_purchaseView.frame.size.height, ScreenSize.width, ScreenSize.height-_purchaseView.height-ScreenSize.height/5)]; mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_purchaseView.frame.size.height, ScreenSize.width, ScreenSize.height-_purchaseView.height-ScreenSize.height/5 )];
mingXiTableView.backgroundColor = [UIColor whiteColor]; mingXiTableView.backgroundColor = [UIColor whiteColor];
mingXiTableView.tag=1002; mingXiTableView.tag=1002;
mingXiTableView.bounces=NO; mingXiTableView.bounces=NO;
...@@ -330,19 +324,12 @@ typedef enum : NSUInteger { ...@@ -330,19 +324,12 @@ typedef enum : NSUInteger {
[footView3 addSubview:self.FootLabel]; [footView3 addSubview:self.FootLabel];
mingXiTableView.tableFooterView = footView3; mingXiTableView.tableFooterView = footView3;
mingXiTableView.tableHeaderView=footView2; mingXiTableView.tableHeaderView=footView2;
[self.view addSubview:mingXiTableView]; [_scrollView addSubview:mingXiTableView];
} }
- (void)createBottomView{ - (void)createBottomView{
_bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_purchaseView.frame) + TopMargin, ScreenSize.width, 200)]; _bottomView= [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(_purchaseView.frame) + TopMargin, ScreenSize.width, 200)];
_bottomView.backgroundColor = [UIColor whiteColor]; _bottomView.backgroundColor = [UIColor whiteColor];
[_scrollView addSubview:_bottomView]; [_scrollView addSubview:_bottomView];
_pvc = [[ProductBillViewController alloc]init];
[self addChildViewController:_pvc];
_pvc.viewFrame = _bottomView.bounds;
_pvc.isHiddenEdit = YES;
[_bottomView addSubview:_pvc.view];
} }
- (void)createPurchaseView{ - (void)createPurchaseView{
......
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