Commit 964131aa authored by Steven杜宇's avatar Steven杜宇

// 预约递交

parent 70451dc4
...@@ -327,7 +327,7 @@ extension YHResignAppointTimeModifyViewController { ...@@ -327,7 +327,7 @@ extension YHResignAppointTimeModifyViewController {
if group.notleaveHK { if group.notleaveHK {
noSeletTime = group.ready_to_submit_at.isEmpty noSeletTime = group.ready_to_submit_at.isEmpty
} else { } else {
noSeletTime = (group.ready_to_submit_at.isEmpty && group.leave_hk_at.isEmpty) noSeletTime = (group.ready_to_submit_at.isEmpty || group.leave_hk_at.isEmpty)
} }
if noSeletTime { if noSeletTime {
isNoSelectTime = true isNoSelectTime = true
......
...@@ -144,7 +144,7 @@ class YHResignAppointTimeViewController: YHBaseViewController { ...@@ -144,7 +144,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
let model1 = YHResignAppointTimeSettingModel() let model1 = YHResignAppointTimeSettingModel()
model1.ready_to_submit_at = defaultSubmitTime model1.ready_to_submit_at = defaultSubmitTime
model1.leave_hk_at = defaultLeaveHKTime model1.leave_hk_at = defaultLeaveHKTime
model1.notleaveHK = !defaultLeaveHKTime.isEmpty model1.notleaveHK = defaultLeaveHKTime.isEmpty
selectGroupArr.append(model1) selectGroupArr.append(model1)
self.tableView.reloadData() self.tableView.reloadData()
return return
...@@ -157,7 +157,7 @@ class YHResignAppointTimeViewController: YHBaseViewController { ...@@ -157,7 +157,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
let model1 = YHResignAppointTimeSettingModel() let model1 = YHResignAppointTimeSettingModel()
model1.ready_to_submit_at = defaultSubmitTime model1.ready_to_submit_at = defaultSubmitTime
model1.leave_hk_at = defaultLeaveHKTime model1.leave_hk_at = defaultLeaveHKTime
model1.notleaveHK = !defaultLeaveHKTime.isEmpty model1.notleaveHK = defaultLeaveHKTime.isEmpty
if self.togetherSetting.is_together == 2 { // 不一起递交 需显示候选人列表 if self.togetherSetting.is_together == 2 { // 不一起递交 需显示候选人列表
// 默认全部选中 // 默认全部选中
let users = allAppointUsers.deepCopy().map { let users = allAppointUsers.deepCopy().map {
...@@ -276,7 +276,7 @@ class YHResignAppointTimeViewController: YHBaseViewController { ...@@ -276,7 +276,7 @@ class YHResignAppointTimeViewController: YHBaseViewController {
if group.notleaveHK { if group.notleaveHK {
noSeletTime = group.ready_to_submit_at.isEmpty noSeletTime = group.ready_to_submit_at.isEmpty
} else { } else {
noSeletTime = (group.ready_to_submit_at.isEmpty && group.leave_hk_at.isEmpty) noSeletTime = (group.ready_to_submit_at.isEmpty || group.leave_hk_at.isEmpty)
} }
if noSeletTime { if noSeletTime {
isNoSelectTime = true isNoSelectTime = true
......
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