// 预约

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

@@ -72,31 +72,36 @@ class YHResignAppointContainerViewController: YHBaseViewController {
                 YHHUD.flash(message: msg)
                 return
             }
-            let isNotAppointed = self.viewModel.scheduleInfoList.renewal_List.count <= 0
-            if isNotAppointed { // 没有预约过
-                // 请求预约人员列表
-                YHHUD.show(.progress(message: "加载中..."))
-                self.viewModel.getResignAppointUserlist(renewalId: self.renewalId) {
-                    [weak self] success2, error2 in
-                    YHHUD.hide()
-                    guard let self = self else { return }
-                    if !success2 {
-                        let msg = error2?.errorMsg ?? "服务器未知错误"
-                        YHHUD.flash(message: msg)
-                        return
-                    }
+            
+            // 请求预约人员列表
+            YHHUD.show(.progress(message: "加载中..."))
+            self.viewModel.getResignAppointUserlist(renewalId: self.renewalId) {
+                [weak self] success2, error2 in
+                YHHUD.hide()
+                guard let self = self else { return }
+                
+                if !success2 {
+                    let msg = error2?.errorMsg ?? "服务器未知错误"
+                    YHHUD.flash(message: msg)
+                    return
+                }
+                
+                let isNotAppointed = self.viewModel.scheduleInfoList.renewal_List.count <= 0
+                if isNotAppointed { // 没有预约过
+            
                     self.appointVC.allAppointUsers = self.viewModel.appointUsers
                     self.appointVC.view.isHidden = false
                     self.scheduleVC.view.isHidden = true
-                }
-                
-            } else { // 预约过
-                self.scheduleVC.result_open = self.viewModel.scheduleInfoList.result_open
-                self.scheduleVC.scheduleArr = self.viewModel.scheduleInfoList.renewal_List
-                self.scheduleVC.isTogether = self.viewModel.scheduleInfoList.is_together
-                self.scheduleVC.view.isHidden = false
-                self.appointVC.view.isHidden = true
-                scheduleBlock?()
+                    
+                } else { // 预约过
+                    self.scheduleVC.allAppointUsers = self.viewModel.appointUsers
+                    self.scheduleVC.result_open = self.viewModel.scheduleInfoList.result_open
+                    self.scheduleVC.scheduleArr = self.viewModel.scheduleInfoList.renewal_List
+                    self.scheduleVC.isTogether = self.viewModel.scheduleInfoList.is_together
+                    self.scheduleVC.view.isHidden = false
+                    self.appointVC.view.isHidden = true
+                    scheduleBlock?()
+               }
             }
         }
     }

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

@@ -25,6 +25,10 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             self.updateBottomBtnAndMotifyBtnStatus()
         }
     }
+    
+    // 所有未预约人员
+    var allAppointUsers: [YHResignAppointMember] = []
+    
     // 是否隐藏修改按钮
     var isHiddenModifyBtn: Bool = false
 
@@ -216,7 +220,7 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             }
         }
         
-        if isOnlyOneUser || isOnlyOneGroup  { // 只有一个人或多人单批 此时scheduleArr只有一个元素
+        if isOnlyOneUser { // 只有一个人
             if scheduleArr.count > 0 {
                 // 先得到所有分批用户的集合
                 YHHUD.show(.progress(message: "加载中..."))
@@ -254,6 +258,7 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             }
             
             let appAppointUsers = self.viewModel.appointUsers
+            
             // 组装数据
             // 上一个批次中未选中的用户集合
             var lastLeftUnselectUsers: [YHResignAppointMember] = appAppointUsers.deepCopy()
@@ -339,6 +344,10 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             let modifyVC = YHResignAppointTimeModifyViewController()
             modifyVC.renewalId = self.renewalId
             modifyVC.selectGroupArr = groupArr
+            modifyVC.allAppointUsers = appAppointUsers.deepCopy()
+            // 只要有一个已确认在港则不能再编辑是否一起递交
+            modifyVC.isCanEditTogether = !self.isAtLeastOneHeaveConfirmInHK()
+            modifyVC.isTogether = (self.isTogether == 1)
             self.navigationController?.pushViewController(modifyVC)
         }
     }
@@ -354,6 +363,19 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
         return isAllHaveConfirmed
     }
     
+    func isAtLeastOneHeaveConfirmInHK() -> Bool { // 至少有一个已确认在港
+        var isAtLeastOneHaveConfirmed = false
+        for group in scheduleArr {
+            let status = group.getConfirmInHKStatus()
+            if status == .haveConfirmHK {
+                isAtLeastOneHaveConfirmed = true
+            }
+        }
+        return isAtLeastOneHaveConfirmed
+    }
+    
+    
+    
     func requestConfirmInHK(_ model: YHResignAppointGroup) {
         YHHUD.show(.progress(message: "提交中..."))
         self.viewModel.submitConfirmInHK(id: model.id, is_edit: model.is_edit) {