Commit 9770aa2d authored by Steven杜宇's avatar Steven杜宇

// 未填项检测

parent 1f7bb444
...@@ -130,21 +130,21 @@ class YHFamilyMemberInfoListVC: YHBaseViewController { ...@@ -130,21 +130,21 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
// 检查填写信息完整性 // 检查填写信息完整性
func checkIntegrity() -> Bool { func checkIntegrity() -> Bool {
if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber > 0 { if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber != 0 {
return false return false
} }
if let father = familyMemberInfo?.father, father.notFillNumber > 0 { if let father = familyMemberInfo?.father, father.notFillNumber != 0 {
return false return false
} }
if let mother = familyMemberInfo?.mother, mother.notFillNumber > 0 { if let mother = familyMemberInfo?.mother, mother.notFillNumber != 0 {
return false return false
} }
if let childs = familyMemberInfo?.child, !childs.isEmpty { if let childs = familyMemberInfo?.child, !childs.isEmpty {
for child in childs { for child in childs {
if child.notFillNumber > 0 { if child.notFillNumber != 0 {
return false return false
} }
} }
...@@ -152,7 +152,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController { ...@@ -152,7 +152,7 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
if let brothers = familyMemberInfo?.brother, !brothers.isEmpty { if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
for brother in brothers { for brother in brothers {
if brother.notFillNumber > 0 { if brother.notFillNumber != 0 {
return false return false
} }
} }
......
...@@ -914,6 +914,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -914,6 +914,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
var finishFollow: Int = 0 var finishFollow: Int = 0
var step: Int = 0 var step: Int = 0
var isHandled: Int = 0 var isHandled: Int = 0
// notFillNumber = -1 表示还没开始填写任意数据项
var notFillNumber: Int = -1 var notFillNumber: Int = -1
var certificates: YHCertificates = YHCertificates() var certificates: YHCertificates = YHCertificates()
var usedName: String = "" var usedName: String = ""
......
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