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
9454d75b
Commit
9454d75b
authored
9 years ago
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分细节修改
parent
5fe58fc7
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
123 additions
and
991 deletions
+123
-991
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+18
-90
BusinessViewController.m
XFFruit/ViewControllers/Business/BusinessViewController.m
+0
-1
FooterCell.h
XFFruit/ViewControllers/ChooseViewController/FooterCell.h
+0
-0
FooterCell.m
XFFruit/ViewControllers/ChooseViewController/FooterCell.m
+0
-0
HeaderCell.h
XFFruit/ViewControllers/ChooseViewController/HeaderCell.h
+0
-0
HeaderCell.m
XFFruit/ViewControllers/ChooseViewController/HeaderCell.m
+3
-2
ICRHomeViewController.m
.../ViewControllers/Home/Controllers/ICRHomeViewController.m
+0
-1
ProductBillCell.m
XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m
+7
-7
NewPurchaseNoticeViewController.m
...chaseNotice/Controllers/NewPurchaseNoticeViewController.m
+5
-5
SeePurchaseNoticeViewController.m
...chaseNotice/Controllers/SeePurchaseNoticeViewController.m
+13
-5
NoticeProductViewController.m
...ollers/PurchaseNotice/Views/NoticeProductViewController.m
+24
-4
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+10
-9
NewCostViewController.m
...Controllers/Transport/Controllers/NewCostViewController.m
+28
-7
CostCell.m
XFFruit/ViewControllers/Transport/Views/CostCell.m
+8
-8
TransportPurductCell.m
...it/ViewControllers/Transport/Views/TransportPurductCell.m
+7
-7
AddWorkSheetViewController.h
...ollers/WorkSheet/Controllers/AddWorkSheetViewController.h
+0
-13
AddWorkSheetViewController.m
...ollers/WorkSheet/Controllers/AddWorkSheetViewController.m
+0
-102
GoodsViewController.h
...ewControllers/WorkSheet/Controllers/GoodsViewController.h
+0
-15
GoodsViewController.m
...ewControllers/WorkSheet/Controllers/GoodsViewController.m
+0
-80
MaterialVIewController.h
...ontrollers/WorkSheet/Controllers/MaterialVIewController.h
+0
-15
MaterialVIewController.m
...ontrollers/WorkSheet/Controllers/MaterialVIewController.m
+0
-139
BottomSheetView.h
XFFruit/ViewControllers/WorkSheet/Views/BottomSheetView.h
+0
-13
BottomSheetView.m
XFFruit/ViewControllers/WorkSheet/Views/BottomSheetView.m
+0
-124
MaterialCell.h
XFFruit/ViewControllers/WorkSheet/Views/MaterialCell.h
+0
-31
MaterialCell.m
XFFruit/ViewControllers/WorkSheet/Views/MaterialCell.m
+0
-149
TopSheetView.h
XFFruit/ViewControllers/WorkSheet/Views/TopSheetView.h
+0
-35
TopSheetView.m
XFFruit/ViewControllers/WorkSheet/Views/TopSheetView.m
+0
-129
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
9454d75b
...
...
@@ -109,6 +109,8 @@
721B5DB01BA02A0C006CA199
/* GXFProcessBoltView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
721B5DAF1BA02A0C006CA199
/* GXFProcessBoltView.m */
;
};
721B5DB51BA02A2B006CA199
/* GXFProcessCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
721B5DB21BA02A2B006CA199
/* GXFProcessCell.m */
;
};
721B5DB61BA02A2B006CA199
/* GXFProcessMaterial.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
721B5DB41BA02A2B006CA199
/* GXFProcessMaterial.m */
;
};
721BF46A1BAAA18400255750
/* FooterCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
721BF4671BAAA18400255750
/* FooterCell.m */
;
};
721BF46B1BAAA18400255750
/* HeaderCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
721BF4691BAAA18400255750
/* HeaderCell.m */
;
};
7241716F1B9D30660094DF55
/* ChooseProductViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
724171661B9D30660094DF55
/* ChooseProductViewController.m */
;
};
724171701B9D30660094DF55
/* ChooseTypeViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
724171681B9D30660094DF55
/* ChooseTypeViewController.m */
;
};
724171711B9D30660094DF55
/* ChooseVendorViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7241716A1B9D30660094DF55
/* ChooseVendorViewController.m */
;
};
...
...
@@ -143,8 +145,6 @@
72B3C0D91B9DB83A00025D81
/* TransportBoltView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72B3C0D81B9DB83A00025D81
/* TransportBoltView.m */
;
};
72B3C0DC1B9DBD7500025D81
/* TransportCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72B3C0DB1B9DBD7500025D81
/* TransportCell.m */
;
};
72B3C0DF1B9DC60D00025D81
/* TransportDetailViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72B3C0DE1B9DC60D00025D81
/* TransportDetailViewController.m */
;
};
72C8034C1B7B72DB00990363
/* AddWorkSheetViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72C8034B1B7B72DB00990363
/* AddWorkSheetViewController.m */
;
};
72C8034F1B7B735300990363
/* TopSheetView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72C8034E1B7B735300990363
/* TopSheetView.m */
;
};
72C803521B7B897B00990363
/* DataManager.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72C803511B7B897B00990363
/* DataManager.m */
;
};
72EDD86E1B96E11700964115
/* ChooseParentViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72EDD86D1B96E11700964115
/* ChooseParentViewController.m */
;
};
72F56CB21B76EC200077F0C9
/* SurveyUser.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
72F56CB11B76EC200077F0C9
/* SurveyUser.m */
;
};
...
...
@@ -436,12 +436,6 @@
FE4678B61B8D986900B5EDA3
/* PurchaseBoltView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FE4678B51B8D986900B5EDA3
/* PurchaseBoltView.m */
;
};
FE7155D91B7B328400595B0A
/* Product.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FE7155D81B7B328400595B0A
/* Product.m */
;
};
FE95FDDA1B93FC12008040D0
/* PurchaseBillProduct.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FE95FDD91B93FC12008040D0
/* PurchaseBillProduct.m */
;
};
FEA2F2FD1B8423B900D64735
/* BottomSheetView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F2FC1B8423B900D64735
/* BottomSheetView.m */
;
};
FEA2F3001B842A1C00D64735
/* MaterialVIewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F2FF1B842A1C00D64735
/* MaterialVIewController.m */
;
};
FEA2F3031B8453C700D64735
/* GoodsViewController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F3021B8453C700D64735
/* GoodsViewController.m */
;
};
FEA2F3091B8459DA00D64735
/* HeaderCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F3081B8459DA00D64735
/* HeaderCell.m */
;
};
FEA2F30C1B84687D00D64735
/* FooterCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F30B1B84687D00D64735
/* FooterCell.m */
;
};
FEA2F30F1B846F0100D64735
/* MaterialCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEA2F30E1B846F0100D64735
/* MaterialCell.m */
;
};
FEAE16E91B79C9F9009D9E01
/* ResultView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEAE16E81B79C9F9009D9E01
/* ResultView.m */
;
};
FEAE16EC1B79CAA0009D9E01
/* TPCustomImageVIew.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEAE16EB1B79CAA0009D9E01
/* TPCustomImageVIew.m */
;
};
FEAE16EF1B79CAE3009D9E01
/* SingleScrollView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FEAE16EE1B79CAE3009D9E01
/* SingleScrollView.m */
;
};
...
...
@@ -621,6 +615,10 @@
721B5DB21BA02A2B006CA199
/* GXFProcessCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
GXFProcessCell.m
;
sourceTree
=
"<group>"
;
};
721B5DB31BA02A2B006CA199
/* GXFProcessMaterial.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
GXFProcessMaterial.h
;
sourceTree
=
"<group>"
;
};
721B5DB41BA02A2B006CA199
/* GXFProcessMaterial.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
GXFProcessMaterial.m
;
sourceTree
=
"<group>"
;
};
721BF4661BAAA18400255750
/* FooterCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
FooterCell.h
;
sourceTree
=
"<group>"
;
};
721BF4671BAAA18400255750
/* FooterCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
FooterCell.m
;
sourceTree
=
"<group>"
;
};
721BF4681BAAA18400255750
/* HeaderCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
HeaderCell.h
;
sourceTree
=
"<group>"
;
};
721BF4691BAAA18400255750
/* HeaderCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
HeaderCell.m
;
sourceTree
=
"<group>"
;
};
724171651B9D30660094DF55
/* ChooseProductViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ChooseProductViewController.h
;
sourceTree
=
"<group>"
;
};
724171661B9D30660094DF55
/* ChooseProductViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ChooseProductViewController.m
;
sourceTree
=
"<group>"
;
};
724171671B9D30660094DF55
/* ChooseTypeViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ChooseTypeViewController.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -689,10 +687,6 @@
72B3C0DB1B9DBD7500025D81
/* TransportCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
TransportCell.m
;
sourceTree
=
"<group>"
;
};
72B3C0DD1B9DC60D00025D81
/* TransportDetailViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
TransportDetailViewController.h
;
sourceTree
=
"<group>"
;
};
72B3C0DE1B9DC60D00025D81
/* TransportDetailViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
TransportDetailViewController.m
;
sourceTree
=
"<group>"
;
};
72C8034A1B7B72DB00990363
/* AddWorkSheetViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
AddWorkSheetViewController.h
;
sourceTree
=
"<group>"
;
};
72C8034B1B7B72DB00990363
/* AddWorkSheetViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
AddWorkSheetViewController.m
;
sourceTree
=
"<group>"
;
};
72C8034D1B7B735300990363
/* TopSheetView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
TopSheetView.h
;
sourceTree
=
"<group>"
;
};
72C8034E1B7B735300990363
/* TopSheetView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
TopSheetView.m
;
sourceTree
=
"<group>"
;
};
72C803501B7B897B00990363
/* DataManager.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
DataManager.h
;
sourceTree
=
"<group>"
;
};
72C803511B7B897B00990363
/* DataManager.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
DataManager.m
;
sourceTree
=
"<group>"
;
};
72EDD86C1B96E11700964115
/* ChooseParentViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ChooseParentViewController.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1012,18 +1006,6 @@
FE7155D81B7B328400595B0A
/* Product.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
Product.m
;
sourceTree
=
"<group>"
;
};
FE95FDD81B93FC12008040D0
/* PurchaseBillProduct.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
PurchaseBillProduct.h
;
sourceTree
=
"<group>"
;
};
FE95FDD91B93FC12008040D0
/* PurchaseBillProduct.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
PurchaseBillProduct.m
;
sourceTree
=
"<group>"
;
};
FEA2F2FB1B8423B900D64735
/* BottomSheetView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
BottomSheetView.h
;
sourceTree
=
"<group>"
;
};
FEA2F2FC1B8423B900D64735
/* BottomSheetView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
BottomSheetView.m
;
sourceTree
=
"<group>"
;
};
FEA2F2FE1B842A1C00D64735
/* MaterialVIewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
MaterialVIewController.h
;
sourceTree
=
"<group>"
;
};
FEA2F2FF1B842A1C00D64735
/* MaterialVIewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
MaterialVIewController.m
;
sourceTree
=
"<group>"
;
};
FEA2F3011B8453C700D64735
/* GoodsViewController.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
GoodsViewController.h
;
sourceTree
=
"<group>"
;
};
FEA2F3021B8453C700D64735
/* GoodsViewController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
GoodsViewController.m
;
sourceTree
=
"<group>"
;
};
FEA2F3071B8459DA00D64735
/* HeaderCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
HeaderCell.h
;
sourceTree
=
"<group>"
;
};
FEA2F3081B8459DA00D64735
/* HeaderCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
HeaderCell.m
;
sourceTree
=
"<group>"
;
};
FEA2F30A1B84687D00D64735
/* FooterCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
FooterCell.h
;
sourceTree
=
"<group>"
;
};
FEA2F30B1B84687D00D64735
/* FooterCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
FooterCell.m
;
sourceTree
=
"<group>"
;
};
FEA2F30D1B846F0100D64735
/* MaterialCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
MaterialCell.h
;
sourceTree
=
"<group>"
;
};
FEA2F30E1B846F0100D64735
/* MaterialCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
MaterialCell.m
;
sourceTree
=
"<group>"
;
};
FEAE16E71B79C9F9009D9E01
/* ResultView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ResultView.h
;
sourceTree
=
"<group>"
;
};
FEAE16E81B79C9F9009D9E01
/* ResultView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
ResultView.m
;
sourceTree
=
"<group>"
;
};
FEAE16EA1B79CAA0009D9E01
/* TPCustomImageVIew.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
TPCustomImageVIew.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1366,6 +1348,10 @@
72873CEA1BA27BA6007B3387
/* GXFPopView.m */
,
72873CEC1BA280DD007B3387
/* GXFPopCell.h */
,
72873CED1BA280DD007B3387
/* GXFPopCell.m */
,
721BF4661BAAA18400255750
/* FooterCell.h */
,
721BF4671BAAA18400255750
/* FooterCell.m */
,
721BF4681BAAA18400255750
/* HeaderCell.h */
,
721BF4691BAAA18400255750
/* HeaderCell.m */
,
);
path
=
ChooseViewController
;
sourceTree
=
"<group>"
;
...
...
@@ -1490,57 +1476,6 @@
path
=
Views
;
sourceTree
=
"<group>"
;
};
72C803431B7B6F0200990363
/* WorkSheet */
=
{
isa
=
PBXGroup
;
children
=
(
72C803471B7B728700990363
/* Controllers */
,
72C803481B7B728700990363
/* Models */
,
72C803491B7B728700990363
/* Views */
,
);
name
=
WorkSheet
;
path
=
Worksheet
;
sourceTree
=
"<group>"
;
};
72C803471B7B728700990363
/* Controllers */
=
{
isa
=
PBXGroup
;
children
=
(
72C8034A1B7B72DB00990363
/* AddWorkSheetViewController.h */
,
72C8034B1B7B72DB00990363
/* AddWorkSheetViewController.m */
,
FEA2F2FE1B842A1C00D64735
/* MaterialVIewController.h */
,
FEA2F2FF1B842A1C00D64735
/* MaterialVIewController.m */
,
FEA2F3011B8453C700D64735
/* GoodsViewController.h */
,
FEA2F3021B8453C700D64735
/* GoodsViewController.m */
,
);
name
=
Controllers
;
path
=
XFFruit/ViewControllers/WorkSheet/Controllers
;
sourceTree
=
SOURCE_ROOT
;
};
72C803481B7B728700990363
/* Models */
=
{
isa
=
PBXGroup
;
children
=
(
);
name
=
Models
;
path
=
XFFruit/ViewControllers/WorkSheet/Models
;
sourceTree
=
SOURCE_ROOT
;
};
72C803491B7B728700990363
/* Views */
=
{
isa
=
PBXGroup
;
children
=
(
72C8034D1B7B735300990363
/* TopSheetView.h */
,
72C8034E1B7B735300990363
/* TopSheetView.m */
,
FEA2F2FB1B8423B900D64735
/* BottomSheetView.h */
,
FEA2F2FC1B8423B900D64735
/* BottomSheetView.m */
,
FEA2F3071B8459DA00D64735
/* HeaderCell.h */
,
FEA2F3081B8459DA00D64735
/* HeaderCell.m */
,
FEA2F30A1B84687D00D64735
/* FooterCell.h */
,
FEA2F30B1B84687D00D64735
/* FooterCell.m */
,
FEA2F30D1B846F0100D64735
/* MaterialCell.h */
,
FEA2F30E1B846F0100D64735
/* MaterialCell.m */
,
);
name
=
Views
;
path
=
XFFruit/ViewControllers/WorkSheet/Views
;
sourceTree
=
SOURCE_ROOT
;
};
8CDB3C30A601E08F91ED44F8
/* Frameworks */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -2195,7 +2130,6 @@
35CF33721B953E8D001211EF
/* Process(加工单) */
,
7281A0A71B8974120052B1AC
/* Purchase */
,
FE17F67A1B85CA5B0078CE96
/* PurchaseNotice */
,
72C803431B7B6F0200990363
/* WorkSheet */
,
7217E9C01B72364300FE5C1D
/* Survey */
,
C159180B1ABE88030013B391
/* Login */
,
C159185D1AC078020013B391
/* Home */
,
...
...
@@ -2584,7 +2518,6 @@
FE2FCC8B1B74A9EE00BBC6FB
/* SurveyResultCell.m in Sources */
,
C182E40E1AD4CE0B009BB9DB
/* IBTModel.m in Sources */
,
C1FE50411AE0240300C18080
/* IBTAVAudioPlayWrapper.m in Sources */
,
FEA2F2FD1B8423B900D64735
/* BottomSheetView.m in Sources */
,
7217E9EC1B72364300FE5C1D
/* HPTextViewInternal.m in Sources */
,
C159184B1AC062460013B391
/* IBTTabBarController.m in Sources */
,
C142D2BE1AC3A155000109A7
/* UIView+FindUIViewController.m in Sources */
,
...
...
@@ -2607,7 +2540,6 @@
72B3C0C91B9D3C7300025D81
/* TransportPurchaseCell.m in Sources */
,
C142D2C51AC3A16C000109A7
/* ICRBaseViewController.m in Sources */
,
351CFF5B1B90633700F30866
/* GXFDisplayFunction.m in Sources */
,
FEA2F3001B842A1C00D64735
/* MaterialVIewController.m in Sources */
,
C123A91D1B25E3F1003C0C36
/* ICRPatrolResultViewController.m in Sources */
,
C1E108651ADAD2F200620375
/* IBTUIScrollView.m in Sources */
,
7217E9E51B72364300FE5C1D
/* NewSurveyViewController.m in Sources */
,
...
...
@@ -2627,6 +2559,7 @@
C11A34661B24487D00079129
/* ICRAnswer.m in Sources */
,
C1D017171AD8EF8100CD9CB8
/* IBTSegmentedControl.m in Sources */
,
C10C90901AE54FE300B911CD
/* IBTDatePickerViewController.m in Sources */
,
721BF46B1BAAA18400255750
/* HeaderCell.m in Sources */
,
72F9D4881BA8065500795A00
/* PurchaseNoticeListCell.m in Sources */
,
C1C5644B1AD66EB4006A1050
/* ICRTaskListViewController.m in Sources */
,
35CF33981B96BB02001211EF
/* GXFPaging.m in Sources */
,
...
...
@@ -2645,7 +2578,6 @@
C1C5643E1AD62BD8006A1050
/* ICRPlaceholderTextView.m in Sources */
,
307059D21AF2211300E9DB8E
/* ICRSyncCellContentView.m in Sources */
,
35CF33811B9542BE001211EF
/* GXFNewProcessViewController.m in Sources */
,
FEA2F30F1B846F0100D64735
/* MaterialCell.m in Sources */
,
72B3C0DC1B9DBD7500025D81
/* TransportCell.m in Sources */
,
0406BFD91B7C97E700DD65A7
/* BusinessViewController.m in Sources */
,
C1374F581B33C40D00594D19
/* IBTWebViewController.m in Sources */
,
...
...
@@ -2655,6 +2587,7 @@
C142D2AA1AC3A155000109A7
/* NSDate+FormatterAdditions.m in Sources */
,
C1B307A31ADD199600657F11
/* ICRTaskResultContentView.m in Sources */
,
72873CEB1BA27BA6007B3387
/* GXFPopView.m in Sources */
,
721BF46A1BAAA18400255750
/* FooterCell.m in Sources */
,
30DB9F971AD7DEC00085FA5C
/* IBTUISearchBar.m in Sources */
,
7217E9E61B72364300FE5C1D
/* SurveyViewController.m in Sources */
,
C10214E41AD9141E0024637E
/* ICRAnnouncementViewController.m in Sources */
,
...
...
@@ -2721,7 +2654,6 @@
C15918671AC19FCF0013B391
/* ICRStoreViewController.m in Sources */
,
C1FBC1291ACA9651007B1A44
/* ICRHTTPApiTestViewController.m in Sources */
,
724171701B9D30660094DF55
/* ChooseTypeViewController.m in Sources */
,
72C8034C1B7B72DB00990363
/* AddWorkSheetViewController.m in Sources */
,
C1D017231AD8F41400CD9CB8
/* IBTRefreshTableView.m in Sources */
,
7241716F1B9D30660094DF55
/* ChooseProductViewController.m in Sources */
,
C15295BF1B24511F00DF60D1
/* ICRQStoreStudyViewController.m in Sources */
,
...
...
@@ -2766,10 +2698,8 @@
C142D2B81AC3A155000109A7
/* UIResponder+FirstResponder.m in Sources */
,
30D3C1251ADF6451004AC54E
/* ICRAnnouncementDetailContentView.m in Sources */
,
FEAE16E91B79C9F9009D9E01
/* ResultView.m in Sources */
,
FEA2F30C1B84687D00D64735
/* FooterCell.m in Sources */
,
C142D2C01AC3A155000109A7
/* UIView+ViewFrameGeometry.m in Sources */
,
C1FE50451AE0249A00C18080
/* IBTImagePicker.m in Sources */
,
FEA2F3091B8459DA00D64735
/* HeaderCell.m in Sources */
,
C1E108611ADA8D3800620375
/* ICRAttachment.m in Sources */
,
C159187C1AC435DF0013B391
/* IBTAdditionsObserver.m in Sources */
,
0460F6771BA8BA30004A073D
/* NoticeRecord.m in Sources */
,
...
...
@@ -2793,7 +2723,6 @@
C1FE503D1AE0235D00C18080
/* IBTAudioServicesManager.m in Sources */
,
7217E9F41B72364300FE5C1D
/* SurveyListCell.m in Sources */
,
C10214D21AD904F30024637E
/* ICRPatrolPlanViewController.m in Sources */
,
72C8034F1B7B735300990363
/* TopSheetView.m in Sources */
,
C1E108591ADA53C700620375
/* ICRTaskResultViewController.m in Sources */
,
FEAE16EF1B79CAE3009D9E01
/* SingleScrollView.m in Sources */
,
C10C909D1AE56E8700B911CD
/* JTOptionsViewController.m in Sources */
,
...
...
@@ -2803,7 +2732,6 @@
C1C5644F1AD6719B006A1050
/* ICRTaskDetailViewController.m in Sources */
,
C1E1085D1ADA577500620375
/* ICRTaskDetailContentView.m in Sources */
,
C14BE30E1ADB86DB0049F1AA
/* NSData+EncodeAdditions.m in Sources */
,
FEA2F3031B8453C700D64735
/* GoodsViewController.m in Sources */
,
72882D8B1BA9121E00935BA6
/* ChooseProductUnitViewController.m in Sources */
,
72B3C0D61B9D769A00025D81
/* TransportProductViewController.m in Sources */
,
FE0C9B091B7C543D00335B39
/* User.m in Sources */
,
...
...
@@ -3046,7 +2974,7 @@
IPHONEOS_DEPLOYMENT_TARGET
=
7.0
;
MTL_ENABLE_DEBUG_INFO
=
YES
;
ONLY_ACTIVE_ARCH
=
YES
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
SDKROOT
=
iphoneos
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
...
...
@@ -3084,7 +3012,7 @@
GCC_WARN_UNUSED_VARIABLE
=
YES
;
IPHONEOS_DEPLOYMENT_TARGET
=
7.0
;
MTL_ENABLE_DEBUG_INFO
=
NO
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
SDKROOT
=
iphoneos
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
...
...
@@ -3108,7 +3036,7 @@
"$(PROJECT_DIR)"
,
);
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Debug
;
...
...
@@ -3129,7 +3057,7 @@
"$(PROJECT_DIR)"
,
);
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Release
;
...
...
@@ -3152,7 +3080,7 @@
INFOPLIST_FILE
=
XFFruitTests/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_NAME
=
XFFruitTests
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
TEST_HOST
=
"$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
...
...
@@ -3172,7 +3100,7 @@
INFOPLIST_FILE
=
XFFruitTests/Info.plist
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks @loader_path/Frameworks"
;
PRODUCT_NAME
=
XFFruitTests
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
TEST_HOST
=
"$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @
9454d75b
...
...
@@ -11,7 +11,6 @@
#import "NewSurveyViewController.h"
#import "SurveyViewController.h"
#import "AddWorkSheetViewController.h"
#import "ICRFunctionBaseView.h"
#import "ICRFunctionEntity.h"
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/
WorkSheet/Views
/FooterCell.h
→
XFFruit/ViewControllers/
ChooseViewController
/FooterCell.h
View file @
9454d75b
File moved
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/
WorkSheet/Views
/FooterCell.m
→
XFFruit/ViewControllers/
ChooseViewController
/FooterCell.m
View file @
9454d75b
File moved
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/
WorkSheet/Views
/HeaderCell.h
→
XFFruit/ViewControllers/
ChooseViewController
/HeaderCell.h
View file @
9454d75b
File moved
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/
WorkSheet/Views
/HeaderCell.m
→
XFFruit/ViewControllers/
ChooseViewController
/HeaderCell.m
View file @
9454d75b
...
...
@@ -32,9 +32,10 @@
CGFloat
headWidth
=
(
ScreenSize
.
width
-
LeftWidth
-
LeftWidth
-
SpaceMargin
*
(
self
.
arr
.
count
-
1
))
/
self
.
arr
.
count
;
for
(
NSInteger
i
=
0
;
i
<
self
.
arr
.
count
;
i
++
)
{
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
LeftWidth
+
(
SpaceMargin
+
headWidth
)
*
i
,
0
,
headWidth
,
self
.
frame
.
size
.
height
)];
label
.
font
=
GXF_F
IFTEENTEN
_SIZE
;
label
.
textAlignment
=
NSTextAlignment
Left
;
label
.
font
=
GXF_F
OURTEENTH
_SIZE
;
label
.
textAlignment
=
NSTextAlignment
Center
;
label
.
textColor
=
GXF_PLACEHOLDER_COLOR
;
// label.backgroundColor = [UIColor redColor];
label
.
text
=
self
.
arr
[
i
];
[
self
addSubview
:
label
];
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m
View file @
9454d75b
...
...
@@ -18,7 +18,6 @@
#import "NewSurveyViewController.h"
#import "SurveyViewController.h"
#import "AddWorkSheetViewController.h"
#import "NewPurchaseViewController.h"
#import "NewPurchaseNoticeViewController.h"
#import "SeePurchaseNoticeViewController.h"
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Views/ProductBillCell.m
View file @
9454d75b
...
...
@@ -45,19 +45,19 @@
self
.
seqLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
titleLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftWidth
,
0
,
headWidth
,
TableHeight
))];
self
.
titleLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
titleLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
titleLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
titleLabel
.
text
=
@"苹果桃子"
;
self
.
titleLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
priceLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
titleLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
priceLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
priceLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
priceLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
priceLabel
.
text
=
@"80"
;
self
.
priceLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
countLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
priceLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
countLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
countLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
countLabel
.
text
=
@"200"
;
self
.
countLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
countLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
...
...
@@ -142,11 +142,11 @@
{
self
.
seqLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
@
(
row
+
1
)];
self
.
titleLabel
.
text
=
billProduct
.
product_name
;
self
.
priceLabel
.
text
=
[
billProduct
.
price
stringValu
e
];
self
.
countLabel
.
text
=
[
billProduct
.
qty
stringValue
];
self
.
priceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@元"
,
billProduct
.
pric
e
];
self
.
countLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
billProduct
.
qty
,
billProduct
.
unit
];
self
.
showStandLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装规格:1*%@"
,
billProduct
.
qpc
];
self
.
showCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装数量:%@%@"
,
billProduct
.
baseQ
ty
,
billProduct
.
unit
];
self
.
showBaseCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"基础数量:%@%@"
,
billProduct
.
q
ty
,
@"斤"
];
self
.
showCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装数量:%@%@"
,
billProduct
.
q
ty
,
billProduct
.
unit
];
self
.
showBaseCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"基础数量:%@%@"
,
billProduct
.
baseQ
ty
,
@"斤"
];
self
.
showPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装单价:%@元"
,
billProduct
.
price
];
self
.
showBasePriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"基础单价:%@元"
,
billProduct
.
basePrice
];
self
.
showTotalLabel
.
text
=
[
NSString
stringWithFormat
:
@"总金额:%@元"
,
billProduct
.
total
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
View file @
9454d75b
...
...
@@ -412,12 +412,12 @@ typedef enum : NSUInteger {
NoticeProduct
*
noticeProduct
=
[
_shopeArr
objectAtIndex
:
indexPath
.
row
];
Cell
.
SpLabel
.
text
=
noticeProduct
.
productName
;
//商品
Cell
.
BzggLabel
.
text
=
[
noticeProduct
.
qpc
stringValue
];
//包装规格
Cell
.
BzggLabel
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
packageUnit
.
text
=
noticeProduct
.
packUnit
;
//包装单位
Cell
.
BzslLabel
.
text
=
[
noticeProduct
.
qpcQuantity
stringValue
];
//包装数量
Cell
.
packageQuantity
.
text
=
[
noticeProduct
.
qpcQuantity
stringValue
];
Cell
.
packageSpecification
.
text
=
[
noticeProduct
.
qpc
stringValue
];
//包装规格
Cell
.
foundationQuantity
.
text
=
[
noticeProduct
.
quantity
stringValue
];
//基础数量
Cell
.
BzslLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
//包装数量
Cell
.
packageQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
Cell
.
packageSpecification
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
foundationQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
quantity
,
@"斤"
];
//基础数量
Cell
.
remark
.
text
=
noticeProduct
.
remark
;
//备注
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m
View file @
9454d75b
...
...
@@ -493,14 +493,22 @@ typedef enum : NSUInteger {
NoticeProduct
*
noticeProduct
=
[
_shopeArr
objectAtIndex
:
indexPath
.
row
];
Cell
.
SpLabel
.
text
=
noticeProduct
.
productName
;
//商品
Cell
.
BzggLabel
.
text
=
[
noticeProduct
.
qpc
stringValue
];
//包装规格
Cell
.
BzslLabel
.
text
=
[
noticeProduct
.
qpcQuantity
stringValue
];
//包装数量
Cell
.
packageSpecification
.
text
=
[
noticeProduct
.
qpc
stringValue
];
//包装规格
Cell
.
BzggLabel
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
packageUnit
.
text
=
noticeProduct
.
packUnit
;
//包装单位
Cell
.
BzslLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
//包装数量
Cell
.
packageQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
Cell
.
packageSpecification
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
foundationQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
quantity
,
@"斤"
];
//基础数量
Cell
.
BzggLabel
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
BzslLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
//包装数量
Cell
.
packageSpecification
.
text
=
[
NSString
stringWithFormat
:
@"1*%@%@"
,
noticeProduct
.
qpc
,
@"斤"
];
//包装规格
Cell
.
YcgslLabel
.
text
=
[
noticeProduct
.
purchasedQuantity
stringValue
];
//已采购数量
Cell
.
packageUnit
.
text
=
noticeProduct
.
packUnit
;
//包装单位
Cell
.
packageQuantity
.
text
=
[
noticeProduct
.
qpcQuantity
stringValue
];
//包装数量
Cell
.
packageQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
qpcQuantity
,
noticeProduct
.
packUnit
];
//包装数量
Cell
.
YcgslLabel
.
text
=
[
noticeProduct
.
purchasedQuantity
stringValue
];
//已采购数量
Cell
.
foundationQuantity
.
text
=
[
noticeProduct
.
quantity
stringValue
];
//基础数量
Cell
.
foundationQuantity
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
noticeProduct
.
quantity
,
@"斤"
];
//基础数量
Cell
.
remark
.
text
=
noticeProduct
.
remark
;
//备注
if
(
Cell
.
YcgslLabel
.
text
==
nil
)
{
Cell
.
YcgslLabel
.
text
=
@"暂无"
;
//已采购数量
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/NoticeProductViewController.m
View file @
9454d75b
...
...
@@ -33,11 +33,16 @@ typedef enum : NSUInteger {
UITextField
*
_qpcField
;
UITextField
*
_qpcQuantityField
;
UITextField
*
_quantityField
;
UILabel
*
_packCountLabel
;
UILabel
*
_qpcLabel
;
UILabel
*
_baseCountLabel
;
HPGrowingTextView
*
_noteTextView
;
}
@property
(
nonatomic
,
strong
)
NSString
*
productNameStr
;
@property
(
nonatomic
,
strong
)
NSString
*
productCodeStr
;
@property
(
nonatomic
,
strong
)
NSString
*
productUuidStr
;
@property
(
nonatomic
,
strong
)
NSString
*
productQpcStr
;
//商品规格描述
@end
@implementation
NoticeProductViewController
...
...
@@ -87,14 +92,12 @@ typedef enum : NSUInteger {
switch
(
btn
.
tag
)
{
case
deleteTag
:
//删除
{
if
([
self
checkCost
])
{
if
(
self
.
indexPath
)
{
self
.
deleteNoticeProduct
(
self
.
noticeProduct
,
self
.
indexPath
);
[
self
PopViewControllerAnimated
:
YES
];
}
else
{
[
self
clearInfomation
];
}
}
}
break
;
case
SaveTag
:
...
...
@@ -117,13 +120,18 @@ typedef enum : NSUInteger {
_qpcField
.
text
=
@""
;
_qpcQuantityField
.
text
=
@""
;
_quantityField
.
text
=
@""
;
_noteTextView
.
text
=
@""
;
}
-
(
BOOL
)
checkCost
{
if
(
_chooseCostLabel
.
text
.
length
==
0
)
{
if
(
_chooseCostLabel
.
text
.
length
==
0
||
[
_chooseCostLabel
.
text
isEqualToString
:
@"选择商品"
]
)
{
ShowMessage
(
@"商品不能为空"
);
return
NO
;
}
if
(
_choosePackUnitLabel
.
text
.
length
==
0
||
[
_choosePackUnitLabel
.
text
isEqualToString
:
@"选择包装单位"
]
)
{
ShowMessage
(
@"包装单位不能为空"
);
return
NO
;
}
if
(
_qpcField
.
text
.
length
==
0
)
{
ShowMessage
(
@"包装规格不能为空"
);
return
NO
;
...
...
@@ -202,7 +210,7 @@ typedef enum : NSUInteger {
_noteTextView
.
placeholder
=
@"输入备注内容"
;
[
cell
.
contentView
addSubview
:
_noteTextView
];
}
else
{
UITextField
*
textField
=
[[
UITextField
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
15
,
TableRowHeight
)];
UITextField
*
textField
=
[[
UITextField
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
30
,
TableRowHeight
)];
textField
.
textAlignment
=
NSTextAlignmentRight
;
textField
.
textColor
=
GXF_CONTENT_COLOR
;
textField
.
font
=
GXF_FIFTEENTEN_SIZE
;
...
...
@@ -210,13 +218,22 @@ typedef enum : NSUInteger {
textField
.
keyboardType
=
UIKeyboardTypeDecimalPad
;
textField
.
delegate
=
self
;
[
cell
.
contentView
addSubview
:
textField
];
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
textField
.
frame
)
+
5
,
0
,
20
,
TableRowHeight
)];
label
.
textColor
=
GXF_CONTENT_COLOR
;
label
.
font
=
GXF_FIFTEENTEN_SIZE
;
[
cell
.
contentView
addSubview
:
label
];
if
(
indexPath
.
row
==
2
)
{
_qpcLabel
=
label
;
textField
.
placeholder
=
@"输入包装规格"
;
_qpcField
=
textField
;
}
else
if
(
indexPath
.
row
==
3
){
_packCountLabel
=
label
;
textField
.
placeholder
=
@"输入包装数量"
;
_qpcQuantityField
=
textField
;
}
else
{
_baseCountLabel
=
label
;
textField
.
placeholder
=
@"输入基础数量"
;
_quantityField
=
textField
;
}
...
...
@@ -253,6 +270,8 @@ typedef enum : NSUInteger {
self
.
productNameStr
=
product
.
name
;
self
.
productUuidStr
=
product
.
uuid
;
self
.
productCodeStr
=
product
.
code
;
_qpcLabel
.
text
=
product
.
measureUnit
?
product
.
measureUnit
:
@"斤"
;
_baseCountLabel
.
text
=
_qpcLabel
.
text
;
};
cvc
.
isMoreChose
=
NO
;
[
self
PushViewController
:
cvc
animated
:
YES
];
...
...
@@ -263,6 +282,7 @@ typedef enum : NSUInteger {
GXFProductUnit
*
productUnit
=
products
[
0
];
_choosePackUnitLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
productUnit
.
name
];
_choosePackUnitLabel
.
textColor
=
GXF_CONTENT_COLOR
;
_packCountLabel
.
text
=
productUnit
.
name
;
}
};
cvc
.
isMoreChose
=
NO
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
9454d75b
...
...
@@ -176,17 +176,17 @@ typedef enum : NSUInteger {
}
-
(
void
)
clearShopDetail
{
_productLabel
.
text
=
@"选择商品"
;
//商品
_productLabel
.
text
=
@"选择商品"
;
//商品
_PackagingLable
.
text
=
@"选择包装单位"
;
//包装单位
packageSpecification
.
text
=
@""
;
//包装规格
packageQuantity
.
text
=
@""
;
//包装数量
_PackagingLable
.
text
=
@"选择包装单位"
;
//包装单位
packageSpecification
.
text
=
@""
;
//包装规格
packageQuantity
.
text
=
@""
;
//包装数量
foundationQuantity
.
text
=
@"
"
;
//基础数量
foundationUnitPrice
.
text
=
@""
;
//基础单价
packageUnitPrice
.
text
=
@"
"
;
//包装单价
totalMoney
.
text
=
@"0"
;
//总金额
remark
.
text
=
@""
;
foundationQuantity
.
text
=
@"0
"
;
//基础数量
foundationUnitPrice
.
text
=
@""
;
//基础单价
packageUnitPrice
.
text
=
@"0
"
;
//包装单价
totalMoney
.
text
=
@"0"
;
//总金额
remark
.
text
=
@""
;
_productLabel
.
textColor
=
GXF_PLACEHOLDER_COLOR
;
_PackagingLable
.
textColor
=
GXF_PLACEHOLDER_COLOR
;
}
...
...
@@ -306,6 +306,7 @@ typedef enum : NSUInteger {
textField
.
textColor
=
GXF_CONTENT_COLOR
;
textField
.
font
=
FontSize
(
15
);
textField
.
returnKeyType
=
UIReturnKeyDone
;
textField
.
keyboardType
=
UIKeyboardTypeDecimalPad
;
textField
.
delegate
=
self
;
[
cell
.
contentView
addSubview
:
textField
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m
View file @
9454d75b
...
...
@@ -82,14 +82,12 @@ typedef enum : NSUInteger {
switch
(
btn
.
tag
)
{
case
deleteTag
:
//删除
{
if
([
self
checkCost
])
{
if
(
self
.
indexPath
)
{
self
.
deleteTransportCost
(
self
.
accountDetail
,
self
.
indexPath
);
[
self
PopViewControllerAnimated
:
YES
];
}
else
{
[
self
clearInfomation
];
}
}
}
break
;
case
SaveTag
:
...
...
@@ -109,11 +107,12 @@ typedef enum : NSUInteger {
_chooseCostLabel
.
textColor
=
GXF_PLACEHOLDER_COLOR
;
_actualmoneyField
.
text
=
@""
;
_paidmoneyField
.
text
=
@""
;
_leftmoneyField
.
text
=
@""
;
_leftmoneyField
.
text
=
@"0"
;
_noteTextView
.
text
=
@""
;
}
-
(
BOOL
)
checkCost
{
if
(
_chooseCostLabel
.
text
.
length
==
0
)
{
if
(
_chooseCostLabel
.
text
.
length
==
0
||
[
_chooseCostLabel
.
text
isEqualToString
:
@"选择费用类型"
]
)
{
ShowMessage
(
@"费用类型不能为空"
);
return
NO
;
}
...
...
@@ -125,10 +124,14 @@ typedef enum : NSUInteger {
ShowMessage
(
@"已付金额不能为空"
);
return
NO
;
}
if
(
_leftmoneyField
.
text
.
length
==
0
)
{
if
(
_leftmoneyField
.
text
.
length
==
0
)
{
ShowMessage
(
@"尾款不能为空"
);
return
NO
;
}
if
([
_leftmoneyField
.
text
floatValue
]
<=
0
)
{
ShowMessage
(
@"检查应付金额和已付金额是否正确"
);
return
NO
;
}
if
(
!
self
.
accountDetail
)
{
self
.
accountDetail
=
[[
FeeAcountDetail
alloc
]
init
];
}
...
...
@@ -187,7 +190,7 @@ typedef enum : NSUInteger {
_noteTextView
.
placeholder
=
@"输入备注内容"
;
[
cell
.
contentView
addSubview
:
_noteTextView
];
}
else
{
UITextField
*
textField
=
[[
UITextField
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
15
,
TableRowHeight
)];
UITextField
*
textField
=
[[
UITextField
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
30
,
TableRowHeight
)];
textField
.
textAlignment
=
NSTextAlignmentRight
;
textField
.
textColor
=
GXF_CONTENT_COLOR
;
textField
.
font
=
GXF_FIFTEENTEN_SIZE
;
...
...
@@ -195,14 +198,25 @@ typedef enum : NSUInteger {
textField
.
keyboardType
=
UIKeyboardTypeDecimalPad
;
textField
.
delegate
=
self
;
[
cell
.
contentView
addSubview
:
textField
];
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
textField
.
frame
)
+
5
,
0
,
20
,
TableRowHeight
)];
label
.
textColor
=
GXF_CONTENT_COLOR
;
label
.
font
=
GXF_FIFTEENTEN_SIZE
;
label
.
text
=
@"元"
;
[
cell
.
contentView
addSubview
:
label
];
if
(
indexPath
.
row
==
1
)
{
textField
.
placeholder
=
@"输入应付金额"
;
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
_actualmoneyField
=
textField
;
}
else
if
(
indexPath
.
row
==
2
){
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
textField
.
placeholder
=
@"输入已付金额"
;
_paidmoneyField
=
textField
;
}
else
{
textField
.
placeholder
=
@"输入尾款"
;
[
textField
setEnabled
:
NO
];
textField
.
text
=
@"0"
;
textField
.
textColor
=
[
UIColor
redColor
];
_leftmoneyField
=
textField
;
}
}
...
...
@@ -220,6 +234,13 @@ typedef enum : NSUInteger {
_noteTextView
.
text
=
self
.
accountDetail
.
note
;
}
-
(
void
)
textChange
:
(
UITextField
*
)
textField
{
if
(
_actualmoneyField
.
text
.
length
>
0
&&
_paidmoneyField
.
text
.
length
>
0
)
{
_leftmoneyField
.
text
=
[
NSString
stringWithFormat
:
@"%.1f"
,[
_actualmoneyField
.
text
floatValue
]
-
[
_paidmoneyField
.
text
floatValue
]];
}
}
-
(
CGFloat
)
tableView
:
(
UITableView
*
)
tableView
heightForRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
return
TableRowHeight
;
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Views/CostCell.m
View file @
9454d75b
...
...
@@ -27,7 +27,7 @@
-
(
void
)
bulidLayout
{
CGFloat
headWidth
=
(
ScreenSize
.
width
-
LeftWidth
-
Righ
tWidth
-
SpaceMargin
*
(
4
-
1
))
/
4
;
CGFloat
headWidth
=
(
ScreenSize
.
width
-
LeftWidth
-
Lef
tWidth
-
SpaceMargin
*
(
4
-
1
))
/
4
;
self
.
smallImageView
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
LeftMargin
,
(
TableHeight
-
SmallSize
)
/
2
,
SmallSize
,
SmallSize
)];
self
.
smallImageView
.
image
=
[
UIImage
imageNamed
:
@"arrowright"
];
...
...
@@ -38,25 +38,25 @@
self
.
seqLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
typeLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftWidth
,
0
,
headWidth
,
TableHeight
))];
self
.
typeLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
typeLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
typeLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
typeLabel
.
text
=
@"苹果桃子"
;
self
.
typeLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
actualLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
typeLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
actualLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
actualLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
actualLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
actualLabel
.
text
=
@"30000"
;
self
.
actualLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
paidLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
actualLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
paidLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
paidLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
paidLabel
.
text
=
@"2015-04-05"
;
self
.
paidLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
paidLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
leftLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
paidLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
leftLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
leftLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
leftLabel
.
text
=
@"2015-04-05"
;
self
.
leftLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
leftLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
...
...
@@ -83,9 +83,9 @@
{
self
.
seqLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
@
(
row
+
1
)];
self
.
typeLabel
.
text
=
fee
.
accounttitle
;
self
.
actualLabel
.
text
=
[
fee
.
actualmoney
stringValue
];
self
.
paidLabel
.
text
=
[
fee
.
paidmoney
stringValue
];
self
.
leftLabel
.
text
=
[
fee
.
leftmoney
stringValue
];
self
.
actualLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@元"
,[
fee
.
actualmoney
stringValue
]
];
self
.
paidLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@元"
,[
fee
.
paidmoney
stringValue
]
];
self
.
leftLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@元"
,[
fee
.
leftmoney
stringValue
]
];
}
-
(
void
)
setSelected
:
(
BOOL
)
selected
animated
:
(
BOOL
)
animated
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Views/TransportPurductCell.m
View file @
9454d75b
...
...
@@ -46,19 +46,19 @@
self
.
seqLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
titleLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftWidth
,
0
,
headWidth
,
TableHeight
))];
self
.
titleLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
titleLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
titleLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
titleLabel
.
text
=
@"苹果桃子"
;
self
.
titleLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
priceLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
titleLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
priceLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
priceLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
priceLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
priceLabel
.
text
=
@"80"
;
self
.
priceLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
countLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
priceLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
countLabel
.
textAlignment
=
NSTextAlignment
Left
;
self
.
countLabel
.
textAlignment
=
NSTextAlignment
Center
;
self
.
countLabel
.
text
=
@"200"
;
self
.
countLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
countLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
...
...
@@ -143,11 +143,11 @@
-
(
void
)
setPdtDetail
:
(
TransportPdtDetail
*
)
pdtDetail
row
:
(
NSInteger
)
row
{
self
.
seqLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
@
(
row
+
1
)];
self
.
titleLabel
.
text
=
pdtDetail
.
productName
;
self
.
priceLabel
.
text
=
[
pdtDetail
.
price
stringValue
];
self
.
countLabel
.
text
=
[
pdtDetail
.
qty
stringValue
];
self
.
priceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@元"
,[
pdtDetail
.
price
stringValue
]
];
self
.
countLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,
pdtDetail
.
qty
,
pdtDetail
.
unit
];
self
.
showStandLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装规格:1*%@"
,
pdtDetail
.
qpc
];
self
.
showCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装数量:%@%@"
,
pdtDetail
.
baseQ
ty
,
pdtDetail
.
unit
];
self
.
showBaseCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"基础数量:%@%@"
,
pdtDetail
.
q
ty
,
@"斤"
];
self
.
showCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装数量:%@%@"
,
pdtDetail
.
q
ty
,
pdtDetail
.
unit
];
self
.
showBaseCountLabel
.
text
=
[
NSString
stringWithFormat
:
@"基础数量:%@%@"
,
pdtDetail
.
baseQ
ty
,
@"斤"
];
self
.
showPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"包装单价:%@元"
,
pdtDetail
.
price
];
self
.
showPurchaseLabel
.
text
=
[
NSString
stringWithFormat
:
@"采购单号:%@"
,
pdtDetail
.
purchasebillnumber
.
length
>
0
?
pdtDetail
.
purchasebillnumber
:
@"无"
];
self
.
showTotalLabel
.
text
=
[
NSString
stringWithFormat
:
@"总金额:%@元"
,
pdtDetail
.
total
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/AddWorkSheetViewController.h
deleted
100644 → 0
View file @
5fe58fc7
//
// AddWorkSheetViewController.h
// XFFruit
//
// Created by 陈俊俊 on 15/8/12.
// Copyright (c) 2015年 Xummer. All rights reserved.
// 新建加工单
#import "ICRBaseViewController.h"
@interface
AddWorkSheetViewController
:
ICRBaseViewController
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/AddWorkSheetViewController.m
deleted
100644 → 0
View file @
5fe58fc7
//
// AddWorkSheetViewController.m
// XFFruit
//
// Created by 陈俊俊 on 15/8/12.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "AddWorkSheetViewController.h"
#import "TopSheetView.h"
#import "BottomSheetView.h"
#define TopHeight 284
#define BottomHeight 300
#define SpaceHeight 20
#define BottomViewHeight 60
typedef
enum
:
NSUInteger
{
SaveTag
=
7000
,
CommitTag
,
}
BtnTag
;
@interface
AddWorkSheetViewController
()
<
TopSheetViewDelegate
,
UIScrollViewDelegate
>
{
UIScrollView
*
_scrollView
;
TopSheetView
*
_sheetView
;
BottomSheetView
*
_bottomView
;
}
@end
@implementation
AddWorkSheetViewController
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
self
.
title
=
@"加工单"
;
//布局
[
self
bulidLayout
];
}
-
(
void
)
bulidLayout
{
self
.
view
.
backgroundColor
=
XXFBgColor
;
_scrollView
=
[[
UIScrollView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
BottomViewHeight
)];
_scrollView
.
showsHorizontalScrollIndicator
=
NO
;
_scrollView
.
showsVerticalScrollIndicator
=
NO
;
_scrollView
.
contentSize
=
CGSizeMake
(
ScreenSize
.
width
,
TopHeight
+
BottomHeight
+
SpaceHeight
*
2
);
[
self
.
view
addSubview
:
_scrollView
];
UIView
*
footView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
ScreenSize
.
height
-
BottomViewHeight
-
64
,
ScreenSize
.
width
,
BottomViewHeight
)];
UIButton
*
saveBtn
=
[
IBTCustomButtom
creatButtonWithFrame
:
CGRectMake
(
15
,
8
,
(
ScreenSize
.
width
-
15
*
3
)
/
2
,
44
)
target
:
self
sel
:
@selector
(
btnClick
:
)
tag
:
SaveTag
image
:
nil
title
:
@"保存"
titleColor
:
[
UIColor
whiteColor
]
isCorner
:
YES
corner
:
5
bgColor
:
GXF_SAVE_COLOR
];
[
footView
addSubview
:
saveBtn
];
UIButton
*
commitBtn
=
[
IBTCustomButtom
creatButtonWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
saveBtn
.
frame
)
+
15
,
8
,
(
ScreenSize
.
width
-
15
*
3
)
/
2
,
44
)
target
:
self
sel
:
@selector
(
btnClick
:
)
tag
:
CommitTag
image
:
nil
title
:
@"提交"
titleColor
:
[
UIColor
whiteColor
]
isCorner
:
YES
corner
:
5
bgColor
:
GXF_COMMIT_COLOR
];
[
footView
addSubview
:
commitBtn
];
[
self
.
view
addSubview
:
footView
];
_sheetView
=
[[
TopSheetView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
ScreenSize
.
width
,
TopHeight
)];
_sheetView
.
delegate
=
self
;
[
_scrollView
addSubview
:
_sheetView
];
_bottomView
=
[[
BottomSheetView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
CGRectGetMaxY
(
_sheetView
.
frame
)
+
20
,
ScreenSize
.
width
,
BottomHeight
)];
_bottomView
.
backgroundColor
=
[
UIColor
whiteColor
];
[
_scrollView
addSubview
:
_bottomView
];
}
-
(
void
)
btnClick
:
(
UIButton
*
)
btn
{
}
#pragma mark - 协议方法
-
(
void
)
hiddenKeyBoard
{
[
self
keyboardHidden
];
}
-
(
void
)
keyboardHidden
{
[
_sheetView
.
titleTextFiled
resignFirstResponder
];
[
_sheetView
.
peopleTextFiled
resignFirstResponder
];
[
_sheetView
.
peopleTextFiled
resignFirstResponder
];
[
_sheetView
.
phoneTextFiled
resignFirstResponder
];
[
_sheetView
.
remarkTextView
resignFirstResponder
];
}
-
(
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
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/GoodsViewController.h
deleted
100644 → 0
View file @
5fe58fc7
//
// GoodsViewController.h
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface
GoodsViewController
:
ICRBaseViewController
@property
(
nonatomic
,
strong
)
NSMutableArray
*
goodsArr
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
assign
)
CGRect
viewFrame
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/GoodsViewController.m
deleted
100644 → 0
View file @
5fe58fc7
//
// GoodsViewController.m
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "GoodsViewController.h"
#import "HeaderCell.h"
#import "FooterCell.h"
@interface
GoodsViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
FooterCellDelegate
>
{
CGRect
_tableFrame
;
}
@end
@implementation
GoodsViewController
-
(
void
)
viewDidLoad
{
self
.
view
.
backgroundColor
=
XXFBgColor
;
[
super
viewDidLoad
];
_goodsArr
=
[
NSMutableArray
array
];
[
self
createView
];
}
-
(
void
)
setViewFrame
:
(
CGRect
)
viewFrame
{
_tableFrame
=
viewFrame
;
}
-
(
void
)
createView
{
self
.
tableView
=
[[
UITableView
alloc
]
initWithFrame
:
_tableFrame
style
:(
UITableViewStylePlain
)];
self
.
tableView
.
backgroundColor
=
[
UIColor
whiteColor
];
self
.
tableView
.
delegate
=
self
;
self
.
tableView
.
dataSource
=
self
;
[
self
.
view
addSubview
:
self
.
tableView
];
NSArray
*
arr
=
@[
@"原料"
,
@"基础数量"
,
@"出库时间"
];
HeaderCell
*
headCell
=
[[
HeaderCell
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
ScreenSize
.
width
,
38
)
withArr
:
arr
];
[
self
.
view
addSubview
:
headCell
];
self
.
tableView
.
tableHeaderView
=
headCell
;
FooterCell
*
footCell
=
[[
FooterCell
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
_tableFrame
.
size
.
width
,
50
)
withTitle
:
@"+点击添加原料明细"
isTwo
:
@""
];
[
self
.
view
addSubview
:
footCell
];
footCell
.
delegate
=
self
;
self
.
tableView
.
tableFooterView
=
footCell
;
}
-
(
void
)
addClick
{
[
self
.
goodsArr
addObject
:
@"dddd"
];
[
self
.
tableView
reloadData
];
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
}
-
(
NSInteger
)
tableView
:
(
UITableView
*
)
tableView
numberOfRowsInSection
:
(
NSInteger
)
section
{
return
self
.
goodsArr
.
count
;
}
-
(
UITableViewCell
*
)
tableView
:
(
UITableView
*
)
tableView
cellForRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
static
NSString
*
cellID
=
@"cellID"
;
UITableViewCell
*
cell
=
[
tableView
dequeueReusableCellWithIdentifier
:
cellID
];
if
(
cell
==
nil
)
{
cell
=
[[
UITableViewCell
alloc
]
initWithStyle
:
UITableViewCellStyleDefault
reuseIdentifier
:
cellID
];
}
cell
.
textLabel
.
text
=
@"3333333"
;
return
cell
;
}
/*
#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
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.h
deleted
100644 → 0
View file @
5fe58fc7
//
// MaterialVIewController.h
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "ICRBaseViewController.h"
@interface
MaterialVIewController
:
ICRBaseViewController
@property
(
nonatomic
,
strong
)
NSMutableArray
*
meterialArr
;
@property
(
nonatomic
,
strong
)
UITableView
*
tableView
;
@property
(
nonatomic
,
assign
)
CGRect
viewFrame
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m
deleted
100644 → 0
View file @
5fe58fc7
//
// MaterialVIewController.m
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "MaterialVIewController.h"
#import "HeaderCell.h"
#import "FooterCell.h"
#import "MaterialCell.h"
#define TableHeight 44
@interface
MaterialVIewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
FooterCellDelegate
>
{
CGRect
_tableFrame
;
NSInteger
_currentRow
;
BOOL
isFirst
;
}
@end
@implementation
MaterialVIewController
-
(
void
)
viewDidLoad
{
self
.
view
.
backgroundColor
=
XXFBgColor
;
[
super
viewDidLoad
];
isFirst
=
YES
;
_meterialArr
=
[
NSMutableArray
array
];
[
self
createView
];
}
-
(
void
)
setViewFrame
:
(
CGRect
)
viewFrame
{
_tableFrame
=
viewFrame
;
}
-
(
void
)
createView
{
self
.
tableView
=
[[
UITableView
alloc
]
initWithFrame
:
_tableFrame
style
:(
UITableViewStylePlain
)];
self
.
tableView
.
delegate
=
self
;
self
.
tableView
.
dataSource
=
self
;
[
self
.
view
addSubview
:
self
.
tableView
];
NSArray
*
arr
=
@[
@"原料"
,
@"基础数量"
,
@"入库时间"
];
HeaderCell
*
headCell
=
[[
HeaderCell
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
ScreenSize
.
width
,
38
)
withArr
:
arr
];
[
self
.
view
addSubview
:
headCell
];
self
.
tableView
.
tableHeaderView
=
headCell
;
//
// FooterCell *footCell = [[FooterCell alloc]initWithFrame:CGRectMake(0, 0, _tableFrame.size.width, 50) withTitle:@"+点击添加原料明细" ];
// [self.view addSubview:footCell];
// footCell.delegate = self;
// self.tableView.tableFooterView = footCell;
}
-
(
void
)
addClick
{
[
self
.
meterialArr
addObject
:
@"dddd"
];
[
self
.
tableView
reloadData
];
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
}
-
(
NSInteger
)
tableView
:
(
UITableView
*
)
tableView
numberOfRowsInSection
:
(
NSInteger
)
section
{
return
self
.
meterialArr
.
count
;
}
-
(
UITableViewCell
*
)
tableView
:
(
UITableView
*
)
tableView
cellForRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
static
NSString
*
cellID
=
@"MaterialCell"
;
MaterialCell
*
cell
=
[
tableView
dequeueReusableCellWithIdentifier
:
cellID
];
if
(
cell
==
nil
)
{
cell
=
[[
MaterialCell
alloc
]
initWithStyle
:
UITableViewCellStyleDefault
reuseIdentifier
:
cellID
];
cell
.
selectionStyle
=
UITableViewCellSelectionStyleNone
;
}
if
(
indexPath
.
row
!=
_currentRow
)
{
CGRect
Linefrmame
=
cell
.
lineLabel
.
frame
;
Linefrmame
.
origin
.
y
=
TableHeight
-
1
;
cell
.
lineLabel
.
frame
=
Linefrmame
;
CGRect
showfrmame
=
cell
.
showView
.
frame
;
showfrmame
.
size
.
height
=
0
;
cell
.
showView
.
frame
=
showfrmame
;
cell
.
showView
.
hidden
=
YES
;
cell
.
backgroundColor
=
[
UIColor
whiteColor
];
}
else
if
(
indexPath
.
row
==
_currentRow
&&
!
isFirst
)
{
CGRect
Linefrmame
=
cell
.
lineLabel
.
frame
;
Linefrmame
.
origin
.
y
=
200
-
1
;
cell
.
lineLabel
.
frame
=
Linefrmame
;
CGRect
showfrmame
=
cell
.
showView
.
frame
;
showfrmame
.
size
.
height
=
150
;
cell
.
showView
.
frame
=
showfrmame
;
cell
.
showView
.
hidden
=
NO
;
cell
.
backgroundColor
=
XXFBgColor
;
}
return
cell
;
}
-
(
void
)
tableView
:
(
UITableView
*
)
tableView
didSelectRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
MaterialCell
*
cell
=
(
MaterialCell
*
)[
tableView
cellForRowAtIndexPath
:
indexPath
];
CGRect
Linefrmame
=
cell
.
lineLabel
.
frame
;
CGRect
showfrmame
=
cell
.
showView
.
frame
;
if
(
Linefrmame
.
origin
.
y
==
TableHeight
-
1
)
{
Linefrmame
.
origin
.
y
=
200
-
1
;
showfrmame
.
size
.
height
=
150
;
cell
.
showView
.
hidden
=
NO
;
isFirst
=
NO
;
cell
.
backgroundColor
=
[
UIColor
whiteColor
];
}
else
{
isFirst
=
YES
;
Linefrmame
.
origin
.
y
=
TableHeight
-
1
;
showfrmame
.
size
.
height
=
0
;
cell
.
showView
.
hidden
=
YES
;
cell
.
backgroundColor
=
[
UIColor
whiteColor
];
}
cell
.
lineLabel
.
frame
=
Linefrmame
;
cell
.
showView
.
frame
=
showfrmame
;
_currentRow
=
indexPath
.
row
;
[
self
.
tableView
reloadData
];
}
-
(
CGFloat
)
tableView
:
(
UITableView
*
)
tableView
heightForRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
if
(
indexPath
.
row
==
_currentRow
&&
!
isFirst
)
{
return
200
;
}
return
TableHeight
;
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/BottomSheetView.h
deleted
100644 → 0
View file @
5fe58fc7
//
// BottomSheetView.h
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface
BottomSheetView
:
UIView
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/BottomSheetView.m
deleted
100644 → 0
View file @
5fe58fc7
//
// BottomSheetView.m
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "BottomSheetView.h"
#import "MaterialVIewController.h"
#import "GoodsViewController.h"
#import "CostViewController.h"
#define ContentHeight 44
#define BtnWidth (ScreenSize.width - 20*4)/3
#define BeginTag 8000
#define SpaceWidth 20
@interface
BottomSheetView
()
<
UIScrollViewDelegate
>
{
UIScrollView
*
_bottomSV
;
UIImageView
*
_moveImageView
;
UIButton
*
_currentBtn
;
UIButton
*
_addBtn
;
MaterialVIewController
*
_materialVC
;
GoodsViewController
*
_goodsVC
;
CostViewController
*
_costVC
;
}
@end
@implementation
BottomSheetView
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
{
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
//界面
[
self
bulidLayout
];
}
return
self
;
}
#pragma mark - 布局
-
(
void
)
bulidLayout
{
[
self
addChildView
];
[
self
createBottomView
];
}
-
(
void
)
createBottomView
{
NSArray
*
arr
=
@[
@"原料明细"
,
@"成品明细"
,
@"费用明细"
];
_bottomSV
=
[[
UIScrollView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
ContentHeight
+
4
,
ScreenSize
.
width
,
CGRectGetHeight
(
self
.
frame
)
-
ContentHeight
-
2
)];
_bottomSV
.
showsHorizontalScrollIndicator
=
NO
;
_bottomSV
.
showsVerticalScrollIndicator
=
NO
;
_bottomSV
.
pagingEnabled
=
YES
;
_bottomSV
.
delegate
=
self
;
_bottomSV
.
backgroundColor
=
[
UIColor
yellowColor
];
_bottomSV
.
contentSize
=
CGSizeMake
(
ScreenSize
.
width
*
arr
.
count
,
CGRectGetHeight
(
_bottomSV
.
frame
));
[
self
addSubview
:
_bottomSV
];
for
(
NSInteger
i
=
0
;
i
<
arr
.
count
;
i
++
)
{
UIButton
*
btn
=
[
UIButton
buttonWithType
:
UIButtonTypeSystem
];
[
btn
setTitle
:
arr
[
i
]
forState
:
UIControlStateNormal
];
btn
.
frame
=
CGRectMake
(
SpaceWidth
+
(
BtnWidth
+
SpaceWidth
)
*
i
,
0
,
BtnWidth
,
ContentHeight
);
[
btn
setTitleColor
:
GXF_CONTENT_COLOR
forState
:
UIControlStateNormal
];
[
btn
setTitleColor
:
GXF_SAVE_COLOR
forState
:
UIControlStateDisabled
];
btn
.
titleLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
btn
.
tag
=
i
+
BeginTag
;
[
btn
addTarget
:
self
action
:
@selector
(
btnClick
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
[
self
addSubview
:
btn
];
UIView
*
view
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetWidth
(
_bottomSV
.
frame
)
*
i
,
0
,
CGRectGetWidth
(
_bottomSV
.
frame
),
CGRectGetHeight
(
_bottomSV
.
frame
))];
if
(
i
==
0
)
{
view
.
backgroundColor
=
[
UIColor
redColor
];
_materialVC
.
viewFrame
=
view
.
bounds
;
[
view
addSubview
:
_materialVC
.
view
];
}
else
if
(
i
==
1
){
view
.
backgroundColor
=
[
UIColor
blackColor
];
_goodsVC
.
viewFrame
=
view
.
bounds
;
[
view
addSubview
:
_goodsVC
.
view
];
}
else
if
(
i
==
2
){
_costVC
.
viewFrame
=
view
.
bounds
;
[
view
addSubview
:
_costVC
.
view
];
view
.
backgroundColor
=
[
UIColor
blueColor
];
}
[
_bottomSV
addSubview
:
view
];
}
_moveImageView
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
SpaceWidth
,
ContentHeight
,
BtnWidth
,
4
)];
_moveImageView
.
image
=
[
UIImage
imageNamed
:
@"tab_line"
];
[
self
addSubview
:
_moveImageView
];
}
-
(
void
)
addChildView
{
_materialVC
=
[[
MaterialVIewController
alloc
]
init
];
_goodsVC
=
[[
GoodsViewController
alloc
]
init
];
_costVC
=
[[
CostViewController
alloc
]
init
];
}
-
(
void
)
btnClick
:
(
UIButton
*
)
btn
{
NSInteger
index
=
btn
.
tag
-
BeginTag
;
_currentBtn
.
enabled
=
YES
;
btn
.
enabled
=
NO
;
_currentBtn
=
btn
;
[
UIView
animateWithDuration
:
0
.
5
animations
:
^
{
CGRect
moveFrame
=
_moveImageView
.
frame
;
moveFrame
.
origin
.
x
=
SpaceWidth
+
(
BtnWidth
+
SpaceWidth
)
*
index
;
_moveImageView
.
frame
=
moveFrame
;
_bottomSV
.
contentOffset
=
CGPointMake
(
index
*
self
.
frame
.
size
.
width
,
0
);
}];
}
-
(
void
)
scrollViewDidEndDecelerating
:
(
UIScrollView
*
)
scrollView
{
CGFloat
offsetX
=
scrollView
.
contentOffset
.
x
/
self
.
frame
.
size
.
width
;
[
UIView
animateWithDuration
:
0
.
5
animations
:
^
{
CGRect
moveFrame
=
_moveImageView
.
frame
;
moveFrame
.
origin
.
x
=
SpaceWidth
+
(
BtnWidth
+
SpaceWidth
)
*
offsetX
;
_moveImageView
.
frame
=
moveFrame
;
}];
_currentBtn
.
enabled
=
YES
;
UIButton
*
btn
=
(
UIButton
*
)
[
self
viewWithTag
:
offsetX
+
BeginTag
];
btn
.
enabled
=
NO
;
_currentBtn
=
btn
;
}
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/MaterialCell.h
deleted
100644 → 0
View file @
5fe58fc7
//
// MaterialCell.h
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface
MaterialCell
:
UITableViewCell
@property
(
nonatomic
,
strong
)
UIImageView
*
smallImageView
;
@property
(
nonatomic
,
strong
)
UIButton
*
editBtn
;
@property
(
nonatomic
,
strong
)
UILabel
*
seqLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
titleLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
baseCountLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
dateLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
lineLabel
;
@property
(
nonatomic
,
strong
)
UIView
*
showView
;
@property
(
nonatomic
,
strong
)
UILabel
*
showTitleLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
showBaseCountLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
showDateLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
basePriceLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
totalPriceLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
placeLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
qualityLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
remarkLabel
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/MaterialCell.m
deleted
100644 → 0
View file @
5fe58fc7
//
// MaterialCell.m
// XFFruit
//
// Created by n22 on 15/8/19.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "MaterialCell.h"
#define LeftMargin 13
#define TableHeight 44
#define SmallSize 15
#define SmallWidth 20
#define SpaceMargin 1
#define LeftWidth 45
#define RightWidth 30
#define ShowColor @"bbbbbb"
#define ShowSize 13
#define ShowWidth 150
#define ShowHeight 20
@implementation
MaterialCell
-
(
instancetype
)
initWithStyle
:(
UITableViewCellStyle
)
style
reuseIdentifier
:(
NSString
*
)
reuseIdentifier
{
self
=
[
super
initWithStyle
:
style
reuseIdentifier
:
reuseIdentifier
];
if
(
self
)
{
[
self
bulidLayout
];
}
return
self
;
}
-
(
void
)
bulidLayout
{
CGFloat
headWidth
=
(
ScreenSize
.
width
-
LeftWidth
-
RightWidth
-
SpaceMargin
*
(
3
-
1
))
/
3
;
self
.
smallImageView
=
[[
UIImageView
alloc
]
initWithFrame
:
CGRectMake
(
LeftMargin
,
(
TableHeight
-
SmallSize
)
/
2
,
SmallSize
,
SmallSize
)];
self
.
smallImageView
.
image
=
[
UIImage
imageNamed
:
@"delete"
];
self
.
seqLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
smallImageView
.
frame
),
0
,
SmallWidth
,
TableHeight
))];
self
.
seqLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
seqLabel
.
text
=
@"13"
;
self
.
seqLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
titleLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftWidth
,
0
,
headWidth
,
TableHeight
))];
self
.
titleLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
titleLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
titleLabel
.
text
=
@"苹果桃子"
;
self
.
titleLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
baseCountLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
titleLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
baseCountLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
baseCountLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
baseCountLabel
.
text
=
@"30000"
;
self
.
baseCountLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
dateLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
baseCountLabel
.
frame
)
+
SpaceMargin
,
0
,
headWidth
,
TableHeight
))];
self
.
dateLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
dateLabel
.
text
=
@"2015-04-05"
;
self
.
dateLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
dateLabel
.
font
=
GXF_SIXTEENTEH_SIZE
;
self
.
showView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TableHeight
,
ScreenSize
.
width
,
0
)];
self
.
showView
.
hidden
=
YES
;
self
.
showTitleLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftMargin
+
SmallSize
,
0
,
ShowWidth
,
ShowHeight
))];
self
.
showTitleLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
showTitleLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
showTitleLabel
.
text
=
@"原料:苹果桃子"
;
self
.
showTitleLabel
.
font
=
FontSize
(
ShowSize
);
self
.
showBaseCountLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMaxX
(
self
.
showTitleLabel
.
frame
),
0
,
ShowWidth
,
ShowHeight
))];
self
.
showBaseCountLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
showBaseCountLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
showBaseCountLabel
.
text
=
@"基础数量:10000"
;
self
.
showBaseCountLabel
.
font
=
FontSize
(
ShowSize
);
self
.
showDateLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showTitleLabel
.
frame
),
CGRectGetMaxY
(
self
.
showTitleLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
showDateLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
showDateLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
showDateLabel
.
text
=
@"入库时间:2015-02-04"
;
self
.
showDateLabel
.
font
=
FontSize
(
ShowSize
);
self
.
basePriceLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showBaseCountLabel
.
frame
),
CGRectGetMaxY
(
self
.
showTitleLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
basePriceLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
basePriceLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
basePriceLabel
.
text
=
@"基础单价:11元"
;
self
.
basePriceLabel
.
font
=
FontSize
(
ShowSize
);
self
.
totalPriceLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showTitleLabel
.
frame
),
CGRectGetMaxY
(
self
.
showDateLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
totalPriceLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
totalPriceLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
totalPriceLabel
.
text
=
@"总金额:1000"
;
self
.
totalPriceLabel
.
font
=
FontSize
(
ShowSize
);
self
.
placeLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showBaseCountLabel
.
frame
),
CGRectGetMaxY
(
self
.
showDateLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
placeLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
placeLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
placeLabel
.
text
=
@"产地:河南省"
;
self
.
placeLabel
.
font
=
FontSize
(
ShowSize
);
self
.
qualityLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showTitleLabel
.
frame
),
CGRectGetMaxY
(
self
.
totalPriceLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
qualityLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
qualityLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
qualityLabel
.
text
=
@"质量:1000"
;
self
.
qualityLabel
.
font
=
FontSize
(
ShowSize
);
self
.
remarkLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
CGRectGetMinX
(
self
.
showTitleLabel
.
frame
),
CGRectGetMaxY
(
self
.
qualityLabel
.
frame
),
ShowWidth
,
ShowHeight
))];
self
.
remarkLabel
.
textAlignment
=
NSTextAlignmentLeft
;
self
.
remarkLabel
.
textColor
=
HexColor
(
ShowColor
);
self
.
remarkLabel
.
text
=
@"描述:河南省"
;
self
.
remarkLabel
.
font
=
FontSize
(
ShowSize
);
self
.
editBtn
=
[
UIButton
buttonWithType
:
UIButtonTypeCustom
];
[
self
.
editBtn
setImage
:[
UIImage
imageNamed
:
@"delete"
]
forState
:
UIControlStateNormal
];
self
.
editBtn
.
frame
=
CGRectMake
(
ScreenSize
.
width
-
LeftWidth
,
0
,
LeftWidth
,
TableHeight
);
self
.
lineLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
LeftMargin
,
TableHeight
-
1
,
ScreenSize
.
width
-
LeftMargin
*
2
,
1
))];;
self
.
lineLabel
.
backgroundColor
=
GXF_LINE_COLOR
;
[
self
.
contentView
addSubview
:
self
.
smallImageView
];
[
self
.
contentView
addSubview
:
self
.
seqLabel
];
[
self
.
contentView
addSubview
:
self
.
titleLabel
];
[
self
.
contentView
addSubview
:
self
.
baseCountLabel
];
[
self
.
contentView
addSubview
:
self
.
dateLabel
];
[
self
.
contentView
addSubview
:
self
.
editBtn
];
[
self
.
contentView
addSubview
:
self
.
showView
];
[
self
.
showView
addSubview
:
self
.
showTitleLabel
];
[
self
.
showView
addSubview
:
self
.
showBaseCountLabel
];
[
self
.
showView
addSubview
:
self
.
showDateLabel
];
[
self
.
showView
addSubview
:
self
.
basePriceLabel
];
[
self
.
showView
addSubview
:
self
.
totalPriceLabel
];
[
self
.
showView
addSubview
:
self
.
placeLabel
];
[
self
.
showView
addSubview
:
self
.
qualityLabel
];
[
self
.
showView
addSubview
:
self
.
remarkLabel
];
[
self
.
contentView
addSubview
:
self
.
lineLabel
];
}
-
(
void
)
awakeFromNib
{
}
-
(
void
)
setSelected
:
(
BOOL
)
selected
animated
:
(
BOOL
)
animated
{
[
super
setSelected
:
selected
animated
:
animated
];
}
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/TopSheetView.h
deleted
100644 → 0
View file @
5fe58fc7
//
// TopSheetView.h
// XFFruit
//
// Created by 陈俊俊 on 15/8/12.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "HPGrowingTextView.h"
@protocol
TopSheetViewDelegate
<
NSObject
>
-
(
void
)
hiddenKeyBoard
;
@end
@interface
TopSheetView
:
UIView
@property
(
nonatomic
,
strong
)
UITextField
*
titleTextFiled
;
//标题
@property
(
nonatomic
,
strong
)
NSString
*
supplier
;
//供应商
@property
(
nonatomic
,
strong
)
UITextField
*
peopleTextFiled
;
//联系人
@property
(
nonatomic
,
strong
)
UITextField
*
phoneTextFiled
;
//电话
@property
(
nonatomic
,
strong
)
NSString
*
factory
;
//加工工厂
@property
(
nonatomic
,
strong
)
HPGrowingTextView
*
remarkTextView
;
//标题
@property
(
nonatomic
,
strong
)
UIButton
*
factoryBtn
;
@property
(
nonatomic
,
strong
)
UIButton
*
supplierBtn
;
@property
(
nonatomic
,
strong
)
UILabel
*
factoryLabel
;
@property
(
nonatomic
,
strong
)
UILabel
*
supplierLabel
;
@property
(
nonatomic
,
weak
)
id
<
TopSheetViewDelegate
>
delegate
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/WorkSheet/Views/TopSheetView.m
deleted
100644 → 0
View file @
5fe58fc7
//
// TopSheetView.m
// XFFruit
//
// Created by 陈俊俊 on 15/8/12.
// Copyright (c) 2015年 Xummer. All rights reserved.
//
#import "TopSheetView.h"
#import "SurveyCell.h"
#define LeftMargin 15
#define TopMargin 20
#define LeftWidth 80
#define TableHeight 44
#define SpaceHeight 10
@interface
TopSheetView
()
<
UITableViewDataSource
,
UITableViewDelegate
,
HPGrowingTextViewDelegate
,
UITextFieldDelegate
>
{
UITableView
*
_tableView
;
NSMutableArray
*
_dataArr
;
}
@end
@implementation
TopSheetView
-
(
instancetype
)
initWithFrame
:(
CGRect
)
frame
{
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
//界面
[
self
bulidLayout
];
}
return
self
;
}
#pragma mark - 布局
-
(
void
)
bulidLayout
{
self
.
backgroundColor
=
XXFBgColor
;
_dataArr
=
[
NSMutableArray
array
];
NSArray
*
arr
=
@[
@"标题:"
,
@"供应商:"
,
@"联系人:"
,
@"联系电话:"
,
@"加工工厂:"
,
@"备注:"
];
[
_dataArr
addObjectsFromArray
:
arr
];
_tableView
=
[[
UITableView
alloc
]
initWithFrame
:(
CGRectMake
(
0
,
TopMargin
,
self
.
frame
.
size
.
width
,
self
.
frame
.
size
.
height
-
TopMargin
))
style
:(
UITableViewStylePlain
)];
_tableView
.
backgroundColor
=
[
UIColor
whiteColor
];
_tableView
.
bounces
=
NO
;
_tableView
.
delegate
=
self
;
_tableView
.
dataSource
=
self
;
[
self
addSubview
:
_tableView
];
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
}
-
(
NSInteger
)
tableView
:
(
UITableView
*
)
tableView
numberOfRowsInSection
:
(
NSInteger
)
section
{
return
_dataArr
.
count
;
}
-
(
UITableViewCell
*
)
tableView
:
(
UITableView
*
)
tableView
cellForRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
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
==
1
||
indexPath
.
row
==
4
)
{
cell
.
accessoryType
=
UITableViewCellAccessoryDisclosureIndicator
;
}
[
self
createViewInCell
:
cell
indexPath
:
indexPath
];
}
[
cell
setTitleStr
:
_dataArr
[
indexPath
.
row
]];
return
cell
;
}
-
(
void
)
createViewInCell
:
(
SurveyCell
*
)
cell
indexPath
:
(
NSIndexPath
*
)
indexPath
{
if
(
indexPath
.
row
==
0
||
indexPath
.
row
==
2
||
indexPath
.
row
==
3
)
{
UITextField
*
textField
=
[[
UITextField
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
10
,
TableHeight
)];
textField
.
textAlignment
=
NSTextAlignmentRight
;
textField
.
textColor
=
GXF_CONTENT_COLOR
;
textField
.
font
=
GXF_FIFTEENTEN_SIZE
;
textField
.
returnKeyType
=
UIReturnKeyDone
;
textField
.
delegate
=
self
;
[
cell
.
contentView
addSubview
:
textField
];
if
(
indexPath
.
row
==
0
)
{
self
.
titleTextFiled
=
textField
;
self
.
titleTextFiled
.
placeholder
=
@"请输入标题"
;
}
else
if
(
indexPath
.
row
==
2
){
self
.
peopleTextFiled
=
textField
;
self
.
peopleTextFiled
.
placeholder
=
@"请输入联系人"
;
}
else
if
(
indexPath
.
row
==
3
){
self
.
phoneTextFiled
=
textField
;
self
.
phoneTextFiled
.
placeholder
=
@"请输入联系人手机"
;
}
}
else
if
(
indexPath
.
row
==
_dataArr
.
count
-
1
){
self
.
remarkTextView
=
[[
HPGrowingTextView
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
10
,
TableHeight
)];
self
.
remarkTextView
.
contentInset
=
UIEdgeInsetsMake
(
5
,
5
,
5
,
0
);
self
.
remarkTextView
.
minNumberOfLines
=
1
;
self
.
remarkTextView
.
maxNumberOfLines
=
2
;
self
.
remarkTextView
.
font
=
GXF_FIFTEENTEN_SIZE
;
self
.
remarkTextView
.
textAlignment
=
NSTextAlignmentRight
;
self
.
remarkTextView
.
delegate
=
self
;
self
.
remarkTextView
.
returnKeyType
=
UIReturnKeyDone
;
self
.
remarkTextView
.
placeholder
=
@"输入备注内容"
;
[
cell
.
contentView
addSubview
:
self
.
remarkTextView
];
}
else
{
UILabel
*
contentLabel
=
[[
UILabel
alloc
]
initWithFrame
:(
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
10
,
TableHeight
))];
contentLabel
.
textAlignment
=
NSTextAlignmentRight
;
contentLabel
.
textColor
=
GXF_PLACEHOLDER_COLOR
;
contentLabel
.
font
=
GXF_FIFTEENTEN_SIZE
;
[
cell
.
contentView
addSubview
:
contentLabel
];
if
(
indexPath
.
row
==
1
)
{
contentLabel
.
text
=
@"选择供应商"
;
self
.
supplierLabel
=
contentLabel
;
}
else
if
(
indexPath
.
row
==
4
){
contentLabel
.
text
=
@"选择加工工厂"
;
self
.
factoryLabel
=
contentLabel
;
}
}
}
-
(
BOOL
)
growingTextViewShouldReturn
:
(
HPGrowingTextView
*
)
growingTextView
{
[
self
.
remarkTextView
resignFirstResponder
];
return
YES
;
}
-
(
BOOL
)
textFieldShouldReturn
:
(
UITextField
*
)
textField
{
[
self
.
delegate
hiddenKeyBoard
];
return
YES
;
}
@end
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