Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
xffruit
Commits
38d3a8b1
Commit
38d3a8b1
authored
Aug 16, 2015
by
朱朝吉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购通知单
parent
9f7df76f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
252 additions
and
23 deletions
+252
-23
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+20
-0
ICRFunctionItemControl.h
XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h
+14
-1
BusinessViewController.m
XFFruit/ViewControllers/Business/BusinessViewController.m
+118
-22
NewPurchaseNoticeViewController.h
...trollers/PurchaseNotice/NewPurchaseNoticeViewController.h
+13
-0
NewPurchaseNoticeViewController.m
...trollers/PurchaseNotice/NewPurchaseNoticeViewController.m
+37
-0
SeePurchaseNoticeViewController.h
...trollers/PurchaseNotice/SeePurchaseNoticeViewController.h
+13
-0
SeePurchaseNoticeViewController.m
...trollers/PurchaseNotice/SeePurchaseNoticeViewController.m
+37
-0
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
38d3a8b1
...
...
@@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
04040E001B6FE75800326D12
/* ICRPerson.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
04040DFF1B6FE75800326D12
/* ICRPerson.m */
;
};
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 */
;
};
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 */
;
};
...
...
@@ -373,6 +375,10 @@
04040DFF1B6FE75800326D12
/* ICRPerson.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ICRPerson.m
;
sourceTree
=
"<group>"
;
};
0406BFD71B7C97E700DD65A7
/* BusinessViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
BusinessViewController.h
;
path
=
../ViewControllers/Business/BusinessViewController.h
;
sourceTree
=
"<group>"
;
};
0406BFD81B7C97E700DD65A7
/* BusinessViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
name
=
BusinessViewController.m
;
path
=
../ViewControllers/Business/BusinessViewController.m
;
sourceTree
=
"<group>"
;
};
0406BFE31B80A19D00DD65A7
/* NewPurchaseNoticeViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
NewPurchaseNoticeViewController.h
;
sourceTree
=
"<group>"
;
};
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>"
;
};
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>"
;
};
...
...
@@ -797,6 +803,17 @@
name
=
Business
;
sourceTree
=
"<group>"
;
};
0406BFE21B80A15800DD65A7
/* PurchaseNotice */
=
{
isa
=
PBXGroup
;
children
=
(
0406BFE31B80A19D00DD65A7
/* NewPurchaseNoticeViewController.h */
,
0406BFE41B80A19D00DD65A7
/* NewPurchaseNoticeViewController.m */
,
0406BFE61B80A1BA00DD65A7
/* SeePurchaseNoticeViewController.h */
,
0406BFE71B80A1BA00DD65A7
/* SeePurchaseNoticeViewController.m */
,
);
path
=
PurchaseNotice
;
sourceTree
=
"<group>"
;
};
35C3C0BA1AE9587F0035AC8A
/* Navigation */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -1579,6 +1596,7 @@
C1C6FEED1AB88A3400D4C41A
/* ViewControllers */
=
{
isa
=
PBXGroup
;
children
=
(
0406BFE21B80A15800DD65A7
/* PurchaseNotice */
,
72C803431B7B6F0200990363
/* WorkSheet */
,
7217E9C01B72364300FE5C1D
/* Survey */
,
C159180B1ABE88030013B391
/* Login */
,
...
...
@@ -1972,6 +1990,7 @@
C167F9BD1AC7BF5500D2A098
/* ICRUserUtil.m in Sources */
,
C14BE3141ADB9C5B0049F1AA
/* ICRURLProtocol.m in Sources */
,
C14BE30A1ADB84720049F1AA
/* ICRFileCache.m in Sources */
,
0406BFE81B80A1BA00DD65A7
/* SeePurchaseNoticeViewController.m in Sources */
,
C1677FCC1AC28A26002613C5
/* ICRAppDelegate.m in Sources */
,
C123A8F31B251284003C0C36
/* UIScrollView+Content.m in Sources */
,
C1A05CBE1ACCE089006E827D
/* ICRSystemHeaderView.m in Sources */
,
...
...
@@ -2076,6 +2095,7 @@
C1FE50451AE0249A00C18080
/* IBTImagePicker.m in Sources */
,
C1E108611ADA8D3800620375
/* ICRAttachment.m in Sources */
,
C159187C1AC435DF0013B391
/* IBTAdditionsObserver.m in Sources */
,
0406BFE51B80A19D00DD65A7
/* NewPurchaseNoticeViewController.m in Sources */
,
C18AEA8C1AC9855400A1DB7B
/* IBTLoadingView.m in Sources */
,
C10C90A11AE5751D00B911CD
/* ICRPost.m in Sources */
,
7217E9F21B72364300FE5C1D
/* StartTimeView.m in Sources */
,
...
...
XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h
View file @
38d3a8b1
...
...
@@ -19,7 +19,20 @@ typedef NS_ENUM (NSUInteger, ICRFunctionID) {
kFunctionComeShopReg
,
kFunctionLeaveShopReg
,
kFunctionCreatTask
,
kFunctionHandleTask
kFunctionHandleTask
,
kFunctionNotice
,
kFunctionNewSurvey
,
kFunctionSeeSurvey
,
kFunctionFeeBackSurvey
,
kFunctionNewPurchaseNotice
,
kFunctionSeePurchaseNotice
,
kFunctionNewPurchase
,
kFunctionSeePurchase
,
kFunctionExaminePurchas
,
kFunctionNewShipment
,
kFunctionSeeShipment
,
kFunctionNewProcessing
,
};
@interface
ICRFunctionItemControl
:
UIControl
...
...
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @
38d3a8b1
...
...
@@ -8,6 +8,16 @@
#import "BusinessViewController.h"
#import "ICRTaskListViewController.h"
#import "ICRPatrolPlanViewController.h"
#import "ICRStoreListViewController.h"
#import "ICRStoreDetailViewController.h"
#import "ICRAnnouncementViewController.h"
#import "NewSurveyViewController.h"
#import "SurveyViewController.h"
#import "AddWorkSheetViewController.h"
#import "ICRFunctionBaseView.h"
#import "ICRFunctionEntity.h"
#import "ICRFunctionBaseView.h"
...
...
@@ -45,18 +55,30 @@
[
IBTCommon
localizableString
:
@"Survey7"
],
[
IBTCommon
localizableString
:
@"Survey8"
],[
IBTCommon
localizableString
:
@"Survey9"
],
];
NSArray
*
functionTags
=
@[
@
(
kFunctionAnnouncement
),
@
(
kFunctionTaskManagement
),
@
(
kFunctionPatrolPlan
),
@
(
kFunctionMyShop
),
@
(
kFunctionNavigation
),
@
(
kFunctionComeShopReg
),
@
(
kFunctionAnnouncement
),
@
(
kFunctionTaskManagement
),
@
(
kFunctionPatrolPlan
),
@
(
kFunctionMyShop
),
@
(
kFunctionNavigation
),
@
(
kFunctionComeShopReg
)];
NSArray
*
functionTags
=
@[
@
(
kFunctionNotice
),
//公告
@
(
kFunctionNewSurvey
),
//新建行情调研
@
(
kFunctionSeeSurvey
),
//查看行情调研
@
(
kFunctionFeeBackSurvey
),
//填写行情反馈
@
(
kFunctionNewPurchaseNotice
),
//新建采购通知
@
(
kFunctionSeePurchaseNotice
),
//查看采购通知
@
(
kFunctionNewPurchase
),
//新建采购单
@
(
kFunctionSeePurchase
),
//查看采购单
@
(
kFunctionExaminePurchas
),
//审核采购单
@
(
kFunctionNewShipment
),
//新建发运单
@
(
kFunctionSeeShipment
),
//查看发运单
@
(
kFunctionNewProcessing
)];
//新建加工单
int
i
=
0
;
for
(
NSString
*
functionName
in
fuctionNames
)
{
...
...
@@ -80,13 +102,96 @@
[
self
.
view
addSubview
:
baseView
];
}
#pragma mark - ICRFunctionBaseViewDelegate
-
(
void
)
ICRFunctionBaseView
:
(
ICRFunctionItemControl
*
)
imageView
{
/*
kFunctionAnnouncement = 0,
kFunctionTaskManagement,
kFunctionPatrolPlan,
kFunctionMyShop,
*/
switch
(
imageView
.
tag
)
{
case
kFunctionNotice
:
//公告
{
ICRAnnouncementViewController
*
aVC
=
[[
ICRAnnouncementViewController
alloc
]
init
];
[
self
PushViewController
:
aVC
animated
:
YES
];
}
break
;
case
kFunctionNewSurvey
:
//新建行情
{
NewSurveyViewController
*
svc
=
[[
NewSurveyViewController
alloc
]
init
];
svc
.
title
=
[
IBTCommon
localizableString
:
@"AddSurvey"
];
[
self
PushViewController
:
svc
animated
:
YES
];
}
break
;
case
kFunctionSeeSurvey
:
//查看行情
{
SurveyViewController
*
svc
=
[[
SurveyViewController
alloc
]
init
];
svc
.
title
=
[
IBTCommon
localizableString
:
@"Survey"
];
[
self
PushViewController
:
svc
animated
:
YES
];
}
break
;
case
kFunctionNewPurchaseNotice
:
//新建采购通知单
{
SurveyViewController
*
svc
=
[[
SurveyViewController
alloc
]
init
];
svc
.
title
=
[
IBTCommon
localizableString
:
@"Survey"
];
[
self
PushViewController
:
svc
animated
:
YES
];
}
break
;
case
kFunctionSeePurchaseNotice
:
//查看采购通知单
{
SurveyViewController
*
svc
=
[[
SurveyViewController
alloc
]
init
];
svc
.
title
=
[
IBTCommon
localizableString
:
@"Survey"
];
[
self
PushViewController
:
svc
animated
:
YES
];
}
break
;
case
kFunctionTaskManagement
:
//任务管理
{
ICRTaskListViewController
*
tVC
=
[[
ICRTaskListViewController
alloc
]
init
];
[
self
PushViewController
:
tVC
animated
:
YES
];
}
break
;
case
kFunctionPatrolPlan
:
//巡店计划
{
ICRPatrolPlanViewController
*
pVC
=
[[
ICRPatrolPlanViewController
alloc
]
initWithStore
:
nil
isHomeShow
:
YES
];
[
self
PushViewController
:
pVC
animated
:
YES
];
}
break
;
case
kFunctionMyShop
:
//我的店铺
{
// ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
// sVC.title = [IBTCommon localizableString:@"MyStore"];
// sVC.m_delegate = self;
// [self PushViewController:sVC animated:YES];
AddWorkSheetViewController
*
sVC
=
[[
AddWorkSheetViewController
alloc
]
init
];
[
self
PushViewController
:
sVC
animated
:
YES
];
}
break
;
default
:
return
;
break
;
}
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
-
(
void
)
initView
{
NSArray
*
butArray
=
[[
NSArray
alloc
]
initWithObjects
:
@"公告"
,
@"新建行情调研"
,
@"查看行情调研"
,
@"填写行情反馈"
,
@"新建采购通知"
,
@"查看采购通知"
,
@"新建采购单"
,
@"查看采购单"
,
@"审核采购单"
,
@"新建发运单"
,
@"查看发运单"
,
@"新建加工单"
,
nil
];
for
(
int
i
=
0
;
i
<
butArray
.
count
;
i
++
)
{
UIButton
*
but
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
but
.
frame
=
CGRectMake
(
15
+
i
%
3
*
(
90
+
10
),
10
+
(
i
/
3
)
*
(
100
+
10
)
,
90
,
90
)
;
// but.titleLabel.text=[NSString stringWithFormat:@"%@",[butArray objectAtIndex:i]];
// but.titleLabel.text=[NSString stringWithFormat:@"%@",[butArray objectAtIndex:i]];
NSString
*
str
=
[
butArray
objectAtIndex
:
i
];
[
but
setTitle
:
str
forState
:
UIControlStateNormal
];
but
.
backgroundColor
=
[
UIColor
redColor
];
...
...
@@ -95,14 +200,5 @@
}
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
XFFruit/ViewControllers/PurchaseNotice/NewPurchaseNoticeViewController.h
0 → 100644
View file @
38d3a8b1
//
// NewPurchaseNoticeViewController.h
// XFFruit
//
// Created by mac on 15/8/16.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface
NewPurchaseNoticeViewController
:
ICRBaseViewController
@end
XFFruit/ViewControllers/PurchaseNotice/NewPurchaseNoticeViewController.m
0 → 100644
View file @
38d3a8b1
//
// NewPurchaseNoticeViewController.m
// XFFruit
//
// Created by mac on 15/8/16.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "NewPurchaseNoticeViewController.h"
@interface
NewPurchaseNoticeViewController
()
@end
@implementation
NewPurchaseNoticeViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
// Do any additional setup after loading the view.
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
XFFruit/ViewControllers/PurchaseNotice/SeePurchaseNoticeViewController.h
0 → 100644
View file @
38d3a8b1
//
// SeePurchaseNoticeViewController.h
// XFFruit
//
// Created by mac on 15/8/16.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface
SeePurchaseNoticeViewController
:
ICRBaseViewController
@end
XFFruit/ViewControllers/PurchaseNotice/SeePurchaseNoticeViewController.m
0 → 100644
View file @
38d3a8b1
//
// SeePurchaseNoticeViewController.m
// XFFruit
//
// Created by mac on 15/8/16.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "SeePurchaseNoticeViewController.h"
@interface
SeePurchaseNoticeViewController
()
@end
@implementation
SeePurchaseNoticeViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
// Do any additional setup after loading the view.
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
@end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment