// 学位类型

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -317,10 +317,11 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                self.navigationController?.pushViewController(vc)
                 
             } else if detailItem.type == .educationStyle { // 授课形式
-                YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
-                    [weak self] selectType in
+                
+                YHSheetPickerView.show(type:.educationStyle, selectTitle:detailInfo.teachingFormat) {
+                    [weak self]  item in
                     guard let self = self else { return }
-                    detailInfo.teachingFormat = selectType.title
+                    detailInfo.teachingFormat = item.title
                     loadInfo()
                     if detailId != 0 {
                         saveDetailInfo(isNeedPop: false, isShowToast:false)
@@ -346,10 +347,10 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 
             } else if detailItem.type == .educationDegree { // 学位
                 
-                YHFormPickerView.show(type: .degree, selectType: .degree(.bachelor)) {
-                    [weak self] selectType in
+                YHSheetPickerView.show(type:.educationDegree, selectTitle:detailInfo.degree) {
+                    [weak self]  item in
                     guard let self = self else { return }
-                    detailInfo.degree = selectType.title
+                    detailInfo.degree = item.title
                     loadInfo()
                     if detailId != 0 {
                         saveDetailInfo(isNeedPop: false, isShowToast:false)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -161,6 +161,18 @@ class YHSheetPickerView: UIView {
                  YHSheetPickerViewItem(title:"博士学位".local, index:3)
                 ],
             
+            // 学位2
+            .educationDegree:
+                [YHSheetPickerViewItem(title:"无学位(专科)".local, index:0),
+                 YHSheetPickerViewItem(title:"无学位(本科)".local, index:1),
+                 YHSheetPickerViewItem(title:"无学位(硕士)".local, index:2),
+                 YHSheetPickerViewItem(title:"无学位(博士)".local, index:3),
+                 YHSheetPickerViewItem(title:"学士学位".local, index:4),
+                 YHSheetPickerViewItem(title:"硕士学位".local, index:5),
+                 YHSheetPickerViewItem(title:"博士学位".local, index:6)
+                ],
+
+            
             // 婚姻
             .marriage:
                 [YHSheetPickerViewItem(title:"未婚".local, index:0),
@@ -171,7 +183,7 @@ class YHSheetPickerView: UIView {
                 ],
     
             // 教育
-            .edution:
+            .educationStyle:
                 [YHSheetPickerViewItem(title:"全日制".local, index:0),
                  YHSheetPickerViewItem(title:"兼职制".local, index:1),
                  YHSheetPickerViewItem(title:"遥距课程".local, index:2),
@@ -343,9 +355,11 @@ extension YHSheetPickerView {
             return ""
         case .degree:
             return "选择学位"
+        case .educationDegree:
+            return "选择学位"
         case .marriage:
             return "选择婚姻状况"
-        case .edution:
+        case .educationStyle:
             return "选择学位"
         case .occupation:
             return "选择职业"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerViewType.swift

@@ -14,12 +14,14 @@ enum YHSheetPickerViewType: Int {
     case none = 0
     // 学位
     case degree
+    // 学位2 (包含无学位类型)
+    case educationDegree
     // 学位有无
     case ownDegree
     // 婚姻
     case marriage
     // 授课形式
-    case edution
+    case educationStyle
     // 职业
     case occupation
     // 职业2