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
609c0b6b
Commit
609c0b6b
authored
9 years ago
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报表细节修改
parent
4725d883
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
112 additions
and
19 deletions
+112
-19
IBTConstants.h
XFFruit/Utilities/IBTUIKit/IBTConstants.h
+11
-0
GrossRateViewController.h
...wControllers/Report/Controllers/GrossRateViewController.h
+2
-1
GrossRateViewController.m
...wControllers/Report/Controllers/GrossRateViewController.m
+4
-1
PassengerViewController.h
...wControllers/Report/Controllers/PassengerViewController.h
+2
-1
PassengerViewController.m
...wControllers/Report/Controllers/PassengerViewController.m
+3
-1
PassgerPriceViewController.h
...ntrollers/Report/Controllers/PassgerPriceViewController.h
+2
-1
PassgerPriceViewController.m
...ntrollers/Report/Controllers/PassgerPriceViewController.m
+4
-1
ReportDetailViewController.m
...ntrollers/Report/Controllers/ReportDetailViewController.m
+4
-0
ReportViewController.m
...ViewControllers/Report/Controllers/ReportViewController.m
+8
-4
SaleViewController.h
...t/ViewControllers/Report/Controllers/SaleViewController.h
+3
-1
SaleViewController.m
...t/ViewControllers/Report/Controllers/SaleViewController.m
+5
-1
PassengerHeaderCell.h
XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.h
+1
-0
PassengerHeaderCell.m
XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.m
+14
-1
RPassgerView.h
XFFruit/ViewControllers/Report/Views/RPassgerView.h
+2
-0
RPassgerView.m
XFFruit/ViewControllers/Report/Views/RPassgerView.m
+12
-2
RSaleView.h
XFFruit/ViewControllers/Report/Views/RSaleView.h
+3
-0
RSaleView.m
XFFruit/ViewControllers/Report/Views/RSaleView.m
+19
-2
SaleHeaderView.h
XFFruit/ViewControllers/Report/Views/SaleHeaderView.h
+1
-0
SaleHeaderView.m
XFFruit/ViewControllers/Report/Views/SaleHeaderView.m
+11
-1
SaleViewCell.m
XFFruit/ViewControllers/Report/Views/SaleViewCell.m
+1
-1
No files found.
XFFruit/Utilities/IBTUIKit/IBTConstants.h
View file @
609c0b6b
...
@@ -264,4 +264,15 @@
...
@@ -264,4 +264,15 @@
//客单价
//客单价
#define PriceWebUrl @"cruiser-web/chart/persalesdatachart.thor"
#define PriceWebUrl @"cruiser-web/chart/persalesdatachart.thor"
#define OrderLastWeak @"比上周同期"
#define OrderLastMonth @"比上月同期"
#define LastWeak @"比上周"
#define LastMonth @"比上月"
#define AvgLabelDay @"单店日均"
#define AvgLabelWeek @"单店周均"
#define AvgLabelMonth @"单店月均"
#endif
#endif
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/GrossRateViewController.h
View file @
609c0b6b
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
strong
)
NSString
*
typeStr
;
-
(
void
)
setValueInGrossRate
:(
Compass
*
)
compass
;
-
(
void
)
setValueInGrossRate
:(
Compass
*
)
compass
withType
:(
NSString
*
)
type
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/GrossRateViewController.m
View file @
609c0b6b
...
@@ -53,7 +53,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
...
@@ -53,7 +53,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
[
self
.
view
addSubview
:
self
.
tableView
];
[
self
.
view
addSubview
:
self
.
tableView
];
}
}
-
(
void
)
setValueInGrossRate
:
(
Compass
*
)
compass
{
-
(
void
)
setValueInGrossRate
:
(
Compass
*
)
compass
withType
:
(
NSString
*
)
type
{
self
.
rpassgerView
.
weekLabelStr
=
type
;
[
self
.
rpassgerView
setGrossprofitWithCompass
:
compass
];
[
self
.
rpassgerView
setGrossprofitWithCompass
:
compass
];
}
}
...
@@ -112,6 +113,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
...
@@ -112,6 +113,8 @@ static NSString *grossRateViewHeaderController = @"grossRateViewHeaderController
[
headerView
buildLayout
:
@"毛利率"
];
[
headerView
buildLayout
:
@"毛利率"
];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
changeTypeName
:
self
.
typeStr
];
return
headerView
;
return
headerView
;
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/PassengerViewController.h
View file @
609c0b6b
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
strong
)
NSString
*
typeStr
;
-
(
void
)
setValueInPassenger
:(
Compass
*
)
compass
;
-
(
void
)
setValueInPassenger
:(
Compass
*
)
compass
withType
:(
NSString
*
)
type
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/PassengerViewController.m
View file @
609c0b6b
...
@@ -50,7 +50,8 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
...
@@ -50,7 +50,8 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
[
self
.
view
addSubview
:
self
.
tableView
];
[
self
.
view
addSubview
:
self
.
tableView
];
}
}
-
(
void
)
setValueInPassenger
:
(
Compass
*
)
compass
{
-
(
void
)
setValueInPassenger
:
(
Compass
*
)
compass
withType
:
(
NSString
*
)
type
{
self
.
rpassgerView
.
weekLabelStr
=
type
;
[
self
.
rpassgerView
setPassengerWithCompass
:
compass
];
[
self
.
rpassgerView
setPassengerWithCompass
:
compass
];
}
}
...
@@ -103,6 +104,7 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
...
@@ -103,6 +104,7 @@ static NSString *passengerHeaderIdentify = @"PassengerHeaderIdentify";
[
headerView
buildLayout
:
@"客流"
];
[
headerView
buildLayout
:
@"客流"
];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
changeTypeName
:
self
.
typeStr
];
return
headerView
;
return
headerView
;
}
}
-
(
void
)
detailClick
:
(
UIButton
*
)
btn
{
-
(
void
)
detailClick
:
(
UIButton
*
)
btn
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/PassgerPriceViewController.h
View file @
609c0b6b
...
@@ -12,7 +12,8 @@
...
@@ -12,7 +12,8 @@
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
strong
)
NSString
*
typeStr
;
-
(
void
)
setValueInPassgerPrice
:(
Compass
*
)
compass
;
-
(
void
)
setValueInPassgerPrice
:(
Compass
*
)
compass
withType
:(
NSString
*
)
type
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/PassgerPriceViewController.m
View file @
609c0b6b
...
@@ -53,7 +53,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
...
@@ -53,7 +53,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
[
self
.
view
addSubview
:
self
.
tableView
];
[
self
.
view
addSubview
:
self
.
tableView
];
}
}
-
(
void
)
setValueInPassgerPrice
:
(
id
)
compass
{
-
(
void
)
setValueInPassgerPrice
:
(
id
)
compass
withType
:
(
NSString
*
)
type
{
self
.
rpassgerView
.
weekLabelStr
=
type
;
[
self
.
rpassgerView
setPersalesWithCompass
:
compass
];
[
self
.
rpassgerView
setPersalesWithCompass
:
compass
];
}
}
...
@@ -113,6 +114,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
...
@@ -113,6 +114,8 @@ static NSString *passgerPriceHeaderIdentify = @"PassgerPriceHeaderIdentify";
[
headerView
buildLayout
:
@"客单价"
];
[
headerView
buildLayout
:
@"客单价"
];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
setTotalValue
:[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
]];
[
headerView
changeTypeName
:
self
.
typeStr
];
return
headerView
;
return
headerView
;
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/ReportDetailViewController.m
View file @
609c0b6b
...
@@ -240,6 +240,10 @@
...
@@ -240,6 +240,10 @@
[
self
.
rpassgerView
setPassengerWithCompass
:
self
.
compass
];
[
self
.
rpassgerView
setPassengerWithCompass
:
self
.
compass
];
[
self
.
rpriceView
setPersalesWithCompass
:
self
.
compass
];
[
self
.
rpriceView
setPersalesWithCompass
:
self
.
compass
];
[
self
.
rgrossView
setGrossprofitWithCompass
:
self
.
compass
];
[
self
.
rgrossView
setGrossprofitWithCompass
:
self
.
compass
];
self
.
rsaleView
.
weekLabelStr
=
self
.
dayType
;
self
.
rpassgerView
.
weekLabelStr
=
self
.
dayType
;
self
.
rpriceView
.
weekLabelStr
=
self
.
dayType
;
self
.
rsaleView
.
weekLabelStr
=
self
.
dayType
;
}
else
{
}
else
{
[
IBTLoadingView
showTips
:
message
];
[
IBTLoadingView
showTips
:
message
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/ReportViewController.m
View file @
609c0b6b
...
@@ -164,10 +164,10 @@
...
@@ -164,10 +164,10 @@
}
}
}
}
-
(
void
)
setValueInScrollView
{
-
(
void
)
setValueInScrollView
{
[
svc
setValueInSale
:
self
.
compass
];
[
svc
setValueInSale
:
self
.
compass
withType
:
self
.
dayType
];
[
pvc
setValueInPassenger
:
self
.
compass
];
[
pvc
setValueInPassenger
:
self
.
compass
withType
:
self
.
dayType
];
[
ppvc
setValueInPassgerPrice
:
self
.
compass
];
[
ppvc
setValueInPassgerPrice
:
self
.
compass
withType
:
self
.
dayType
];
[
gvc
setValueInGrossRate
:
self
.
compass
];
[
gvc
setValueInGrossRate
:
self
.
compass
withType
:
self
.
dayType
];
}
}
//获取底部详情数据
//获取底部详情数据
...
@@ -251,9 +251,13 @@
...
@@ -251,9 +251,13 @@
#pragma mark - 刷新所有的tableView
#pragma mark - 刷新所有的tableView
-
(
void
)
refreshAllTable
{
-
(
void
)
refreshAllTable
{
svc
.
count
=
self
.
storeCount
;
svc
.
count
=
self
.
storeCount
;
svc
.
typeStr
=
self
.
dayType
;
pvc
.
count
=
self
.
storeCount
;
pvc
.
count
=
self
.
storeCount
;
pvc
.
typeStr
=
self
.
dayType
;
ppvc
.
count
=
self
.
storeCount
;
ppvc
.
count
=
self
.
storeCount
;
ppvc
.
typeStr
=
self
.
dayType
;
gvc
.
count
=
self
.
storeCount
;
gvc
.
count
=
self
.
storeCount
;
gvc
.
typeStr
=
self
.
dayType
;
svc
.
dataArr
=
self
.
dataArr
;
svc
.
dataArr
=
self
.
dataArr
;
pvc
.
dataArr
=
self
.
dataArr
;
pvc
.
dataArr
=
self
.
dataArr
;
ppvc
.
dataArr
=
self
.
dataArr
;
ppvc
.
dataArr
=
self
.
dataArr
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/SaleViewController.h
View file @
609c0b6b
...
@@ -12,6 +12,8 @@
...
@@ -12,6 +12,8 @@
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
dataArr
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
@property
(
nonatomic
,
assign
)
NSInteger
count
;
-
(
void
)
setValueInSale
:(
Compass
*
)
compass
;
@property
(
nonatomic
,
strong
)
NSString
*
typeStr
;
-
(
void
)
setValueInSale
:(
Compass
*
)
compass
withType
:(
NSString
*
)
type
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Controllers/SaleViewController.m
View file @
609c0b6b
...
@@ -60,9 +60,11 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
...
@@ -60,9 +60,11 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
[
self
.
view
addSubview
:
self
.
tableView
];
[
self
.
view
addSubview
:
self
.
tableView
];
}
}
-
(
void
)
setValueInSale
:
(
Compass
*
)
compass
{
-
(
void
)
setValueInSale
:
(
Compass
*
)
compass
withType
:
(
NSString
*
)
type
{
self
.
compass
=
compass
;
self
.
compass
=
compass
;
self
.
rsaleView
.
weekLabelStr
=
type
;
[
self
.
rsaleView
setValueInSaleView
:
compass
];
[
self
.
rsaleView
setValueInSaleView
:
compass
];
}
}
#pragma mark - tableViewDelegate
#pragma mark - tableViewDelegate
...
@@ -112,6 +114,8 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
...
@@ -112,6 +114,8 @@ static NSString *saleHeaderIdentify = @"saleHeaderIdentify";
}
}
[
headerView
buildLayout
];
[
headerView
buildLayout
];
headerView
.
totalLabel
.
text
=
[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
];
headerView
.
totalLabel
.
text
=
[
NSString
stringWithFormat
:
@"共%ld家"
,(
long
)
self
.
count
];
[
headerView
changeTypeName
:
self
.
typeStr
];
return
headerView
;
return
headerView
;
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.h
View file @
609c0b6b
...
@@ -12,4 +12,5 @@
...
@@ -12,4 +12,5 @@
+
(
CGFloat
)
viewHeight
;
+
(
CGFloat
)
viewHeight
;
-
(
void
)
buildLayout
:(
NSString
*
)
titleStr
;
-
(
void
)
buildLayout
:(
NSString
*
)
titleStr
;
-
(
void
)
setTotalValue
:(
NSString
*
)
totalValue
;
-
(
void
)
setTotalValue
:(
NSString
*
)
totalValue
;
-
(
void
)
changeTypeName
:(
NSString
*
)
name
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/PassengerHeaderCell.m
View file @
609c0b6b
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
@property
(
nonatomic
,
strong
)
UILabel
*
searchLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
searchLabel
;
@property
(
nonatomic
,
strong
)
UIFont
*
textFont
;
@property
(
nonatomic
,
strong
)
UIFont
*
textFont
;
@property
(
nonatomic
,
strong
)
UILabel
*
bszLabel
;
@end
@end
...
@@ -71,6 +71,7 @@
...
@@ -71,6 +71,7 @@
UILabel
*
bszLabel
=
[
IBTCommon
labelWithTitle
:
@"比上周"
frame
:
rect
textFont
:
self
.
textFont
];
UILabel
*
bszLabel
=
[
IBTCommon
labelWithTitle
:
@"比上周"
frame
:
rect
textFont
:
self
.
textFont
];
bszLabel
.
textColor
=
ReportTitleColor
;
bszLabel
.
textColor
=
ReportTitleColor
;
[
self
.
contentView
addSubview
:
bszLabel
];
[
self
.
contentView
addSubview
:
bszLabel
];
self
.
bszLabel
=
bszLabel
;
rect
=
CGRectMake
(
0
,
Sale_Header_Height
-
1
,
ScreenSize
.
width
,
1
);
rect
=
CGRectMake
(
0
,
Sale_Header_Height
-
1
,
ScreenSize
.
width
,
1
);
UILabel
*
lineTLabel
=
[[
UILabel
alloc
]
initWithFrame
:
rect
];
UILabel
*
lineTLabel
=
[[
UILabel
alloc
]
initWithFrame
:
rect
];
...
@@ -81,4 +82,16 @@
...
@@ -81,4 +82,16 @@
-
(
void
)
setTotalValue
:
(
NSString
*
)
totalValue
{
-
(
void
)
setTotalValue
:
(
NSString
*
)
totalValue
{
self
.
searchLabel
.
text
=
totalValue
;
self
.
searchLabel
.
text
=
totalValue
;
}
}
-
(
void
)
changeTypeName
:
(
NSString
*
)
name
{
NSString
*
typeStr
=
@""
;
if
([
name
isEqualToString
:
SaleEnMonth
])
{
typeStr
=
LastMonth
;
}
else
{
typeStr
=
LastWeak
;
}
self
.
bszLabel
.
text
=
typeStr
;
}
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/RPassgerView.h
View file @
609c0b6b
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
@property
(
nonatomic
,
strong
)
UIButton
*
lastYearLabel
;
@property
(
nonatomic
,
strong
)
UIButton
*
lastYearLabel
;
@property
(
nonatomic
,
strong
)
UIImageView
*
bgImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
bgImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
cenImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
cenImage
;
@property
(
nonatomic
,
strong
)
NSString
*
weekLabelStr
;
@property
(
nonatomic
,
strong
)
UILabel
*
weekLabel
;
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
withPage
:(
NSInteger
)
currentPage
;
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
withPage
:(
NSInteger
)
currentPage
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/RPassgerView.m
View file @
609c0b6b
...
@@ -79,6 +79,7 @@
...
@@ -79,6 +79,7 @@
weekLabel
.
textAlignment
=
NSTextAlignmentCenter
;
weekLabel
.
textAlignment
=
NSTextAlignmentCenter
;
weekLabel
.
font
=
GXF_THREETEENTH_SIZE
;
weekLabel
.
font
=
GXF_THREETEENTH_SIZE
;
[
self
addSubview
:
weekLabel
];
[
self
addSubview
:
weekLabel
];
self
.
weekLabel
=
weekLabel
;
rect
=
CGRectMake
(
self
.
lastWeekLabel
.
right
,
self
.
dateLabel
.
bottom
,
bottomWidth
,
ContentHeight
);
rect
=
CGRectMake
(
self
.
lastWeekLabel
.
right
,
self
.
dateLabel
.
bottom
,
bottomWidth
,
ContentHeight
);
...
@@ -105,8 +106,17 @@
...
@@ -105,8 +106,17 @@
self
.
pageControl
.
indicatorDiameter
=
10
.
0
f
;
self
.
pageControl
.
indicatorDiameter
=
10
.
0
f
;
[
self
addSubview
:
self
.
pageControl
];
[
self
addSubview
:
self
.
pageControl
];
}
}
-
(
void
)
setWeekLabelStr
:
(
NSString
*
)
weekLabelStr
{
NSString
*
typeStr
=
@""
;
if
([
weekLabelStr
isEqualToString
:
SaleEnDay
])
{
typeStr
=
OrderLastWeak
;
}
else
if
([
weekLabelStr
isEqualToString
:
SaleEnWeek
]){
typeStr
=
OrderLastWeak
;
}
else
if
([
weekLabelStr
isEqualToString
:
SaleEnMonth
]){
typeStr
=
OrderLastMonth
;
}
self
.
weekLabel
.
text
=
typeStr
;
}
//客流
//客流
-
(
void
)
setPassengerWithCompass
:
(
Compass
*
)
compass
{
-
(
void
)
setPassengerWithCompass
:
(
Compass
*
)
compass
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/RSaleView.h
View file @
609c0b6b
...
@@ -12,6 +12,9 @@
...
@@ -12,6 +12,9 @@
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
withPage
:(
NSInteger
)
currentPage
;
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
withPage
:(
NSInteger
)
currentPage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
bgImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
bgImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
cenImage
;
@property
(
nonatomic
,
strong
)
UIImageView
*
cenImage
;
@property
(
nonatomic
,
strong
)
NSString
*
weekLabelStr
;
@property
(
nonatomic
,
strong
)
UILabel
*
weekLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
avgLabel
;
-
(
void
)
setValueInSaleView
:(
Compass
*
)
compass
;
-
(
void
)
setValueInSaleView
:(
Compass
*
)
compass
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/RSaleView.m
View file @
609c0b6b
...
@@ -89,6 +89,7 @@
...
@@ -89,6 +89,7 @@
weekLabel
.
font
=
GXF_THREETEENTH_SIZE
;
weekLabel
.
font
=
GXF_THREETEENTH_SIZE
;
weekLabel
.
textAlignment
=
NSTextAlignmentCenter
;
weekLabel
.
textAlignment
=
NSTextAlignmentCenter
;
[
self
addSubview
:
weekLabel
];
[
self
addSubview
:
weekLabel
];
self
.
weekLabel
=
weekLabel
;
rect
=
CGRectMake
(
self
.
lastWeekLabel
.
right
,
self
.
lastWeekLabel
.
top
,
bottomWidth
,
ContentHeight
);
rect
=
CGRectMake
(
self
.
lastWeekLabel
.
right
,
self
.
lastWeekLabel
.
top
,
bottomWidth
,
ContentHeight
);
self
.
lastYearLabel
=
[
IBTCommon
buttonWithTitle
:
@""
Image
:
nil
frame
:
rect
fontSize
:
15
fontColor
:
[
UIColor
lightGrayColor
]];
self
.
lastYearLabel
=
[
IBTCommon
buttonWithTitle
:
@""
Image
:
nil
frame
:
rect
fontSize
:
15
fontColor
:
[
UIColor
lightGrayColor
]];
...
@@ -134,7 +135,7 @@
...
@@ -134,7 +135,7 @@
avLabel
.
font
=
GXF_THREETEENTH_SIZE
;
avLabel
.
font
=
GXF_THREETEENTH_SIZE
;
avLabel
.
textAlignment
=
NSTextAlignmentCenter
;
avLabel
.
textAlignment
=
NSTextAlignmentCenter
;
[
self
addSubview
:
avLabel
];
[
self
addSubview
:
avLabel
];
self
.
avgLabel
=
avLabel
;
self
.
pageControl
=
[[
SMPageControl
alloc
]
initWithFrame
:
CGRectMake
(
0
,
avLabel
.
bottom
+
5
,
ScreenSize
.
width
,
10
)];
self
.
pageControl
=
[[
SMPageControl
alloc
]
initWithFrame
:
CGRectMake
(
0
,
avLabel
.
bottom
+
5
,
ScreenSize
.
width
,
10
)];
self
.
pageControl
.
numberOfPages
=
4
;
self
.
pageControl
.
numberOfPages
=
4
;
self
.
pageControl
.
currentPage
=
self
.
currentPage
;
self
.
pageControl
.
currentPage
=
self
.
currentPage
;
...
@@ -144,7 +145,23 @@
...
@@ -144,7 +145,23 @@
self
.
pageControl
.
indicatorDiameter
=
10
.
0
f
;
self
.
pageControl
.
indicatorDiameter
=
10
.
0
f
;
[
self
addSubview
:
self
.
pageControl
];
[
self
addSubview
:
self
.
pageControl
];
}
}
-
(
void
)
setWeekLabelStr
:
(
NSString
*
)
weekLabelStr
{
NSString
*
typeStr
=
@""
;
NSString
*
avStr
=
@""
;
if
([
weekLabelStr
isEqualToString
:
SaleEnDay
])
{
typeStr
=
OrderLastWeak
;
avStr
=
AvgLabelDay
;
}
else
if
([
weekLabelStr
isEqualToString
:
SaleEnWeek
]){
typeStr
=
OrderLastWeak
;
avStr
=
AvgLabelWeek
;
}
else
if
([
weekLabelStr
isEqualToString
:
SaleEnMonth
]){
typeStr
=
OrderLastMonth
;
avStr
=
AvgLabelMonth
;
}
self
.
weekLabel
.
text
=
typeStr
;
self
.
avgLabel
.
text
=
avStr
;
}
-
(
void
)
setValueInSaleView
:
(
Compass
*
)
compass
{
-
(
void
)
setValueInSaleView
:
(
Compass
*
)
compass
{
//统计时间
//统计时间
NSString
*
weekday
=
@""
;
NSString
*
weekday
=
@""
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/SaleHeaderView.h
View file @
609c0b6b
...
@@ -14,5 +14,6 @@
...
@@ -14,5 +14,6 @@
+
(
CGFloat
)
viewHeight
;
+
(
CGFloat
)
viewHeight
;
-
(
void
)
buildLayout
;
-
(
void
)
buildLayout
;
-
(
void
)
changeTypeName
:(
NSString
*
)
name
;
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/SaleHeaderView.m
View file @
609c0b6b
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
@property
(
nonatomic
,
strong
)
UILabel
*
label
;
@property
(
nonatomic
,
strong
)
UILabel
*
label
;
@property
(
nonatomic
,
strong
)
UIFont
*
textFont
;
@property
(
nonatomic
,
strong
)
UIFont
*
textFont
;
@property
(
nonatomic
,
strong
)
UILabel
*
bszLabel
;
@end
@end
...
@@ -64,6 +65,7 @@
...
@@ -64,6 +65,7 @@
UILabel
*
bszLabel
=
[
IBTCommon
labelWithTitle
:
@"比上周"
frame
:
rect
textFont
:
self
.
textFont
];
UILabel
*
bszLabel
=
[
IBTCommon
labelWithTitle
:
@"比上周"
frame
:
rect
textFont
:
self
.
textFont
];
bszLabel
.
textColor
=
ReportTitleColor
;
bszLabel
.
textColor
=
ReportTitleColor
;
[
self
.
contentView
addSubview
:
bszLabel
];
[
self
.
contentView
addSubview
:
bszLabel
];
self
.
bszLabel
=
bszLabel
;
rect
=
CGRectMake
(
bszLabel
.
right
,
0
,
width
-
20
,
Sale_Header_Height
);
rect
=
CGRectMake
(
bszLabel
.
right
,
0
,
width
-
20
,
Sale_Header_Height
);
UILabel
*
sclLabel
=
[
IBTCommon
labelWithTitle
:
@"达成率"
frame
:
rect
textFont
:
self
.
textFont
];
UILabel
*
sclLabel
=
[
IBTCommon
labelWithTitle
:
@"达成率"
frame
:
rect
textFont
:
self
.
textFont
];
...
@@ -76,5 +78,13 @@
...
@@ -76,5 +78,13 @@
[
self
.
contentView
addSubview
:
lineTLabel
];
[
self
.
contentView
addSubview
:
lineTLabel
];
}
}
-
(
void
)
changeTypeName
:
(
NSString
*
)
name
{
NSString
*
typeStr
=
@""
;
if
([
name
isEqualToString
:
SaleEnMonth
])
{
typeStr
=
LastMonth
;
}
else
{
typeStr
=
LastWeak
;
}
self
.
bszLabel
.
text
=
typeStr
;
}
@end
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Report/Views/SaleViewCell.m
View file @
609c0b6b
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
//销售额
//销售额
self
.
saleLabel
.
text
=
sale
.
sales
?[
IBTCommon
countNumAndChangeformat
:[
sale
.
sales
stringValue
]]
:
@"0"
;
self
.
saleLabel
.
text
=
sale
.
sales
?[
IBTCommon
countNumAndChangeformat
:[
sale
.
sales
stringValue
]]
:
@"0"
;
NSString
*
salesYoStr
=
[
NSString
stringWithFormat
:
@"%@%%"
,
sale
.
salesChainRate
];
NSString
*
salesYoStr
=
[
NSString
stringWithFormat
:
@"%@%%"
,
[
sale
.
salesChainRate
stringValue
]
];
[
self
.
lastWeekLabel
setTitle
:
salesYoStr
forState
:
UIControlStateNormal
];
[
self
.
lastWeekLabel
setTitle
:
salesYoStr
forState
:
UIControlStateNormal
];
//销售目标达成率
//销售目标达成率
NSString
*
salesTargetRateStr
=
[
NSString
stringWithFormat
:
@"%@%%"
,
sale
.
salesTargetRate
];
NSString
*
salesTargetRateStr
=
[
NSString
stringWithFormat
:
@"%@%%"
,
sale
.
salesTargetRate
];
...
...
This diff is collapsed.
Click to expand it.
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