Skip to content

X
xffruit
Commit ff97980e authored by 朱朝吉's avatar 朱朝吉
Browse files
Options

no message

parent aae2413b
Show whitespace changes
Inline Side-by-side
Showing with 426 additions and 6 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ ff97980e
......@@ -11,6 +11,7 @@
0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFD81B7C97E700DD65A7 /* BusinessViewController.m */; };
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 */; };
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 */; };
......@@ -378,6 +379,8 @@
0406BFE41B80A19D00DD65A7 /* NewPurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPurchaseNoticeViewController.m; sourceTree = "<group>"; };
0406BFE61B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeePurchaseNoticeViewController.h; sourceTree = "<group>"; };
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>"; };
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>"; };
......@@ -802,6 +805,16 @@
sourceTree = "<group>";
};
0406BFE21B80A15800DD65A7 /* PurchaseNotice */ = {
isa = PBXGroup;
children = (
0406BFE91B82C64800DD65A7 /* Controllers */,
0406BFEA1B82C66F00DD65A7 /* Models */,
0406BFEB1B82C6A700DD65A7 /* Views */,
);
path = PurchaseNotice;
sourceTree = "<group>";
};
0406BFE91B82C64800DD65A7 /* Controllers */ = {
isa = PBXGroup;
children = (
0406BFE31B80A19D00DD65A7 /* NewPurchaseNoticeViewController.h */,
......@@ -809,7 +822,23 @@
0406BFE61B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.h */,
0406BFE71B80A1BA00DD65A7 /* SeePurchaseNoticeViewController.m */,
);
path = PurchaseNotice;
name = Controllers;
sourceTree = "<group>";
};
0406BFEA1B82C66F00DD65A7 /* Models */ = {
isa = PBXGroup;
children = (
);
name = Models;
sourceTree = "<group>";
};
0406BFEB1B82C6A700DD65A7 /* Views */ = {
isa = PBXGroup;
children = (
0406BFEC1B82C72200DD65A7 /* PurchaseNoticeCell.h */,
0406BFED1B82C72200DD65A7 /* PurchaseNoticeCell.m */,
);
name = Views;
sourceTree = "<group>";
};
35C3C0BA1AE9587F0035AC8A /* Navigation */ = {
......@@ -2118,6 +2147,7 @@
C1864A561B0B0D9D00D11C4E /* ICRPostTask.m in Sources */,
FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */,
FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */,
0406BFEE1B82C72200DD65A7 /* PurchaseNoticeCell.m in Sources */,
C159183D1AC062460013B391 /* IBTTableViewCellInfo.m in Sources */,
C1FE504E1AE024FA00C18080 /* RIButtonItem.m in Sources */,
C18AEA9A1AD2749200A1DB7B /* ICRStoreListViewController.m in Sources */,
......
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @ ff97980e
......@@ -22,6 +22,9 @@
#import "ICRFunctionEntity.h"
#import "ICRFunctionBaseView.h"
#import "NewPurchaseNoticeViewController.h"
#import "SeePurchaseNoticeViewController.h"
@interface BusinessViewController ()<ICRFunctionBaseViewDelegate>
@end
......@@ -134,15 +137,16 @@
break;
case kFunctionNewPurchaseNotice://新建采购通知单
{
SurveyViewController *svc = [[SurveyViewController alloc] init];
svc.title = [IBTCommon localizableString:@"Survey"];
NewPurchaseNoticeViewController *svc = [[NewPurchaseNoticeViewController alloc] init];
svc.title = [IBTCommon localizableString:@"Survey2"];
[self PushViewController:svc animated:YES];
}
break;
case kFunctionSeePurchaseNotice://查看采购通知单
{
SurveyViewController *svc = [[SurveyViewController alloc] init];
svc.title = [IBTCommon localizableString:@"Survey"];
SeePurchaseNoticeViewController *svc =
[[SeePurchaseNoticeViewController alloc] init];
svc.title = [IBTCommon localizableString:@"Survey3"];
[self PushViewController:svc animated:YES];
}
break;
......
XFFruit/ViewControllers/PurchaseNotice/NewPurchaseNoticeViewController.m
View file @ ff97980e
......@@ -8,7 +8,56 @@
#import "NewPurchaseNoticeViewController.h"
@interface NewPurchaseNoticeViewController ()
#import "SurveyCell.h"
#import "HPGrowingTextView.h"
#import "ChosePersonViewController.h"
#import "SurveyUser.h"
#import "Survey.h"
#import "PurchaseNoticeCell.h"
#define LeftMargin 15
#define BtnHeight 44
#define TableHeight 46
#define CornerRadius 5
#define TitleSize 15
#define BtnSize 19
#define TotalHeight 432
#define KeyboardHeight 258
#define DateViewHeight 300
@interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate>
{
UITableView *_tableView;
NSMutableArray *_dataArr;
UITextField *_titleField;
UILabel *_productLabel;
UILabel *_startDateLabel;
UILabel *_endDateLabel;
UILabel *_personLabel;
HPGrowingTextView *_noteTextView;
BOOL _isClickStart;
UITableView *mingXiTableView;
}
@property (nonatomic,strong)NSString *titleStr;
@property (nonatomic,strong)NSString *productCodeStr;
@property (nonatomic,strong)NSString *productNameStr;
@property (nonatomic,strong)NSString *productUuidStr;
@property (nonatomic,strong)NSString *beginDateStr;
@property (nonatomic,strong)NSString *endDateStr;
@property (nonatomic,strong)NSString *remarkStr;
@property (nonatomic,strong)NSMutableArray *users;
@property (nonatomic,strong)Survey *survey;
@end
......@@ -16,8 +65,265 @@
- (void)viewDidLoad {
[super viewDidLoad];
[self setupSubviews];
// Do any additional setup after loading the view.
}
-(void)setupSubviews
{
_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.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.tag=1002;
mingXiTableView.bounces=YES;
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];
[self.view addSubview:footView2];
[self.view addSubview:footView3];
mingXiTableView.tableFooterView = footView2;
mingXiTableView.tableHeaderView=footView3;
[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 - 协议方法
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
if ([tableView isEqual:_tableView]) {
return 1;
}else if ([tableView isEqual:mingXiTableView])
{
return 1;
}
return 1;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
if ([tableView isEqual:_tableView]) {
return _dataArr.count;
}else if ([tableView isEqual:mingXiTableView])
{
return _dataArr.count;
}
return 1;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
if ([tableView isEqual:_tableView]) {
static NSString *cellID = @"cellID";
SurveyCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) {
cell = [[SurveyCell 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 setTitleStr:_dataArr[indexPath.row]];
return cell;
}else if ([tableView isEqual:mingXiTableView])
{
static NSString *CellID = @"CellID";
PurchaseNoticeCell *Cell = [tableView dequeueReusableCellWithIdentifier:CellID];
if (Cell == nil) {
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 setTitleStr:_dataArr[indexPath.row]];
return Cell;
}
return nil;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
if ([tableView isEqual:_tableView]) {
if (indexPath.row == 2){
return TableHeight*2;
}else{
return TableHeight;
}
}else if ([tableView isEqual:mingXiTableView])
{
return TableHeight;
}
return TableHeight;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
if ([tableView isEqual:_tableView]) {
if (indexPath.row == 2 || indexPath.row == 3) {
[self keyboardHidden];
if (indexPath.row == 2) {
_isClickStart = YES;
}else{
_isClickStart = NO;
}
}else if(indexPath.row == 1){
ChosePersonViewController *cvc = [ChosePersonViewController new];
cvc.chosePerson = ^(NSArray *users){
NSString *textStr = @"";
if (self.users.count <=0) {
[self.users removeAllObjects];
}
for (SurveyUser *user in users) {
if (textStr.length == 0) {
textStr = [textStr stringByAppendingFormat:@"%@",user.userName];
}else {
textStr = [textStr stringByAppendingFormat:@"、%@",user.userName];
}
[self.users addObject:[user dictForCommit]];
}
_personLabel.text = textStr;
_personLabel.textColor = HexColor(@"444444");
};
cvc.isMoreChose = NO;
[self PushViewController:cvc animated:YES];
}
}
}
- (void)createViewInCell:(SurveyCell *)cell indexPath:(NSIndexPath *)indexPath{
if (indexPath.row == 0) {
_titleField = [[UITextField alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
_titleField.textAlignment = NSTextAlignmentRight;
_titleField.textColor = HexColor(@"444444");
_titleField.placeholder = @"输入采购通知标题";
_titleField.font = FontSize(15);
_titleField.returnKeyType = UIReturnKeyDone;
_titleField.delegate = self;
[cell.contentView addSubview:_titleField];
// if (self.survey) {
// _titleField.text = [IBTCommon checkString:self.survey.title];
// self.titleStr = [IBTCommon checkString:self.survey.title];
// }
// }else
}else if (indexPath.row == _dataArr.count -1){
_noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
_noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
_noteTextView.minNumberOfLines = 1;
_noteTextView.maxNumberOfLines = 4;
_noteTextView.font = FontSize(15);
_noteTextView.textAlignment = NSTextAlignmentRight;
_noteTextView.delegate = self;
_noteTextView.returnKeyType = UIReturnKeyDone;
_noteTextView.placeholder = @"输入备注内容";
[cell.contentView addSubview:_noteTextView];
// if (self.survey) {
// _noteTextView.text = [IBTCommon checkString:self.survey.remark];
// self.remarkStr = [IBTCommon checkString:self.survey.remark];
// }
CGRect lineFrame = cell.lineLabel.frame;
lineFrame.origin.y = TableHeight*2-1;
cell.lineLabel.frame = lineFrame;
}else{
UILabel *contentLabel = [[UILabel alloc]initWithFrame:(CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight))];
contentLabel.textAlignment= NSTextAlignmentRight;
contentLabel.textColor = HexColor(@"bbbbbb");
contentLabel.font = FontSize(TitleSize);
[cell.contentView addSubview:contentLabel];
if (indexPath.row == 1) {
contentLabel.text = @"选择采购员";
_personLabel = contentLabel;
[self preferDataInPersonLabel];
}
}
}
- (void)preferDataInPersonLabel{
if (self.survey) {
if (self.survey.users.count > 0) {
NSString *personStr = @"";
for (SurveyUser * surveyUser in self.survey.users) {
if (personStr.length == 0) {
personStr = [personStr stringByAppendingFormat:@"%@",surveyUser.userName];
}else {
personStr = [personStr stringByAppendingFormat:@"、%@",surveyUser.userName];
}
}
_personLabel.text = personStr;
_personLabel.textColor = HexColor(@"444444");
}
if (self.users > 0) {
[self.users addObjectsFromArray:self.survey.users];
}
}
}
#pragma mark delegate
- (BOOL)growingTextViewShouldReturn:(HPGrowingTextView *)growingTextView{
[_noteTextView resignFirstResponder];
[self setTableFrame:LeftMargin];
return YES;
}
- (void)growingTextViewDidBeginEditing:(HPGrowingTextView *)growingTextView{
CGFloat offset = ScreenSize.height - TotalHeight - KeyboardHeight;
if (offset < 0) {//上移
[self setTableFrame:LeftMargin+offset];
}
}
- (void)setTableFrame:(CGFloat)tabelH{
[UIView animateWithDuration:0.25 animations:^{
CGRect tableFrame = _tableView.frame;
tableFrame.origin.y = tabelH;
_tableView.frame = tableFrame;
}];
}
- (void)keyboardHidden{
[_titleField resignFirstResponder];
[_noteTextView resignFirstResponder];
[self setTableFrame:LeftMargin];
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.h 0 → 100644
View file @ ff97980e
//
// PurchaseNoticeCell.h
// XFFruit
//
// Created by mac on 15/8/18.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface PurchaseNoticeCell : UITableViewCell
@property (nonatomic,strong)UILabel *SpLabel;
@property (nonatomic,strong)UILabel *DjLabel;
@property (nonatomic,strong)UILabel *BzggLabel;
@property (nonatomic,strong)UILabel *BzslLabel;
- (void)setTitleStr:(NSString *)str;
@end
XFFruit/ViewControllers/PurchaseNotice/PurchaseNoticeCell.m 0 → 100644
View file @ ff97980e
//
// PurchaseNoticeCell.m
// XFFruit
//
// Created by mac on 15/8/18.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "PurchaseNoticeCell.h"
#define TitleSize 15
#define LeftMargin 15
@implementation PurchaseNoticeCell
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) {
[self bulidLayout];
}
return self;
}
- (void)bulidLayout
{
self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, 0, 50, 44))];
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.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.contentView addSubview:self.SpLabel];
[self.contentView addSubview:self.DjLabel];
[self.contentView addSubview:self.BzslLabel];
[self.contentView addSubview:self.BzggLabel];
}
- (void)setTitleStr:(NSString *)str
{
self.SpLabel.text = str;
}
- (void)awakeFromNib {
// Initialization code
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
// Configure the view for the selected state
}
@end
XFFruit/ViewControllers/PurchaseNotice/SeePurchaseNoticeViewController.m
View file @ ff97980e
......@@ -15,6 +15,7 @@
@implementation SeePurchaseNoticeViewController
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
}
......
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