// 高才

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCEducationDetailVC.swift

@@ -116,17 +116,6 @@ class YHGCEducationDetailVC: YHBaseViewController {
         }
         item00.value = detailInfo.college
         
-        let item01 = YHFormDetailItem(type: .educationStyle)
-        item01.tips = "请选择授课形式".local
-        item01.placeHolder = "请选择授课形式"
-        item01.value = detailInfo.teachingFormat
-        
-        let item02 = YHFormDetailItem(type: .educationTime)
-        item02.tips = "请选择年月".local
-        item02.placeHolder = "请选择年月".local
-        item02.value = detailInfo.admissionTime
-        
-        
         let item03 = YHFormDetailItem(type: .graduateTime)
         item03.tips = "请选择年月".local
         item03.placeHolder = "请选择年月".local
@@ -137,14 +126,25 @@ class YHGCEducationDetailVC: YHBaseViewController {
         item04.placeHolder = "请选择专业".local
         item04.value = detailInfo.major
         
+        let item01 = YHFormDetailItem(type: .educationStyle)
+        item01.tips = "请选择授课形式".local
+        item01.placeHolder = "请选择授课形式"
+        item01.value = detailInfo.teachingFormat
+        
         let item05 = YHFormDetailItem(type: .educationDegree)
         item05.tips = "请选择学位".local
         item05.placeHolder = "请选择学位".local
         item05.value = detailInfo.degree
         
-        let item06 = YHFormDetailItem(type: .degreeType)
-        item06.tips = "请选择学位类型".local
-        item06.value = detailInfo.degreeType
+//        let item02 = YHFormDetailItem(type: .educationTime)
+//        item02.tips = "请选择年月".local
+//        item02.placeHolder = "请选择年月".local
+//        item02.value = detailInfo.admissionTime
+        
+        
+//        let item06 = YHFormDetailItem(type: .degreeType)
+//        item06.tips = "请选择学位类型".local
+//        item06.value = detailInfo.degreeType
 
         let item07 = YHFormDetailItem(type: .educationCountry)
         item07.tips = "请选择国家及地区".local
@@ -162,7 +162,7 @@ class YHGCEducationDetailVC: YHBaseViewController {
             item08.tips = "请选择城市".local
         }
         
-        let arr0:[YHFormItemProtocol] = [title0, item05, item00, item01, item02, item03, item04, item07]
+        let arr0:[YHFormItemProtocol] = [title0, item00, item03, item04, item05, item07, item08]
         items.append(arr0)
         
         let item10 = YHFormDetailItem(type: .cerConfirm)
@@ -627,8 +627,6 @@ extension YHGCEducationDetailVC {
     func checkIntegrity() -> Bool {
         
         if detailInfo.college.isEmpty
-            || detailInfo.teachingFormat.isEmpty
-            || detailInfo.admissionTime.isEmpty
             || detailInfo.graduateTime.isEmpty
             || detailInfo.major.isEmpty
             || detailInfo.degree.isEmpty
@@ -641,13 +639,13 @@ extension YHGCEducationDetailVC {
             return false
         }
         
-//        if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
-//            return false
-//        }
+        if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
+            return false
+        }
         
-//        if !detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.area.count <= 0 {
-//            return false
-//        }
+        if !detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.area.count <= 0 {
+            return false
+        }
         return true
     }