// UI走查

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

@@ -107,43 +107,35 @@ class YHEducationDetailVC: YHBaseViewController {
         
         let title0 = YHFormTitleItem(type: .mainApplicantEducation)
         let item00 = YHFormDetailItem(type: .universityFullName)
-        item00.placeHolder = "请选择学校".local
         item00.tips = "请选择学校".local
         item00.value = detailInfo.college
         
         let item01 = YHFormDetailItem(type: .educationStyle)
-        item01.placeHolder = "请选择授课形式".local
         item01.tips = "请选择授课形式".local
         item01.value = detailInfo.teachingFormat
         
         let item02 = YHFormDetailItem(type: .educationTime)
-        item02.placeHolder = "请选择年月".local
         item02.tips = "请选择年月".local
         item02.value = detailInfo.admissionTime
         
         
         let item03 = YHFormDetailItem(type: .graduateTime)
-        item03.placeHolder = "请选择年月".local
         item03.tips = "请选择年月".local
         item03.value = detailInfo.graduateTime
         
         let item04 = YHFormDetailItem(type: .educationMajor)
-        item04.placeHolder = "请输入专业".local
         item04.tips = "请输入专业".local
         item04.value = detailInfo.major
         
         let item05 = YHFormDetailItem(type: .educationDegree)
-        item05.placeHolder = "请选择学位".local
         item05.tips = "请选择学位".local
         item05.value = detailInfo.degree
         
         let item06 = YHFormDetailItem(type: .degreeType)
-        item06.placeHolder = "请选择学位类型".local
         item06.tips = "请选择学位类型".local
         item06.value = detailInfo.degreeType
 
         let item07 = YHFormDetailItem(type: .educationCountry)
-        item07.placeHolder = "请输入国家及地区".local
         item07.tips = "请输入国家及地区".local
         item07.value = detailInfo.schoolAddress.country
         
@@ -152,14 +144,10 @@ class YHEducationDetailVC: YHBaseViewController {
         if detailInfo.isSchoolInAboard() {
             item08.value = detailInfo.schoolAddress.foreign
             item08.tips = "请输入城市".local
-            item08.placeHolder = "请输入城市".local
-            item08.tips = "请输入城市".local
 
         } else {
             item08.value = detailInfo.schoolAddress.area.joined(separator: ",")
             item08.tips = "请选择城市".local
-            item08.placeHolder = "请选择城市".local
-            item08.tips = "请选择城市".local
         }
         
         let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07, item08]

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

@@ -315,9 +315,10 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         } else {
                             cell.title = "学历标题".local
                         }
-                        cell.detailLabel.text = String(format: "有%d项未填", eduInfo.vacantNum)
+                        let tips = String(format: "有%d项未填", eduInfo.vacantNum)
+                        cell.detailLabel.text = tips
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
-                        cell.detailLabel.textColor = (isNeedShowError && eduInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
+                        cell.setTips(tips, isShow:(isNeedShowError && eduInfo.vacantNum > 0))
                         cell.deleteBlock = {
                             var title = "确定要删除该学历吗?"
                             YHTwoOptionAlertView.showAlertView(message:title) {
@@ -366,12 +367,15 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                     if let qualification = quaInfo.qualification, !qualification.isEmpty {
                         cell.title = qualification
                     }
+                    var tips = ""
                     if quaInfo.vacantNum > 0 {
-                        cell.detailLabel.text = String(format: "有%d项未填", quaInfo.vacantNum)
+                        tips = String(format: "有%d项未填", quaInfo.vacantNum)
+                        cell.detailLabel.text = tips
                     } else {
                         cell.detailLabel.text = "已填完".local
                     }
-                    cell.detailLabel.textColor = (isNeedShowError && quaInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
+                    cell.setTips(tips, isShow:(isNeedShowError && quaInfo.vacantNum > 0))
+
                     cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
                     cell.deleteBlock = {
                         var title = "确定要删除该证书吗?"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -165,12 +165,14 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             }
             if detailItem.type == .isAccompanyToHK 
                 || detailItem.type == .isHandleHKPassPort
-                || detailItem.type == .isLiveTother
-                || detailItem.type == .isLiveOverSeasMore1Year
-                || detailItem.type == .ownCustody
             {
                 return .twoChoice
             }
+            if detailItem.type == .ownCustody
+               || detailItem.type == .isLiveTother
+               || detailItem.type == .isLiveOverSeasMore1Year{
+                return .question
+            }
         }
         return .defaultType
     }
@@ -249,17 +251,6 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
                         self.child?.setNeedHandleHKPassPort(option)
-                        
-                    } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
-                        self.child?.setLiveTother(option)
-                        if option {
-                            self.child?.address.clearAddress()
-                        }
-                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
-                        self.child?.setOverSearsOver1Year(option)
-                        
-                    } else if detailItem.type == .ownCustody { // 抚养权
-                        self.child?.setOwnCustody(option)
                     }
                     self.loadInfo()
                     save()
@@ -308,7 +299,43 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 return cell
+            } else if cellType == .question {
                 
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
+                cell.isMust = detailItem.isNeed
+                cell.title = detailItem.getTitle()
+                
+                var select = false
+                if let value = detailItem.value {
+                   select = Bool(value)!
+                }
+                
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
+                cell.answerArr = answers
+                            
+                cell.answerBlock = {
+                    
+                    [weak self]  (arr, selectIndex) in
+                    
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
+
+                    guard let self = self else { return }
+                    if detailItem.type == .isLiveTother { // 是否与主申请人同住
+                        self.child?.setLiveTother(option)
+                        if option {
+                            self.child?.address.clearAddress()
+                        }
+                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.child?.setOverSearsOver1Year(option)
+                        
+                    } else if detailItem.type == .ownCustody { // 抚养权
+                        self.child?.setOwnCustody(option)
+                    }
+                    self.loadInfo()
+                    save()
+                }
+                return cell
             }
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -19,6 +19,7 @@ enum HKFormItemCellType: Int {
     case addItem = 6
     case degreeDetailInfo = 7
     case onlyTwoChoice = 8
+    case question = 9
     
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -38,6 +38,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
         tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHFormItemQuestionsCell.self, forCellReuseIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier)
         tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         return tableView
@@ -167,7 +168,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             
             // 是否随行到香港 / 是否办理港澳通行证 / // 是否与主申请人同住 均用双项按钮cell
-            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother || detailItem.type == .isLiveOverSeasMore1Year {
+            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
                 cell.isMust = detailItem.isNeed
@@ -215,7 +216,34 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     save()
                 }
                 return cell
+            }
+            
+            if detailItem.type == .isLiveOverSeasMore1Year {
                 
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
+                cell.isMust = detailItem.isNeed
+                cell.title = detailItem.getTitle()
+                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+    
+                var select = false
+                if let value = detailItem.value {
+                   select = Bool(value)!
+                }
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
+                cell.answerArr = answers
+                            
+                cell.answerBlock = {
+                    [weak self]  (arr, selectIndex) in
+                    guard let self = self else { return }
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
+                    if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.spouse?.setOverSearsOver1Year(option)
+                        self.loadInfo()
+                    }
+                    save()
+                }
+                return cell
             }
             
             if detailItem.type == .nationOrArea || detailItem.type == .liveCity  {