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

// 高才

parent b324fc23
...@@ -8,8 +8,15 @@ ...@@ -8,8 +8,15 @@
import UIKit import UIKit
enum YHCInfoType: Int {
case none = 0
case spouse = 1
case child = 2
}
class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol { class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
var infoType: YHCInfoType = .none
var familyMember:YHFamilyMember? var familyMember:YHFamilyMember?
var mainApplicantInfo: YHMyMainApplicantInfoModel? var mainApplicantInfo: YHMyMainApplicantInfoModel?
...@@ -164,7 +171,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol ...@@ -164,7 +171,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
// //
if familyMember.nationality == "中国-China" { if familyMember.nationality == "中国-China" {
var isChinaIdCardMust = true var isChinaIdCardMust = infoType == .child ? false : true
let title1 = YHFormTitleItem(type: .chinaIdCardInfo) let title1 = YHFormTitleItem(type: .chinaIdCardInfo)
let item10 = YHFormDetailItem(type: .chinaIdentityCardNumber, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.number, tips:"请输入证件号码".local) let item10 = YHFormDetailItem(type: .chinaIdentityCardNumber, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.number, tips:"请输入证件号码".local)
let item11 = YHFormDetailItem(type: .certificateSignPlace, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueAt, tips:"请输入签发地".local) let item11 = YHFormDetailItem(type: .certificateSignPlace, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueAt, tips:"请输入签发地".local)
...@@ -555,6 +562,7 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo ...@@ -555,6 +562,7 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
let showPassport = a.showPassport let showPassport = a.showPassport
let isPassportMust = a.isPassportMust let isPassportMust = a.isPassportMust
if infoType != .child {
if familyMember.nationality == "中国-China" { if familyMember.nationality == "中国-China" {
if familyMember.certificates.cnIdentityCard.number.count <= 0 if familyMember.certificates.cnIdentityCard.number.count <= 0
|| familyMember.certificates.cnIdentityCard.issueAt.count <= 0 || familyMember.certificates.cnIdentityCard.issueAt.count <= 0
...@@ -564,7 +572,7 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo ...@@ -564,7 +572,7 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
return false return false
} }
} }
}
if showHK, isHKMust { if showHK, isHKMust {
......
...@@ -82,7 +82,11 @@ class YHGCChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol { ...@@ -82,7 +82,11 @@ class YHGCChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
let primaryInfoVC = YHGCChildPrimaryInfoVC() let primaryInfoVC = YHGCChildPrimaryInfoVC()
let uploadVC = YHGCCertificateUploadVC() let uploadVC = YHGCCertificateUploadVC()
let certificateVC = YHGCCertificateInfoController() lazy var certificateVC = {
let vc = YHGCCertificateInfoController()
vc.infoType = .child
return vc
}
let basicInfoVC = YHGCChildBasicInfoVC() let basicInfoVC = YHGCChildBasicInfoVC()
override func viewDidLoad() { override func viewDidLoad() {
......
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