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
1de7a49b
Commit
1de7a49b
authored
9 years ago
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
采购通知选择多人
parent
a5276e21
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
111 additions
and
49 deletions
+111
-49
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+6
-6
ICRAppMacro.h
XFFruit/Macro/ICRAppMacro.h
+2
-2
ICRLoginViewController.m
XFFruit/ViewControllers/Login/ICRLoginViewController.m
+8
-8
TopPurchaseView.m
XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m
+1
-1
NewPurchaseNoticeViewController.m
...chaseNotice/Controllers/NewPurchaseNoticeViewController.m
+42
-18
PurchaseNoticeViewController.m
...PurchaseNotice/Controllers/PurchaseNoticeViewController.m
+8
-0
SeePurchaseNoticeViewController.m
...chaseNotice/Controllers/SeePurchaseNoticeViewController.m
+17
-2
PurchaseNotice.h
...it/ViewControllers/PurchaseNotice/Models/PurchaseNotice.h
+1
-0
PurchaseNoticeListCell.m
...Controllers/PurchaseNotice/Views/PurchaseNoticeListCell.m
+10
-2
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+3
-5
NewReceiveProductViewController.m
...s/Receiving/Controllers/NewReceiveProductViewController.m
+2
-3
NewSurveyViewController.m
...wControllers/Survey/controllers/NewSurveyViewController.m
+3
-0
NewCostViewController.m
...Controllers/Transport/Controllers/NewCostViewController.m
+2
-2
Accounttitle.m
XFFruit/ViewControllers/Transport/Models/Accounttitle.m
+6
-0
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
1de7a49b
...
...
@@ -3213,7 +3213,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}/**"
;
...
...
@@ -3251,7 +3251,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}/**"
;
...
...
@@ -3278,7 +3278,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.cntaiping.life.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Debug
;
...
...
@@ -3302,7 +3302,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.cntaiping.life.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
cfc700e3-f78e-4893-a7fd-62daba6a0c6c
"
;
PROVISIONING_PROFILE
=
"
a12432a9-50b3-4cef-bae7-dcb35f965ce4
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Release
;
...
...
@@ -3325,7 +3325,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}/**"
;
};
...
...
@@ -3345,7 +3345,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/Macro/ICRAppMacro.h
View file @
1de7a49b
...
...
@@ -23,14 +23,14 @@
#define ICR_IMAGE_BG_COLOR [UIColor colorWithW:242 a:1]
//********阿里云内部测试环境********
//
#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//********现场测试环境********
//#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
//********现场正式环境*********
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
//
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
// HTTP
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @
1de7a49b
...
...
@@ -101,21 +101,21 @@
// self.m_containerView.m_passwordTextF.text = @"aaa";
//@"http://218.244.151.129:7580/cruiser-server/rest"
//
self.m_containerView.m_cCodeTextF.text = @"211534962";
//
self.m_containerView.m_userNameTextF.text = @"admin";
//
self.m_containerView.m_passwordTextF.text = @"thoradmin";
self
.
m_containerView
.
m_cCodeTextF
.
text
=
@"211534962"
;
self
.
m_containerView
.
m_userNameTextF
.
text
=
@"admin"
;
self
.
m_containerView
.
m_passwordTextF
.
text
=
@"thoradmin"
;
//@"http://122.224.171.126:7280/cruiser-server/rest"
//@"http://122.224.171.126:7280/cruiser-server/rest"
// self.m_containerView.m_cCodeTextF.text = @"923";
// self.m_containerView.m_userNameTextF.text = @"admin";
// self.m_containerView.m_passwordTextF.text = @"thoradmin";
self
.
m_containerView
.
m_cCodeTextF
.
text
=
@"211534968"
;
self
.
m_containerView
.
m_userNameTextF
.
text
=
@"admin"
;
self
.
m_containerView
.
m_passwordTextF
.
text
=
@"thoradmin"
;
//现场正式环境登陆
//
self.m_containerView.m_cCodeTextF.text = @"211534968";
//
self.m_containerView.m_userNameTextF.text = @"admin";
//
self.m_containerView.m_passwordTextF.text = @"thoradmin";
[
self
.
m_containerView
checkLoginEnable
];
#else
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Purchase/Views/TopPurchaseView.m
View file @
1de7a49b
...
...
@@ -133,7 +133,7 @@
}
else
if
(
indexPath
.
row
==
5
){
contentLabel
.
text
=
@"0"
;
contentLabel
.
frame
=
CGRectMake
(
100
+
LeftMargin
,
0
,
ScreenSize
.
width
-
100
-
LeftMargin
*
2
-
30
,
TableHeight
);
contentLabel
.
textColor
=
[
UIColor
redColor
]
;
contentLabel
.
textColor
=
GXF_NAVIGAYION_COLOR
;
self
.
purchasePriceLabel
=
contentLabel
;
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
contentLabel
.
frame
)
+
5
,
0
,
20
,
TableHeight
)];
label
.
text
=
@"元"
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/NewPurchaseNoticeViewController.m
View file @
1de7a49b
...
...
@@ -69,6 +69,7 @@ typedef enum : NSUInteger {
@property
(
nonatomic
,
strong
)
UILabel
*
FootLabel
;
@property
(
nonatomic
,
strong
)
UIButton
*
addDetailedButton
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
selectUsers
;
@property
(
nonatomic
,
strong
)
NSMutableArray
*
users
;
@property
(
nonatomic
,
strong
)
NSString
*
purchaseNoticeUuid
;
...
...
@@ -123,13 +124,28 @@ typedef enum : NSUInteger {
_titleField
.
text
=
self
.
purchaseNotice
.
title
;
self
.
titleStr
=
self
.
purchaseNotice
.
title
;
}
if
(
self
.
purchaseNotice
.
purchaserName
.
length
>
0
)
{
_personLabel
.
text
=
self
.
purchaseNotice
.
purchaserName
;
if
(
self
.
purchaseNotice
.
purchasers
.
count
>
0
)
{
NSString
*
personStr
=
@""
;
for
(
NSDictionary
*
userDict
in
self
.
purchaseNotice
.
purchasers
)
{
SurveyUser
*
surveyUser
=
[[
SurveyUser
alloc
]
init
];
[
surveyUser
setValuesForKeysWithDictionary
:
userDict
];
[
self
.
selectUsers
addObject
:
surveyUser
.
userUuid
];
if
(
personStr
.
length
==
0
)
{
personStr
=
[
personStr
stringByAppendingFormat
:
@"%@"
,
surveyUser
.
userName
];
}
else
{
personStr
=
[
personStr
stringByAppendingFormat
:
@"、%@"
,
surveyUser
.
userName
];
}
}
_personLabel
.
text
=
personStr
;
_personLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
purchaseUuidStr
=
self
.
purchaseNotice
.
purchaserUuid
;
self
.
purchaseCodeStr
=
self
.
purchaseNotice
.
purchaserCode
;
self
.
purchaseNameStr
=
self
.
purchaseNotice
.
purchaserName
;
[
self
.
selectUsers
addObject
:
self
.
purchaseNotice
.
purchaserUuid
];
}
if
(
self
.
users
)
{
if
(
self
.
users
.
count
>
0
)
{
[
self
.
users
removeAllObjects
];
}
[
self
.
users
addObjectsFromArray
:
self
.
purchaseNotice
.
purchasers
];
}
if
(
self
.
purchaseNotice
.
finishDate
)
{
if
(
self
.
purchaseNotice
.
finishDate
.
length
>
15
)
{
...
...
@@ -159,6 +175,7 @@ typedef enum : NSUInteger {
{
selectCellAry
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
1000
];
self
.
selectUsers
=
[
NSMutableArray
array
];
self
.
users
=
[
NSMutableArray
array
];
_dataArr
=
[[
NSMutableArray
alloc
]
initWithObjects
:
@"标题:"
,
@"采购员:"
,
@"要求采购完成时间:"
,
@"备注:"
,
nil
];
_shopeArr
=
[[
NSMutableArray
alloc
]
init
];
...
...
@@ -337,20 +354,28 @@ typedef enum : NSUInteger {
cvc
.
selectArr
=
self
.
selectUsers
;
}
cvc
.
choseBaseInfo
=
^
(
NSArray
*
users
){
if
(
users
.
count
>
0
)
{
if
(
users
.
count
>
0
){
NSString
*
textStr
=
@""
;
if
(
self
.
users
.
count
>
0
)
{
[
self
.
users
removeAllObjects
];
}
if
(
self
.
selectUsers
.
count
>
0
)
{
[
self
.
selectUsers
removeAllObjects
];
}
SurveyUser
*
user
=
users
[
0
];
_personLabel
.
text
=
user
.
userName
;
for
(
SurveyUser
*
user
in
users
)
{
if
(
textStr
.
length
==
0
)
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"%@"
,
user
.
userName
];
}
else
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"、%@"
,
user
.
userName
];
}
[
self
.
selectUsers
addObject
:
user
.
userUuid
];
[
self
.
users
addObject
:[
user
dictForCommit
]];
}
_personLabel
.
text
=
textStr
;
_personLabel
.
textColor
=
GXF_CONTENT_COLOR
;
self
.
purchaseNameStr
=
user
.
userName
;
self
.
purchaseCodeStr
=
user
.
userCode
;
self
.
purchaseUuidStr
=
user
.
userUuid
;
[
self
.
selectUsers
addObject
:
user
.
userUuid
];
}
};
cvc
.
isMoreChose
=
NO
;
cvc
.
isMoreChose
=
YES
;
[
self
PushViewController
:
cvc
animated
:
YES
];
}
else
if
(
indexPath
.
row
==
2
){
[
self
startDatePickView
];
...
...
@@ -521,7 +546,7 @@ typedef enum : NSUInteger {
ShowMessage
(
@"采购通知单标题不能为空"
);
return
NO
;
}
if
(
_personLabel
.
text
.
length
==
0
)
{
if
(
self
.
users
.
count
<=
0
)
{
ShowMessage
(
@"采购员不能为空"
);
return
NO
;
}
...
...
@@ -642,14 +667,13 @@ typedef enum : NSUInteger {
@"version"
:
versionObject
,
@"title"
:
[
IBTCommon
checkString
:
self
.
titleStr
],
@"state"
:
[
IBTCommon
checkString
:
state
],
@"purchaserUuid"
:
[
IBTCommon
checkString
:
self
.
purchaseUuidStr
],
@"purchaserCode"
:
[
IBTCommon
checkString
:
self
.
purchaseCodeStr
],
@"purchaserName"
:
[
IBTCommon
checkString
:
self
.
purchaseNameStr
],
@"purchasers"
:
self
.
users
,
@"finishDate"
:
[
IBTCommon
checkString
:
self
.
finishDateStr
],
@"remark"
:
[
IBTCommon
checkString
:
self
.
remarkStr
],
@"products"
:
billProducts
};
[
IBTLoadingView
showProgressLabel
:
msg
];
[[
ICRHTTPController
sharedController
]
savePurchaseNoticeWithData
:
dict
success
:
succ
failure
:
fail
];
}
-
(
void
)
alertView
:
(
UIAlertView
*
)
alertView
clickedButtonAtIndex
:
(
NSInteger
)
buttonIndex
{
if
(
buttonIndex
==
1
)
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m
View file @
1de7a49b
...
...
@@ -15,6 +15,7 @@
#import "MJRefresh.h"
#import "PurchaseNoticeListCell.h"
#import "PurchaseNotice.h"
#import "SurveyUser.h"
#define TopMargin 44
#define TableHeight 120
#define LeftMargin 20
...
...
@@ -128,6 +129,13 @@ typedef enum : NSUInteger {
for
(
NSDictionary
*
purchaseBillDict
in
recodesArr
)
{
PurchaseNotice
*
purchaseBill
=
[[
PurchaseNotice
alloc
]
init
];
[
purchaseBill
setValuesForKeysWithDictionary
:
purchaseBillDict
];
NSMutableArray
*
users
=
[
NSMutableArray
array
];
for
(
NSDictionary
*
userDict
in
purchaseBill
.
purchasers
)
{
SurveyUser
*
user
=
[
SurveyUser
new
];
[
user
setValuesForKeysWithDictionary
:
userDict
];
[
users
addObject
:
user
];
}
purchaseBill
.
purchasers
=
users
;
[
self
.
dataArr
addObject
:
purchaseBill
];
}
NSDictionary
*
pageDict
=
data
[
@"data"
][
@"paging"
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Controllers/SeePurchaseNoticeViewController.m
View file @
1de7a49b
...
...
@@ -11,7 +11,7 @@
#import "NoticeProduct.h"
#import "NoticeDetailCell.h"
#import "SurveyCell.h"
#import "SurveyUser.h"
#import "HPGrowingTextView.h"
#import "NoticeProductViewController.h"
#import "FollowUpRecordViewController.h"
...
...
@@ -92,6 +92,13 @@ typedef enum : NSUInteger {
[
productArr
addObject
:
billProbuct
];
}
purchaseNotice
.
products
=
productArr
;
NSMutableArray
*
users
=
[
NSMutableArray
array
];
for
(
NSDictionary
*
userDict
in
purchaseNotice
.
purchasers
)
{
SurveyUser
*
user
=
[
SurveyUser
new
];
[
user
setValuesForKeysWithDictionary
:
userDict
];
[
users
addObject
:
user
];
}
purchaseNotice
.
purchasers
=
users
;
self
.
purchaseNotice
=
purchaseNotice
;
[
strongSelf
fetchtNoticeDetail
];
}
else
{
...
...
@@ -123,7 +130,15 @@ typedef enum : NSUInteger {
self
.
createOperNameLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@%@"
,[
IBTCommon
checkString
:
self
.
purchaseNotice
.
create_operName
],
self
.
purchaseNotice
.
create_time
.
length
>
10
?
[
self
.
purchaseNotice
.
create_time
substringToIndex
:
10
]
:
self
.
purchaseNotice
.
create_time
];
self
.
titleLabel
.
text
=
[
IBTCommon
checkString
:
self
.
purchaseNotice
.
title
];
self
.
userLabel
.
text
=
[
IBTCommon
checkString
:
self
.
purchaseNotice
.
purchaserName
];
NSString
*
textStr
=
@""
;
for
(
SurveyUser
*
user
in
self
.
purchaseNotice
.
purchasers
)
{
if
(
textStr
.
length
==
0
)
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"%@"
,
user
.
userName
];
}
else
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"、%@"
,
user
.
userName
];
}
}
self
.
userLabel
.
text
=
[
IBTCommon
checkString
:
textStr
];
self
.
countLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,[
self
calutionTotalCount
]];
self
.
finishLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@"
,
self
.
purchaseNotice
.
finishDate
?[[
IBTCommon
checkString
:
self
.
purchaseNotice
.
finishDate
]
substringToIndex
:
10
]:
@"无"
];
self
.
noteLabel
.
text
=
[
IBTCommon
checkString
:
self
.
purchaseNotice
.
remark
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Models/PurchaseNotice.h
View file @
1de7a49b
...
...
@@ -23,6 +23,7 @@
@property
(
nonatomic
,
strong
)
NSString
*
purchaserUuid
;
//采购员ID
@property
(
nonatomic
,
strong
)
NSString
*
purchaserCode
;
//采购员代码
@property
(
nonatomic
,
strong
)
NSString
*
purchaserName
;
//采购员名称
@property
(
nonatomic
,
strong
)
NSArray
*
purchasers
;
@property
(
nonatomic
,
strong
)
NSString
*
finishDate
;
//新增要求采购完成时间
@property
(
nonatomic
,
strong
)
NSString
*
remark
;
//备注
@property
(
nonatomic
,
strong
)
NSArray
*
products
;
//商品
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/PurchaseNoticeListCell.m
View file @
1de7a49b
...
...
@@ -7,7 +7,7 @@
//
#import "PurchaseNoticeListCell.h"
#import "SurveyUser.h"
#define TitleSize 16
#define LeftMargin 90
#define TopMargin 10
...
...
@@ -69,7 +69,15 @@
-
(
void
)
setPurchaseNotice
:
(
PurchaseNotice
*
)
purchaseNotice
{
self
.
billNumberLabel
.
text
=
[
NSString
stringWithFormat
:
@"单号:%@"
,
purchaseNotice
.
billnumber
];
self
.
titleLabel
.
text
=
[
NSString
stringWithFormat
:
@"标题:%@"
,
purchaseNotice
.
title
];
self
.
userLabel
.
text
=
[
NSString
stringWithFormat
:
@"采购员:%@"
,
purchaseNotice
.
purchaserName
]
;
NSString
*
textStr
=
@""
;
for
(
SurveyUser
*
user
in
purchaseNotice
.
purchasers
)
{
if
(
textStr
.
length
==
0
)
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"%@"
,
user
.
userName
];
}
else
{
textStr
=
[
textStr
stringByAppendingFormat
:
@"、%@"
,
user
.
userName
];
}
}
self
.
userLabel
.
text
=
[
NSString
stringWithFormat
:
@"采购员:%@"
,
textStr
]
;
self
.
createOperNameLabel
.
text
=
[
NSString
stringWithFormat
:
@"创建人:%@"
,
purchaseNotice
.
create_operName
]
;
self
.
createTimeLabel
.
text
=
[
NSString
stringWithFormat
:
@"创建时间:%@"
,
purchaseNotice
.
create_time
];
NSString
*
stateStr
=
@""
;
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
1de7a49b
...
...
@@ -102,7 +102,6 @@ typedef enum : NSUInteger {
-
(
void
)
setviewsData
{
if
(
self
.
shopDetail
!=
nil
)
{
//商品
_productLabel
.
text
=
[
NSString
stringWithFormat
:
@"%@[%@]"
,
self
.
shopDetail
.
merchandise
,
self
.
shopDetail
.
product_code
];
[
self
.
selectProducts
addObject
:
_shopDetail
.
product_uuid
];
...
...
@@ -367,7 +366,7 @@ typedef enum : NSUInteger {
_baseCountLabel
=
label
;
[
textField
setEnabled
:
NO
];
textField
.
placeholder
=
@"基础数量"
;
textField
.
textColor
=
[
UIColor
redColor
]
;
textField
.
textColor
=
GXF_NAVIGAYION_COLOR
;
foundationQuantity
=
textField
;
//基础数量
}
else
if
(
indexPath
.
row
==
5
)
...
...
@@ -380,15 +379,14 @@ typedef enum : NSUInteger {
{
label
.
text
=
@"元"
;
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
textField
.
placeholder
=
@"包装单价"
;
textField
.
placeholder
=
@"
输入
包装单价"
;
packageUnitPrice
=
textField
;
//包装单价
}
else
if
(
indexPath
.
row
==
7
)
{
label
.
text
=
@"元"
;
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
textField
.
placeholder
=
@"总金额"
;
textField
.
textColor
=
[
UIColor
redColor
];
textField
.
placeholder
=
@"输入总金额"
;
totalMoney
=
textField
;
//总金额
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Receiving/Controllers/NewReceiveProductViewController.m
View file @
1de7a49b
...
...
@@ -206,7 +206,6 @@
textField
.
delegate
=
self
;
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
[
cell
.
contentView
addSubview
:
textField
];
textField
.
textColor
=
[
UIColor
redColor
];
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
textField
.
frame
)
+
5
,
0
,
20
,
TableRowHeight
)];
label
.
textColor
=
GXF_CONTENT_COLOR
;
...
...
@@ -295,7 +294,7 @@
baseCount
=
total
/
[
self
.
noticeProduct
.
price
floatValue
];
}
_chooseTotalPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.
2
f元"
,
total
];
_chooseTotalPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.
4
f元"
,
total
];
_shBaseQuantityField
.
text
=
[
NSString
stringWithFormat
:
@"%.0f"
,
baseCount
];
}
}
else
if
(
textField
==
_shBaseQuantityField
)
{
...
...
@@ -306,7 +305,7 @@
baseCount
=
total
/
[
self
.
noticeProduct
.
packprice
floatValue
];
}
_chooseTotalPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.
2
f元"
,
total
];
_chooseTotalPriceLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.
4
f元"
,
total
];
_shPackField
.
text
=
[
NSString
stringWithFormat
:
@"%.0f"
,
baseCount
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m
View file @
1de7a49b
...
...
@@ -356,6 +356,9 @@ typedef enum : NSUInteger {
_personLabel
.
textColor
=
GXF_CONTENT_COLOR
;
}
if
(
self
.
users
)
{
// if (self.users.count > 0) {
// [self.users removeAllObjects];
// }
[
self
.
users
addObjectsFromArray
:
self
.
survey
.
users
];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Controllers/NewCostViewController.m
View file @
1de7a49b
...
...
@@ -216,7 +216,7 @@ typedef enum : NSUInteger {
}
else
{
[
textField
setEnabled
:
NO
];
textField
.
text
=
@"0"
;
textField
.
textColor
=
[
UIColor
redColor
]
;
textField
.
textColor
=
GXF_NAVIGAYION_COLOR
;
_leftmoneyField
=
textField
;
}
}
...
...
@@ -236,7 +236,7 @@ typedef enum : NSUInteger {
}
-
(
void
)
textChange
:
(
UITextField
*
)
textField
{
if
(
_actualmoneyField
.
text
.
length
>
0
&&
_paidmoneyField
.
text
.
length
>
0
)
{
_leftmoneyField
.
text
=
[
NSString
stringWithFormat
:
@"%.
2
f"
,[
_actualmoneyField
.
text
floatValue
]
-
[
_paidmoneyField
.
text
floatValue
]];
_leftmoneyField
.
text
=
[
NSString
stringWithFormat
:
@"%.
4
f"
,[
_actualmoneyField
.
text
floatValue
]
-
[
_paidmoneyField
.
text
floatValue
]];
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Models/Accounttitle.m
View file @
1de7a49b
...
...
@@ -9,5 +9,11 @@
#import "Accounttitle.h"
@implementation
Accounttitle
+
(
NSDictionary
*
)
specialKeysAndReplaceKeys
{
return
@{
@"aID"
:
[[
self
class
]
PrimaryKey
],
};
}
+
(
NSString
*
)
PrimaryKey
{
return
@"uuid"
;
}
@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