// 删除待确认在港

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointScheduleListViewController.swift

@@ -329,7 +329,6 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             
             if lastLeftUnselectUsers.count > 0 { // 如果还有剩余的人 这批人不在行程列表里 可能是在后台随意操作删除用户的
                 let model = YHResignAppointTimeSettingModel()
-                let status = YHResignConfirmHKStatus.waitConfirmHK
                 model.isHaveAppointed = false
                 model.ready_to_submit_at = ""
                 model.leave_hk_at = ""

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/M/YHResignAppointGroup.swift

@@ -70,16 +70,17 @@ class YHResignAppointGroup: SmartCodable {
         dateFormatter.dateFormat = "yyyy-MM-dd HH:mm"
         let nowDateString = dateFormatter.string(from: Date())
         
-        var confirmStatus = YHResignConfirmHKStatus.waitConfirmHK
+        var confirmStatus = YHResignConfirmHKStatus.canConfirmHK
         
         if self.determine_hk_at.isEmpty {
             // 是否到了预约递交时间
-            let isArriveSubmitTime = compareDates(self.ready_to_submit_at, nowDateString)
-            if isArriveSubmitTime {
-                confirmStatus = .waitConfirmHK
-            } else {
-                confirmStatus = .canConfirmHK
-            }
+//            let isArriveSubmitTime = compareDates(self.ready_to_submit_at, nowDateString)
+//            if isArriveSubmitTime {
+//                confirmStatus = .waitConfirmHK
+//            } else {
+//                confirmStatus = .canConfirmHK
+//            }
+            confirmStatus = .canConfirmHK
             
         } else { // 有确认在港日期
             confirmStatus = .haveConfirmHK

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/RangeDatePicker2/YHPickTimeHoldView.swift

@@ -10,9 +10,9 @@ import UIKit
 
 class YHPickTimeHoldView: UIView {
     
-    var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
-    
-    var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
+//    var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
+//    
+//    var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
     
     lazy var lineView: UIView = {
         let view = UIView()
@@ -61,7 +61,7 @@ class YHPickTimeHoldView: UIView {
     }
     
     @objc func didConfirmInHKBtnClicked() {
-        clickConfirmBtnBlock?(self.confirmHKStatus)
+//        clickConfirmBtnBlock?(self.confirmHKStatus)
     }
     
     func createUI() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleSingleItemView.swift

@@ -13,7 +13,7 @@ class YHResignAppointedScheduleSingleItemView: UIView {
     var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
     var applyPaymentBlock: (() -> Void)?
 
-    var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
+    var confirmHKStatus: YHResignConfirmHKStatus = .canConfirmHK
     
     lazy var lineView: UIView = {
         let view = UIView()
@@ -120,9 +120,11 @@ class YHResignAppointedScheduleSingleItemView: UIView {
         confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK)
         
         var statusWidth = 71.0
-        if self.confirmHKStatus == .waitConfirmHK {
-            statusWidth = 71.0
-        } else if self.confirmHKStatus == .canConfirmHK {
+//        if self.confirmHKStatus == .waitConfirmHK {
+//            statusWidth = 71.0
+//        } else
+        
+        if self.confirmHKStatus == .canConfirmHK {
             statusWidth = 68.0
         } else if self.confirmHKStatus == .haveConfirmHK {
             statusWidth = 65.0
@@ -133,15 +135,17 @@ class YHResignAppointedScheduleSingleItemView: UIView {
             make.right.equalTo(-18-statusWidth-18)
         }
         
-        if self.confirmHKStatus == .waitConfirmHK {
-            confirmInHKBtn.setTitle("待确认在港", for: .normal)
-            confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
-            confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
-            confirmInHKBtn.snp.updateConstraints { make in
-                make.width.equalTo(71)
-            }
-            
-        } else if self.confirmHKStatus == .canConfirmHK {
+//        if self.confirmHKStatus == .waitConfirmHK {
+//            confirmInHKBtn.setTitle("待确认在港", for: .normal)
+//            confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
+//            confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
+//            confirmInHKBtn.snp.updateConstraints { make in
+//                make.width.equalTo(71)
+//            }
+//            
+//        } else
+        
+        if self.confirmHKStatus == .canConfirmHK {
             confirmInHKBtn.setTitle("确认在港", for: .normal)
             confirmInHKBtn.setTitleColor(.white, for: .normal)
             confirmInHKBtn.backgroundColor = .brandMainColor

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignScheduleMultipleInfoCell.swift

@@ -12,7 +12,7 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHResignScheduleMultipleInfoCell"
     
-    var confirmHKStatus: YHResignConfirmHKStatus = .waitConfirmHK
+    var confirmHKStatus: YHResignConfirmHKStatus = .canConfirmHK
     var clickConfirmBtnBlock: ((YHResignConfirmHKStatus) -> Void)?
     var applyPaymentBlock: (() -> Void)?
     
@@ -148,15 +148,17 @@ class YHResignScheduleMultipleInfoCell: UITableViewCell {
         haveConfirmInHKLabel.isHidden = (self.confirmHKStatus != .haveConfirmHK)
         confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK)
         
-        if self.confirmHKStatus == .waitConfirmHK {
-            confirmInHKBtn.setTitle("待确认在港", for: .normal)
-            confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
-            confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
-            confirmInHKBtn.snp.updateConstraints { make in
-                make.width.equalTo(71)
-            }
-            
-        } else if self.confirmHKStatus == .canConfirmHK {
+//        if self.confirmHKStatus == .waitConfirmHK {
+//            confirmInHKBtn.setTitle("待确认在港", for: .normal)
+//            confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
+//            confirmInHKBtn.backgroundColor = .init(hex: 0xF4F6FA)
+//            confirmInHKBtn.snp.updateConstraints { make in
+//                make.width.equalTo(71)
+//            }
+//            
+//        } else
+        
+        if self.confirmHKStatus == .canConfirmHK {
             confirmInHKBtn.setTitle("确认在港", for: .normal)
             confirmInHKBtn.setTitleColor(.white, for: .normal)
             confirmInHKBtn.backgroundColor = .brandMainColor

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignScheduleSingleInfoCell.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 enum YHResignConfirmHKStatus: Int {
-    case waitConfirmHK = 0 // 待确认在港
+//    case waitConfirmHK = 0 // 待确认在港
     case canConfirmHK = 1 // 可点击确认在港
     case haveConfirmHK = 2 // 已确认在港
 }