// 学历资格

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -495,6 +495,8 @@
 		047F3DCD2CE2F96E001B2A6D /* YHGCFamilyMemberInfoListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DCC2CE2F96E001B2A6D /* YHGCFamilyMemberInfoListVC.swift */; };
 		047F3DCF2CE2FB64001B2A6D /* YHGCCertificateUploadVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DCE2CE2FB64001B2A6D /* YHGCCertificateUploadVC.swift */; };
 		047F3DD12CE2FB81001B2A6D /* YHGCCertificateInfoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DD02CE2FB81001B2A6D /* YHGCCertificateInfoController.swift */; };
+		047F3DD52CE446F6001B2A6D /* YHGCEducationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DD42CE446F6001B2A6D /* YHGCEducationDetailVC.swift */; };
+		047F3DD72CE44E02001B2A6D /* YHGCEducationCerUploadCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DD62CE44E02001B2A6D /* YHGCEducationCerUploadCell.swift */; };
 		0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */; };
 		048058312C7DBDC900502CAA /* YHTravelCertificateTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */; };
 		048058332C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */; };
@@ -1488,6 +1490,8 @@
 		047F3DCC2CE2F96E001B2A6D /* YHGCFamilyMemberInfoListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCFamilyMemberInfoListVC.swift; sourceTree = "<group>"; };
 		047F3DCE2CE2FB64001B2A6D /* YHGCCertificateUploadVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCertificateUploadVC.swift; sourceTree = "<group>"; };
 		047F3DD02CE2FB81001B2A6D /* YHGCCertificateInfoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCertificateInfoController.swift; sourceTree = "<group>"; };
+		047F3DD42CE446F6001B2A6D /* YHGCEducationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationDetailVC.swift; sourceTree = "<group>"; };
+		047F3DD62CE44E02001B2A6D /* YHGCEducationCerUploadCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationCerUploadCell.swift; sourceTree = "<group>"; };
 		0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDisappointHKAlertView.swift; sourceTree = "<group>"; };
 		048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsView.swift; sourceTree = "<group>"; };
 		048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsCell.swift; sourceTree = "<group>"; };
@@ -3614,6 +3618,7 @@
 		047F3DB32CDF3728001B2A6D /* V */ = {
 			isa = PBXGroup;
 			children = (
+				047F3DD62CE44E02001B2A6D /* YHGCEducationCerUploadCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -3622,6 +3627,7 @@
 			isa = PBXGroup;
 			children = (
 				047F3DB52CDF3898001B2A6D /* YHGCEducationInfoListVC.swift */,
+				047F3DD42CE446F6001B2A6D /* YHGCEducationDetailVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -6315,6 +6321,7 @@
 				04F2435F2C9D1C0600DF2C74 /* YHHKRecordsStayingPersonnelCell.swift in Sources */,
 				A5EB6C732C69FB9A0081FB6C /* YHOffivialApprovalSuccessCheckView.swift in Sources */,
 				04FD85682C21277800BEF9C5 /* YHMyNameCardAvatarInfoCell.swift in Sources */,
+				047F3DD52CE446F6001B2A6D /* YHGCEducationDetailVC.swift in Sources */,
 				A566A79A2C219FA400980D06 /* YHHomeSalonAreaView.swift in Sources */,
 				04213B312C4917BD00797900 /* YHHomeInfoDetailViewController.swift in Sources */,
 				A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
@@ -6337,6 +6344,7 @@
 				A567E5A82BD7643D00D5D5A0 /* YHHomeWebBottomButton.swift in Sources */,
 				045EEEC02B9F171A0022A143 /* YHOtherInfoFillViewModel.swift in Sources */,
 				045EEEF22B9F171A0022A143 /* YHChildBasicInfoVC.swift in Sources */,
+				047F3DD72CE44E02001B2A6D /* YHGCEducationCerUploadCell.swift in Sources */,
 				A567E5A22BD7643D00D5D5A0 /* YHConfigManager.swift in Sources */,
 				044EE2532C9565FF00A2FE3A /* YHResignGuidelinesExampleShareViewController.swift in Sources */,
 				0418921F2C91BAAC00B9FB94 /* YHBaseDynamicCornerRadiusView.swift in Sources */,

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

@@ -20,6 +20,7 @@ enum HKFormItemCellType: Int {
     case degreeDetailInfo = 7
     case onlyTwoChoice = 8
     case question = 9
+    case educationCerUpload = 10
     
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -70,6 +70,8 @@ enum YHFormTitleItemType:Int, CaseIterable {
     case mainApplicantProfessionalQualification
     // 学历证书姓名及出生日期正确性
     case edutionalCertificateNameAndBirthday
+    // 学历证件(选填)
+    case educationCertificate
 
 
     
@@ -190,6 +192,8 @@ enum YHFormDetailItemType:Int {
     case educationCountry
     // 上课城市
     case educationCity
+    // 学历证件上传
+    case educationCerUpload
     
     // 证书信息
     case certificateInfo
@@ -294,7 +298,8 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "主申请人专业资格及会员资格".local
         case .edutionalCertificateNameAndBirthday:
             return "学历证书姓名及出生日期正确性".local
-            
+        case .educationCertificate:
+            return "学历证件(选填)".local
         }
     }
     
@@ -314,6 +319,8 @@ class YHFormTitleItem : YHFormItemProtocol {
             return "(如有，非必填）".local
         case .edutionalCertificateNameAndBirthday:
             return "".local
+        case .educationCertificate:
+            return "".local
         case .isPreviousMarriageChild:
             return "".local
         case .accompany:
@@ -523,6 +530,8 @@ class YHFormDetailItem : YHFormItemProtocol {
             return "颁授国家/地区".local
         case .conferCity:
             return "颁授城市".local
+        case .educationCerUpload:
+            return "".local
         }
 
     }

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

@@ -129,28 +129,28 @@ class YHGCEducationInfoListVC: YHBaseViewController {
         items.append(arr0)
         
         // 主申请人专业资格及会员资格
-        let title1 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
-        var arr1:[YHFormItemProtocol] = [title1]
-        if let quaList = educationInfo.quaList {
-            for (index, quaInfo) in quaList.enumerated() {
-                let item = YHFormDetailItem(type: .certificateInfo)
-                arr1.append(item)
-            }
-            // 多专业可编辑删除状态
-            if quaList.count <= 0 {
-                isQualificationEditMode = .none
-            } else {
-                if isQualificationEditMode == .none {
-                    isQualificationEditMode = .canEdit
-                }
-            }
-        } else {
-            isQualificationEditMode = .none
-        }
-        
-        // 新增学历信息
-        arr1.append(YHFormAddItem(type: .addCertificateInfo))
-        items.append(arr1)
+//        let title1 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
+//        var arr1:[YHFormItemProtocol] = [title1]
+//        if let quaList = educationInfo.quaList {
+//            for (index, quaInfo) in quaList.enumerated() {
+//                let item = YHFormDetailItem(type: .certificateInfo)
+//                arr1.append(item)
+//            }
+//            // 多专业可编辑删除状态
+//            if quaList.count <= 0 {
+//                isQualificationEditMode = .none
+//            } else {
+//                if isQualificationEditMode == .none {
+//                    isQualificationEditMode = .canEdit
+//                }
+//            }
+//        } else {
+//            isQualificationEditMode = .none
+//        }
+        
+        // 新增证书信息
+//        arr1.append(YHFormAddItem(type: .addCertificateInfo))
+//        items.append(arr1)
         
         // 学历证书姓名及出生日期正确性
         let title2 = YHFormTitleItem(type: .edutionalCertificateNameAndBirthday)
@@ -160,11 +160,11 @@ class YHGCEducationInfoListVC: YHBaseViewController {
         for questionInfo in questions {
             if questionInfo.key == "qualification" {
                 questionInfo.answer = educationInfo.isNameSame
+                arr2.append(questionInfo)
                 
             } else if questionInfo.key == "graduate" {
                 questionInfo.answer = educationInfo.isSpouseNameSame
             }
-            arr2.append(questionInfo)
         }
         items.append(arr2)
         
@@ -253,7 +253,7 @@ extension YHGCEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                 guard let self = self else { return }
                 
                 if detailItem.type == .addEducation { // 学历
-                    let vc = YHEducationDetailVC()
+                    let vc = YHGCEducationDetailVC()
                     vc.orderId = self.orderId
                     self.navigationController?.pushViewController(vc)
                     
@@ -457,7 +457,7 @@ extension YHGCEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
         if item is YHFormDetailItem {
             let detailItem = item as! YHFormDetailItem
             if detailItem.type == .educationInfo { // 学历
-                let vc = YHEducationDetailVC()
+                let vc = YHGCEducationDetailVC()
                 if let eduList = educationInfo?.eduList, indexPath.row-1 < eduList.count {
                     let eduInfo = eduList[indexPath.row-1]
                     vc.detailId = eduInfo.id
@@ -603,16 +603,16 @@ extension YHGCEducationInfoListVC {
             }
         }
         // 检查所有证书信息是否有未填项
-        if let quaList = educationInfo.quaList, quaList.count > 0 {
-            for quaInfo in quaList {
-                if quaInfo.vacantNum > 0 {
-                    return false
-                }
-            }
-        }
+//        if let quaList = educationInfo.quaList, quaList.count > 0 {
+//            for quaInfo in quaList {
+//                if quaInfo.vacantNum > 0 {
+//                    return false
+//                }
+//            }
+//        }
         
         // 检查所有问题是否有未答项
-        if educationInfo.isNameSame == nil || educationInfo.isSpouseNameSame == nil {
+        if educationInfo.isNameSame == nil {
             return false
         }
         return true

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

+//
+//  YHGCEducationCerUploadCell.swift
+//  galaxy
+//
+//  Created by Dufet on 2024/11/13.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHGCEducationCerUploadCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHGCEducationCerUploadCell"
+    
+    private lazy var topLine:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.init(hex: 0xE9ECF0)
+        return view
+    }()
+    
+    lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        let aa: ASAttributedString = .init("备注：为了进一步确认您的具体信息，如有相关", .font(UIFont.PFSC_R(ofSize: 13)), .foreground(UIColor.init(hex: 0x8993A2)))
+        let bb: ASAttributedString = .init("学士学位证明文件", .font(UIFont.PFSC_R(ofSize: 13)), .foreground(UIColor.brandMainColor))
+        let cc: ASAttributedString = .init("，请优先在列表上传。", .font(UIFont.PFSC_R(ofSize: 13)), .foreground(UIColor.init(hex: 0x8993A2)))
+        label.attributed.text = aa + bb + cc
+        return label
+    }()
+    
+    lazy var uploadContentView: UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    lazy var uploadTitleLabel: UILabel = {
+        let label = UILabel()
+        let aa: ASAttributedString = .init("上传学历证件", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.mainTextColor))
+        label.attributed.text = aa
+        return label
+    }()
+    
+    lazy var uploadLabel: UILabel = {
+        let label = UILabel()
+        label.textAlignment = .right
+        let aa: ASAttributedString = .init("去上传", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor.brandMainColor))
+        label.attributed.text = aa
+        return label
+    }()
+    
+    lazy var arrowImgV: UIImageView = {
+        let imgV = UIImageView(image: UIImage(named: "blue_right_arrow"))
+        return imgV
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        contentView.addSubview(topLine)
+        contentView.addSubview(tipsLabel)
+        contentView.addSubview(uploadContentView)
+        uploadContentView.addSubview(uploadTitleLabel)
+        uploadContentView.addSubview(uploadLabel)
+        uploadContentView.addSubview(arrowImgV)
+        
+        topLine.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(0.5)
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(topLine.snp.bottom).offset(16)
+        }
+        
+        uploadContentView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(tipsLabel.snp.bottom).offset(12)
+            make.height.equalTo(52)
+            make.bottom.equalTo(-4)
+        }
+        
+        uploadTitleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview()
+            make.height.equalTo(20)
+        }
+        
+        arrowImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(20)
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-20)
+        }
+        
+        uploadLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(arrowImgV.snp.left)
+            make.height.equalTo(20)
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/YHGCFamilyMemberInfoListVC.swift

@@ -206,6 +206,7 @@ class YHGCFamilyMemberInfoListVC: YHBaseViewController {
 //        }
 //        items.append(brotherArr)
         
+        
         let childCount = familyMemberInfo?.child?.count ?? 0
         if childCount <= 0 {
             isChildsEditMode = .none