// 原则批

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -306,6 +306,7 @@
 		0485DFD82C66036600B50293 /* YHPrincipleFileRenameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485DFD72C66036600B50293 /* YHPrincipleFileRenameView.swift */; };
 		0485DFDA2C660EFA00B50293 /* YHPrincipleRequestModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485DFD92C660EFA00B50293 /* YHPrincipleRequestModel.swift */; };
 		0485DFDC2C670C7200B50293 /* YHPrincipleSendMailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485DFDB2C670C7200B50293 /* YHPrincipleSendMailView.swift */; };
+		0485DFE12C6A0B6200B50293 /* YHPrincipleApprovedResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485DFE02C6A0B6200B50293 /* YHPrincipleApprovedResultVC.swift */; };
 		048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */; };
 		048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */; };
 		048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */; };
@@ -959,6 +960,7 @@
 		0485DFD72C66036600B50293 /* YHPrincipleFileRenameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleFileRenameView.swift; sourceTree = "<group>"; };
 		0485DFD92C660EFA00B50293 /* YHPrincipleRequestModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleRequestModel.swift; sourceTree = "<group>"; };
 		0485DFDB2C670C7200B50293 /* YHPrincipleSendMailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleSendMailView.swift; sourceTree = "<group>"; };
+		0485DFE02C6A0B6200B50293 /* YHPrincipleApprovedResultVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleApprovedResultVC.swift; sourceTree = "<group>"; };
 		048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceNoOrderView.swift; sourceTree = "<group>"; };
 		048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderListViewController.swift; sourceTree = "<group>"; };
 		048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderProgressTableViewCell.swift; sourceTree = "<group>"; };
@@ -2215,6 +2217,7 @@
 				04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */,
 				04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */,
 				0485DFD52C64E70200B50293 /* YHPrincipleApprovedWaitSubmitVC.swift */,
+				0485DFE02C6A0B6200B50293 /* YHPrincipleApprovedResultVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -3735,6 +3738,7 @@
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
 				A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
 				044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,
+				0485DFE12C6A0B6200B50293 /* YHPrincipleApprovedResultVC.swift in Sources */,
 				04F5F8702C1AC4C2004A463C /* YHHKEventWebViewController.swift in Sources */,
 				045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
 				045EEEA42B9F171A0022A143 /* YHImageResultViewController.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -224,36 +224,9 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 navigationController?.pushViewController(vc)
                 
             } else if model.type == 13 { //原则批已获批~
-                YHHUD.show(.progress(message:"加载中"))
-                self.principleViewModel.requestIsSendMail(orderId: orderID) { isSend in
-                    YHHUD.hide()
-                    if isSend {
-                        // 已发送邮件
-                        let vc = YHPrincipleApprovedMailViewController()
-                        vc.status = model.type
-                        vc.orderId = self.orderID
-                        self.navigationController?.pushViewController(vc)
-                        return
-                    }
-                    // 未发送邮件
-                    YHHUD.show(.progress(message:"加载中"))
-                    self.principleViewModel.getEnvelopeInfo(orderId: self.orderID) { success, error in
-                        YHHUD.hide()
-                        // 已获得港府甄选名额
-                        if !self.principleViewModel.envelopModel.name.isEmpty, !self.principleViewModel.envelopModel.url.isEmpty {
-                            // 进入原则批已获批待提交页面
-                            let vc = YHPrincipleApprovedWaitSubmitVC()
-                            vc.orderId = self.orderID
-                            self.navigationController?.pushViewController(vc)
-                            
-                        } else {
-                            // 进入原则批上传列表页面
-                            let vc = YHPrincipleUploadListVC()
-                            vc.orderId = self.orderID
-                            self.navigationController?.pushViewController(vc)
-                        }
-                    }
-                }
+                let vc = YHPrincipleApprovedResultVC()
+                vc.orderId = orderID
+                navigationController?.pushViewController(vc)
                 
             } else if model.type == 15 {
                 //正式批已获批~

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedMailViewController.swift

@@ -14,7 +14,6 @@ import AttributedString
 class YHPrincipleApprovedMailViewController: YHBaseViewController {
 
     var orderId: Int = -1
-    var status: Int = -1
     var items: [SmartCodable] = []
     let viewModel = YHPrincleViewModel()
     lazy var tableView: UITableView = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleApprovedResultVC.swift

+//
+//  YHPrincipleApprovedResultVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/12.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHPrincipleApprovedResultVC: YHBaseViewController {
+
+    var orderId: Int = -1
+    let viewModel = YHPrincleViewModel()
+    
+    // 已获批且已发送邮件页面
+    lazy var mailVC: YHPrincipleApprovedMailViewController = {
+        let vc = YHPrincipleApprovedMailViewController()
+        vc.orderId = self.orderId
+        vc.view.isHidden = true
+        return vc
+    }()
+    
+    lazy var preSubmitVC: YHPrincipleApprovedWaitSubmitVC = {
+        let vc = YHPrincipleApprovedWaitSubmitVC()
+        vc.orderId = self.orderId
+        vc.view.isHidden = true
+        return vc
+    }()
+    
+    lazy var uploadListVC: YHPrincipleUploadListVC = {
+        let vc = YHPrincipleUploadListVC()
+        vc.orderId = self.orderId
+        vc.view.isHidden = true
+        return vc
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+        
+        self.addChild(mailVC)
+        self.addChild(preSubmitVC)
+        self.addChild(uploadListVC)
+        
+        self.view.addSubview(mailVC.view)
+        self.view.addSubview(preSubmitVC.view)
+        self.view.addSubview(uploadListVC.view)
+
+        YHHUD.show(.progress(message:"加载中"))
+        self.viewModel.requestIsSendMail(orderId: self.orderId) { isSend in
+            YHHUD.hide()
+            if isSend {
+                // 已发送邮件
+                self.mailVC.requestData()
+                self.mailVC.view.isHidden = false
+            }
+            // 未发送邮件
+            YHHUD.show(.progress(message:"加载中"))
+            self.viewModel.getEnvelopeInfo(orderId: self.orderId) { success, error in
+                YHHUD.hide()
+                // 已获得港府甄选名额
+                if !self.viewModel.envelopModel.name.isEmpty, !self.viewModel.envelopModel.url.isEmpty {
+                    // 进入原则批已获批待提交页面
+                    self.preSubmitVC.requestData()
+                    self.preSubmitVC.view.isHidden = false
+                    
+                } else {
+                    // 进入原则批上传列表页面
+                    self.uploadListVC.requestData()
+                    self.uploadListVC.view.isHidden = false
+                }
+            }
+        }
+
+    }
+}