// 原则批

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

@@ -235,11 +235,24 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                         self.navigationController?.pushViewController(vc)
                         return
                     }
-                    
                     // 未发送邮件
-                    let vc = YHPrincipleApprovedWaitSubmitVC()
-                    vc.orderId = self.orderID
-                    self.navigationController?.pushViewController(vc)
+                    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)
+                        }
+                    }
                 }
                 
             } else if model.type == 15 {

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

@@ -93,7 +93,9 @@ extension YHPrincipleApprovedMailViewController {
         self.items.removeAll()
         
         // 已获得港府甄选名额
-        self.items.append(self.viewModel.envelopModel)
+        if !self.viewModel.envelopModel.name.isEmpty, !self.viewModel.envelopModel.url.isEmpty {
+            self.items.append(self.viewModel.envelopModel)
+        }
         
         let waitResultModel = self.viewModel.waitResultModel
         // 入境处已认收受理

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

@@ -98,8 +98,10 @@ class YHPrincipleApprovedWaitSubmitVC: YHBaseViewController {
         viewModel.getEnvelopeInfo(orderId: orderId) { success, error in
             self.items.removeAll()
             // 已获得港府甄选名额
-            self.viewModel.envelopModel.isUnfold = true
-            self.items.append(self.viewModel.envelopModel)
+            if !self.viewModel.envelopModel.name.isEmpty, !self.viewModel.envelopModel.url.isEmpty {
+                self.viewModel.envelopModel.isUnfold = true
+                self.items.append(self.viewModel.envelopModel)
+            }
             self.tableView.reloadData()
         }
     }

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

@@ -130,27 +130,35 @@ class YHPrincipleUploadListVC: YHBaseViewController {
         
         // 赴港居留同意书
         let agreementModel = self.viewModel.uploadDetailModel.file_data.agreement
-        agreementModel.customType = YHPrincipleAgreementType.agreement.rawValue
-        agreementModel.isMust = true
-        agreementModel.isNeedTemplate = true
-        self.items.append(agreementModel)
+        if agreementModel.id > 0 {
+            agreementModel.customType = YHPrincipleAgreementType.agreement.rawValue
+            agreementModel.isMust = true
+            agreementModel.isNeedTemplate = true
+            self.items.append(agreementModel)
+        }
         
         // 申请人意见访问
         let opinionModel = self.viewModel.uploadDetailModel.file_data.opinion
-        opinionModel.customType = YHPrincipleAgreementType.opinion.rawValue
-        opinionModel.isMust = true
-        opinionModel.isNeedTemplate = true
-        self.items.append(opinionModel)
+        if opinionModel.id > 0 {
+            opinionModel.customType = YHPrincipleAgreementType.opinion.rawValue
+            opinionModel.isMust = true
+            opinionModel.isNeedTemplate = true
+            self.items.append(opinionModel)
+        }
         
         // 其他证明条件
         let otherModel = self.viewModel.uploadDetailModel.file_data.other
-        otherModel.customType = YHPrincipleAgreementType.other.rawValue
-        otherModel.isMust = false
-        otherModel.isNeedTemplate = false
-        self.items.append(otherModel)
+        if otherModel.id > 0 {
+            otherModel.customType = YHPrincipleAgreementType.other.rawValue
+            otherModel.isMust = false
+            otherModel.isNeedTemplate = false
+            self.items.append(otherModel)
+        }
         
         // 已获得港府甄选名额
-        self.items.append(self.viewModel.envelopModel)
+        if !self.viewModel.envelopModel.name.isEmpty, !self.viewModel.envelopModel.url.isEmpty {
+            self.items.append(self.viewModel.envelopModel)
+        }
         
         let waitResultModel = self.viewModel.waitResultModel
         // 入境处已认收受理
@@ -301,7 +309,8 @@ extension YHPrincipleUploadListVC {
                 }
             } else if editType == .preview { // 预览
                 print(model.url)
-                self.viewModel.getPublicImageUrl(model.url) { success, error in
+                let fileUrl = !model.url.isEmpty ? model.url : model.fileUrl
+                self.viewModel.getPublicImageUrl(fileUrl) { success, error in
                     if let success = success {
                         self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.name)
                     }