Commit 8867d7d6 authored by Sandy's avatar Sandy

1.增加开发环境。2.保存的单据不显示费用。

parent ad699d4e
......@@ -2046,13 +2046,14 @@
path = Views;
sourceTree = "<group>";
};
7281A0A71B8974120052B1AC /* Purchase */ = {
7281A0A71B8974120052B1AC /* Purchase(采购单) */ = {
isa = PBXGroup;
children = (
7281A0A81B8974120052B1AC /* Controllers */,
7281A0AD1B8974120052B1AC /* Models */,
7281A0AE1B8974120052B1AC /* Views */,
);
name = "Purchase(采购单)";
path = Purchase;
sourceTree = "<group>";
};
......@@ -2952,7 +2953,7 @@
724171641B9D30660094DF55 /* ChooseViewController */,
35CF33911B95B419001211EF /* GXFCommon */,
35CF33721B953E8D001211EF /* Process(加工单) */,
7281A0A71B8974120052B1AC /* Purchase */,
7281A0A71B8974120052B1AC /* Purchase(采购单) */,
FE17F67A1B85CA5B0078CE96 /* PurchaseNotice */,
7217E9C01B72364300FE5C1D /* Survey */,
C159180B1ABE88030013B391 /* Login */,
......@@ -4423,7 +4424,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
PROVISIONING_PROFILE = "";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -4433,8 +4434,8 @@
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
COPYING_PRESERVES_HFS_DATA = NO;
ENABLE_BITCODE = NO;
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
......@@ -4448,7 +4449,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
PROVISIONING_PROFILE = "";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
......@@ -54,6 +64,16 @@
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
......
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
......@@ -51,6 +61,16 @@
"filename" : "AppIcon180x180.png",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
......
......@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.2.12</string>
<string>1.2.13</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0</string>
<string>1.2.13</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
......
......@@ -29,14 +29,14 @@
#define HTTP_REST_REPORT_BASE_URL @"http://jdcg.demo.hd123.cn:7080"
#else
//********阿里云内部测试环境********
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:7580/cruiser-server/rest"
//********开发环境********
//#define HTTP_REST_API_BASE_URL @"http://gomoredev:8090/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: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"
#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380"
#endif
......
......@@ -121,6 +121,17 @@ typedef enum : NSUInteger {
}
_aBottomView.productVC.productArr = arr;
[_aBottomView.productVC.tableView reloadData];
NSMutableArray *arrCost = [NSMutableArray array];
for (NSDictionary *dic in _purchaseBill.accountDetails) {
FeeAcountDetail *cost = [[FeeAcountDetail alloc] init];
[cost setValuesForKeysWithDictionary:dic];
[arrCost addObject:cost];
}
_aBottomView.costVC.costArr = arrCost;
[_aBottomView.costVC.tableView reloadData];
}
- (void)addTransportCost:(NSNotification *)fination{
......
......@@ -38,4 +38,5 @@
@property (nonatomic, strong) NSString *purchaserCode;//采购员代码
@property (nonatomic,strong)NSArray *products;
@property (strong, nonatomic) NSArray *accountDetails;
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment