1.审批流

2.通用表单

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4716,7 +4716,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -20056,10 +20056,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20100,10 +20100,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20138,10 +20138,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20165,18 +20165,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					"$DOUBANGO_HOME/bindings/_common",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
+					$DOUBANGO_HOME/bindings/_common,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO_HOME/tinySIP/include",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO_HOME/tinySIP/include,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20207,8 +20207,48 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[arch=*]" = (
+					"$(PROJECT_DIR)/shiku_im/LibBPush",
+					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(PROJECT_DIR)/shiku_im/RSA/include",
+					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im",
+					"$(PROJECT_DIR)",
+					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
+					"$(inherited)",
+					$DOUBANGO_LIBS,
+					"$(SRCROOT)/shiku_im/Vendor/libidn",
+					"$(PROJECT_DIR)/shiku_im/RSA",
+					"$(PROJECT_DIR)/shiku_im/youMeng",
+					"$(PROJECT_DIR)/shiku_im/audioRecorder",
+					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
+					"$(PROJECT_DIR)/shiku_im/admob5.05",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
+					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
+					"$(inherited)",
+					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
+				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20255,10 +20295,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
-				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
-				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
-				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
+				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
+				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
+				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
+				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20284,16 +20324,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					"$DOUBANGO_HOME/tinyDAV/include",
-					"$DOUBANGO_HOME/tinySAK/src",
-					"$DOUBANGO_HOME/tinyNET/src",
-					"$DOUBANGO_HOME/tinyMEDIA/include",
-					"$DOUBANGO/HOME/tinyMSRP/include",
-					"$DOUBANGO_HOME/tinySIP/include",
-					"$DOUBANGO_HOME/tinyHTTP/include",
-					"$DOUBANGO_HOME/tinySMS/include",
-					"$DOUBANGO_HOME/tinySDP/include",
-					"$DOUBANGO_HOME/bindings/_common",
+					$DOUBANGO_HOME/tinyDAV/include,
+					$DOUBANGO_HOME/tinySAK/src,
+					$DOUBANGO_HOME/tinyNET/src,
+					$DOUBANGO_HOME/tinyMEDIA/include,
+					$DOUBANGO/HOME/tinyMSRP/include,
+					$DOUBANGO_HOME/tinySIP/include,
+					$DOUBANGO_HOME/tinyHTTP/include,
+					$DOUBANGO_HOME/tinySMS/include,
+					$DOUBANGO_HOME/tinySDP/include,
+					$DOUBANGO_HOME/bindings/_common,
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20301,7 +20341,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$DOUBANGO_LIBS",
+					$DOUBANGO_LIBS,
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/controller/DocumentDetailVC.m

@@ -433,7 +433,7 @@
     NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"ipAndPort"];
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     
-    NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@",ip,_caller,_dan_id,sessionId];
+    NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddata.action?caller=%@&id=%@&sessionId=%@&isprocess=1",ip,_caller,_dan_id,sessionId];
     //21655,Ask4Leave
     UASNetworkManager *manager = [UASNetworkManager shareManager];
     manager.requestSerializer = [AFHTTPRequestSerializer serializer];
@@ -534,8 +534,7 @@
             
             DLog(@"错误的原因:%@",errorStr);
             [JOShowMessageFromNavi showDropViewWithMessage:errorStr ToNavi:self.navigationController withColor:nil];
-        }
-        else{
+        }else{
             [JOShowMessageFromNavi showDropViewWithMessage:@"请检查网络情况" ToNavi:self.navigationController withColor:nil];
         }
 
@@ -594,6 +593,7 @@
         
         
     }else{
+        
     LYYReadingVC *vc1 = [[LYYReadingVC alloc] init];
     
     LYYFuJianModel *model =    _fd_dataArr[sender.tag -89];

shiku_im/shiku_im/controller/DocumentListVC.m

@@ -482,7 +482,7 @@ static NSString *cellID = @"cellID";
     
     status = [_listData[indexPath.row] objectForKey:_cModel.fo_statusfield];
     
-    if ([status isEqualToString:@"在录入"]) {
+    if ([status isEqualToString:@"在录入"] || [status isEqualToString:@"未审核"] ) {
         
         if ([_caller isEqualToString:URL_REIMBURSEMENT_CALLER]) {
             LYYReimbursementVC *vc = (LYYReimbursementVC *)[self.navigationController.viewControllers objectAtIndex:2];

shiku_im/shiku_im/controller/DocumentVC.m

@@ -260,15 +260,15 @@ static NSString *cellID = @"cellID";
                 [_listKeyArr addObject:obj[@"fd_field"]];
                 NSString *fdtype = [NSString stringWithFormat:@"%@",obj[@"fd_type"]];
                 NSString *fddefaultValue = [NSString stringWithFormat:@"%@",obj[@"fd_defaultvalue"]];
-                if ([fdtype isEqualToString:@"D"]) {
-                    [_detailDataArr addObject:dateString];
-                }else{
+//                if ([fdtype isEqualToString:@"D"]) {
+//                    [_detailDataArr addObject:dateString];
+//                }else{
                     if (fddefaultValue.length != 0) {
                         [_detailDataArr addObject:fddefaultValue];
                     }else{
                         [_detailDataArr addObject:@""];
                     }
-                }
+//                }
             }else if([isDefault isEqualToString:@"0"]){
                 [edit1 addObject:obj];
             }
@@ -285,11 +285,11 @@ static NSString *cellID = @"cellID";
                 [_gridData addObject:obj];
                 [_gridKeyArr addObject:obj[@"dg_field"]];
                 NSString *fdtype = [NSString stringWithFormat:@"%@",obj[@"dg_type"]];
-                if ([fdtype isEqualToString:@"D"]) {
-                    [_gridDetail addObject:dateString];
-                }else{
+//                if ([fdtype isEqualToString:@"D"]) {
+//                    [_gridDetail addObject:dateString];
+//                }else{
                     [_gridDetail addObject:@""];
-                }
+//                }
                 
             }else if([isDefault isEqualToString:@"0"]){
                 [_edit2Arr addObject:obj];

shiku_im/shiku_im/controller/UpdateDocumentVC.m

@@ -65,6 +65,8 @@ static NSString *cellID = @"cellID";
     
     BOOL turnFrame; //用来判断是否点击了textView
     BOOL turnFrameSpecial; //返回选择提示框 特殊处理
+    
+    NSString *_vecode;//高登特殊要求字段
 }
 
 - (NSMutableArray *)cellHeightArray
@@ -136,6 +138,7 @@ static NSString *cellID = @"cellID";
     _gridId = [[NSMutableArray alloc]init];
     _formCount = 0;
     _guanlianId = @"";
+    _vecode = @"";
     turnFrame = NO;
     turnFrameSpecial = NO;
     [self getDataFromSeverWithCaller:_caller];
@@ -292,6 +295,13 @@ static NSString *cellID = @"cellID";
                 [_idArr addObject:idArr];
             }
             
+            //特殊取值-高登要求
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                NSString *field = [NSString stringWithFormat:@"%@",obj[@"fd_field"]];
+                if ([field isEqualToString:@"ve_code"]) {
+                    _vecode = FORMAT(@"%@",obj[@"fd_value"]);
+                }
+            }
             
         }
         _listArr = [NSDictionary changeType:_listArr];
@@ -881,14 +891,20 @@ static NSString *cellID = @"cellID";
     
     if (_gridData.count != 0) {
         if (section == (_listArr.count-1)) {
-            return 100;
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                return 150;
+            }else
+                return 100;
         }
         else{
             return 4;
         }
     }else{
         if (section == (_listArr.count-1)) {
-            return 60;
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                return 110;
+            }else
+                return 60;
         }
         else{
             return 4;
@@ -984,7 +1000,35 @@ static NSString *cellID = @"cellID";
                     make.top.equalTo(footerView.mas_bottom).offset(10);
                     make.height.mas_equalTo(40);
                 }];
-            }else{
+            }
+            else if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                [footerView addSubview:addBtn];
+                
+                UIButton *zhuandanBtn = [UIButton new];
+                zhuandanBtn.layer.cornerRadius = 5;
+                zhuandanBtn.layer.masksToBounds = YES;
+                [zhuandanBtn setBackgroundColor:HexColor(@"#33A2EE") forState:UIControlStateNormal];
+                [zhuandanBtn setBackgroundColor:HexColor(@"#2D84C0") forState:UIControlStateHighlighted];
+                [zhuandanBtn setTitleColor:HexColor(@"#FFFFFF") forState:UIControlStateNormal];
+                zhuandanBtn.titleLabel.font = FONT_SIZE(18);
+                [zhuandanBtn setTitle:@"转单" forState:UIControlStateNormal];
+                [zhuandanBtn addTarget:self action:@selector(zhandanAction) forControlEvents:UIControlEventTouchUpInside];
+                [footerView addSubview:zhuandanBtn];
+                [zhuandanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(addBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+                
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(zhuandanBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+            }
+            else{
                 [footerView addSubview:addBtn];
                 [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
                     make.left.equalTo(footerView).offset(20);
@@ -1022,12 +1066,38 @@ static NSString *cellID = @"cellID";
             [_refreshBtn addTarget:self action:@selector(uploadAction) forControlEvents:UIControlEventTouchUpInside];
             [footerView addSubview:_refreshBtn];
             
-            [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.left.equalTo(footerView).offset(20);
-                make.right.equalTo(footerView).offset(-20);
-                make.top.equalTo(footerView).offset(10);
-                make.height.mas_equalTo(40);
-            }];
+            if ([_caller isEqualToString:@"VerifyApplyDetail!FQC"]) {
+                UIButton *zhuandanBtn = [UIButton new];
+                zhuandanBtn.layer.cornerRadius = 5;
+                zhuandanBtn.layer.masksToBounds = YES;
+                [zhuandanBtn setBackgroundColor:HexColor(@"#33A2EE") forState:UIControlStateNormal];
+                [zhuandanBtn setBackgroundColor:HexColor(@"#2D84C0") forState:UIControlStateHighlighted];
+                [zhuandanBtn setTitleColor:HexColor(@"#FFFFFF") forState:UIControlStateNormal];
+                zhuandanBtn.titleLabel.font = FONT_SIZE(18);
+                [zhuandanBtn setTitle:@"转单" forState:UIControlStateNormal];
+                [zhuandanBtn addTarget:self action:@selector(zhandanAction) forControlEvents:UIControlEventTouchUpInside];
+                [footerView addSubview:zhuandanBtn];
+                [zhuandanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(footerView).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+                
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(zhuandanBtn.mas_bottom).offset(5);
+                    make.height.mas_equalTo(40);
+                }];
+            }else{
+                [_refreshBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.left.equalTo(footerView).offset(20);
+                    make.right.equalTo(footerView).offset(-20);
+                    make.top.equalTo(footerView).offset(10);
+                    make.height.mas_equalTo(40);
+                }];
+            }
             
             return footerView;
         }
@@ -1123,6 +1193,29 @@ static NSString *cellID = @"cellID";
     [self.tableView reloadData];
 }
 
+#pragma mark --- 转单
+-(void)zhandanAction
+{
+    [MBProgressHUD showMessage:@"" toView:self.view];
+    
+    NSString *url = [NSString stringWithFormat:@"%@scm/qc/turnQualityYC.action",g_id];
+    NSDictionary *dic = @{
+                          @"id":_listid,
+                          @"code":_vecode,
+                          };
+    UASNetworkManager *manager = [UASNetworkManager shareManager];
+    
+    [manager request:url method:POST parameters:dic progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        [MBProgressHUD hideHUDForView:self.view];
+        
+        [JOShowMessageFromNavi showDropViewWithMessage:@"转单成功" ToNavi:self.navigationController withColor:nil];
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        [MBProgressHUD hideHUDForView:self.view];
+        ErrorInfomation
+    }];
+}
+
 #pragma mark --- 提交单据
 -(void)uploadAction
 {

shiku_im/shiku_im/person/ScanWebView.m

@@ -29,7 +29,7 @@
     UIBarButtonItem *bbi2 = [[UIBarButtonItem alloc]initWithCustomView:btn2];
     self.navigationItem.leftBarButtonItems = @[bbi2];
     
-    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+    UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
     webView.backgroundColor = [UIColor clearColor];
     [webView setOpaque:NO];
     webView.delegate = self;
@@ -55,24 +55,6 @@
         
     }];
     
-    //获取网页的上下文
-   /* JSContext *context = [webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    DLog(@"获取的是什么呢:%@",context);
-    context[@"CloseWindow"] = ^() {
-        
-        DLog(@"+++++++Begin Log+++++++");
-        NSArray *args = [JSContext currentArguments];
-        
-        for (JSValue *jsVal in args) {
-            DLog(@"%@", jsVal);
-        }
-        
-        JSValue *this = [JSContext currentThis];
-        DLog(@"this: %@",this);
-        DLog(@"-------End Log-------");
-        
-    };*/
-    
     
 }
 -(void)backAction{
@@ -100,11 +82,9 @@
 }
 
 -(void)webViewDidStartLoad:(UIWebView *)webView{
-    DLog(@"开始加载");
-    //
-//       [((AppDelegate*)[[UIApplication sharedApplication] delegate]) newLoginCheckWithName:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_LoginName] withPass:[[NSUserDefaults standardUserDefaults] objectForKey:kMY_USER_PASSWORD]];
-    DLog(@"开始登陆了走这个方法么");
-//    [(AppDelegate*)[UIApplication sharedApplication].delegate newLoginExtend];
+  
+    
+    
 }
 -(void)webViewDidFinishLoad:(UIWebView *)webView{
     
@@ -117,41 +97,6 @@
         
     };
     
-    DLog(@"加载完成");
-//    [self loadJSToOCMethod];
-//    JSContext *context=[webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];  //通过webView键创建JSContext对象
-//   NSString * astr =  [context name];
-//   
-//    DLog(@"giuhouho:%@",context[@"closeWebWindow"]);
-//    context[@"closeWebWindow"] = ^(){
-//        
-//        [self.navigationController popViewControllerAnimated:YES];
-//        
-//    };
-//    JSContext * context = [webView valueForKeyPath:@"documentView.webView.mainFrame.javaScriptContext"];
-    
-    
-//    [ljObject setJumpToVoidPageBlock:^{
-//
-//        id vc = [[NSClassFromString(@"ljDriverFollowCarInsuranceWritePolicyVC") alloc]init];
-//        [self.navigationController pushViewController:vc animated:YES];
-//    }];
-//
-//    [ljObject setJumpToPageBlock:^(NSString *linkUrl)
-//     {
-//         //JS的链接中有fuck这个字符串的话，就跳转
-//         if ([linkUrl rangeOfString:@"fuck"].location != NSNotFound)
-//         {
-//             id vc = [[NSClassFromString(@"ljVC") alloc]init];
-//             [self.navigationController pushViewController:vc animated:YES];
-//         }
-//     }];
-    
-//    NSString *alertJS=@"alert('Hello JS')";//这是利用OC调用JS所执行的命令
-//
-//    [context evaluateScript:alertJS];//通过oc方法调用js的alert
-//    [webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextSizeAdjust= '78%'"];
-//    [webView stringByEvaluatingJavaScriptFromString:@"document.getElementsByTagName('body')[0].style.webkitTextFillColor= '#575757'"];
 }
 
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error

shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.4.2</string>
+	<string>6.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>