Skip to content

G
galaxy-iOS
Commit 82f03788 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 高才

parent 3cd4cb60
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 66 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 82f03788
......@@ -1126,6 +1126,7 @@
04AE203B2D13C01B00891D24 /* YHGCEducationInfoListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */; };
04AE203D2D13C14900891D24 /* YHGCEducationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */; };
04AE203F2D13C36500891D24 /* YHGCQualificationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */; };
04AE20432D1907E300891D24 /* YHGCEducationCerUploadCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20422D1907E300891D24 /* YHGCEducationCerUploadCell.swift */; };
04EA376D2BEA06EF00DBAF64 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376C2BEA06EF00DBAF64 /* WebKit.framework */; };
04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
......@@ -2290,6 +2291,7 @@
04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationInfoListVC.swift; sourceTree = "<group>"; };
04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationDetailVC.swift; sourceTree = "<group>"; };
04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCQualificationDetailVC.swift; sourceTree = "<group>"; };
04AE20422D1907E300891D24 /* YHGCEducationCerUploadCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationCerUploadCell.swift; sourceTree = "<group>"; };
04EA376C2BEA06EF00DBAF64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
......@@ -6122,6 +6124,7 @@
04AE20382D13BAC400891D24 /* Education&Qualification(学历专业资格填写) */ = {
isa = PBXGroup;
children = (
04AE20412D1907CD00891D24 /* V */,
04AE20392D13C00400891D24 /* C */,
);
path = "Education&Qualification(学历专业资格填写)";
......@@ -6137,6 +6140,14 @@
path = C;
sourceTree = "<group>";
};
04AE20412D1907CD00891D24 /* V */ = {
isa = PBXGroup;
children = (
04AE20422D1907E300891D24 /* YHGCEducationCerUploadCell.swift */,
);
path = V;
sourceTree = "<group>";
};
04E86E212B81E9FA00A35F4B /* Recovered References */ = {
isa = PBXGroup;
children = (
......@@ -6909,6 +6920,7 @@
045C11612D12CA5F00BD2DC0 /* YHCNIDCardModel.swift in Sources */,
047A96832D1674010033BB4E /* YHGCSchemeTableViewCell.swift in Sources */,
045C11622D12CA5F00BD2DC0 /* YHPrincipleUploadModel.swift in Sources */,
04AE20432D1907E300891D24 /* YHGCEducationCerUploadCell.swift in Sources */,
045C11632D12CA5F00BD2DC0 /* YHResignCertificateEvisaTableViewCell.swift in Sources */,
045C11642D12CA5F00BD2DC0 /* YHFormItemTitleCell.swift in Sources */,
045C11652D12CA5F00BD2DC0 /* YHCertificateNameCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift
View file @ 82f03788
......@@ -21,7 +21,8 @@ enum HKFormItemCellType: Int {
case onlyTwoChoice = 8
case question = 9
case cerConfirm = 10
case cerConfirm = 10
case cerUpload = 11
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ 82f03788
......@@ -192,6 +192,8 @@ enum YHFormDetailItemType:Int {
case educationCity
// 证件提供确认
case cerConfirm
// 学历证件上传
case cerUpload
// 证书信息
case certificateInfo
......@@ -527,9 +529,9 @@ class YHFormDetailItem : YHFormItemProtocol {
return "颁授城市".local
case .cerConfirm:
return "证件提供确认".local
case .cerUpload:
return ""
}
}
func getSubTitle() -> String {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCEducationDetailVC.swift
View file @ 82f03788
......@@ -43,7 +43,7 @@ class YHGCEducationDetailVC: YHBaseViewController {
tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
tableView.register(YHEducationCertificateConfirmCell.self, forCellReuseIdentifier: YHEducationCertificateConfirmCell.cellReuseIdentifier)
tableView.register(YHGCEducationCerUploadCell.self, forCellReuseIdentifier: YHGCEducationCerUploadCell.cellReuseIdentifier)
return tableView
}()
......@@ -165,7 +165,7 @@ class YHGCEducationDetailVC: YHBaseViewController {
let arr0:[YHFormItemProtocol] = [title0, item00, item03, item04, item05, item07, item08]
items.append(arr0)
let item10 = YHFormDetailItem(type: .cerConfirm)
let item10 = YHFormDetailItem(type: .cerUpload)
let arr1:[YHFormItemProtocol] = [item10]
items.append(arr1)
......@@ -282,35 +282,9 @@ extension YHGCEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
return cell
} else if cellType == .cerConfirm {
} else if cellType == .cerUpload {
let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationCertificateConfirmCell.cellReuseIdentifier, for: indexPath) as! YHEducationCertificateConfirmCell
cell.isCheck = isNeedShowError
var isSelectTrue = false
var isSelectFalse = false
let isCerConfirm = detailInfo.certConfirm
if isCerConfirm == 1 {
isSelectTrue = true
isSelectFalse = false
} else if isCerConfirm == 2 {
isSelectFalse = true
isSelectTrue = false
}
let answers = [YHFormChoiceItem(title: "是".local, isSelect: isSelectTrue),
YHFormChoiceItem(title: "否".local, isSelect: isSelectFalse)]
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)
detailInfo.certConfirm = option ? 1 : 2
self.tableView.reloadData()
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHGCEducationCerUploadCell.cellReuseIdentifier, for: indexPath) as! YHGCEducationCerUploadCell
return cell
}
}
......@@ -556,8 +530,8 @@ extension YHGCEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
if item is YHFormDetailItem {
let detailItem = item as! YHFormDetailItem
if detailItem.type == .cerConfirm {
return .cerConfirm
if detailItem.type == .cerUpload {
return .cerUpload
}
// 学位选择：学士学位，
......@@ -635,9 +609,9 @@ extension YHGCEducationDetailVC {
return false
}
if detailInfo.certConfirm == 0 { // 证件提供确认
return false
}
// if detailInfo.certConfirm == 0 { // 证件提供确认
// return false
// }
if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
return false
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHGCEducationInfoListVC.swift
View file @ 82f03788
......@@ -128,28 +128,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)
......@@ -166,8 +166,6 @@ class YHGCEducationInfoListVC: YHBaseViewController {
}
}
items.append(arr2)
self.tableView.reloadData()
}
}
......@@ -252,12 +250,12 @@ 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)
} else if detailItem.type == .addCertificateInfo { // 证书
let vc = YHQualificationDetailVC()
let vc = YHGCQualificationDetailVC()
vc.orderId = self.orderId
self.navigationController?.pushViewController(vc)
}
......@@ -456,7 +454,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
......@@ -466,7 +464,7 @@ extension YHGCEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
return
}
if detailItem.type == .certificateInfo { // 证书
let vc = YHQualificationDetailVC()
let vc = YHGCQualificationDetailVC()
if let quaList = educationInfo?.quaList, indexPath.row-1 < quaList.count {
let quaInfo = quaList[indexPath.row-1]
vc.detailId = quaInfo.id
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/V/YHGCEducationCerUploadCell.swift 0 → 100644
View file @ 82f03788
//
// 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"
lazy var titleLabel: UILabel = {
let label = UILabel()
let aa: ASAttributedString = .init("学历证件(选填)", .font(UIFont.PFSC_M(ofSize: 17)), .foreground(UIColor.mainTextColor))
label.attributed.text = aa
return label
}()
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(titleLabel)
contentView.addSubview(topLine)
contentView.addSubview(tipsLabel)
contentView.addSubview(uploadContentView)
uploadContentView.addSubview(uploadTitleLabel)
uploadContentView.addSubview(uploadLabel)
uploadContentView.addSubview(arrowImgV)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(23)
make.height.equalTo(24)
}
topLine.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(16)
make.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)
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment