// 预约

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

@@ -186,8 +186,6 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
         }
         
         if isOnlyOneUser || isOnlyOneGroup  { // 只有一个人或多人单批 此时scheduleArr只有一个元素
-            let vc = YHResignAppointTimeViewController()
-            vc.renewalId = self.renewalId
             if scheduleArr.count > 0 {
                 // 先得到所有分批用户的集合
                 YHHUD.show(.progress(message: "加载中..."))
@@ -196,6 +194,9 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
                     YHHUD.hide()
                     guard let self = self else { return }
                     let group = scheduleArr[0]
+                    let vc = YHResignAppointTimeViewController()
+                    vc.isUpdate = true
+                    vc.renewalId = self.renewalId
                     vc.togetherSetting.isCanEdit = false
                     vc.togetherSetting.is_together = self.isTogether
                     vc.defaultSubmitTime = group.ready_to_submit_at

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

@@ -10,10 +10,12 @@ import UIKit
 import AttributedString
 import SwifterSwift
 
-// 初始是单人或初始默认为所有人为一批的情况 可用此VC
+// 之前从未分过批的情况 可用此VC
+// 之前单人或多人一批的情况 需要编辑时 可用此VC
 
 class YHResignAppointTimeViewController: YHBaseViewController {
 
+    var isUpdate: Bool = false // 是否是编辑已有信息
     // 订单ID
     var orderId: Int = 0
     // 批次ID
@@ -22,6 +24,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
     // 所有预约人员
     var allAppointUsers = [YHResignAppointMember]() {
         didSet {
+            
             self.updateUI()
         }
     }
@@ -147,7 +150,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
             let model1 = YHResignAppointTimeSettingModel()
             model1.ready_to_submit_at = defaultSubmitTime
             model1.leave_hk_at = defaultLeaveHKTime
-            model1.notleaveHK = defaultLeaveHKTime.isEmpty
+            model1.notleaveHK = defaultLeaveHKTime.isEmpty && self.isUpdate
             selectGroupArr.append(model1)
             self.tableView.reloadData()
             return
@@ -160,7 +163,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
         let model1 = YHResignAppointTimeSettingModel()
         model1.ready_to_submit_at = defaultSubmitTime
         model1.leave_hk_at = defaultLeaveHKTime
-        model1.notleaveHK = defaultLeaveHKTime.isEmpty
+        model1.notleaveHK = defaultLeaveHKTime.isEmpty && self.isUpdate
         if self.togetherSetting.is_together == 2 { // 不一起递交 需显示候选人列表
             // 默认全部选中
             let users = allAppointUsers.deepCopy().map {