Skip to content

G
galaxy-iOS
Commit 23ca0164 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 配偶、子女

parent 2ecbd403
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 71 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift
View file @ 23ca0164
...@@ -92,8 +92,11 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -92,8 +92,11 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
item07.tips = "请输入出生城市".local item07.tips = "请输入出生城市".local
} else { } else {
item07.value = child.birthPlace.area.joined(separator: ",") item07.value = child.birthPlace.details
item07.tips = "请选择出生城市".local item07.tips = "请输入出生城市".local
// item07.value = child.birthPlace.area.joined(separator: ",")
// item07.tips = "请选择出生城市".local
} }
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item06, item07] let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item06, item07]
...@@ -176,15 +179,17 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -176,15 +179,17 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let detailItem = item as! YHFormDetailItem let detailItem = item as! YHFormDetailItem
if detailItem.type == .birthCity { if detailItem.type == .birthCity {
var isBirthOverSeas = false
if let child = child {
isBirthOverSeas = child.isBirthOverSeas()
}
if isBirthOverSeas {
return .inputText return .inputText
} else {
return .selectSheet // var isBirthOverSeas = false
} // if let child = child {
// isBirthOverSeas = child.isBirthOverSeas()
// }
// if isBirthOverSeas {
// return .inputText
// } else {
// return .selectSheet
// }
} }
if detailItem.type == .childName if detailItem.type == .childName
...@@ -317,9 +322,12 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -317,9 +322,12 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
self.child?.surname = tt ?? "" self.child?.surname = tt ?? ""
cell.textField.text = tt cell.textField.text = tt
} else if detailItem.type == .birthCity { } else if detailItem.type == .birthCity {
if let child = child, child.isBirthOverSeas() { // 出生国外
self.child?.birthPlace.foreign = text ?? "" self.child?.birthPlace.foreign = text ?? ""
} else {
self.child?.birthPlace.details = text ?? ""
}
} else if detailItem.type == .occupationName { } else if detailItem.type == .occupationName {
self.child?.occupationName = text ?? "" self.child?.occupationName = text ?? ""
...@@ -371,6 +379,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -371,6 +379,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
[weak self] (answers, index) in [weak self] (answers, index) in
guard let self = self else { return } guard let self = self else { return }
let selectItem = answers[index] let selectItem = answers[index]
self.view.endEditing(true)
self.child?.setBirthOverSeas(selectItem.title == "国外".local) self.child?.setBirthOverSeas(selectItem.title == "国外".local)
self.loadInfo() self.loadInfo()
save() save()
...@@ -474,30 +483,31 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -474,30 +483,31 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .birthCity { // 出生城市 } else if detailItem.type == .birthCity { // 出生城市
var isBirthOverSeas = false return
if let child = child { // var isBirthOverSeas = false
isBirthOverSeas = child.isBirthOverSeas() // if let child = child {
} // isBirthOverSeas = child.isBirthOverSeas()
// 出生国外时 出生城市是输入框 // }
if isBirthOverSeas { return } // // 出生国外时 出生城市是输入框
// if isBirthOverSeas { return }
let vc = YHAddressViewController() //
vc.backLocationStringController = { // let vc = YHAddressViewController()
[weak self] (string1, string2, string3, string4) in // vc.backLocationStringController = {
guard let self = self else { return } // [weak self] (string1, string2, string3, string4) in
print("\(string1)\n\(string2)\n\(string3)\n\(string4)") // guard let self = self else { return }
var citys:[String] = [] // print("\(string1)\n\(string2)\n\(string3)\n\(string4)")
if !isEmptyString(string2) { // var citys:[String] = []
citys.append(string2) // if !isEmptyString(string2) {
} // citys.append(string2)
if !isEmptyString(string3) { // }
citys.append(string3) // if !isEmptyString(string3) {
} // citys.append(string3)
self.child?.birthPlace.area = citys // }
self.loadInfo() // self.child?.birthPlace.area = citys
save() // self.loadInfo()
} // save()
self.present(vc, animated: true) // }
// self.present(vc, animated: true)
} else if detailItem.type == .roleInHK { // 在港身份 } else if detailItem.type == .roleInHK { // 在港身份
...@@ -580,7 +590,7 @@ extension YHChildBasicInfoVC { ...@@ -580,7 +590,7 @@ extension YHChildBasicInfoVC {
} }
} else { } else {
if isEmptyArray(child.birthPlace.area) { if isEmptyString(child.birthPlace.details) {
return false return false
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift
View file @ 23ca0164
...@@ -115,9 +115,13 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -115,9 +115,13 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
item05.tips = "请输入出生城市".local item05.tips = "请输入出生城市".local
} else { } else {
item05.value = spouse.birthPlace.area.joined(separator: ",") item05.value = spouse.birthPlace.details
item05.placeHolder = "请选择".local item05.placeHolder = "请输入".local
item05.tips = "请选择出生城市".local item05.tips = "请输入出生城市".local
// item05.value = spouse.birthPlace.area.joined(separator: ",")
// item05.placeHolder = "请选择".local
// item05.tips = "请选择出生城市".local
} }
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05] let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05]
...@@ -226,7 +230,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -226,7 +230,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
} }
} else { } else {
if isEmptyArray(spouse.birthPlace.area) { if isEmptyString(spouse.birthPlace.details) {
return false return false
} }
} }
...@@ -300,15 +304,17 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -300,15 +304,17 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let detailItem = item as! YHFormDetailItem let detailItem = item as! YHFormDetailItem
if detailItem.type == .birthCity { if detailItem.type == .birthCity {
var isBirthOverSeas = false
if let spouse = spouse {
isBirthOverSeas = spouse.isBirthOverSeas()
}
if isBirthOverSeas {
return .inputText return .inputText
} else {
return .selectSheet // var isBirthOverSeas = false
} // if let spouse = spouse {
// isBirthOverSeas = spouse.isBirthOverSeas()
// }
// if isBirthOverSeas {
// return .inputText
// } else {
// return .selectSheet
// }
} }
if detailItem.type == .spouseName if detailItem.type == .spouseName
...@@ -453,7 +459,12 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -453,7 +459,12 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .birthCity { } else if detailItem.type == .birthCity {
if let spouse = spouse, spouse.isBirthOverSeas() { // 出生国外
self.spouse?.birthPlace.foreign = text ?? "" self.spouse?.birthPlace.foreign = text ?? ""
} else {
self.spouse?.birthPlace.details = text ?? ""
}
} else if detailItem.type == .occupationName { } else if detailItem.type == .occupationName {
self.spouse?.occupationName = text ?? "" self.spouse?.occupationName = text ?? ""
} else if detailItem.type == .hkIdentityCardNumber { } else if detailItem.type == .hkIdentityCardNumber {
...@@ -505,6 +516,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -505,6 +516,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
[weak self] (answers, index) in [weak self] (answers, index) in
guard let self = self else { return } guard let self = self else { return }
let selectItem = answers[index] let selectItem = answers[index]
self.view.endEditing(true)
self.spouse?.setBirthOverSeas(selectItem.title == "国外".local) self.spouse?.setBirthOverSeas(selectItem.title == "国外".local)
self.loadInfo() self.loadInfo()
save() save()
...@@ -695,30 +707,31 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource { ...@@ -695,30 +707,31 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .birthCity { // 出生城市 } else if detailItem.type == .birthCity { // 出生城市
var isBirthOverSeas = false
if let spouse = spouse {
isBirthOverSeas = spouse.isBirthOverSeas()
}
// 出生国外时 出生城市是输入框
if isBirthOverSeas { return }
let vc = YHAddressViewController() // var isBirthOverSeas = false
vc.backLocationStringController = { // if let spouse = spouse {
[weak self] (string1, string2, string3, string4) in // isBirthOverSeas = spouse.isBirthOverSeas()
guard let self = self else { return } // }
print("\(string1)\n\(string2)\n\(string3)\n\(string4)") // // 出生国外时 出生城市是输入框
var citys:[String] = [] // if isBirthOverSeas { return }
if !isEmptyString(string2) { //
citys.append(string2) // let vc = YHAddressViewController()
} // vc.backLocationStringController = {
if !isEmptyString(string3) { // [weak self] (string1, string2, string3, string4) in
citys.append(string3) // guard let self = self else { return }
} // print("\(string1)\n\(string2)\n\(string3)\n\(string4)")
self.spouse?.birthPlace.area = citys // var citys:[String] = []
loadInfo() // if !isEmptyString(string2) {
save() // citys.append(string2)
} // }
self.present(vc, animated: true) // if !isEmptyString(string3) {
// citys.append(string3)
// }
// self.spouse?.birthPlace.area = citys
// loadInfo()
// save()
// }
// self.present(vc, animated: true)
} else if detailItem.type == .roleInHK { // 在港身份 } else if detailItem.type == .roleInHK { // 在港身份
......
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