// 选择器

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

@@ -129,7 +129,9 @@ class YHSpouseBasicInfoVC: YHBaseViewController {
         // 职业信息
         let title2 = YHFormTitleItem(type: .degreeInfo)
         let item20 = YHFormDetailItem(type: .ownDegree)
-        
+        item20.placeHolder = "请选择".local
+        item20.value = spouse.hasDegreeStr()
+
 //        let item21 = YHFormDetailItem(type: .degreeDetailInfo)
 //        let item22 = YHFormDetailItem(type: .degreeDetailInfo)
         
@@ -462,6 +464,16 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     self.spouse?.occupation = selectType.title
                     self.loadBasicInfo()
                 }
+            } else if detailItem.type == .ownDegree {
+                let hasDegree = self.spouse?.hasDegree ?? "无学位"
+                YHFormPickerView.show(type: .ownDegree, selectTitle:hasDegree ) {
+                    [weak self] selectType in
+                    guard let self = self else { return }
+                    let ownDegree = (selectType.title == YHFormPickerViewSubType.ownDegree(.hasDegree).title)
+                    self.spouse?.setHasDegree(ownDegree)
+                    self.loadBasicInfo()
+                }
+                
             }
         }
     }

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

@@ -346,7 +346,7 @@ extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
                  }
                 self.present(vc, animated: true)
 
-            }
+            } 
         }
     }
         

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

@@ -465,6 +465,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var orderId: Int = 0
     // 关系 1父亲  2母亲 3配偶 4子女 5兄弟姐妹
     var relation: String?
+    // 是否拥有学位
     var hasDegree: String?
     
     // mark any
@@ -660,6 +661,20 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         self.childHasHkId?.has = value ?  "Y" : "N"
     }
     
+    // 是否拥有学位
+    func hasDegreeStr() -> String? {
+        if hasDegree == "1" {
+            return "有学位"
+        } else {
+            return "无学位"
+        }
+    }
+    
+    func setHasDegree(_ val:Bool) {
+        self.hasDegree = val ? "1" : "0"
+    }
+    
+    
     var relationType:YHFamilyMemberType {
         
         if relation == "1" {

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

@@ -32,6 +32,8 @@ enum YHFormPickerViewType: Int {
     case none = 0
     // 学位
     case degree
+    // 学位有无
+    case ownDegree
     // 婚姻
     case marriage
     // 授课形式
@@ -44,6 +46,7 @@ enum YHFormPickerViewType: Int {
     case certificate
     // 在港身份
     case identity
+    
 }
 
 enum YHFormPickerViewSubType {
@@ -51,6 +54,7 @@ enum YHFormPickerViewSubType {
     case none
     case marriage(YHPickerViewMarriageType)
     case degree(YHPickerViewDegreeType)
+    case ownDegree(YHPickerViewHasDegreeType)
     case education(YHPickerViewEducationType)
     case occupation(YHPickerViewOccupationType)
     case gender(YHPickerViewGenderType)
@@ -62,6 +66,11 @@ enum YHFormPickerViewSubType {
             
         case .none:
             return "".local
+        
+        case .ownDegree(.hasDegree):
+            return "有学位".local
+        case .ownDegree(.noDegree):
+            return "无学位".local
             
         case .marriage(.unmarriage):
             return "未婚".local
@@ -217,6 +226,13 @@ enum YHPickerViewIdentityType {
     case other
 }
 
+enum YHPickerViewHasDegreeType {
+    // 无学位
+    case noDegree
+    // 有学位
+    case hasDegree
+}
+
 
 class YHFormPickerViewItem {
     
@@ -373,6 +389,11 @@ class YHFormPickerView: UIView {
              YHFormPickerViewItem(type: .identity(.residence)),
              YHFormPickerViewItem(type: .identity(.visit)),
              YHFormPickerViewItem(type: .identity(.other))],
+            
+            .ownDegree:
+            [YHFormPickerViewItem(type: .ownDegree(.noDegree)),
+             YHFormPickerViewItem(type: .ownDegree(.hasDegree))]
+                                      
         ]
     }()
     
@@ -519,6 +540,8 @@ class YHFormPickerView: UIView {
             return "选择证件"
         case .identity:
             return "选择在港身份"
+        case .ownDegree:
+            return "是否拥有学位"
         }
     }
 }
@@ -583,8 +606,10 @@ extension YHFormPickerView {
        guard let title = title else { return .none }
        
         switch type {
+            
         case .none:
             return .none
+            
         case .degree:
             if title == "学士学位".local {
                 return .degree(.bachelor)
@@ -657,6 +682,13 @@ extension YHFormPickerView {
             } else if title == "其他".local {
                 return .identity(.other)
             }
+            
+        case .ownDegree:
+            if title == "无学位".local {
+                return .ownDegree(.noDegree)
+            } else if title == "有学位".local {
+                return .ownDegree(.hasDegree)
+            }
         }
         return .none
    }