Skip to content

X
xffruit
Commit 9ac64d07 authored by zhu's avatar zhu
Browse files
Options

no message

parent 9d420d62
Expand all Show whitespace changes
Inline Side-by-side
Showing with 874 additions and 25 deletions
XFFruit.xcodeproj/project.pbxproj
View file @ 9ac64d07
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
0414FF191B94959700C7B00E /* PurchaseNoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF121B94959700C7B00E /* PurchaseNoticeCell.m */; }; 0414FF191B94959700C7B00E /* PurchaseNoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF121B94959700C7B00E /* PurchaseNoticeCell.m */; };
0414FF1A1B94959700C7B00E /* SelectCompanyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF141B94959700C7B00E /* SelectCompanyViewController.m */; }; 0414FF1A1B94959700C7B00E /* SelectCompanyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF141B94959700C7B00E /* SelectCompanyViewController.m */; };
0414FF1B1B94959700C7B00E /* ShopDetaileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF161B94959700C7B00E /* ShopDetaileViewController.m */; }; 0414FF1B1B94959700C7B00E /* ShopDetaileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0414FF161B94959700C7B00E /* ShopDetaileViewController.m */; };
04F6E70A1B9B08A500550849 /* PurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04F6E7091B9B08A500550849 /* PurchaseNoticeViewController.m */; };
300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; }; 300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; };
300DD94B1B184B450080EE12 /* 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 */; }; 300DD94E1B184EA70080EE12 /* ICRQuestion.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD94D1B184EA70080EE12 /* ICRQuestion.m */; };
...@@ -419,6 +420,8 @@ ...@@ -419,6 +420,8 @@
0414FF141B94959700C7B00E /* SelectCompanyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectCompanyViewController.m; sourceTree = "<group>"; }; 0414FF141B94959700C7B00E /* SelectCompanyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SelectCompanyViewController.m; sourceTree = "<group>"; };
0414FF151B94959700C7B00E /* ShopDetaileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopDetaileViewController.h; sourceTree = "<group>"; }; 0414FF151B94959700C7B00E /* ShopDetaileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopDetaileViewController.h; sourceTree = "<group>"; };
0414FF161B94959700C7B00E /* ShopDetaileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopDetaileViewController.m; sourceTree = "<group>"; }; 0414FF161B94959700C7B00E /* ShopDetaileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopDetaileViewController.m; sourceTree = "<group>"; };
04F6E7081B9B08A500550849 /* PurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseNoticeViewController.h; sourceTree = "<group>"; };
04F6E7091B9B08A500550849 /* PurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseNoticeViewController.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>"; }; 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>"; }; 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>"; }; 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPatrolPlan.m; sourceTree = "<group>"; };
...@@ -912,6 +915,8 @@ ...@@ -912,6 +915,8 @@
children = ( children = (
0414FF0B1B94959700C7B00E /* NewPurchaseNoticeViewController.h */, 0414FF0B1B94959700C7B00E /* NewPurchaseNoticeViewController.h */,
0414FF0C1B94959700C7B00E /* NewPurchaseNoticeViewController.m */, 0414FF0C1B94959700C7B00E /* NewPurchaseNoticeViewController.m */,
04F6E7081B9B08A500550849 /* PurchaseNoticeViewController.h */,
04F6E7091B9B08A500550849 /* PurchaseNoticeViewController.m */,
0414FF0D1B94959700C7B00E /* SeePurchaseNoticeViewController.h */, 0414FF0D1B94959700C7B00E /* SeePurchaseNoticeViewController.h */,
0414FF0E1B94959700C7B00E /* SeePurchaseNoticeViewController.m */, 0414FF0E1B94959700C7B00E /* SeePurchaseNoticeViewController.m */,
); );
...@@ -2228,6 +2233,7 @@ ...@@ -2228,6 +2233,7 @@
C142D2BE1AC3A155000109A7 /* UIView+FindUIViewController.m in Sources */, C142D2BE1AC3A155000109A7 /* UIView+FindUIViewController.m in Sources */,
35C3C0BF1AE95F1D0035AC8A /* UIImage+Rotate.m in Sources */, 35C3C0BF1AE95F1D0035AC8A /* UIImage+Rotate.m in Sources */,
7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */, 7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */,
04F6E70A1B9B08A500550849 /* PurchaseNoticeViewController.m in Sources */,
C11A344D1B1BE27200079129 /* ICRPatrolAllStoreViewController.m in Sources */, C11A344D1B1BE27200079129 /* ICRPatrolAllStoreViewController.m in Sources */,
C10214DD1AD90A3F0024637E /* ICRFunctionEntity.m in Sources */, C10214DD1AD90A3F0024637E /* ICRFunctionEntity.m in Sources */,
FE4678AA1B8D60F900B5EDA3 /* ChooseTypeViewController.m in Sources */, FE4678AA1B8D60F900B5EDA3 /* ChooseTypeViewController.m in Sources */,
...@@ -2639,7 +2645,6 @@ ...@@ -2639,7 +2645,6 @@
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c"; PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
...@@ -2678,7 +2683,6 @@ ...@@ -2678,7 +2683,6 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c"; PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
...@@ -2703,7 +2707,6 @@ ...@@ -2703,7 +2707,6 @@
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c"; PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -2725,7 +2728,6 @@ ...@@ -2725,7 +2728,6 @@
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c"; PROVISIONING_PROFILE = "cfc700e3-f78e-4893-a7fd-62daba6a0c6c";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @ 9ac64d07
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#import "NewPurchaseViewController.h" #import "NewPurchaseViewController.h"
#import "PurchaseViewController.h" #import "PurchaseViewController.h"
#import"PurchaseNoticeViewController.h"
@interface BusinessViewController ()<ICRFunctionBaseViewDelegate> @interface BusinessViewController ()<ICRFunctionBaseViewDelegate>
@end @end
...@@ -148,8 +150,8 @@ ...@@ -148,8 +150,8 @@
break; break;
case kFunctionSeePurchaseNotice://查看采购通知单 case kFunctionSeePurchaseNotice://查看采购通知单
{ {
SeePurchaseNoticeViewController *svc = PurchaseNoticeViewController *svc =
[[SeePurchaseNoticeViewController alloc] init]; [[PurchaseNoticeViewController alloc] init];
svc.title = [IBTCommon localizableString:@"Survey3"]; svc.title = [IBTCommon localizableString:@"Survey3"];
[self PushViewController:svc animated:YES]; [self PushViewController:svc animated:YES];
} }
......
XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.h 0 → 100644
View file @ 9ac64d07
//
// PurchaseNoticeViewController.h
// XFFruit
//
// Created by mac on 15/9/5.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface PurchaseNoticeViewController : ICRBaseViewController
@end
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.h
View file @ 9ac64d07
...@@ -7,7 +7,10 @@ ...@@ -7,7 +7,10 @@
// //
#import "ICRBaseViewController.h" #import "ICRBaseViewController.h"
#import "PurchaseBill.h"
@interface SeePurchaseNoticeViewController : ICRBaseViewController @interface SeePurchaseNoticeViewController : ICRBaseViewController
@property (nonatomic,strong)PurchaseBill *bill;
//模拟三个人员
@property (nonatomic,assign)NSInteger indexPerson;//0.1.2
@end @end
XFFruit/ViewControllers/PurchaseNotice/Views/SelectCompanyViewController.h
View file @ 9ac64d07
...@@ -7,7 +7,11 @@ ...@@ -7,7 +7,11 @@
// //
#import "ICRBaseViewController.h" #import "ICRBaseViewController.h"
#import "MaskCell.h"
typedef void(^ChosePackaging)(NSString *Packaging);
@interface SelectCompanyViewController : ICRBaseViewController
@interface SelectCompanyViewController : ICRBaseViewController
@property (nonatomic,copy)ChosePackaging chosePackaging;
@end @end
XFFruit/ViewControllers/PurchaseNotice/Views/SelectCompanyViewController.m
View file @ 9ac64d07
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
#import "SelectCompanyViewController.h" #import "SelectCompanyViewController.h"
#define TableHeight 45
@interface SelectCompanyViewController ()<UITableViewDataSource,UITableViewDelegate> @interface SelectCompanyViewController ()<UITableViewDataSource,UITableViewDelegate>
{ {
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
-(void)initData -(void)initData
{ {
self.dataArr=[NSMutableArray arrayWithObjects:@"筐",@"斤",nil]; self.dataArr=[NSMutableArray arrayWithObjects:@"筐",@"斤",nil];
self.title = @"选择包装单位";
} }
-(void)initView -(void)initView
...@@ -45,19 +46,16 @@ ...@@ -45,19 +46,16 @@
return self.dataArr.count; return self.dataArr.count;
} }
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
static NSString *cellID = @"cellID";
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
static NSString *cellID = @"MaskCell";
MaskCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) { if (cell == nil) {
cell = [[UITableViewCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID]; cell = [[MaskCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID totalWidth:ScreenSize.width totalHeight:TableHeight];
// tableView.separatorStyle = UITableViewCellSeparatorStyleNone; tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
cell.selectionStyle = UITableViewCellSelectionStyleNone; cell.selectionStyle = UITableViewCellSelectionStyleNone;
if (indexPath.row >=0 && indexPath.row < _dataArr.count ) {
// cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell.textAlignment = UITextAlignmentCenter; cell.textAlignment = UITextAlignmentCenter;
cell.textLabel.text=self.dataArr[indexPath.row]; cell.textLabel.text=self.dataArr[indexPath.row];
} cell.Commitbtn.hidden = YES;
} }
return cell; return cell;
...@@ -68,6 +66,10 @@ ...@@ -68,6 +66,10 @@
return 40; return 40;
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
NSString *ChosePackaging = self.dataArr[indexPath.row];
//block 回调
self.chosePackaging(ChosePackaging);
[self PopViewControllerAnimated:YES];
} }
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
......
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @ 9ac64d07
...@@ -35,6 +35,7 @@ typedef enum : NSUInteger { ...@@ -35,6 +35,7 @@ typedef enum : NSUInteger {
NSMutableArray *_dataArr; NSMutableArray *_dataArr;
UITextField *_titleField; UITextField *_titleField;
UILabel *_productLabel; UILabel *_productLabel;
UILabel *_PackagingLable;
UILabel *_startDateLabel; UILabel *_startDateLabel;
UILabel *_endDateLabel; UILabel *_endDateLabel;
UILabel *_personLabel; UILabel *_personLabel;
...@@ -260,7 +261,7 @@ typedef enum : NSUInteger { ...@@ -260,7 +261,7 @@ typedef enum : NSUInteger {
}else if (indexPath.row==3) }else if (indexPath.row==3)
{ {
contentLabel.text = @"选择包装单位"; contentLabel.text = @"选择包装单位";
_productLabel = contentLabel; _PackagingLable = contentLabel;
[self preferDataInProductLabel]; [self preferDataInProductLabel];
} }
...@@ -301,9 +302,11 @@ typedef enum : NSUInteger { ...@@ -301,9 +302,11 @@ typedef enum : NSUInteger {
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
if(indexPath.row == 0){ if(indexPath.row == 0){
ChooseProductViewController *cvc = [ChooseProductViewController new]; ChooseProductViewController *cvc = [ChooseProductViewController new];
cvc.choseProduct = ^(Product *product){ cvc.choseProduct = ^(Product *product){
_productLabel.text = [NSString stringWithFormat:@"%@[%@]",product.name,product.code]; _productLabel.text = [NSString stringWithFormat:@"%@[%@]",product.name,product.code];
_productLabel.textColor = HexColor(@"444444"); _productLabel.textColor = HexColor(@"444444");
self.productNameStr = product.name; self.productNameStr = product.name;
...@@ -315,6 +318,14 @@ typedef enum : NSUInteger { ...@@ -315,6 +318,14 @@ typedef enum : NSUInteger {
}else if (indexPath.row ==3) }else if (indexPath.row ==3)
{ {
SelectCompanyViewController *vc=[SelectCompanyViewController new]; SelectCompanyViewController *vc=[SelectCompanyViewController new];
vc.chosePackaging = ^(NSString *Packaging){
_PackagingLable.text = [NSString stringWithFormat:@"%@",Packaging];
_PackagingLable.textColor = HexColor(@"444444");
};
[self PushViewController:vc animated:YES]; [self PushViewController:vc animated:YES];
} }
} }
......
XFFruit/en.lproj/Localizable.strings
View file @ 9ac64d07
...@@ -195,5 +195,21 @@ ...@@ -195,5 +195,21 @@
"AddSurvey" = "新建行情调研"; "AddSurvey" = "新建行情调研";
"AddPurchase" = "新建采购单"; "AddPurchase" = "新建采购单";
"Purchase" = "采购单"; "Purchase" = "采购单";
//Business
"Business" = "业务";
"Announcement" = "公告";
"AddSurvey" = "新建行情调研";
"Survey" = "查看行情调研";
"Survey1" = "填写行情反馈";
"Survey2" = "新建采购通知";
"Survey3" = "查看采购通知";
"Survey4" = "新建采购单";
"Survey5" = "查看采购单";
"Survey6" = "审核采购单";
"Survey7" = "新建发运单";
"Survey8" = "查看发运单";
"Survey9" = "新建加工单";
"EditorShopDetail" ="编辑商品明细";
"AddShopDetail" ="添加商品明细";
XFFruit/zh-Hans.lproj/Localizable.strings
View file @ 9ac64d07
...@@ -181,3 +181,19 @@ ...@@ -181,3 +181,19 @@
"AddSurvey" = "新建行情调研"; "AddSurvey" = "新建行情调研";
"AddPurchase" = "新建采购单"; "AddPurchase" = "新建采购单";
"Purchase" = "采购单"; "Purchase" = "采购单";
//Business
"Business" = "业务";
"Announcement" = "公告";
"AddSurvey" = "新建行情调研";
"Survey" = "查看行情调研";
"Survey1" = "填写行情反馈";
"Survey2" = "新建采购通知";
"Survey3" = "查看采购通知";
"Survey4" = "新建采购单";
"Survey5" = "查看采购单";
"Survey6" = "审核采购单";
"Survey7" = "新建发运单";
"Survey8" = "查看发运单";
"Survey9" = "新建加工单";
"EditorShopDetail" ="编辑商品明细";
"AddShopDetail" ="添加商品明细";
\ No newline at end of file
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