소스 검색

1.修改NPD Trade Show模式下提交订单后,打印Sales Order的Title不正确以及自动登出后登陆状态显示未刷新。

Pen Li 8 년 전
부모
커밋
3f36294c65
2개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      RedAnt ERP Mobile/common/Functions/MainViewController.m
  2. 2 1
      RedAnt ERP Mobile/common/Functions/order/RAOrderPreviewController.m

+ 2 - 1
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -617,7 +617,7 @@
 //                    [self hideMenu];
 //                    [self switchToHome:nil];
                     [appDelegate Logout];
-                    
+                    [self checklogin :false];
                     if(showlogin)
                     {
                     LoginViewController * loginvc =[ self.storyboard instantiateViewControllerWithIdentifier:@"LoginViewController"];
@@ -676,6 +676,7 @@
             
         }];
     }
+    
 }
 
 - (IBAction)onUserListClick:(id)sender {

+ 2 - 1
RedAnt ERP Mobile/common/Functions/order/RAOrderPreviewController.m

@@ -3482,7 +3482,8 @@
                         
 //                        [alert dismissWithClickedButtonIndex:0 animated:FALSE];
                         [alert dismissViewControllerAnimated:YES completion:nil];
-                        [appDelegate printPdf:pdf_url company:company send_to:send_to soid:soid content:email_content];
+                        NSString *pdf_title = [editor_json objectForKey:@"title"];
+                        [appDelegate printPdf:pdf_url company:company send_to:send_to soid:pdf_title content:email_content];
                     }
                 }