no message

XFFruit.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		0406BFE51B80A19D00DD65A7 /* NewPurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFE41B80A19D00DD65A7 /* NewPurchaseNoticeViewController.m */; };
 		0406BFE81B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFE71B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.m */; };
 		0406BFEE1B82C72200DD65A7 /* PurchaseNoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFED1B82C72200DD65A7 /* PurchaseNoticeCell.m */; };
+		04703FA41B8461AB00C72846 /* ShopDetaileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04703FA31B8461AB00C72846 /* ShopDetaileViewController.m */; };
 		300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; };
 		300DD94B1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; };
 		300DD94E1B184EA70080EE12 /* ICRQuestion.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD94D1B184EA70080EE12 /* ICRQuestion.m */; };
@@ -381,6 +382,8 @@
 		0406BFE71B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeePurchaseNoticeViewController.m; sourceTree = "<group>"; };
 		0406BFEC1B82C72200DD65A7 /* PurchaseNoticeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseNoticeCell.h; sourceTree = "<group>"; };
 		0406BFED1B82C72200DD65A7 /* PurchaseNoticeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseNoticeCell.m; sourceTree = "<group>"; };
+		04703FA21B8461AB00C72846 /* ShopDetaileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopDetaileViewController.h; sourceTree = "<group>"; };
+		04703FA31B8461AB00C72846 /* ShopDetaileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopDetaileViewController.m; sourceTree = "<group>"; };
 		1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 		300DD9481B184B450080EE12 /* ICRPatrolPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRPatrolPlan.h; sourceTree = "<group>"; };
 		300DD9491B184B450080EE12 /* ICRPatrolPlan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPatrolPlan.m; sourceTree = "<group>"; };
@@ -837,6 +840,8 @@
 			children = (
 				0406BFEC1B82C72200DD65A7 /* PurchaseNoticeCell.h */,
 				0406BFED1B82C72200DD65A7 /* PurchaseNoticeCell.m */,
+				04703FA21B8461AB00C72846 /* ShopDetaileViewController.h */,
+				04703FA31B8461AB00C72846 /* ShopDetaileViewController.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -2034,6 +2039,7 @@
 				72C803521B7B897B00990363 /* DataManager.m in Sources */,
 				C1C5643E1AD62BD8006A1050 /* ICRPlaceholderTextView.m in Sources */,
 				307059D21AF2211300E9DB8E /* ICRSyncCellContentView.m in Sources */,
+				04703FA41B8461AB00C72846 /* ShopDetaileViewController.m in Sources */,
 				0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */,
 				C1374F581B33C40D00594D19 /* IBTWebViewController.m in Sources */,
 				C159186B1AC1A03B0013B391 /* ICRSyncViewController.m in Sources */,

XFFruit/ViewControllers/PurchaseNotice/NewPurchaseNoticeViewController.m

@@ -15,6 +15,7 @@
 #import "SurveyUser.h"
 #import "Survey.h"
 #import "PurchaseNoticeCell.h"
+#import "ShopDetaileViewController.h"
 
 
 
@@ -28,6 +29,7 @@
 #define TotalHeight 432
 #define KeyboardHeight 258
 #define DateViewHeight 300
+#define FootOfsetHeight 140
 @interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate>
 {
     UITableView *_tableView;
@@ -38,7 +40,7 @@
     UILabel *_endDateLabel;
     UILabel *_personLabel;
     HPGrowingTextView *_noteTextView;
-    
+    NSIndexPath *selectedCellIndexPath;
     BOOL _isClickStart;
     
     
@@ -57,6 +59,10 @@
 @property (nonatomic,strong)NSString *remarkStr;
 @property (nonatomic,strong)NSMutableArray *users;
 @property (nonatomic,strong)Survey *survey;
+@property (nonatomic,strong)UILabel *HeardLabel;
+@property (nonatomic,strong)UILabel *FootLabel;
+@property (nonatomic,strong)UIButton *addDetailedButton;
+
 
 
 @end
@@ -73,55 +79,53 @@
     _dataArr=[[NSMutableArray alloc]initWithObjects:@"标题：",@"采购员：",@"备注：", nil];
     self.view.backgroundColor  = XXFBgColor;
     
-    _tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, LeftMargin,ScreenSize.width, ScreenSize.height/2 - 64 - LeftMargin)) style:(UITableViewStylePlain)];
+    _tableView = [[UITableView alloc]initWithFrame:(CGRectMake(0, LeftMargin,ScreenSize.width, ScreenSize.height/2 - FootOfsetHeight - LeftMargin)) style:(UITableViewStylePlain)];
     _tableView.backgroundColor = [UIColor whiteColor];
     _tableView.tag=1001;
     _tableView.bounces = NO;
     _tableView.delegate = self;
     _tableView.dataSource = self;
-    
-    
-    UIView *footView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
-    [self.view addSubview:footView];
-    _tableView.tableFooterView = footView;
-    [self.view addSubview:_tableView];
-    
-    
-    
-    
-    mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_tableView.frame.size.height, ScreenSize.width, ScreenSize.height-_tableView.height-64-LeftMargin)];
-     mingXiTableView.backgroundColor = [UIColor whiteColor];
+   
+    mingXiTableView=[[UITableView alloc]initWithFrame:CGRectMake(0, 2*LeftMargin+_tableView.frame.size.height, ScreenSize.width, ScreenSize.height-_tableView.height-TableHeight-LeftMargin)];
+    mingXiTableView.backgroundColor = [UIColor whiteColor];
     mingXiTableView.tag=1002;
-    mingXiTableView.bounces=YES;
+    mingXiTableView.bounces=NO;
     mingXiTableView.delegate=self;
     mingXiTableView.dataSource=self;
     
-    UIView *footView2 = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
-    footView2.backgroundColor=[UIColor whiteColor];
-    UIButton *button=[UIButton  buttonWithType: UIButtonTypeCustom];
-    [button  setFrame:CGRectMake(50, 5, 200, 30)];
-    [button setTitle:@"点击添加商品行情" forState:UIControlStateNormal];
-    [button setTitleColor:[UIColor grayColor] forState:UIControlStateNormal];
-//    button.alpha=0;
-    [footView2 addSubview:button];
-    UIView *footView3=[[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
-    footView3.backgroundColor=[UIColor whiteColor];
-    UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 50)];
-    lable.text=@"     商品  价格  包装规格   包装数量";
-    [footView3 addSubview:lable];
+    UIView *footView2=[[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, TableHeight)];
+    footView2.backgroundColor=[UIColor clearColor];
+    UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, TableHeight)];
+    lable.text=@"       商品      价格      包装规格      包装数量";
+    lable.textColor=HexColor(@"444444");
+    [footView2 addSubview:lable];
+    
+    UIView *footView3 = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, TableHeight)];
+    footView3.backgroundColor=[UIColor clearColor];
+    self.addDetailedButton=[UIButton  buttonWithType: UIButtonTypeCustom];
+    [self.addDetailedButton  setFrame:CGRectMake(90, 0, 200, TableHeight)];
+    [self.addDetailedButton setTitle:@"+ 点击添加商品明细" forState:UIControlStateNormal];
+    [self.addDetailedButton addTarget:self action:@selector(addShopeDetailed) forControlEvents:UIControlEventTouchUpInside];
+    [self.addDetailedButton setTitleColor:HexColor(@"444444") forState:UIControlStateNormal];
+    self.FootLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, footView3.size.height-1, footView3.size.width-2*LeftMargin, 1))];
+    self.FootLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.FootLabel.font = FontSize(TitleSize);
+    self.HeardLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, footView3.size.width-2*LeftMargin, 1))];
+    self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.HeardLabel.font = FontSize(TitleSize);
+    //HexColor(@"e5e5e5")
+
+    [footView3 addSubview:self.addDetailedButton];
+    [footView3 addSubview:self.HeardLabel];
+    [footView3 addSubview:self.FootLabel];
+    
     
-    [self.view addSubview:footView2];
-    [self.view addSubview:footView3];
-    mingXiTableView.tableFooterView = footView2;
-    mingXiTableView.tableHeaderView=footView3;
+
+    mingXiTableView.tableFooterView = footView3;
+    mingXiTableView.tableHeaderView=footView2;
+    [self.view addSubview:_tableView];
     [self.view addSubview:mingXiTableView];
-//    for (int i=0; i<3; i++) {
-//        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(10, 10+i*(30+30), 80, 30)];
-//        lable.font=FontSize(17);
-//        [lable setText:[array objectAtIndex:i]];
-//        [lable setTextColor:[UIColor blueColor] ];
-//        [self.view  addSubview:lable];
-//    }
+
 }
 
 #pragma mark - 协议方法
@@ -149,6 +153,7 @@
    
     static NSString *cellID = @"cellID";
     SurveyCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+        
     if (cell == nil) {
         cell = [[SurveyCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -169,11 +174,19 @@
             Cell = [[PurchaseNoticeCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellID];
             tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
             Cell.selectionStyle = UITableViewCellSelectionStyleNone;
-//            if (indexPath.row >0 && indexPath.row < _dataArr.count - 1) {
-//                cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
-//            }
-//            [self createViewInCell:cell indexPath:indexPath];
+//            Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;向左箭头
+
+        }
+        if(selectedCellIndexPath != nil&[selectedCellIndexPath compare:indexPath] == NSOrderedSame){
+            Cell.backgroundColor=XXFBgColor;
+            Cell.subSview.hidden=NO;
+        }else
+        {
+            Cell.subSview.hidden=YES;
+            Cell.backgroundColor=[UIColor whiteColor];
+           
         }
+        [Cell.button addTarget:self action:@selector(didtoucher) forControlEvents:UIControlEventTouchUpInside];
 //        [cell setTitleStr:_dataArr[indexPath.row]];
         return Cell;
 
@@ -190,6 +203,15 @@
         
     }else if ([tableView isEqual:mingXiTableView])
     {
+        
+        if(selectedCellIndexPath != nil&[selectedCellIndexPath compare:indexPath] == NSOrderedSame){
+           
+            
+            return TableHeight*3;
+        
+    }
+        
+        
         return TableHeight;
     }
     return TableHeight;
@@ -227,6 +249,16 @@
         cvc.isMoreChose = NO;
         [self PushViewController:cvc animated:YES];
     }
+    }else if ([tableView isEqual:mingXiTableView])
+    {
+        PurchaseNoticeCell *Cell=(PurchaseNoticeCell*)[mingXiTableView cellForRowAtIndexPath:indexPath ];
+        Cell.isSelected=YES;
+         selectedCellIndexPath = indexPath;
+
+//        [Cell setTitleStr:@"selected"];
+//        [tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject:indexPath]  withRowAnimation:UITableViewRowAnimationNone];
+       
+        [mingXiTableView reloadData];
     }
 }
 
@@ -298,7 +330,24 @@
         }
     }
 }
-
+//添加商品明细
+-(void)addShopeDetailed
+{
+    ShopDetaileViewController *svc = [[ShopDetaileViewController    alloc] init];
+    svc.title = [IBTCommon localizableString:@"AddShopDetail"];
+    [self PushViewController:svc animated:YES];
+    NSLog(@"1111111111");
+}
+//编辑
+- (void)didtoucher
+{
+//    EditorShopDetail
+    ShopDetaileViewController *svc = [[ShopDetaileViewController    alloc] init];
+    svc.title = [IBTCommon localizableString:@"EditorShopDetail"];
+    [self PushViewController:svc animated:YES];
+//
+    NSLog(@"123213232332323223");
+}
 #pragma mark delegate
 - (BOOL)growingTextViewShouldReturn:(HPGrowingTextView *)growingTextView{
     [_noteTextView resignFirstResponder];

XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.h

@@ -9,10 +9,15 @@
 #import <UIKit/UIKit.h>
 
 @interface PurchaseNoticeCell : UITableViewCell
+@property (nonatomic,strong)UILabel *HeardLabel;
+@property (nonatomic,strong)UILabel *FootLabel;
 @property (nonatomic,strong)UILabel *SpLabel;
 @property (nonatomic,strong)UILabel *DjLabel;
 @property (nonatomic,strong)UILabel *BzggLabel;
 @property (nonatomic,strong)UILabel *BzslLabel;
+@property (nonatomic,strong)UIView *subSview;
+@property (nonatomic, assign) BOOL isSelected;
+@property (nonatomic,strong)UIButton *button;
 
 
 - (void)setTitleStr:(NSString *)str;

XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.m

@@ -7,14 +7,19 @@
 //
 
 #import "PurchaseNoticeCell.h"
-#define TitleSize 15
+#define TitleSize 17
 #define LeftMargin 15
+#define TableHeight 46
+#define TableWidth 60
+
 @implementation PurchaseNoticeCell
 
 - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
     
     self =  [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
+        
+        self.isSelected=NO;
         [self bulidLayout];
     }
     return self;
@@ -22,31 +27,82 @@
 
 - (void)bulidLayout
 {
+    self.HeardLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, ScreenSize.width - LeftMargin * 2, 1))];
+    self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.HeardLabel.font = FontSize(TitleSize);
+    
+    self.FootLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, self.size.height-1, ScreenSize.width - LeftMargin * 2, 1))];
+    self.HeardLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.HeardLabel.font = FontSize(TitleSize);
     
-    self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, 50, 44))];
+    self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+20, 0, TableWidth, TableHeight))];
     self.SpLabel.textAlignment= NSTextAlignmentLeft;
     self.SpLabel.textColor = HexColor(@"666666");
     self.SpLabel.font = FontSize(TitleSize);
     
-    self.DjLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+80, 0,  60, 44))];
-    self.DjLabel.backgroundColor = HexColor(@"e5e5e5");
+    self.DjLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+80, 0,  TableWidth,TableHeight ))];
+    self.DjLabel.textAlignment= NSTextAlignmentLeft;
+    self.DjLabel.textColor = HexColor(@"666666");
     self.DjLabel.font = FontSize(TitleSize);
     
-    self.BzggLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+150, 0, 80, 44)];
-    self.BzslLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+260, 0, 60, 44)];
-    self.SpLabel.text=@"shangp";
-    self.DjLabel.text=@"asda";
-    self.BzggLabel.text=@"nnjj";
-    self.BzslLabel.text=@"sdad";
+    self.BzggLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+150, 0, TableWidth, TableHeight)];
+    self.BzggLabel.textAlignment= NSTextAlignmentLeft;
+    self.BzggLabel.textColor = HexColor(@"666666");
+    self.BzggLabel.font = FontSize(TitleSize);
+    
+    self.BzslLabel=[[UILabel alloc]initWithFrame:CGRectMake(LeftMargin+240, 0, TableWidth, TableHeight)];
+    self.BzslLabel.textAlignment= NSTextAlignmentLeft;
+    self.BzslLabel.textColor = HexColor(@"666666");
+    self.BzslLabel.font = FontSize(TitleSize);
+    
+    self.SpLabel.text=@"1 西瓜";
+    self.DjLabel.text=@"0.8";
+    self.BzggLabel.text=@"1*12";
+    self.BzslLabel.text=@"100框";
+    self.subSview=[[UIView alloc]initWithFrame:CGRectMake(0, 50, ScreenSize.width, TableHeight*3)];
+    
+   
+    
+    NSArray*array=[NSArray arrayWithObjects:@"包装规格",@"基础数量" ,@"包装单价",@"备注",nil];
+    NSArray*array1=[NSArray arrayWithObjects:@"包装数量",@"基础单价" ,@"总金额",nil];
+    
+    for (int i=0; i<array.count; i++) {
+        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(TableWidth-10, i*(10+10), 100, 10)];
+        lable.text=[array objectAtIndex:i];
+        lable.font=FontSize(TitleSize-2);
+        [lable setTextColor:HexColor(@"444444")];
+        [self.subSview addSubview:lable];
+    }
+    for (int i=0; i<array1.count; i++) {
+        UILabel *lable=[[UILabel alloc]initWithFrame:CGRectMake(TableWidth+150, i*(10+10), 100, 10)];
+        lable.text=[array objectAtIndex:i];
+        lable.font=FontSize(TitleSize-2);
+        [lable setTextColor:HexColor(@"444444")];
+        [self.subSview addSubview:lable];
+    }
+    self.subSview.hidden=YES;
+    
+    self.button=[UIButton buttonWithType:UIButtonTypeCustom];
+    [self.button setFrame:CGRectMake(310, 0, 50, 50)];
+    [self.button setImage:[UIImage imageNamed:@"AttachHide"] forState:UIControlStateNormal];
+//    [self.button setTitle:@"编辑" forState:UIControlStateNormal];
+//    [self.button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+    [self.contentView addSubview:self.button];
+     [self.contentView addSubview:self.subSview];
     [self.contentView addSubview:self.SpLabel];
     [self.contentView addSubview:self.DjLabel];
     [self.contentView addSubview:self.BzslLabel];
     [self.contentView addSubview:self.BzggLabel];
+    [self.contentView  addSubview:self.HeardLabel];
+//    [self.contentView  addSubview:self.FootLabel];
 }
 - (void)setTitleStr:(NSString *)str
+
 {
-    self.SpLabel.text = str;
-}
+  
+   
+   
+    }
 - (void)awakeFromNib {
     // Initialization code
 }

XFFruit/ViewControllers/PurchaseNotice/ShopDetaileViewController.h

+//
+//  ShopDetaileViewController.h
+//  XFFruit
+//
+//  Created by mac on 15/8/19.
+//  Copyright (c) 2015年 Xummer. All rights reserved.
+//
+
+#import "ICRBaseViewController.h"
+#import "Survey.h"
+@interface ShopDetaileViewController : ICRBaseViewController
+@property (nonatomic,strong)Survey *survey;
+@property (nonatomic,strong)NSString *navTitle;
+@end

XFFruit/en.lproj/Localizable.strings

@@ -50,6 +50,8 @@
 "Survey7"                                 = "新建发运单";
 "Survey8"                                 = "查看发运单";
 "Survey9"                                 = "新建加工单";
+"EditorShopDetail"                              ="编辑商品明细";
+"AddShopDetail"                           ="添加商品明细";
 
 // Store
 "Store"                                 = "门店";