Skip to content

X
xffruit
Commit 7dd4e49c authored by 陈俊俊's avatar 陈俊俊
Browse files
Options

Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 

Conflicts:
	XFFruit.xcodeproj/project.pbxproj
	XFFruit/ViewControllers/Receiving/Controllers/ReceiveViewController.m
parents 24e850bd cbc3d2f0
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 115 deletions
Podfile
View file @ 7dd4e49c
platform :ios, '8.1' platform :ios, '8.1'
pod 'AFNetworking', '~> 2.5.4' pod 'AFNetworking', '~> 2.5.4'
pod 'SDWebImage', '~> 3.7.2' pod 'SDWebImage', '~> 3.7.2'
...@@ -6,6 +8,6 @@ pod 'SSKeychain', '~> 1.2.3' ...@@ -6,6 +8,6 @@ pod 'SSKeychain', '~> 1.2.3'
pod 'FMDB', '~> 2.5' pod 'FMDB', '~> 2.5'
pod 'Base64nl', '~> 1.2' pod 'Base64nl', '~> 1.2'
pod 'Reveal-iOS-SDK', '~> 1.5.1' pod 'Reveal-iOS-SDK', '~> 1.5.1'
pod 'BaiduMapAPI', '~> 2.7.0’ pod 'BaiduMapAPI', '~> 2.7.0'
pod 'MJRefresh', '~> 2.2.0' pod 'MJRefresh', '~> 2.2.0'
pod 'IQKeyboardManager', '~> 3.2.3' pod 'IQKeyboardManager', '~> 3.2.3'
\ No newline at end of file
Podfile.lock
View file @ 7dd4e49c
...@@ -60,4 +60,4 @@ SPEC CHECKSUMS: ...@@ -60,4 +60,4 @@ SPEC CHECKSUMS:
SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29 SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
COCOAPODS: 0.38.2 COCOAPODS: 0.37.1
XFFruit.xcodeproj/project.pbxproj
View file @ 7dd4e49c
...@@ -2550,7 +2550,7 @@ ...@@ -2550,7 +2550,7 @@
TargetAttributes = { TargetAttributes = {
C1F696021AB870B400F9F5DD = { C1F696021AB870B400F9F5DD = {
CreatedOnToolsVersion = 6.2; CreatedOnToolsVersion = 6.2;
DevelopmentTeam = 2G3393EZPN; DevelopmentTeam = W54V2VB863;
}; };
C1F6961B1AB870B400F9F5DD = { C1F6961B1AB870B400F9F5DD = {
CreatedOnToolsVersion = 6.2; CreatedOnToolsVersion = 6.2;
...@@ -3197,9 +3197,9 @@ ...@@ -3197,9 +3197,9 @@
baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */; baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch"; GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist; INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 7.0;
...@@ -3209,7 +3209,8 @@ ...@@ -3209,7 +3209,8 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Debug; name = Debug;
...@@ -3219,9 +3220,9 @@ ...@@ -3219,9 +3220,9 @@
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */; baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: Minglong Hu (TR9LJDJBFT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Minglong Hu (TR9LJDJBFT)"; CODE_SIGN_IDENTITY = "iPhone Developer";
ENABLE_BITCODE = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch"; GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
INFOPLIST_FILE = XFFruit/Info.plist; INFOPLIST_FILE = XFFruit/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 7.0;
...@@ -3231,7 +3232,7 @@ ...@@ -3231,7 +3232,7 @@
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
PRODUCT_NAME = XFFruit; PRODUCT_NAME = XFFruit;
PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4"; PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**"; USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
}; };
name = Release; name = Release;
......
XFFruit/Controllers/DataBaseController/GXFFunctionDB.m
View file @ 7dd4e49c
...@@ -241,6 +241,7 @@ ...@@ -241,6 +241,7 @@
BOOL hasSeeOption5 = NO; BOOL hasSeeOption5 = NO;
BOOL hasSeeOption6 = NO; BOOL hasSeeOption6 = NO;
BOOL hasSeeOption7 = NO; BOOL hasSeeOption7 = NO;
BOOL hasSeeOption8 = NO;
for (int count = 0; count < hasPermission.count; count ++) { for (int count = 0; count < hasPermission.count; count ++) {
FMResultSet *rs = [_dataBase executeQuery: @"SELECT * FROM displayFunction WHERE functionId = ?",hasPermission[count] ]; FMResultSet *rs = [_dataBase executeQuery: @"SELECT * FROM displayFunction WHERE functionId = ?",hasPermission[count] ];
while ([rs next]) { while ([rs next]) {
...@@ -299,6 +300,16 @@ ...@@ -299,6 +300,16 @@
hasSeeOption7 = NO; hasSeeOption7 = NO;
} }
//"收货单"
if (displayFunction.functionId == 500802 && hasSeeOption8 == NO) {
hasSeeOption8 = YES;
}
if (displayFunction.functionId == 500803 && hasSeeOption8 == YES) {
[muArr removeObject:displayFunction];
hasSeeOption8 = NO;
}
continue; continue;
} }
} }
...@@ -434,7 +445,7 @@ ...@@ -434,7 +445,7 @@
BOOL hasSeeOption5 = NO; BOOL hasSeeOption5 = NO;
BOOL hasSeeOption6 = NO; BOOL hasSeeOption6 = NO;
BOOL hasSeeOption7 = NO; BOOL hasSeeOption7 = NO;
BOOL hasSeeOption8 = NO;
while ([rs next]) { while ([rs next]) {
GXFDisplayFunction *displayFunction = [self p_resultSetDisplayFunction:rs]; GXFDisplayFunction *displayFunction = [self p_resultSetDisplayFunction:rs];
[muArr addObject:displayFunction]; [muArr addObject:displayFunction];
...@@ -493,6 +504,16 @@ ...@@ -493,6 +504,16 @@
hasSeeOption7 = NO; hasSeeOption7 = NO;
} }
//"收货单"
if (displayFunction.functionId == 500802 && hasSeeOption8 == NO) {
hasSeeOption8 = YES;
}
if (displayFunction.functionId == 500803 && hasSeeOption8 == YES) {
[muArr removeObject:displayFunction];
hasSeeOption8 = NO;
}
} }
return muArr; return muArr;
......
XFFruit/Controllers/DataBaseController/GXFFunctionDBHelper.m
View file @ 7dd4e49c
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
@(500401),@(500402),@(500403),@(500404),//"采购单" @(500401),@(500402),@(500403),@(500404),//"采购单"
@(500501),@(500502),@(500503),//"发运单" @(500501),@(500502),@(500503),//"发运单"
@(500601),@(500602),@(500603),//"转运单" @(500601),@(500602),@(500603),//"转运单"
@(500701),@(500702),@(500703),];//加工单 @(500701),@(500702),@(500703),//加工单
@(500802),@(500803),];//收货单
NSArray *functionsName = @[@"公告", NSArray *functionsName = @[@"公告",
@"新建行情调研",@"查看行情调研", @"查看行情调研", @"新建行情调研",@"查看行情调研", @"查看行情调研",
@"填写行情反馈", @"填写行情反馈",
...@@ -100,7 +101,8 @@ ...@@ -100,7 +101,8 @@
@"新建采购单",@"查看采购单", @"查看采购单", @"审核采购单",//【供应商】", @"新建采购单",@"查看采购单", @"查看采购单", @"审核采购单",//【供应商】",
@"新建发运单",@"查看发运单", @"查看发运单", @"新建发运单",@"查看发运单", @"查看发运单",
@"新增加工单",@"查看加工单", @"查看加工单", @"新增加工单",@"查看加工单", @"查看加工单",
@"新建转运单", @"查看转运单", @"查看转运单"]; @"新建转运单", @"查看转运单", @"查看转运单",
@"查看收货单", @"查看收货单"];
NSArray *functionsImageName = @[@"notice", NSArray *functionsImageName = @[@"notice",
@"create_surver",@"watch_surver", @"watch_surver", @"create_surver",@"watch_surver", @"watch_surver",
@"create_surver_result", @"create_surver_result",
...@@ -108,7 +110,8 @@ ...@@ -108,7 +110,8 @@
@"create_purchase",@"watch_purchase", @"watch_purchase", @"review_purchase", @"create_purchase",@"watch_purchase", @"watch_purchase", @"review_purchase",
@"create_transport",@"watch_transort", @"watch_transort", @"create_transport",@"watch_transort", @"watch_transort",
@"create_process",@"watch_process", @"watch_process", @"create_process",@"watch_process", @"watch_process",
@"create_transfer", @"create_transfer", @"create_transfer"]; @"create_transfer", @"create_transfer", @"create_transfer",
@"create_transfer", @"create_transfer" ];//收货单
//NSArray *functionsSmallImgName = @[]; //NSArray *functionsSmallImgName = @[];
NSArray *functionItemTag = @[@(0), NSArray *functionItemTag = @[@(0),
...@@ -118,7 +121,8 @@ ...@@ -118,7 +121,8 @@
@(6),@(7),@(7),@(8),//"采购单" @(6),@(7),@(7),@(8),//"采购单"
@(9),@(10),@(10),//"发运单" @(9),@(10),@(10),//"发运单"
@(11),@(12),@(12),//"转运单" @(11),@(12),@(12),//"转运单"
@(13),@(14),@(14),];//加工单 @(13),@(14),@(14),//加工单
@(15),@(15),];//收货单
if ((functionsId.count != functionsName.count) ||(functionsId.count != functionsImageName.count)||(functionsName.count != functionsImageName.count)) { if ((functionsId.count != functionsName.count) ||(functionsId.count != functionsImageName.count)||(functionsName.count != functionsImageName.count)) {
NSLog(@"展现功能界面：插入的数据不是一一对应的"); NSLog(@"展现功能界面：插入的数据不是一一对应的");
return nil; return nil;
......
XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h
View file @ 7dd4e49c
...@@ -14,21 +14,22 @@ typedef NS_ENUM (NSUInteger, ICRFunctionID) { ...@@ -14,21 +14,22 @@ typedef NS_ENUM (NSUInteger, ICRFunctionID) {
kFunctionNotice = 0, //公告 kFunctionNotice = 0, //公告
kFunctionNewSurvey, //新建行情调研 kFunctionNewSurvey, //新建行情调研 1
kFunctionSeeSurvey, //查看行情调研 kFunctionSeeSurvey, //查看行情调研2
kFunctionFeeBackSurvey, //填写行情反馈 kFunctionFeeBackSurvey, //填写行情反馈3
kFunctionNewPurchaseNotice, //新建采购通知 kFunctionNewPurchaseNotice, //新建采购通知4
kFunctionSeePurchaseNotice, //查看采购通知 kFunctionSeePurchaseNotice, //查看采购通知5
kFunctionNewPurchase, // 新建采购单 kFunctionNewPurchase, // 新建采购单6
kFunctionSeePurchase, // 查看采购单 kFunctionSeePurchase, // 查看采购单7
kFunctionExaminePurchase, // 审核采购单【供应商】 kFunctionExaminePurchase, // 审核采购单【供应商】8
kFunctionNewShipment, // 新建发运单 kFunctionNewShipment, // 新建发运单9
kFunctionSeeShipment, // 查看发运单 kFunctionSeeShipment, // 查看发运单10
kFunctionNewProcessing, // 新增加工单 kFunctionNewProcessing, // 新增加工单11
kFunctionSeeProcessing, // 查看加工单 kFunctionSeeProcessing, // 查看加工单12
kFunctionNewTransfer, //新建转运单 kFunctionNewTransfer, //新建转运单13
kFunctionSeeTransfer, //查看发运单 kFunctionSeeTransfer, //查看发运单14
kFunctionSeeReceive, //查看收货单
kFunctionSeeReceive, //查看收货单15
kFunctionAnnouncement , kFunctionAnnouncement ,
......
XFFruit/Info.plist
View file @ 7dd4e49c
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.cntaiping.life.XFFruit</string> <string>com.gomore.xffruit</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
......
XFFruit/Macro/ICRAppMacro.h
View file @ 7dd4e49c
...@@ -26,9 +26,11 @@ ...@@ -26,9 +26,11 @@
//#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest" //#define HTTP_REST_API_BASE_URL @"http://115.28.191.44:8080/IPatrol/rest"
//new HTTP //new HTTP
#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 Server_Url @"http://218.244.151.129:7580/cruiser-server" #define Server_Url @"http://218.244.151.129:7580/cruiser-server"
//10月23 122.224.171.126:7280
//#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:8281/XFFruit-server/rest" //#define HTTP_REST_API_BASE_URL @"http://218.244.151.129:8281/XFFruit-server/rest"
// Import Headers // Import Headers
......
XFFruit/PermissionJson
View file @ 7dd4e49c
{ {
"id" : "50", "id": "50",
"name": "前台", "name": "前台",
"type" : "mobileModule", "type": "mobileModule",
"children": [ "children": [
{ {
"id" : "5001", "id": "5001",
"name": "行情调研", "name": "行情调研",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500101", "id": "500101",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500102", "id": "500102",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500103", "id": "500103",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
} }
] ]
}, },
{ {
"id" : "5002", "id": "5002",
"name": "行情反馈", "name": "行情反馈",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500201", "id": "500201",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500202", "id": "500202",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500203", "id": "500203",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
} }
] ]
}, },
{ {
"id" : "5003", "id": "5003",
"name": "采购通知", "name": "采购通知",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500301", "id": "500301",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500302", "id": "500302",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500303", "id": "500303",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
}, },
{ {
"id" : "500304", "id": "500304",
"name": "accepttask", "name": "accepttask",
"caption": "接受任务权" "caption": "接受任务权"
}, },
{ {
"id" : "500305", "id": "500305",
"name": "createpurchasebill", "name": "createpurchasebill",
"caption": "新建采购单权" "caption": "新建采购单权"
}, },
{ {
"id" : "500306", "id": "500306",
"name": "finish", "name": "finish",
"caption": "结束权" "caption": "结束权"
} }
] ]
}, },
{ {
"id" : "5004", "id": "5004",
"name": "采购单", "name": "采购单",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500401", "id": "500401",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500402", "id": "500402",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500403", "id": "500403",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
}, },
{ {
"id" : "500404", "id": "500404",
"name": "viewvendor", "name": "viewvendor",
"caption": "供应商查看权" "caption": "供应商查看权"
}, },
{ {
"id" : "500405", "id": "500405",
"name": "managerapprove", "name": "managerapprove",
"caption": "经理审批权" "caption": "经理审批权"
}, },
{ {
"id" : "500406", "id": "500406",
"name": "vendorapprove", "name": "vendorapprove",
"caption": "供应商审批权" "caption": "供应商审批权"
}, },
{ {
"id" : "500407", "id": "500407",
"name": "finish", "name": "finish",
"caption": "结束权" "caption": "结束权"
}, },
{ {
"id" : "500408", "id": "500408",
"name": "abort", "name": "abort",
"caption": "作废权" "caption": "作废权"
} }
] ]
}, },
{ {
"id" : "5005", "id": "5005",
"name": "发运单", "name": "发运单",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500501", "id": "500501",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500502", "id": "500502",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500503", "id": "500503",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
}, },
{ {
"id" : "500404", "id": "500404",
"name": "finish", "name": "finish",
"caption": "结束权" "caption": "结束权"
}, },
{ {
"id" : "500505", "id": "500505",
"name": "abort", "name": "abort",
"caption": "作废权" "caption": "作废权"
} }
] ]
}, },
{ {
"id" : "5006", "id": "5006",
"name": "转运单", "name": "转运单",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500601", "id": "500601",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500602", "id": "500602",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500603", "id": "500603",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
}, },
{ {
"id" : "500604", "id": "500604",
"name": "finish", "name": "finish",
"caption": "结束权" "caption": "结束权"
}, },
{ {
"id" : "500605", "id": "500605",
"name": "abort", "name": "abort",
"caption": "作废权" "caption": "作废权"
} }
] ]
}, },
{ {
"id" : "5007", "id": "5007",
"name": "加工单", "name": "加工单",
"type" : "mobileModule", "type": "mobileModule",
"permissions": [ "permissions": [
{ {
"id" : "500701", "id": "500701",
"name": "create", "name": "create",
"caption": "新建权" "caption": "新建权"
}, },
{ {
"id" : "500702", "id": "500702",
"name": "viewall", "name": "viewall",
"caption": "全部查看权" "caption": "全部查看权"
}, },
{ {
"id" : "500703", "id": "500703",
"name": "viewself", "name": "viewself",
"caption": "本人查看权" "caption": "本人查看权"
}, },
{ {
"id" : "500704", "id": "500704",
"name": "finish", "name": "finish",
"caption": "结束权" "caption": "结束权"
}, },
{ {
"id" : "500705", "id": "500705",
"name": "abort", "name": "abort",
"caption": "作废权" "caption": "作废权"
} }
] ]
},
{
"id": "5008",
"name": "收货单",
"type": "mobileModule",
"permissions": [
{
"id": "500801",
"name": "viewall",
"caption": "全部查看权"
},
{
"id": "500802",
"name": "viewself",
"caption": "本人查看权"
},
{
"id": "500803",
"name": "receive",
"caption": "收货权"
}
]
} }
] ]
} }
\ No newline at end of file
XFFruit/ViewControllers/Business/BusinessViewController.m
View file @ 7dd4e49c
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
[super viewDidLoad]; [super viewDidLoad];
[self setupSubviews]; [self setupSubviews];
self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc]initWithTitle:@"收货单" style:UIBarButtonItemStylePlain target:self action:@selector(receiveClick:)]; // self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc]initWithTitle:@"收货单" style:UIBarButtonItemStylePlain target:self action:@selector(receiveClick:)];
} }
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
...@@ -210,29 +210,6 @@ ...@@ -210,29 +210,6 @@
[self PushViewController:tVC animated:YES]; [self PushViewController:tVC animated:YES];
} }
break; break;
case kFunctionSeeReceive://收货单
{
ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
tVC.title = @"收货单";
[self PushViewController:tVC animated:YES];
}
break;
// case kFunctionPatrolPlan://巡店计划
// {
// ICRPatrolPlanViewController *pVC = [[ICRPatrolPlanViewController alloc] initWithStore:nil isHomeShow:YES];
// [self PushViewController:pVC animated:YES];
// }
// break;
// case kFunctionMyShop://我的店铺
// {
// // ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
// // sVC.title = [IBTCommon localizableString:@"MyStore"];
// // sVC.m_delegate = self;
// // [self PushViewController:sVC animated:YES];
// AddWorkSheetViewController *sVC = [[AddWorkSheetViewController alloc] init];
// [self PushViewController:sVC animated:YES];
// }
// break;
case kFunctionNewProcessing:{ case kFunctionNewProcessing:{
GXFNewProcessViewController *pvc = [[GXFNewProcessViewController alloc]init]; GXFNewProcessViewController *pvc = [[GXFNewProcessViewController alloc]init];
...@@ -245,6 +222,16 @@ ...@@ -245,6 +222,16 @@
[self PushViewController:seeProcessVC animated:YES]; [self PushViewController:seeProcessVC animated:YES];
} }
break; break;
case kFunctionSeeReceive://收货单
{
ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
tVC.title = @"收货单";
[self PushViewController:tVC animated:YES];
}
break;
default: default:
return; return;
break; break;
......
XFFruit/ViewControllers/Login/ICRLoginViewController.m
View file @ 7dd4e49c
...@@ -97,10 +97,15 @@ ...@@ -97,10 +97,15 @@
// self.m_containerView.m_cCodeTextF.text = @"A93jie957lK"; // self.m_containerView.m_cCodeTextF.text = @"A93jie957lK";
// self.m_containerView.m_userNameTextF.text = @"kevin"; // self.m_containerView.m_userNameTextF.text = @"kevin";
// self.m_containerView.m_passwordTextF.text = @"aaa"; // 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_cCodeTextF.text = @"211534962";
// self.m_containerView.m_userNameTextF.text = @"alexander"; // self.m_containerView.m_userNameTextF.text = @"admin";
// self.m_containerView.m_passwordTextF.text = @"1"; // self.m_containerView.m_passwordTextF.text = @"thoradmin";
self.m_containerView.m_cCodeTextF.text = @"211534962";
//@"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_userNameTextF.text = @"admin";
self.m_containerView.m_passwordTextF.text = @"thoradmin"; self.m_containerView.m_passwordTextF.text = @"thoradmin";
......
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