更改权限

Podfile

+
+
 platform :ios, '8.1'
 pod 'AFNetworking', '~> 2.5.4'
 pod 'SDWebImage', '~> 3.7.2'
@@ -6,6 +8,6 @@ pod 'SSKeychain', '~> 1.2.3'
 pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.7.0’
+pod 'BaiduMapAPI', '~> 2.7.0'
 pod 'MJRefresh', '~> 2.2.0'
 pod 'IQKeyboardManager', '~> 3.2.3'
\ No newline at end of file

Podfile.lock

@@ -60,4 +60,4 @@ SPEC CHECKSUMS:
   SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.37.1

XFFruit.xcodeproj/project.pbxproj

@@ -2550,7 +2550,7 @@
 				TargetAttributes = {
 					C1F696021AB870B400F9F5DD = {
 						CreatedOnToolsVersion = 6.2;
-						DevelopmentTeam = 2G3393EZPN;
+						DevelopmentTeam = W54V2VB863;
 					};
 					C1F6961B1AB870B400F9F5DD = {
 						CreatedOnToolsVersion = 6.2;
@@ -3197,8 +3197,8 @@
 			baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
@@ -3208,7 +3208,7 @@
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "2fa95960-d007-48b7-90a8-85831ed9bc43";
+				PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3218,8 +3218,8 @@
 			baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Taiping E-Commerce Co., Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
 				INFOPLIST_FILE = XFFruit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
@@ -3229,7 +3229,7 @@
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "2fa95960-d007-48b7-90a8-85831ed9bc43";
+				PROVISIONING_PROFILE = "5f40eb8c-7628-4615-bffc-1e4d56ebb56f";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Controllers/DataBaseController/GXFFunctionDB.m

@@ -299,6 +299,16 @@
                 hasSeeOption7 = NO;
             }
 
+            //"收货单"
+            if (displayFunction.functionId == 500802 && hasSeeOption7 == NO) {
+                hasSeeOption7 = YES;
+            }
+            if (displayFunction.functionId == 500803 && hasSeeOption7 == YES) {
+                [muArr removeObject:displayFunction];
+                hasSeeOption7 = NO;
+            }
+            
+
             continue;
         }
     }

XFFruit/Controllers/DataBaseController/GXFFunctionDBHelper.m

@@ -92,7 +92,8 @@
                              @(500401),@(500402),@(500403),@(500404),//"采购单"
                              @(500501),@(500502),@(500503),//"发运单"
                              @(500601),@(500602),@(500603),//"转运单"
-                             @(500701),@(500702),@(500703),];//加工单
+                             @(500701),@(500702),@(500703),//加工单
+                            @(500802),@(500803),];//收货单
     NSArray *functionsName = @[@"公告",
                                @"新建行情调研",@"查看行情调研",  @"查看行情调研",
                                @"填写行情反馈",
@@ -100,15 +101,17 @@
                                @"新建采购单",@"查看采购单",     @"查看采购单", @"审核采购单",//【供应商】",
                                @"新建发运单",@"查看发运单",     @"查看发运单",
                                @"新增加工单",@"查看加工单",     @"查看加工单",
-                               @"新建转运单", @"查看转运单",    @"查看转运单"];
+                               @"新建转运单", @"查看转运单",    @"查看转运单",
+                               @"查看收货单",    @"查看收货单"];
     NSArray *functionsImageName = @[@"notice",
                                 @"create_surver",@"watch_surver",   @"watch_surver",
                                 @"create_surver_result",
                                 @"create_needs",@"watch_needs",      @"watch_needs",
                                 @"create_purchase",@"watch_purchase",   @"watch_purchase",  @"review_purchase",
                                 @"create_transport",@"watch_transort",   @"watch_transort",
-                                @"create_process",@"watch_process",      @"watch_process",
-                                @"create_transfer", @"create_transfer",           @"create_transfer"];
+                                    @"create_process",@"watch_process",      @"watch_process",
+                                    @"create_transfer", @"create_transfer",  @"create_transfer",
+                                @"create_transfer",  @"create_transfer"   ];//收货单
     
     //NSArray *functionsSmallImgName = @[];
     NSArray *functionItemTag = @[@(0),
@@ -118,7 +121,8 @@
                                  @(6),@(7),@(7),@(8),//"采购单"
                                  @(9),@(10),@(10),//"发运单"
                                  @(11),@(12),@(12),//"转运单"
-                                 @(13),@(14),@(14),];//加工单
+                                 @(13),@(14),@(14),//加工单
+                                 @(15),@(15),];//收货单
     if ((functionsId.count != functionsName.count) ||(functionsId.count != functionsImageName.count)||(functionsName.count != functionsImageName.count)) {
         NSLog(@"展现功能界面：插入的数据不是一一对应的");
         return nil;

XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h

@@ -14,21 +14,22 @@ typedef NS_ENUM (NSUInteger, ICRFunctionID) {
 
     
     kFunctionNotice = 0, //公告
-    kFunctionNewSurvey,  //新建行情调研
-    kFunctionSeeSurvey,  //查看行情调研
-    kFunctionFeeBackSurvey,   //填写行情反馈
-    kFunctionNewPurchaseNotice,  //新建采购通知
-    kFunctionSeePurchaseNotice,  //查看采购通知
-    kFunctionNewPurchase,   // 新建采购单
-    kFunctionSeePurchase,   //  查看采购单
-    kFunctionExaminePurchase,   // 审核采购单【供应商】
-    kFunctionNewShipment,     // 新建发运单
-    kFunctionSeeShipment,   // 查看发运单
-    kFunctionNewProcessing,  // 新增加工单
-    kFunctionSeeProcessing,  //  查看加工单
-    kFunctionNewTransfer,    //新建转运单
-    kFunctionSeeTransfer,    //查看发运单
-    kFunctionSeeReceive,     //查看收货单
+    kFunctionNewSurvey,  //新建行情调研 1
+    kFunctionSeeSurvey,  //查看行情调研2
+    kFunctionFeeBackSurvey,   //填写行情反馈3
+    kFunctionNewPurchaseNotice,  //新建采购通知4
+    kFunctionSeePurchaseNotice,  //查看采购通知5
+    kFunctionNewPurchase,   // 新建采购单6
+    kFunctionSeePurchase,   //  查看采购单7
+    kFunctionExaminePurchase,   // 审核采购单【供应商】8
+    kFunctionNewShipment,     // 新建发运单9
+    kFunctionSeeShipment,   // 查看发运单10
+    kFunctionNewProcessing,  // 新增加工单11
+    kFunctionSeeProcessing,  //  查看加工单12
+    kFunctionNewTransfer,    //新建转运单13
+    kFunctionSeeTransfer,    //查看发运单14
+   
+    kFunctionSeeReceive,     //查看收货单15
     
     
         kFunctionAnnouncement ,

XFFruit/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.cntaiping.life.XFFruit</string>
+	<string>com.gomore.xffruit</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

XFFruit/Macro/ICRAppMacro.h

@@ -26,9 +26,11 @@
 //#define HTTP_REST_API_BASE_URL          @"http://115.28.191.44:8080/IPatrol/rest"
 
 //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"
 
+//10月23   122.224.171.126:7280
 //#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:8281/XFFruit-server/rest"
 
 // Import Headers

XFFruit/PermissionJson

 {
-"id" : "50",
+"id": "50",
 "name": "前台",
-"type" : "mobileModule",
+"type": "mobileModule",
 "children": [
 {
-"id" : "5001",
+"id": "5001",
 "name": "行情调研",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500101",
+"id": "500101",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500102",
+"id": "500102",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500103",
+"id": "500103",
 "name": "viewself",
 "caption": "本人查看权"
 }
 ]
 },
 {
-"id" : "5002",
+"id": "5002",
 "name": "行情反馈",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500201",
+"id": "500201",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500202",
+"id": "500202",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500203",
+"id": "500203",
 "name": "viewself",
 "caption": "本人查看权"
 }
 ]
 },
 {
-"id" : "5003",
+"id": "5003",
 "name": "采购通知",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500301",
+"id": "500301",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500302",
+"id": "500302",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500303",
+"id": "500303",
 "name": "viewself",
 "caption": "本人查看权"
 },
 {
-"id" : "500304",
+"id": "500304",
 "name": "accepttask",
 "caption": "接受任务权"
 },
 {
-"id" : "500305",
+"id": "500305",
 "name": "createpurchasebill",
 "caption": "新建采购单权"
 },
 {
-"id" : "500306",
+"id": "500306",
 "name": "finish",
 "caption": "结束权"
 }
 ]
 },
 {
-"id" : "5004",
+"id": "5004",
 "name": "采购单",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500401",
+"id": "500401",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500402",
+"id": "500402",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500403",
+"id": "500403",
 "name": "viewself",
 "caption": "本人查看权"
 },
 {
-"id" : "500404",
+"id": "500404",
 "name": "viewvendor",
 "caption": "供应商查看权"
 },
 {
-"id" : "500405",
+"id": "500405",
 "name": "managerapprove",
 "caption": "经理审批权"
 },
 {
-"id" : "500406",
+"id": "500406",
 "name": "vendorapprove",
 "caption": "供应商审批权"
 },
 {
-"id" : "500407",
+"id": "500407",
 "name": "finish",
 "caption": "结束权"
 },
 {
-"id" : "500408",
+"id": "500408",
 "name": "abort",
 "caption": "作废权"
 }
 ]
 },
 {
-"id" : "5005",
+"id": "5005",
 "name": "发运单",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500501",
+"id": "500501",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500502",
+"id": "500502",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500503",
+"id": "500503",
 "name": "viewself",
 "caption": "本人查看权"
 },
 {
-"id" : "500404",
+"id": "500404",
 "name": "finish",
 "caption": "结束权"
 },
 {
-"id" : "500505",
+"id": "500505",
 "name": "abort",
 "caption": "作废权"
 }
 ]
 },
 {
-"id" : "5006",
+"id": "5006",
 "name": "转运单",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500601",
+"id": "500601",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500602",
+"id": "500602",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500603",
+"id": "500603",
 "name": "viewself",
 "caption": "本人查看权"
 },
 {
-"id" : "500604",
+"id": "500604",
 "name": "finish",
 "caption": "结束权"
 },
 {
-"id" : "500605",
+"id": "500605",
 "name": "abort",
 "caption": "作废权"
 }
 ]
 },
 {
-"id" : "5007",
+"id": "5007",
 "name": "加工单",
-"type" : "mobileModule",
+"type": "mobileModule",
 "permissions": [
 {
-"id" : "500701",
+"id": "500701",
 "name": "create",
 "caption": "新建权"
 },
 {
-"id" : "500702",
+"id": "500702",
 "name": "viewall",
 "caption": "全部查看权"
 },
 {
-"id" : "500703",
+"id": "500703",
 "name": "viewself",
 "caption": "本人查看权"
 },
 {
-"id" : "500704",
+"id": "500704",
 "name": "finish",
 "caption": "结束权"
 },
 {
-"id" : "500705",
+"id": "500705",
 "name": "abort",
 "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

@@ -45,7 +45,7 @@
     [super viewDidLoad];
 
     [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 {
@@ -210,30 +210,7 @@
             [self PushViewController:tVC animated:YES];
         }
             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:{
             GXFNewProcessViewController *pvc = [[GXFNewProcessViewController alloc]init];
             //pvc.title = @"采购单";
@@ -245,6 +222,16 @@
             [self PushViewController:seeProcessVC animated:YES];
         }
             break;
+
+        case kFunctionSeeReceive://收货单
+        {
+            ReceiveViewController *tVC = [[ReceiveViewController alloc] init];
+            tVC.title = @"收货单";
+            [self PushViewController:tVC animated:YES];
+        }
+            break;
+            
+
         default:
             return;
             break;

XFFruit/ViewControllers/Login/ICRLoginViewController.m

@@ -97,12 +97,17 @@
 //    self.m_containerView.m_cCodeTextF.text = @"A93jie957lK";
 //    self.m_containerView.m_userNameTextF.text = @"kevin";
 //    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 = @"alexander";
-//    self.m_containerView.m_passwordTextF.text = @"1";
-    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_userNameTextF.text = @"admin";
+//    self.m_containerView.m_passwordTextF.text = @"thoradmin";
+    
+    
+    //@"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";
 
     
     

XFFruit/ViewControllers/Receiving/Controllers/ReceiveViewController.m

@@ -14,7 +14,7 @@
 #import "ReceiveBoltView.h"
 #import "MJRefresh.h"
 #import "NewReceiveViewController.h"
-#import "ReceiveDetailViewController.h"
+//#import "ReceiveDetailViewController.h"
 #define TopMargin 44
 #define TableHeight 140
 #define LeftMargin 20