Skip to content

G
galaxy-iOS
Commit 3f2e6c85 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130 

* 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  方案
  // 方案
  添加收入记录入口
  //  学历
parents 21b1fb3c 91d55b6b
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 34 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 3f2e6c85
......@@ -513,10 +513,10 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
}
else if tapIndex == 5 {
//收入记录
// let vc = YHOtherInfoFillViewController()
// vc.orderId = orderId
// navigationController?.pushViewController(vc)
YHHUD.flash(message: "这里完善 收入记录 跳转逻辑")
if let orderId = orderId {
let ctl = YHIncomeRecordViewController(orderId: orderId)
navigationController?.pushViewController(ctl)
}
}
else if tapIndex == 6 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift
View file @ 3f2e6c85
......@@ -56,6 +56,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
make.width.equalTo(14)
make.height.equalTo(24)
make.centerY.equalTo(greetLabel)
make.right.lessThanOrEqualTo(-24)
}
tipsLabel.snp.makeConstraints { make in
......@@ -72,6 +73,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
label.font = UIFont.PFSC_B(ofSize: 24)
label.textColor = .init(hex: 0xFFDEC8)
label.text = "尊敬的先生"
// label.lineBreakMode = .byTruncatingMiddle
return label
}()
......@@ -186,7 +188,13 @@ class YHImproveSchemeViewController: YHBaseViewController {
items.removeAll()
items.append(contentsOf: viewModel.improveDetailModel.improvePlanItem)
tableView.reloadData()
greetLabel.text = "尊敬的\(viewModel.improveDetailModel.username)\(viewModel.improveDetailModel.sex)"
viewModel.improveDetailModel.username = "一二三十五阿萨法"
var name = viewModel.improveDetailModel.username
if name.count > 5 {
name = String(name.prefix(5)) + "..."
}
greetLabel.text = "尊敬的\(name)\(viewModel.improveDetailModel.sex)"
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift
View file @ 3f2e6c85
......@@ -103,7 +103,8 @@ class YHMyNewSchemeViewController: YHBaseViewController {
titleLabel.snp.makeConstraints { make in
make.top.equalTo(27)
make.height.equalTo(34)
make.centerX.equalToSuperview()
make.left.equalTo(subTitleLabel)
make.right.equalTo(subTitleLabel)
}
subTitleLabel.snp.makeConstraints { make in
......@@ -120,6 +121,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
label.font = UIFont.PFSC_B(ofSize: 24)
label.textColor = .white
label.text = "尊敬的先生"
label.lineBreakMode = .byTruncatingMiddle
return label
}()
......@@ -264,6 +266,11 @@ class YHMyNewSchemeViewController: YHBaseViewController {
return $0.standardKey
}
if selectKeys.count <= 0 {
YHHUD.flash(message: "请选择必填项")
return
}
YHHUD.show(.progress(message: "提交中..."))
viewModel.postSelectImproveTargets(orderId: orderId, targets: selectKeys) {
[weak self] success, error in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHDocumentListCell.swift
View file @ 3f2e6c85
......@@ -43,10 +43,16 @@ class YHDocumentListCell: UITableViewCell {
lazy var tips1Label: UILabel = {
let label = UILabel()
label.numberOfLines = 0
let aa: ASAttributedString = .init("您的文书清单，包括推荐信、赴港计划书。文书编写后会发送至APP【我的文书】，与您一起沟通定稿，预计", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("3周-4周", .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
let cc: ASAttributedString = .init("左右完成，需要咱们共同配合完成噢", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
label.attributed.text = aa+bb+cc
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let a = NSMutableAttributedString(string: "您的文书清单，包括推荐信、赴港计划书。文书编写后会发送至APP【我的文书】，与您一起沟通定稿，预计", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_R(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
let b = NSMutableAttributedString(string: "3周-4周", attributes: [NSAttributedString.Key.foregroundColor : UIColor.init(hex: 0xD48638), NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
let c = NSMutableAttributedString(string: "左右完成，需要咱们共同配合完成噢", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_R(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
a.append(b)
a.append(c)
label.attributedText = a
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeCell.swift
View file @ 3f2e6c85
......@@ -42,9 +42,13 @@ class YHImproveSchemeCell: UITableViewCell {
lazy var tips1Label: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = UIColor.mainTextColor
label.numberOfLines = 0
let aa: ASAttributedString = .init("已根据港府甄选条件，为您规划后续提升方案，您可根据实际情况进行提升~", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
label.attributed.text = aa
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle]
label.attributedText = NSAttributedString(string: "已根据港府甄选条件，为您规划后续提升方案，您可根据实际情况进行提升~", attributes: attributes)
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHIndustryLocationCell.swift
View file @ 3f2e6c85
......@@ -48,7 +48,10 @@ class YHIndustryLocationCell: UITableViewCell {
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .mainTextColor
label.numberOfLines = 0
label.text = "根据您目前给来的材料，初步建议您申请的行业："
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle]
label.attributedText = NSAttributedString(string: "根据您目前给来的材料，初步建议您申请的行业：", attributes: attributes)
return label
}()
......@@ -65,8 +68,11 @@ class YHIndustryLocationCell: UITableViewCell {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .init(hex: 0x8993A2)
label.numberOfLines = 0
label.text = "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。"
label.numberOfLines = 0
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle]
label.attributedText = NSAttributedString(string: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", attributes: attributes)
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHMaterialListCell.swift
View file @ 3f2e6c85
......@@ -43,10 +43,16 @@ class YHMaterialListCell: UITableViewCell {
lazy var tips1Label: UILabel = {
let label = UILabel()
label.numberOfLines = 0
let aa: ASAttributedString = .init("这是您的资料清单，请您前往查看。请您在", .font(UIFont.PFSC_R(ofSize: 14)), .foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("1-2周内", .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.init(hex: 0xD48638)))
let cc: ASAttributedString = .init("上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
label.attributed.text = aa+bb+cc
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let a = NSMutableAttributedString(string: "这是您的资料清单，请您前往查看。请您在", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_R(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
let b = NSMutableAttributedString(string: "1-2周内", attributes: [NSAttributedString.Key.foregroundColor : UIColor.init(hex: 0xD48638), NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
let c = NSMutableAttributedString(string: "上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_R(ofSize: 14), NSAttributedString.Key.paragraphStyle: paragraphStyle])
a.append(b)
a.append(c)
label.attributedText = a
return label
}()
......@@ -55,7 +61,11 @@ class YHMaterialListCell: UITableViewCell {
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .init(hex: 0x8993A2)
label.numberOfLines = 0
label.text = "(1)港澳通如未办理，请优先安排办理；\n(2)如为国内学校，需准备由教育部学信网出具的学位认证报告；\n(3)如为海外学校，需准备官方成绩单和第三方机构学位认证文件；\n(4)赴港同意书，在获批后1个月内，由您获批时在职公司盖章出具即可（目前不需要提供）。"
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineSpacing = 4
let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle]
label.attributedText = NSAttributedString(string: "(1)港澳通如未办理，请优先安排办理；\n(2)如为国内学校，需准备由教育部学信网出具的学位认证报告；\n(3)如为海外学校，需准备官方成绩单和第三方机构学位认证文件；\n(4)赴港同意书，在获批后1个月内，由您获批时在职公司盖章出具即可（目前不需要提供）。", attributes: attributes)
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ 3f2e6c85
......@@ -21,7 +21,6 @@ class YHEducationDetailVC: YHBaseViewController {
var isNeedShowError = false
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
var detailInfo: YHEducationDetailInfo = YHEducationDetailInfo()
var isCerConfirm: Bool? = nil
var items:[[YHFormItemProtocol]] = []
......@@ -109,30 +108,38 @@ class YHEducationDetailVC: YHBaseViewController {
let item00 = YHFormDetailItem(type: .universityFullName)
if detailInfo.degree.contains("学士学位") {
item00.tips = "请输入学校全称".local
item00.placeHolder = "请输入学校全称，例：清华，需填全称“清华大学”".local
} else {
item00.tips = "请选择学校".local
item00.placeHolder = "请选择学校"
}
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
item03.value = detailInfo.graduateTime
let item04 = YHFormDetailItem(type: .educationMajor)
item04.tips = "请选择专业".local
item04.placeHolder = "请选择专业".local
item04.value = detailInfo.major
let item05 = YHFormDetailItem(type: .educationDegree)
item05.tips = "请选择学位".local
item05.placeHolder = "请选择学位".local
item05.value = detailInfo.degree
let item06 = YHFormDetailItem(type: .degreeType)
......@@ -140,7 +147,8 @@ class YHEducationDetailVC: YHBaseViewController {
item06.value = detailInfo.degreeType
let item07 = YHFormDetailItem(type: .educationCountry)
item07.tips = "请输入国家及地区".local
item07.tips = "请选择国家及地区".local
item07.placeHolder = "请选择国家及地区".local
item07.value = detailInfo.schoolAddress.country
let item08 = YHFormDetailItem(type: .educationCity)
......@@ -281,9 +289,14 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
var isSelectTrue = false
var isSelectFalse = false
if let isCerConfirm = isCerConfirm {
isSelectTrue = isCerConfirm
isSelectFalse = !isCerConfirm
var 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)]
......@@ -294,7 +307,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
let selectItem:YHFormChoiceItem = arr[selectIndex]
let option = (selectItem.title == "是".local ? true : false)
self.isCerConfirm = option
detailInfo.certConfirm = option ? 1 : 2
self.tableView.reloadData()
}
return cell
......@@ -341,7 +354,11 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
let detailItem = item as! YHFormDetailItem
if detailItem.type == .universityFullName { // 选择大学名称
if detailInfo.degree.contains("学士学位") {
// 此时学位是输入
return
}
let vc = YHCollegeSearchViewController()
vc.orderId = self.orderId
vc.searchCollegeName = detailInfo.college
......@@ -426,13 +443,6 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .educationDegree { // 学位
if detailItem.type == .universityFullName { // 学校全称
if detailInfo.degree.contains("学士学位") {
// 此时学位是输入
return
}
}
YHSheetPickerView.show(type:.degree, selectTitle:detailInfo.degree) {
[weak self] item in
guard let self = self else { return }
......@@ -626,6 +636,10 @@ extension YHEducationDetailVC {
return false
}
if detailInfo.certConfirm == 0 { // 证件提供确认
return false
}
// if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
// return false
// }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift
View file @ 3f2e6c85
......@@ -89,8 +89,13 @@ class YHEducationDetailInfo: SmartCodable {
var degreeType: String = ""
var schoolAddress: YHCollegeAddress = YHCollegeAddress()
var isAboardSchool: Bool = false
var majorOther: String = ""
var hasBachelorDegree: Int = 0
// 证件提供确认 0 未选择 1 是 2 否
var certConfirm: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
case college = "college"
case teachingFormat = "teaching_format"
......@@ -101,6 +106,9 @@ class YHEducationDetailInfo: SmartCodable {
case degreeType = "degree_type"
case schoolAddress = "school_address"
case isAboardSchool = "is_aboard_school"
case majorOther = "major_other"
case hasBachelorDegree = "has_bachelor_degree"
case certConfirm = "cert_confirm"
}
required init() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordViewController.swift
View file @ 3f2e6c85
......@@ -346,6 +346,7 @@ extension YHIncomeRecordViewController {
}
self.datas = []
self.tableView.reloadData()
self.navigationController?.popViewController(animated: true)
return
}
self.incomeModel = incomeModel
......
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