Merge branch 'newVersion' of ssh://10.10.100.21/source/iOSUU

# Conflicts:
#	shiku_im/shiku_im/shiku_im-Info.plist

shiku_im/Podfile

@@ -25,4 +25,5 @@ target 'shiku_im' do
   pod 'HMSegmentedControl'
   
 
+
 end

shiku_im/Podfile.lock

@@ -91,6 +91,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: 7850b158d025065b162a1a963d445040b828abc9
   WechatOpenSDK: 9b721089507c895d05f997408c30bb6e6f5f9b60
 
-PODFILE CHECKSUM: b24727c5036e6873182234452070d8185a3752ed
+PODFILE CHECKSUM: 35f8891469791b77021a3108626cac09b8c84acb
 
 COCOAPODS: 1.5.2

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -64,7 +64,6 @@
         
         [self setUpUI];
         
-        
     }
     return self;
 }
@@ -1094,7 +1093,7 @@
     url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     
     //执行网络请求
-    DLog(@"开始登录请求！！！！");
+    DLog(@"%@",g_master);
     
     UASNetworkManager *loginSeverManager = [UASNetworkManager manager];
     
@@ -1153,7 +1152,17 @@
             
             [userDefaults setBool:NO forKey:@"erpOpen"];
             
-            [UASAlertView showWithTitle:nil content:@"账号或密码错误,UAS登录失败" sureTitle:Localized(@"UU_custom_sure") cancelTitle:nil click:^(NSInteger index) {
+            NSString *msgStr = @"";
+            if ([dic[@"data"] isKindOfClass:NSString.class]) {
+                
+                msgStr = [NSString stringWithFormat:@"%@",dic[@"data"]];
+                
+            }else{
+                
+                msgStr = @"账号或密码错误,UAS登录失败";
+            }
+            
+            [UASAlertView showWithTitle:nil content:msgStr sureTitle:Localized(@"UU_custom_sure") cancelTitle:nil click:^(NSInteger index) {
                 
             }];
         }

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/UASAdView.m

@@ -28,7 +28,6 @@ static UASAdView *adView = nil;
     
     [adView makeKeyAndVisible];
     
-    
     return adView;
     
 }

shiku_im/shiku_im/controller/UASMainVC.m

@@ -118,7 +118,6 @@
             
             if ([view isKindOfClass:class]) {
                 
-                
                 [self.tarArr addObject:view];
                 
             }
@@ -242,7 +241,6 @@
     
     NSDictionary *urlDic = [self getParametersWithUrl:url];
     
-
     NSString *str = urlDic[@"pagekind"];
     
     if (self.waitVC) {

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/controller/myOA/UASButton.h

@@ -9,8 +9,11 @@
 #import <UIKit/UIKit.h>
 
 typedef NS_ENUM(NSInteger,NSTextVerticalAlignment){
+    //位于Label上方
     NSTextVerticalAlignmentTop = 101,
+    //位于Label中间
     NSTextVerticalAlignmentMiddle,
+    //位于Label下方
     NSTextVerticalAlignmentBottom
 };
 

shiku_im/shiku_im/controller/myOA/UASNetworkManager.m

@@ -9,7 +9,6 @@
 #import "UASNetworkManager.h"
 #import <objc/runtime.h>
 #import "NSJSONSerialization+ZXJSON.h"
-
 static UASNetworkManager *b2bManager = nil;
 
 @implementation UASNetworkManager
@@ -141,7 +140,7 @@ static UASNetworkManager *b2bManager = nil;
 -(NSURLSessionDataTask *)request:(NSString *)url method:(requestType)type parameters:(id)parameters constructingBodyWithBlock:(void (^)(id<AFMultipartFormData>))conBlock progress:(void (^)(NSProgress *))uploadProgress success:(void (^)(NSURLSessionDataTask *, id))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure{
     
     if (type == POST) {
-
+     
       return [self POST:url parameters:parameters constructingBodyWithBlock:conBlock progress:uploadProgress success:success failure:failure];
         
     }else{

shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -5111,6 +5111,9 @@
     
 }
 
+/**
+ 标识头部信息，适应不改url修改图片的情况
+ */
 -(void)configSdWebImage{
     
     

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;
@@ -48,23 +48,12 @@
     [webView loadRequest:request];
     self.webView = webView;
     [self.view addSubview:webView];
-    //获取网页的上下文
-   /* 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-------");
+    
+    [webView mas_makeConstraints:^(MASConstraintMaker *make) {
+       
+        make.edges.equalTo(self.view);
         
-    };*/
+    }];
     
     
 }
@@ -93,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{
     
@@ -110,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.4</string>
+	<string>6.4.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

shiku_im/shiku_im/文件夹1/ProduceCity(产城服务)/Controllers/UASDocumentVC.m

@@ -1607,8 +1607,6 @@ static NSString *cellID = @"cellID";
         
     }];
     
-    
-    
 }
 
 
@@ -1638,7 +1636,7 @@ static NSString *cellID = @"cellID";
     
     manager1.requestSerializer = [AFHTTPRequestSerializer serializer];
     manager1.responseSerializer = [AFHTTPResponseSerializer serializer];
-   
+    
     NSString * urlAddress1=@"api/serve/getMultiNodeAssigns.action";
     
     NSString *str = [[NSUserDefaults standardUserDefaults] objectForKey:b2bSession];
@@ -1662,7 +1660,6 @@ static NSString *cellID = @"cellID";
         NSString *idString = @"";
         
         
-        
         for (id obj in rootDic[@"assigns"])
         {
             for (id obk in obj[@"JP_CANDIDATES"]) {

shiku_im/shiku_im/文件夹3/MainView/UserInfo/UASUserInfo.m

@@ -17,6 +17,7 @@
     dispatch_once(&onceToken, ^{
         
         instance = [UASUserInfo new];
+        //默认是切换账套的状态，数据需要更新
         instance.masChanged = YES;
         //默认在大陆以及港澳地区
         instance.inRegion = YES;