Skip to content

G
galaxy-iOS
Commit 6c7e0872 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge commit '9fd764fd' into davidhuang 

* commit '9fd764fd':
  // 兄弟姐妹信息填写
  // 选择器
parents 91c3d6e7 9fd764fd
Hide whitespace changes
Inline Side-by-side
Showing with 524 additions and 231 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 6c7e0872
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */; }; 042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */; };
042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */; }; 042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */; };
042FBBD42B67A2FE00F9DE23 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */; }; 042FBBD42B67A2FE00F9DE23 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */; };
042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */; };
0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; }; 0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; }; 0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; }; 0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
...@@ -213,6 +214,7 @@ ...@@ -213,6 +214,7 @@
042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemExpireDateCell.swift; sourceTree = "<group>"; }; 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemExpireDateCell.swift; sourceTree = "<group>"; };
042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildBasicInfoVC.swift; sourceTree = "<group>"; }; 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildBasicInfoVC.swift; sourceTree = "<group>"; };
042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; }; 042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; };
042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBrotherInfoVC.swift; sourceTree = "<group>"; };
0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; }; 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; }; 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; }; 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
...@@ -425,6 +427,7 @@ ...@@ -425,6 +427,7 @@
042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */, 042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */, 042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */,
042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */, 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */,
); );
path = C; path = C;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1244,6 +1247,7 @@ ...@@ -1244,6 +1247,7 @@
042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */, 042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */,
A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */, A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */,
A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */, A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */,
042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */,
A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */, A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */,
A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */, A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */,
A5C5B3102B57677300A7C5D1 /* YHGestureTableView.swift in Sources */, A5C5B3102B57677300A7C5D1 /* YHGestureTableView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHBrotherInfoVC.swift 0 → 100644
View file @ 6c7e0872
//
// YHBrotherInfoVC.swift
// galaxy
//
// Created by edy on 2024/1/29.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHBrotherInfoVC: YHBaseViewController {
var brotherInfo:YHBrother?
var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
lazy var tableView: UITableView = {
let tableView = UITableView(frame:.zero, style:.plain)
if #available(iOS 11.0, *) {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.showsVerticalScrollIndicator = false
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
tableView.register(YHFormItemEnterDetailCell.self, forCellReuseIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier)
tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
tableView.register(YHFormItemOnlyDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemOnlyDoubleChoiceCell.cellReuseIdentifier)
return tableView
}()
override func viewDidLoad() {
super.viewDidLoad()
gk_navTitle = "兄弟姐妹信息填写".local
createUI()
loadBasicInfo()
}
func createUI() {
view.addSubview(tableView);
tableView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
make.bottom.equalToSuperview().offset(-100)
make.left.equalToSuperview().offset(16)
make.right.equalToSuperview().offset(-16)
}
loadBasicInfo()
}
func loadBasicInfo() {
guard let brotherInfo = brotherInfo else { return }
items.removeAll()
// 兄弟姐妹信息
let title0:YHFormItemProtocol = YHFormTitleItem(type: .brotherInfo)
let item00:YHFormItemProtocol = YHFormDetailItem(type: .brotherName)
let item01:YHFormItemProtocol = YHFormDetailItem(type: .birthday)
let item02:YHFormItemProtocol = YHFormDetailItem(type: .birthNation)
let item03:YHFormItemProtocol = YHFormDetailItem(type: .birthCity)
let item04:YHFormItemProtocol = YHFormDetailItem(type: .gender)
let item05:YHFormItemProtocol = YHFormDetailItem(type: .marriageState)
let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05]
// 职业信息
let title1:YHFormItemProtocol = YHFormTitleItem(type: .occupationInfo)
let item10:YHFormItemProtocol = YHFormDetailItem(type: .occupation)
let arr1:[YHFormItemProtocol] = [title1, item10]
// 居住信息
let title2:YHFormItemProtocol = YHFormTitleItem(type: .liveInfo)
let item20:YHFormItemProtocol = YHFormDetailItem(type: .liveNationOrArea)
let arr2:[YHFormItemProtocol] = [title2, item20]
// 香港身份证
let title3:YHFormItemProtocol = YHFormTitleItem(type: .hkIdentityCardInfo)
let item30:YHFormItemProtocol = YHFormDetailItem(type: .isHaveHkIdentityCard)
let item31:YHFormItemProtocol = YHFormDetailItem(type: .hkIdentityCardNumber)
let arr3:[YHFormItemProtocol] = [title3, item30, item31]
items.append(contentsOf: [arr0, arr1, arr2, arr3, arr3])
tableView.reloadData()
}
func getCellType(_ item: Any) ->HKFormItemCellType {
if item is YHFormTitleItem {
return .title
}
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
if detailItem.type == .fatherName
|| detailItem.type == .motherName
|| detailItem.type == .nationOrArea
|| detailItem.type == .hkIdentityCardNumber
|| detailItem.type == .brotherName
{
return .inputText
}
if detailItem.type == .birthday
|| detailItem.type == .birthCity
|| detailItem.type == .marriageState
|| detailItem.type == .occupation
|| detailItem.type == .liveNationOrArea
|| detailItem.type == .gender
{
return .selectSheet
}
if detailItem.type == .birthNation
|| detailItem.type == .isHaveHkIdentityCard
{
return .twoChoice
}
}
return .defaultType
}
}
extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return items.count
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section >= items.count { return 0 }
let arr = items[section]
return arr.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section >= items.count { return createDefaultCell(indexPath) }
let arr:[YHFormItemProtocol] = items[indexPath.section]
if indexPath.row >= arr.count { return createDefaultCell(indexPath) }
let item:YHFormItemProtocol = arr[indexPath.row]
let cellType = getCellType(item)
if cellType == .title { // 标题
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
cell.titleLabel.text = item.getTitle()
return cell
}
if cellType == .inputText { // 输入文字cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
cell.titleLabel.text = item.getTitle()
return cell
}
if cellType == .selectSheet { // 点击选择列表cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
cell.title = item.getTitle()
return cell
}
if cellType == .twoChoice { // 问答双项选择cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
cell.title = item.getTitle()
cell.answerArr = nil
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
if detailItem.type == .birthNation {
let answers = [YHFormChoiceItem(title: "国内".local, isSelect: true),
YHFormChoiceItem(title: "国外".local, isSelect: false)]
cell.answerArr = answers
} else if detailItem.type == .isHaveHkIdentityCard {
let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),
YHFormChoiceItem(title: "否".local, isSelect: false)]
cell.answerArr = answers
}
}
return cell
}
if cellType == .degreeDetailInfo { // 学位cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDegreeInfoCell
cell.title = item.getTitle()
return cell
}
return createDefaultCell(indexPath)
}
func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
if indexPath.section >= items.count { return }
let arr:[YHFormItemProtocol] = items[indexPath.section]
if indexPath.row >= arr.count { return }
createCorner(cell: cell, arr: arr, indexPath: indexPath)
}
func createDefaultCell(_ indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section >= items.count { return 0.0 }
let arr:[YHFormItemProtocol] = items[indexPath.section]
if indexPath.row >= arr.count { return 0.0 }
let item = arr[indexPath.row]
if item is YHFormTitleItem { // 标题
return 52.0
}
if item is YHFormAddItem {
return 70.0
}
if item is YHFormDetailItem {
return UITableView.automaticDimension
}
return 52.0
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView()
}
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 14.0
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
// 复用时需清理
cell.layer.mask = nil
// 设置每块section圆角
if (indexPath.row == 0) {
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
cell.createCorner(CGSizeMake(12.0, 12.0), corner)
} else if (indexPath.row == arr.count-1) {
let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
cell.createCorner(CGSizeMake(12.0, 12.0), corner)
} else {
cell.layer.mask = nil
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift
View file @ 6c7e0872
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import IQKeyboardManagerSwift
enum YHFormTitleItemEditType:Int { enum YHFormTitleItemEditType:Int {
case none = 1 case none = 1
...@@ -628,11 +629,11 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource { ...@@ -628,11 +629,11 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let picker = YHFormPickerView(type: .marriage) IQKeyboardManager.shared.enable = true
picker.selectTitle = "女"
picker.selectType = .marriage(.separated) let caseList = YHFormTitleItemType.allCases.map({ "\($0)" }).joined(separator: ", ")
picker.show() print(caseList)
return
let arr = items[indexPath.section] let arr = items[indexPath.section]
let item:YHFormItemProtocol = arr[indexPath.row] let item:YHFormItemProtocol = arr[indexPath.row]
...@@ -677,6 +678,15 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource { ...@@ -677,6 +678,15 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
return return
} }
// 兄弟姐妹
if item is YHBrother {
let brother = item as! YHBrother
let vc = YHBrotherInfoVC()
vc.brotherInfo = brother
self.navigationController?.pushViewController(vc)
return
}
} }
func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) { func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift
View file @ 6c7e0872
...@@ -16,52 +16,54 @@ protocol YHFormItemProtocol { ...@@ -16,52 +16,54 @@ protocol YHFormItemProtocol {
} }
// 表单标题类型 // 表单标题类型
enum YHFormTitleItemType:Int { enum YHFormTitleItemType:Int, CaseIterable {
// 配偶 // 配偶
case sponse = 1 case sponse = 1
// 父母 // 父母
case parent = 2 case parent
// 子女 // 子女
case child = 3 case child
// 兄弟姐妹 // 兄弟姐妹
case brother = 4 case brother
// 随行 // 随行
case accompany = 5 case accompany
// 国籍 // 国籍
case country = 6 case country
// 居住信息 // 居住信息
case liveInfo = 7 case liveInfo
// 港澳通信证 // 港澳通信证
case hkAndMacaoPassport = 8 case hkAndMacaoPassport
// 中国身份证 // 中国身份证
case chinaIdCardInfo = 9 case chinaIdCardInfo
// 护照 // 护照
case passPortInfo = 10 case passPortInfo
// 配偶信息 // 配偶信息
case spouseInfo = 11 case spouseInfo
// 职业信息 // 职业信息
case occupationInfo = 12 case occupationInfo
// 学历学位信息 // 学历学位信息
case degreeInfo = 13 case degreeInfo
// 在港信息 // 在港信息
case inHongKongInfo = 14 case inHongKongInfo
// 香港身份证 // 香港身份证
case hkIdentityCardInfo = 15 case hkIdentityCardInfo
// 父亲信息 // 父亲信息
case fatherInfo = 16 case fatherInfo
// 母亲信息 // 母亲信息
case motherInfo = 17 case motherInfo
// 基本信息 // 基本信息
case basicInfo = 18 case basicInfo
// 子女信息 // 子女信息
case childInfo = 19 case childInfo
// 是否前次婚姻子女 // 是否前次婚姻子女
case isPreviousMarriageChild = 20 case isPreviousMarriageChild
// 兄弟姐妹信息
case brotherInfo
} }
...@@ -69,8 +71,8 @@ enum YHFormTitleItemType:Int { ...@@ -69,8 +71,8 @@ enum YHFormTitleItemType:Int {
enum YHFormAddItemType:Int { enum YHFormAddItemType:Int {
case addChild = 1 case addChild = 1
case addBrother = 2 case addBrother
case addDegree = 3 case addDegree
} }
// 表单具体条目类型 // 表单具体条目类型
...@@ -79,76 +81,78 @@ enum YHFormDetailItemType:Int { ...@@ -79,76 +81,78 @@ enum YHFormDetailItemType:Int {
// 是否随行至香港 // 是否随行至香港
case isAccompanyToHK = 1 case isAccompanyToHK = 1
// 是否与主申请人同住 // 是否与主申请人同住
case isLiveTother = 3 case isLiveTother
// 国家/地区 // 国家/地区
case nationOrArea = 4 case nationOrArea
// 现居住城市 // 现居住城市
case liveCity = 5 case liveCity
// 详细地址 // 详细地址
case detailAddress = 6 case detailAddress
// 是否办理 // 是否办理
case isHandleHKPassPort = 7 case isHandleHKPassPort
// 证件类别 // 证件类别
case cetificateType = 8 case cetificateType
// 证件号码 // 证件号码
case certificateNumber = 9 case certificateNumber
// 签发日期 // 签发日期
case certificateSignDate = 10 case certificateSignDate
// 届满日期 // 届满日期
case certificateValidDate = 11 case certificateValidDate
// 签发地 // 签发地
case certificateSignPlace = 12 case certificateSignPlace
// 配偶姓名 // 配偶姓名
case spouseName = 13 case spouseName
// 曾用名 // 曾用名
case everName = 14 case everName
// 婚前姓氏 // 婚前姓氏
case befourMarryFirstName = 15 case befourMarryFirstName
// 出生日期 // 出生日期
case birthday = 16 case birthday
// 出生国家/地区 // 出生国家/地区
case birthNation = 17 case birthNation
// 出生城市 // 出生城市
case birthCity = 18 case birthCity
// 职业 // 职业
case occupation = 19 case occupation
// 职业名称 // 职业名称
case occupationName = 20 case occupationName
// 是否拥有学位 // 是否拥有学位
case ownDegree = 21 case ownDegree
// 目前是否在港 // 目前是否在港
case isNowInHK = 22 case isNowInHK
// 获准逗留至 // 获准逗留至
case stayHKDate = 23 case stayHKDate
// 在港身份 // 在港身份
case roleInHK = 24 case roleInHK
// 是否办理过(香港身份证) // 是否办理过(香港身份证)
case isHaveHkIdentityCard = 25 case isHaveHkIdentityCard
// 香港身份证号码 // 香港身份证号码
case hkIdentityCardNumber = 26 case hkIdentityCardNumber
// 学位信息X // 学位信息X
case degreeDetailInfo = 27 case degreeDetailInfo
// 父亲姓名 // 父亲姓名
case fatherName = 28 case fatherName
// 母亲姓名 // 母亲姓名
case motherName = 29 case motherName
// 婚姻状况 // 婚姻状况
case marriageState = 30 case marriageState
// 现居住国家/地区 // 现居住国家/地区
case liveNationOrArea = 31 case liveNationOrArea
// 仅有两个按钮 标题数组有外部提供 // 仅有两个按钮 标题数组有外部提供
case onlyDoubleChoice = 32 case onlyDoubleChoice
// 主申请人和现配偶是否拥有孩子抚养权 // 主申请人和现配偶是否拥有孩子抚养权
case ownCustody = 33 case ownCustody
// 子女姓名 // 子女姓名
case childName = 34 case childName
// 性别 // 性别
case gender = 35 case gender
// 是否为前次婚姻子女 // 是否为前次婚姻子女
case isPreviousMarriageChild = 36 case isPreviousMarriageChild
// 兄弟姐妹姓名
case brotherName
} }
...@@ -190,92 +194,96 @@ class YHFormTitleItem : YHFormItemProtocol { ...@@ -190,92 +194,96 @@ class YHFormTitleItem : YHFormItemProtocol {
func getTitle() -> String { func getTitle() -> String {
switch self.type { switch self.type {
case .sponse: case .sponse:
return "配偶".local return "配偶".local
case .parent: case .parent:
return "父母".local return "父母".local
case .brother: case .brother:
return "兄弟姐妹".local return "兄弟姐妹".local
case .child: case .child:
return "子女".local return "子女".local
case .accompany: case .accompany:
return "随行".local return "随行".local
case .country: case .country:
return "国籍".local return "国籍".local
case .liveInfo: case .liveInfo:
return "居住信息".local return "居住信息".local
case .hkAndMacaoPassport: case .hkAndMacaoPassport:
return "港澳通行证".local return "港澳通行证".local
case .chinaIdCardInfo: case .chinaIdCardInfo:
return "中国身份证".local return "中国身份证".local
case .passPortInfo: case .passPortInfo:
return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local) return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local)
case .spouseInfo: case .spouseInfo:
return "配偶信息".local return "配偶信息".local
case .occupationInfo: case .occupationInfo:
return "职业信息".local return "职业信息".local
case .degreeInfo: case .degreeInfo:
return "学历学位信息".local return "学历学位信息".local
case .inHongKongInfo: case .inHongKongInfo:
return "在港信息".local return "在港信息".local
case .hkIdentityCardInfo: case .hkIdentityCardInfo:
return "香港身份证".local return "香港身份证".local
case .fatherInfo: case .fatherInfo:
return "父亲信息".local return "父亲信息".local
case .motherInfo: case .motherInfo:
return "母亲信息".local return "母亲信息".local
case .basicInfo: case .basicInfo:
return "基本信息".local return "基本信息".local
case .childInfo: case .childInfo:
return "子女信息".local return "子女信息".local
case .isPreviousMarriageChild: case .isPreviousMarriageChild:
return "是否前次婚姻子女".local return "是否前次婚姻子女".local
case .brotherInfo:
return "兄弟姐妹信息".local
} }
} }
func getSubTitle() -> String { func getSubTitle() -> String {
switch self.type { switch self.type {
case .sponse: case .sponse:
return String(format: "(%@)", "如未婚、离婚、丧偶可不填".local) return String(format: "(%@)", "如未婚、离婚、丧偶可不填".local)
case .parent: case .parent:
return String(format: "(%@)", "包含已故".local) return String(format: "(%@)", "包含已故".local)
case .brother: case .brother:
return String(format: "(%@)", "如无可不填".local) return String(format: "(%@)", "如无可不填".local)
case .child: case .child:
return String(format: "(%@)", "如无可不填".local) return String(format: "(%@)", "如无可不填".local)
case .isPreviousMarriageChild: case .isPreviousMarriageChild:
return "".local return "".local
case .accompany: case .accompany:
return "".local return "".local
case .country: case .country:
return "".local return "".local
case .liveInfo: case .liveInfo:
return "".local return "".local
case .hkAndMacaoPassport: case .hkAndMacaoPassport:
return "".local return "".local
case .chinaIdCardInfo: case .chinaIdCardInfo:
return "".local return "".local
case .passPortInfo: case .passPortInfo:
return "".local return "".local
case .spouseInfo: case .spouseInfo:
return "".local return "".local
case .occupationInfo: case .occupationInfo:
return "".local return "".local
case .degreeInfo: case .degreeInfo:
return "".local return "".local
case .inHongKongInfo: case .inHongKongInfo:
return "".local return "".local
case .hkIdentityCardInfo: case .hkIdentityCardInfo:
return "".local return "".local
case .fatherInfo: case .fatherInfo:
return "".local return "".local
case .motherInfo: case .motherInfo:
return "".local return "".local
case .basicInfo: case .basicInfo:
return "".local return "".local
case .childInfo: case .childInfo:
return "".local return "".local
case .brotherInfo:
return "".local
} }
...@@ -315,95 +323,97 @@ class YHFormDetailItem : YHFormItemProtocol { ...@@ -315,95 +323,97 @@ class YHFormDetailItem : YHFormItemProtocol {
func getTitle() -> String { func getTitle() -> String {
switch type { switch type {
case .isAccompanyToHK: case .isAccompanyToHK:
return "是否随行至香港".local return "是否随行至香港".local
case .isLiveTother: case .isLiveTother:
return "是否与主申请人同住".local return "是否与主申请人同住".local
case .nationOrArea: case .nationOrArea:
return String(format: "%@/%@", "国家".local, "地区".local) return String(format: "%@/%@", "国家".local, "地区".local)
case .liveCity: case .liveCity:
return "现居住城市".local return "现居住城市".local
case .detailAddress: case .detailAddress:
return "详细地址".local return "详细地址".local
case .isHandleHKPassPort: case .isHandleHKPassPort:
return "是否办理".local return "是否办理".local
// 证件类别 // 证件类别
case .cetificateType: case .cetificateType:
return "证件类别".local return "证件类别".local
// 证件号码 // 证件号码
case .certificateNumber: case .certificateNumber:
return "中国身份证号".local return "中国身份证号".local
// 签发日期 // 签发日期
case .certificateSignDate: case .certificateSignDate:
return "签发日期".local return "签发日期".local
// 届满日期 // 届满日期
case .certificateValidDate: case .certificateValidDate:
return "届满日期".local return "届满日期".local
case .certificateSignPlace: case .certificateSignPlace:
return "签发地".local return "签发地".local
// 配偶姓名 // 配偶姓名
case .spouseName: case .spouseName:
return "配偶姓名".local return "配偶姓名".local
// 曾用名 // 曾用名
case .everName: case .everName:
return "曾用名".local return "曾用名".local
// 婚前姓氏 // 婚前姓氏
case .befourMarryFirstName: case .befourMarryFirstName:
return "婚前姓氏".local return "婚前姓氏".local
// 出生日期 // 出生日期
case .birthday: case .birthday:
return "出生日期".local return "出生日期".local
// 出生国家/地区 // 出生国家/地区
case .birthNation: case .birthNation:
return "出生国家/地区".local return "出生国家/地区".local
// 出生城市 // 出生城市
case .birthCity: case .birthCity:
return "出生城市".local return "出生城市".local
// 职业 // 职业
case .occupation: case .occupation:
return "职业".local return "职业".local
// 职业名称 // 职业名称
case .occupationName: case .occupationName:
return "职业名称".local return "职业名称".local
// 是否拥有学位 // 是否拥有学位
case .ownDegree: case .ownDegree:
return "是否拥有学位".local return "是否拥有学位".local
// 目前是否在港 // 目前是否在港
case .isNowInHK: case .isNowInHK:
return "目前是否在港".local return "目前是否在港".local
// 获准逗留至 // 获准逗留至
case .stayHKDate: case .stayHKDate:
return "获准逗留至".local return "获准逗留至".local
// 在港身份 // 在港身份
case .roleInHK: case .roleInHK:
return "在港身份".local return "在港身份".local
// 是否办理过(香港身份证) // 是否办理过(香港身份证)
case .isHaveHkIdentityCard: case .isHaveHkIdentityCard:
return "是否办理过".local return "是否办理过".local
// 香港身份证号码 // 香港身份证号码
case .hkIdentityCardNumber: case .hkIdentityCardNumber:
return "香港身份证号码".local return "香港身份证号码".local
case .degreeDetailInfo: case .degreeDetailInfo:
return "学位信息X".local return "学位信息X".local
case .fatherName: case .fatherName:
return "父亲姓名".local return "父亲姓名".local
case .motherName: case .motherName:
return "母亲姓名".local return "母亲姓名".local
case .marriageState: case .marriageState:
return "婚姻状况".local return "婚姻状况".local
case .liveNationOrArea: case .liveNationOrArea:
return "现居住国家/地区".local return "现居住国家/地区".local
case .ownCustody: case .ownCustody:
return "主申请人和现配偶是否拥有孩子抚养权".local return "主申请人和现配偶是否拥有孩子抚养权".local
case .childName: case .childName:
return "子女姓名".local return "子女姓名".local
case .gender: case .gender:
return "性别".local return "性别".local
case .isPreviousMarriageChild: case .isPreviousMarriageChild:
return "是否前次婚姻子女".local return "是否前次婚姻子女".local
case .onlyDoubleChoice: case .brotherName:
return "".local return "兄弟姐妹姓名".local
case .onlyDoubleChoice:
return "".local
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/PickerView/YHFormPickerView.swift
View file @ 6c7e0872
...@@ -493,7 +493,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -493,7 +493,7 @@ extension YHFormPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
} }
} }
// 选中背景色 // 选中背景色
if #available(iOS 14.0, *), self.subviews.count > 1 { if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06) pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
} }
return label return label
......
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