配偶基本信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 		042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBB82B627C0E00F9DE23 /* YHCertificateInfo.swift */; };
 		042FBBBB2B62806D00F9DE23 /* YHCertificateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */; };
 		042FBBBD2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */; };
+		042FBBBF2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -178,6 +179,7 @@
 		042FBBB82B627C0E00F9DE23 /* YHCertificateInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfo.swift; sourceTree = "<group>"; };
 		042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateViewController.swift; sourceTree = "<group>"; };
 		042FBBBC2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemSelectSheetCell.swift; sourceTree = "<group>"; };
+		042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseBasicInfoVC.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>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -361,6 +363,7 @@
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */,
 				041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateViewController.swift */,
+				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -1076,6 +1079,7 @@
 				A5ACE9452B4564F7002C94D2 /* BsHUDContainerView.swift in Sources */,
 				A5ACE93A2B4564F7002C94D2 /* NSAttributedString+Extension.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
+				042FBBBF2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift in Sources */,
 				A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */,
 				041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHCertificateViewController.swift

@@ -178,7 +178,9 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-
+        
+        let vc = YHSpouseBasicInfoVC()
+        self.navigationController?.pushViewController(vc)
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseBasicInfoVC.swift

+//
+//  YHSpouseBasicInfoVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/26.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+enum HKFormItemCellType: Int {
+    
+    case defaultType = 0
+    case title = 1
+    case enterDetail = 2
+    case inputText = 3
+    case selectSheet = 4
+    case twoChoice = 5
+}
+
+class YHSpouseBasicInfoVC: YHBaseViewController {
+    
+    var spouse:YHSpouse?
+    
+    var cardInfo: YHCNIdentityCard?
+        
+    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)
+        
+        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)
+        }
+    }
+    
+    func loadBasicInfo() {
+        
+        let title0 = YHFormTitleItem(type: .spouseInfo)
+        let item01 = YHFormDetailItem(type: .everName)
+        let item02 = YHFormDetailItem(type: .befourMarryFirstName)
+        let item03 = YHFormDetailItem(type: .birthday)
+        let item04 = YHFormDetailItem(type: .birthNation)
+        let item05 = YHFormDetailItem(type: .birthCity)
+        let arr0:[YHFormItemProtocol] = [title0, item01, item02, item03, item04, item05]
+            
+        let title1 = YHFormTitleItem(type: .occupationInfo)
+        let item10 = YHFormDetailItem(type: .occupation)
+        let item11 = YHFormDetailItem(type: .occupationName)
+        let arr1:[YHFormItemProtocol] = [title1, item10, item11]
+        
+        let title2 = YHFormTitleItem(type: .degreeInfo)
+        let item20 = YHFormDetailItem(type: .ownDegree)
+        let arr2:[YHFormItemProtocol] = [title2, item20]
+        
+        let title3 = YHFormTitleItem(type: .hkIdentityCardInfo)
+        let item30 = YHFormDetailItem(type: .isHaveHkIdentityCard)
+        let item31 = YHFormDetailItem(type: .hkIdentityCardNumber)
+        let arr3:[YHFormItemProtocol] = [title3, item30, item31]
+        
+        items.append(contentsOf: [arr0, arr1, arr2, 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 == .spouseName
+               || detailItem.type == .everName
+               || detailItem.type == .befourMarryFirstName
+               || detailItem.type == .occupationName
+               || detailItem.type == .hkIdentityCardNumber
+            {
+                return .inputText
+            }
+            if detailItem.type == .birthday
+                || detailItem.type == .birthCity
+                || detailItem.type == .occupation
+                || detailItem.type == .stayHKDate
+                || detailItem.type == .roleInHK
+                || detailItem.type == .ownDegree
+            {
+                return .selectSheet
+            }
+            if detailItem.type == .birthNation
+                || detailItem.type == .isNowInHK
+                || detailItem.type == .isHaveHkIdentityCard
+            {
+                return .twoChoice
+            }
+        }
+        return .defaultType
+    }
+    
+}
+
+extension YHSpouseBasicInfoVC : 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()
+            let answers = [YHFormChoiceItem(title: "是".local, isSelect: true),
+                           YHFormChoiceItem(title: "否".local, isSelect: false)]
+            cell.answerArr = answers
+            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 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/YHSpouseFormVC.swift

@@ -89,6 +89,7 @@ class YHSpouseFormVC: YHBaseViewController {
             // 居住信息
             let title2 = YHFormTitleItem(type: .liveInfo)
             let item20 = YHFormDetailItem(type: .isLiveTother)
+            item20.isLiveTogether = (spouse.finishFollow == 1)
             let item21 = YHFormDetailItem(type: .liveContry)
             let item22 = YHFormDetailItem(type: .liveCity)
             let item23 = YHFormDetailItem(type: .detailAddress)
@@ -97,9 +98,8 @@ class YHSpouseFormVC: YHBaseViewController {
             // 港澳通信证
             let title3 = YHFormTitleItem(type: .getHKPassport)
             let item30 = YHFormDetailItem(type: .hkPassport)
-            item30.isHandleHkPassport = true
+            item30.isHandleHkPassport = (spouse.isHandled == 1)
             let arr3:[YHFormItemProtocol] = [title3, item30]
-
             items.append(contentsOf:[arr1, arr2, arr3])
 
         }
@@ -224,6 +224,8 @@ extension YHSpouseFormVC : UITableViewDelegate, UITableViewDataSource {
                         
                     } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
                         let isLiveTother = (selectItem.title == "是".local ? 1 : 0)
+                        self?.spouse?.finishFollow = (selectItem.title == "是".local ? 1 : 0)
+                        self?.loadSponseInfo()
                     }
                 }
                 return cell

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -32,6 +32,18 @@ enum YHFormTitleItemType:Int {
     case chinaIdCardInfo = 9
     // 护照
     case passPortInfo = 10
+    
+    // 配偶信息
+    case spouseInfo = 11
+    // 职业信息
+    case occupationInfo = 12
+    // 学历学位信息
+    case degreeInfo = 13
+    // 在港信息
+    case inHongKongInfo = 14
+    // 香港身份证
+    case hkIdentityCardInfo = 15
+    
 }
 
 // 表单添加条目类型
@@ -63,6 +75,35 @@ enum YHFormDetailItemType:Int {
     // 签发地
     case certificateSignPlace = 12
     
+    // 配偶姓名
+    case spouseName = 13
+    // 曾用名
+    case everName = 14
+    // 婚前姓氏
+    case befourMarryFirstName = 15
+    // 出生日期
+    case birthday = 16
+    // 出生国家/地区
+    case birthNation = 17
+    // 出生城市
+    case birthCity = 18
+    // 职业
+    case occupation = 19
+    // 职业名称
+    case occupationName = 20
+    // 是否拥有学位
+    case ownDegree = 21
+    // 目前是否在港
+    case isNowInHK = 22
+    // 获准逗留至
+    case stayHKDate = 23
+    // 在港身份
+    case roleInHK = 24
+    // 是否办理过(香港身份证)
+    case isHaveHkIdentityCard = 25
+    // 香港身份证号码
+    case hkIdentityCardNumber = 26
+    
 }
 
 //添加item
@@ -120,6 +161,16 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "中国身份证".local
             case .passPortInfo:
                 return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local)
+            case .spouseInfo:
+                return "配偶信息".local
+            case .occupationInfo:
+                return "职业信息".local
+            case .degreeInfo:
+                return "学历学位信息".local
+            case .inHongKongInfo:
+                return "在港信息".local
+            case .hkIdentityCardInfo:
+                return "香港身份证".local
             
         }
     }
@@ -146,6 +197,16 @@ class YHFormTitleItem : YHFormItemProtocol {
                 return "".local
             case .passPortInfo:
                 return "".local
+            case .spouseInfo:
+                return "".local
+            case .occupationInfo:
+                return "".local
+            case .degreeInfo:
+                return "".local
+            case .inHongKongInfo:
+                return "".local
+            case .hkIdentityCardInfo:
+                return "".local
             
             
         }
@@ -213,6 +274,48 @@ class YHFormDetailItem : YHFormItemProtocol {
             return "届满日期".local
         case .certificateSignPlace:
             return "签发地".local
+        // 配偶姓名
+        case .spouseName:
+            return "配偶姓名".local
+            // 曾用名
+        case .everName:
+            return "曾用名".local
+            // 婚前姓氏
+        case .befourMarryFirstName:
+            return "婚前姓氏".local
+            // 出生日期
+        case .birthday:
+            return "出生日期".local
+            // 出生国家/地区
+        case .birthNation:
+            return "出生国家/地区".local
+            // 出生城市
+        case .birthCity:
+            return "出生城市".local
+            // 职业
+        case .occupation:
+            return "职业".local
+            // 职业名称
+        case .occupationName:
+            return "职业名称".local
+            // 是否拥有学位
+        case .ownDegree:
+            return "是否拥有学位".local
+            // 目前是否在港
+        case .isNowInHK:
+            return "目前是否在港".local
+            // 获准逗留至
+        case .stayHKDate:
+            return "获准逗留至".local
+            // 在港身份
+        case .roleInHK:
+            return "在港身份".local
+            // 是否办理过(香港身份证)
+        case .isHaveHkIdentityCard:
+            return "是否办理过".local
+            // 香港身份证号码
+        case .hkIdentityCardNumber:
+            return "香港身份证号码".local
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormItemDoubleChoiceCell.swift

@@ -80,8 +80,6 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
         btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
     }
     
-    
-    
     lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#333333")