// 旅行

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift

@@ -221,7 +221,8 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         var errorItemCount = 0
         for item in sectionItems {
             if item.type == .certificate {
-                var hasError = false
+                var hasSubmitError = false
+                var isDateValidate = true
                 item.cerDetailModel.isNeedCheckCer = false
                 item.cerDetailModel.isNeedCheckDate = false
 
@@ -239,7 +240,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     }
                     
                     if noCerInfo {
-                        hasError = true
+                        hasSubmitError = true
                         item.cerDetailModel.isNeedCheckCer = true
                         if item.cerDetailModel.type == 3 { // 港澳通行证
                             item.cerDetailModel.checkTips = item.cerDetailModel.img_front.isEmpty ? "请上传港澳通行证正面" : "请上传港澳通行证反面"
@@ -254,7 +255,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                     } else {
                         item.cerDetailModel.isNeedCheckDate = false
                         if item.cerDetailModel.issue_start.isEmpty || item.cerDetailModel.issue_end.isEmpty {
-                            hasError = true
+                            hasSubmitError = true
                             item.cerDetailModel.isNeedCheckDate = true
                             
                         } else {
@@ -262,11 +263,12 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                             if !isValidCertificate {
                                 if item.cerDetailModel.type == 2, item.cerDetailModel.china_travel_latest_validaty_date.isEmpty {
                                     // 这个情况直接弹toast
-                                    hasError = true
+                                    hasSubmitError = true
                                     YHHUD.flash(message: "赴港行程尚未成功预约，请前往检查")
                                     
                                 } else {
                                     // 有效期不足也能提交
+                                    isDateValidate = false
                                     item.cerDetailModel.isNeedCheckCer = true
                                     let deadDate: String = (item.cerDetailModel.type == 2 ? item.cerDetailModel.china_travel_latest_validaty_date :  item.cerDetailModel.latest_validaty_date)
                                     item.cerDetailModel.checkTips = "有效期不足，需要为\(deadDate)或以后"
@@ -275,8 +277,9 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                         }
                     }
                 }
-                if !hasError {
-                    if !item.cerDetailModel.isOCR_failed { // 无法识别也要可以提交
+                if !hasSubmitError {
+                    // 无法识别或有效期不足也要可以提交
+                    if !item.cerDetailModel.isOCR_failed && isDateValidate {
                         item.cerDetailModel.isNeedCheckCer = false
                         item.cerDetailModel.isNeedCheckDate = false
                     }