// 旅行证件

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

@@ -48,13 +48,6 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
     //上个界面传递过来的数据对象
     var dataModel : YHTravelDocsPreparationListModel = YHTravelDocsPreparationListModel()
     
-    var isDisableEdit: Bool {
-        get {
-            // 待审核或已完成 不能编辑
-            return (self.dataModel.status == 1 || self.dataModel.status == 3)
-        }
-    }
-    
     var orderId: Int = 0
     
     var sectionItems:[YHTravelCerSectionItem] = []
@@ -143,6 +136,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         let item1 = YHTravelCerSectionItem(type: .tips, tipsArr: tipsArr)
         sectionItems.append(item1)
         
+        var isCanEdit: Bool = false
         // 证件相关
         if let list = self.viewModel.travelDetailModel?.list, list.count > 0 {
             for model in list {
@@ -150,12 +144,15 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
                 if let model = model {
                     item2.cerDetailModel = model
                     model.isCanEdit = (model.status == 2)
+                    if model.status == 2 {
+                        isCanEdit = true
+                    }
                     sectionItems.append(item2)
                 }
             }
             
         } else { // 没有上传过证件
-            
+            isCanEdit = true
             let age = self.viewModel.travelDetailModel?.age ?? 0
             var userId = 0
             if let uid = YHLoginManager.shared.userModel?.id {
@@ -201,9 +198,9 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
             }
         }
         
-        self.bottomView.isHidden = self.isDisableEdit
+        self.bottomView.isHidden = !isCanEdit
         self.bottomView.snp.updateConstraints { make in
-            make.height.equalTo(self.isDisableEdit ? 0.0 : bottomViewHeight)
+            make.height.equalTo(isCanEdit ? bottomViewHeight : 0.0)
         }
         tableView.reloadData()
         self.view.setNeedsLayout()

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

@@ -109,7 +109,7 @@ class YHTravelDocsPreparationDetailItemModel: SmartCodable {
             return false
         }
         
-        if date1 <= date2 {
+        if date1 < date2 {
             return false
         }
         return true

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

@@ -227,7 +227,7 @@ class YHTravelCertificateUploadCell: UITableViewCell {
                 }
                 
                 if item.id == .signDate || item.id == .deadDate {
-                    YHDatePickView.show(type: .yyyymmdd) {
+                    YHDatePickView.show(type: .yyyymmdd, currentDay: item.value) {
                         time in
                         
                         if item.id == .signDate {