Commit e50d29f7 authored by Steven杜宇's avatar Steven杜宇

// 预约

parent 27b7b0c8
...@@ -68,7 +68,6 @@ class YHResignAppointContainerViewController: YHBaseViewController { ...@@ -68,7 +68,6 @@ class YHResignAppointContainerViewController: YHBaseViewController {
return return
} }
self.appointVC.allAppointUsers = self.viewModel.appointUsers self.appointVC.allAppointUsers = self.viewModel.appointUsers
self.appointVC.updateUI()
self.appointVC.view.isHidden = false self.appointVC.view.isHidden = false
self.scheduleVC.view.isHidden = true self.scheduleVC.view.isHidden = true
} }
......
...@@ -197,6 +197,7 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController { ...@@ -197,6 +197,7 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
// 多人多批 // 多人多批
var groupArr = [YHResignAppointTimeSettingModel]() var groupArr = [YHResignAppointTimeSettingModel]()
for (index, group) in scheduleArr.enumerated() { for (index, group) in scheduleArr.enumerated() {
let model = YHResignAppointTimeSettingModel() let model = YHResignAppointTimeSettingModel()
let status = group.getConfirmInHKStatus() let status = group.getConfirmInHKStatus()
...@@ -212,7 +213,7 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController { ...@@ -212,7 +213,7 @@ class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
m.isSelected = false m.isSelected = false
return m return m
} }
// 更新已选择状态 // group.user_list 表示当前批已选用户组 更新已选择状态
for selectUser in group.user_list { for selectUser in group.user_list {
for user in users { for user in users {
if user.id == selectUser.id { if user.id == selectUser.id {
......
...@@ -13,7 +13,6 @@ import SwifterSwift ...@@ -13,7 +13,6 @@ import SwifterSwift
class YHResignAppointTimeModifyViewController: YHBaseViewController { class YHResignAppointTimeModifyViewController: YHBaseViewController {
var renewalId: Int = 0 var renewalId: Int = 0
var familyArr: [String] = ["", "", "", "", ""]
var selectGroupArr: [YHResignAppointTimeSettingModel] = [] var selectGroupArr: [YHResignAppointTimeSettingModel] = []
let viewModel = YHResignAppointViewModel() let viewModel = YHResignAppointViewModel()
......
...@@ -17,7 +17,11 @@ class YHResignAppointTimeViewController: YHBaseViewController { ...@@ -17,7 +17,11 @@ class YHResignAppointTimeViewController: YHBaseViewController {
var renewalId: Int = 0 var renewalId: Int = 0
// 所有预约人员 // 所有预约人员
var allAppointUsers: [YHResignAppointMember] = [] var allAppointUsers = [YHResignAppointMember]() {
didSet {
self.updateUI()
}
}
// 预约在港递交时间 // 预约在港递交时间
var defaultSubmitTime: String = "" var defaultSubmitTime: String = ""
// 预计离港时间 // 预计离港时间
......
...@@ -83,7 +83,7 @@ class YHResignAppointGroup: SmartCodable { ...@@ -83,7 +83,7 @@ class YHResignAppointGroup: SmartCodable {
} }
} }
class YHResignAppointUser: SmartCodable { class YHResignAppointUser: SmartCodable, NSCopying {
var id: Int = 0 var id: Int = 0
var name: String = "" var name: String = ""
...@@ -93,6 +93,16 @@ class YHResignAppointUser: SmartCodable { ...@@ -93,6 +93,16 @@ class YHResignAppointUser: SmartCodable {
} }
init(id: Int, name: String, memberId: Int) {
self.id = id
self.name = name
self.memberId = memberId
}
func copy(with zone: NSZone? = nil) -> Any {
return YHResignAppointUser(id: self.id, name: self.name, memberId: self.memberId)
}
func transformToMember() -> YHResignAppointMember { func transformToMember() -> YHResignAppointMember {
let m = YHResignAppointMember() let m = YHResignAppointMember()
m.id = self.id m.id = self.id
...@@ -100,3 +110,16 @@ class YHResignAppointUser: SmartCodable { ...@@ -100,3 +110,16 @@ class YHResignAppointUser: SmartCodable {
return m return m
} }
} }
// [YHResignAppointUser] 数组实现神拷贝
extension Array where Element == YHResignAppointUser {
func deepCopy() -> [YHResignAppointUser] {
var results: [YHResignAppointUser] = []
for item in self {
let newItem = item.copy()
results.append(newItem as! YHResignAppointUser)
}
return results
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment