// 原则批等待结果

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -304,6 +304,7 @@
 		0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
 		0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
 		048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
+		0485DFD42C649A2500B50293 /* YHPrincipleUploadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0485DFD32C649A2500B50293 /* YHPrincipleUploadModel.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 */; };
@@ -953,6 +954,7 @@
 		0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
 		0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
 		048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
+		0485DFD32C649A2500B50293 /* YHPrincipleUploadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadModel.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>"; };
@@ -2218,6 +2220,7 @@
 				0472CB9E2C5A11640096F48F /* YHPrincleGroupModel.swift */,
 				04B360F02C635A33001EB053 /* YHPrincipleWaitResultModel.swift */,
 				04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */,
+				0485DFD32C649A2500B50293 /* YHPrincipleUploadModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -3632,6 +3635,7 @@
 				04213B252C48C15400797900 /* YHHomeIdentityViewController.swift in Sources */,
 				0472E25C2C521E64008EAB6E /* YHHomeIdentityListVC.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
+				0485DFD42C649A2500B50293 /* YHPrincipleUploadModel.swift in Sources */,
 				04213B352C4F85A900797900 /* YHHomeLifeCategoryModel.swift in Sources */,
 				04FB01CE2C23DDBD0040115D /* YHPeopleMatchNoDataView.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,

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

@@ -208,16 +208,28 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 vc.orderId = orderID
                 vc.mobile = mobile
                 navigationController?.pushViewController(vc)
-            } else if model.type == 11 {
-                //正在等待原则批结果
                 
                 
-            } else if model.type == 12 {
-                //正在进行原则批补件~
+            } else if model.type == 11 || model.type == 12 || model.type == 14  {
+                
+                // 11 原则批等待结果
+                // 12 原则批待补件
+                // 14 原则批未获批准
+                
+                let vc = YHPrincipleWaitResultViewController()
+                vc.status = model.type
+                vc.orderId = orderID
+                navigationController?.pushViewController(vc)
+                
             } else if model.type == 13 {
+                
                 //原则批已获批~
-            } else if model.type == 14 {
-                //未获批准~
+                let vc = YHPrincipleWaitResultViewController()
+                vc.status = model.type
+                vc.orderId = orderID
+                navigationController?.pushViewController(vc)
+                
+           
             } else if model.type == 15 {
                 //正式批已获批~
             }

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

@@ -13,8 +13,8 @@ import AttributedString
 // 【原则批已获批 - 所有材料已一键发邮件】
 class YHPrincipleApprovedMailViewController: YHBaseViewController {
 
-    var orderId: Int = 0
-    var status: Int = 11
+    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/YHPrincipleReviewListVC.swift

@@ -14,6 +14,7 @@ class YHPrincipleReviewListVC: YHBaseViewController {
     var status: Int = 0
     var items: [YHPrincipleWaitResultModel] = []
     let viewModel = YHPrincleViewModel()
+    
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.contentInsetAdjustmentBehavior = .never
@@ -64,6 +65,13 @@ class YHPrincipleReviewListVC: YHBaseViewController {
             make.left.right.bottom.equalToSuperview()
         }
     }
+    
+    func requestData() {
+        
+//        viewModel.getPrincipleUploadDetail(orderId: orderId) { <#Bool#>, <#YHErrorModel?#> in
+//            <#code#>
+//        }
+    }
 }
 
 extension YHPrincipleReviewListVC {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/M/YHPrincipleEnvelopeModel.swift

@@ -19,9 +19,9 @@ class YHPrincipleEnvelopeModel: SmartCodable {
     var date: String = ""
     var sex: Int = 0
     
-    
-    
     required init() {
         
     }
 }
+
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/M/YHPrincipleUploadModel.swift

+//
+//  YHPrincipleUploadModel.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/8.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHPrincipleUploadDetailModel: SmartCodable {
+    
+    var date: String = ""
+    var applicant: YHPrincipleApplicantModel = YHPrincipleApplicantModel()
+    var file_data: YHPrincipleFileDataModel = YHPrincipleFileDataModel()
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleApplicantModel: SmartCodable {
+    var id: Int = 0
+    var sex: Int = 0
+    var username: String = ""
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleFileDataModel: SmartCodable  {
+    var agreement: YHPrincipleAgreementModel = YHPrincipleAgreementModel()
+    var opinion: YHPrincipleAgreementModel = YHPrincipleAgreementModel()
+    var other: YHPrincipleAgreementModel = YHPrincipleAgreementModel()
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleFileUrlModel: SmartCodable  {
+    var name: String = ""
+    var url: String = ""
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleNameExtraModel: SmartCodable  {
+    var organization: String = ""
+    var applicant: String = ""
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleContentUrlModel: SmartCodable  {
+    var name: String = ""
+    var url: String = ""
+    var type: Int = 0
+    var fileUrl: String = ""
+    var updated_at: String = ""
+    
+    required init() {
+        
+    }
+}
+
+class YHPrincipleAgreementModel: SmartCodable  {
+    var id: Int = 0
+    var order_id: Int = 0
+    var plan_id: Int = 0
+    var file_id: Int = 0
+    var file_url = [YHPrincipleFileUrlModel]()
+    var document_url: String = ""
+    var type: Int = 0
+    var order_subset_id: Int = 0
+    var template_name: String = ""
+    var template_provider: String = ""
+    var template_row_sort: Int = 0
+    var template_row: Int = 0
+    var template_cate_name: String = ""
+    var template_cate_id: Int = 0
+    var template_id: Int = 0
+    var template_type: Int = 0
+    var name: String = ""
+    var name_extra: YHPrincipleNameExtraModel = YHPrincipleNameExtraModel()
+    var name_temp: String = ""
+    var applicant_name: String = ""
+    var is_original: Int = 0
+    var is_check: Int = 0
+    var upload_requirement: Int = 0
+    var submit_time: String = ""
+    var check_status: Int = 0
+    var audit_content: String = ""
+    var audit_content_crm: String = ""
+    var sort: Int = 0
+    var finalized_file = [YHPrincipleFileUrlModel]()
+    var progress_type: Int = 0
+    var document_check_status: Int = 0
+    var document_check_time: String = ""
+    var document_submit_time: String = ""
+    var document_audit_content: String = ""
+    var check_time: String = ""
+    var assign_at: String = ""
+    var collect_status: Int = 0
+    var content_url = [YHPrincipleContentUrlModel]()
+    var original_content_url = [YHPrincipleContentUrlModel]()
+    var ship_company: String = ""
+    var ship_code: String = ""
+    var remark: String = ""
+    var ship_remark: String = ""
+    var node: Int = 0
+    var state: Int = 0
+    var renew_state: Int = 0
+    var original: Int = 0
+    var old_id: Int = 0
+    var approved_add: Int = 0
+    var delay_supplement_log: String = ""
+    var content_upload_by: String = ""
+    var mark_completed: Int = 0
+    var chart_type: Int = 0
+    var chart_data: String = ""
+    var chart_push_type: Int = 0
+    var client_display: Int = 0
+    var deleted_at: String = ""
+    var created_at: String = ""
+    var updated_at: String = ""
+    var send_client_time: String = ""
+    var system_check_status: Int = 0
+    var system_check_time: String = ""
+    var create_from_appid: Int = 0
+    var update_from_appid: Int = 0
+    var first_submit_time: String = ""
+    var is_system_check_async: Int = 0
+    var generated_state: Int = 0
+    var document_type: Int = 0
+    var process_status: Int = 0
+    var dwp_status: Int = 0
+    var ocr: String = ""
+    var handle_remark: String = ""
+    var rejection_confirmation: Int = 0
+    
+    required init() {
+        
+    }
+}
+
+
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleUnapprovedCell.swift

@@ -9,12 +9,12 @@
 import UIKit
 
 class YHPrincipleFileModel {
-    var url: String = ""
+    var value: String = ""
     var name: String = ""
     var btnTitle: String = ""
     
-    init(url: String = "", name: String = "", btnTitle: String = "") {
-        self.url = url
+    init(value: String = "", name: String = "", btnTitle: String = "") {
+        self.value = value
         self.name = name
         self.btnTitle = btnTitle
     }
@@ -23,6 +23,7 @@ class YHPrincipleFileModel {
 class YHPrincipleUnapprovedItemView: UIView {
     
     static let viewH: CGFloat = 20.0
+    var btnClick: (()->())?
     
     lazy var pointView:UIView = {
         let view = UIView()
@@ -46,8 +47,13 @@ class YHPrincipleUnapprovedItemView: UIView {
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.backgroundColor = UIColor(hex: 0xF4F6FA)
         btn.layer.cornerRadius = 10.0
+        btn.addTarget(self, action: #selector(didRightBtnClicked), for: .touchUpInside)
         return btn
     }()
+    
+    @objc func didRightBtnClicked() {
+        btnClick?()
+    }
      
     func updateModel(_ model: YHPrincipleFileModel) {
         titleLabel.text = model.name
@@ -136,14 +142,17 @@ class YHPrincipleUnapprovedCell: UITableViewCell {
         items.removeAll()
         if model.type == .entry {
             let url = model.applicationFileNumberAttachment
-            let name = url
-            let m = YHPrincipleFileModel(url:url, name:name, btnTitle: "查看")
+            var name = "申请确认通知书"
+            if !url.pathExtension.isEmpty {
+                name = name + "." + url.pathExtension
+            }
+            let m = YHPrincipleFileModel(value:url, name:name, btnTitle: "查看")
             items.append(m)
             
         } else if model.type == .profile {
             for file in model.fileNumberList {
                 let name = file.applicationName + " " + file.fileNumber
-                let m = YHPrincipleFileModel(name:name, btnTitle: "复制")
+                let m = YHPrincipleFileModel(value:file.fileNumber, name:name, btnTitle: "复制")
                 items.append(m)
             }
         }
@@ -184,9 +193,22 @@ class YHPrincipleUnapprovedCell: UITableViewCell {
         }
         
         var lastItemView: UIView = listTitleLabel
-        for (index, model) in items.enumerated() {
+        for (index, item) in items.enumerated() {
             let itemView = YHPrincipleUnapprovedItemView(frame: .zero)
-            itemView.updateModel(model)
+            itemView.updateModel(item)
+            if model.type == .entry {
+                itemView.btnClick = {
+                    YHHUD.flash(message: "查看文件")
+                    // 私链转公链
+                }
+                
+            } else if model.type == .profile {
+                itemView.btnClick = {
+                    UIPasteboard.general.string = item.value
+                    YHHUD.flash(message: "复制成功")
+                }
+            }
+            
             whiteView.addSubview(itemView)
             itemView.snp.makeConstraints { make in
                 make.left.right.equalTo(0)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -12,6 +12,7 @@ class YHPrincleViewModel: NSObject {
     
     var waitResultModel = YHPrincipleWaitResultModel()
     var envelopModel = YHPrincipleEnvelopeModel()
+    var uploadDetailModel = YHPrincipleUploadDetailModel()
     
     func getPrincipleWaitReviewResult(params:[String : Any], callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
         
@@ -26,23 +27,19 @@ class YHPrincleViewModel: NSObject {
                 let dic = json.data
                 guard let resultModel = YHPrincipleWaitResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
-                    self.waitResultModel = self.getTestModel()
                     callback?(false, err)
                     return
                 }
                 self.waitResultModel = resultModel
-                self.waitResultModel = self.getTestModel()
                 callback?(true, nil)
                 
             } else {
                 
                 let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
-                self.waitResultModel = self.getTestModel()
                 callback?(false, err)
             }
             
         } failBlock: { err in
-            self.waitResultModel = self.getTestModel()
             callback?(false, err)
         }
     }
@@ -61,12 +58,40 @@ class YHPrincleViewModel: NSObject {
                 let dic = json.data
                 guard let resultModel = YHPrincipleEnvelopeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
-                    self.envelopModel = self.getEnvelopModel()
                     callback?(false, err)
                     return
                 }
                 self.envelopModel = resultModel
-                self.envelopModel = self.getEnvelopModel()
+                callback?(true, nil)
+                
+            } else {
+                let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
+                callback?(false, err)
+            }
+            
+        } failBlock: { err in
+            callback?(false, err)
+        }
+    }
+    
+    func getPrincipleUploadDetail(orderId:Int, callback:((_ success: Bool,_ error:YHErrorModel?)->())?) {
+        
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Principle.getUploadDetail
+        
+        let params: [String : Any] = ["order_id": orderId]
+        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog("model 是 ==> \(json)")
+            
+            if json.code == 200 {
+                let dic = json.data
+                guard let resultModel = YHPrincipleUploadDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callback?(false, err)
+                    return
+                }
+                self.uploadDetailModel = resultModel
                 callback?(true, nil)
                 
             } else {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -345,7 +345,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
 //            YHPrincipleCongratulationAlertView.alertView().show()
             // YHPrincipleWaitResultViewController
             let vc = YHPrincipleApprovedMailViewController()
-            vc.orderId = 123456
             self.navigationController?.pushViewController(vc)
             return
         }