// 预约

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

@@ -217,6 +217,7 @@ extension YHResignAppointTimeModifyViewController {
             if groupLevel == selectGroupArr.count-1 {
                 // 进行分批
                 let newItem = YHResignAppointTimeSettingModel()
+                newItem.isShowUsers = true
                 // 批次+1
                 newItem.itemIndex = groupLevel+1
                 // 找出上一批未选中的人
@@ -251,6 +252,7 @@ extension YHResignAppointTimeModifyViewController {
                 if nextGroupIndex == selectGroupArr.count { // 在现有列表没有找到下一批可以操作的批次 则需要分一个新批次
                     // 进行分批
                     let newItem = YHResignAppointTimeSettingModel()
+                    newItem.isShowUsers = true
                     // 批次+1
                     newItem.itemIndex = groupLevel+1
                     // 找出上一批未选中的人

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

@@ -151,6 +151,13 @@ class YHResignAppointTimeViewController: YHBaseViewController {
             model1.ready_to_submit_at = defaultSubmitTime
             model1.leave_hk_at = defaultLeaveHKTime
             model1.notleaveHK = defaultLeaveHKTime.isEmpty && self.isUpdate
+            let users = allAppointUsers.deepCopy().map {
+                let item = $0
+                item.isSelected = true
+                return item
+            }
+            model1.users = users
+            model1.isShowUsers = false
             selectGroupArr.append(model1)
             self.tableView.reloadData()
             return
@@ -161,17 +168,20 @@ class YHResignAppointTimeViewController: YHBaseViewController {
         togetherArr.append(self.togetherSetting)
         // 分组数据
         let model1 = YHResignAppointTimeSettingModel()
+        model1.isShowUsers = true
         model1.ready_to_submit_at = defaultSubmitTime
         model1.leave_hk_at = defaultLeaveHKTime
         model1.notleaveHK = defaultLeaveHKTime.isEmpty && self.isUpdate
-        if self.togetherSetting.is_together == 2 { // 不一起递交 需显示候选人列表
-            // 默认全部选中
         let users = allAppointUsers.deepCopy().map {
             let item = $0
             item.isSelected = true
             return item
         }
         model1.users = users
+        if self.togetherSetting.is_together == 2 { // 不一起递交 需显示候选人列表
+            model1.isShowUsers = true
+        } else {
+            model1.isShowUsers = false
         }
         selectGroupArr.append(model1)
         self.tableView.reloadData()
@@ -202,6 +212,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
             if groupLevel == selectGroupArr.count-1 {
                 // 进行分批
                 let newItem = YHResignAppointTimeSettingModel()
+                newItem.isShowUsers = true
                 // 批次+1
                 newItem.itemIndex = groupLevel+1
                 // 找出上一批未选中的人
@@ -301,7 +312,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
         var batchs: [[String : Any]] = []
         for group in self.selectGroupArr {
             group.isClickSubmit = false
-            if group.users.count <= 0 { // 说明是一起递交
+            if !group.isShowUsers { // 说明是一起递交
                 let allUserInfoArr = allAppointUsers.map {
                     let dict = ["member_id" : "\($0.id)"]
                     return dict
@@ -397,7 +408,7 @@ extension YHResignAppointTimeViewController: UITableViewDelegate, UITableViewDat
         // 时间选择cell
         if 0 <= indexPath.row && indexPath.row < selectGroupArr.count {
             let model = selectGroupArr[indexPath.row]
-            if model.users.count <= 0 || self.togetherSetting.is_together == 1 { // 不分组选择cell
+            if !model.isShowUsers || self.togetherSetting.is_together == 1 { // 不分组选择cell
                 let cell2 = tableView.dequeueReusableCell(withIdentifier: YHResignAppointTimeSingleCell.cellReuseIdentifier, for: indexPath) as! YHResignAppointTimeSingleCell
                 cell2.updateModel(model)
                 cell2.switchBlock = {

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

@@ -15,6 +15,7 @@ class YHResignAppointTimeSettingModel: SmartCodable {
     var leave_hk_at: String = ""   // 预计离港时间
     var notleaveHK: Bool = false // 暂不离港
     var users: [YHResignAppointMember] = []
+    var isShowUsers: Bool = false // 是否展示选择用户列表
     var itemIndex: Int = 0 // 第几批 从0开始
     var isClickSubmit: Bool = false
     var isHaveAppointed: Bool = false