Skip to content

G
galaxy-iOS
Commit 2b3d5862 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

Merge branch 'qmas-1130' into yinhe-live-1212

parents 06a31cdd 05b22711
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 34 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 2b3d5862
......@@ -21,8 +21,9 @@ class YHInformationPerfectListVC: YHBaseViewController {
submitBtn.isHidden = hasSubmitFlag
submitHoldView.isHidden = !hasSubmitFlag
if hasSubmitFlag == true {
if hasSubmitFlag {
headerTitleDesLable.text = "您已提交信息表"
myDeslable.text = "您已提交个人信息表，我的方案详情和个人信息表可点击底部按钮进行查看"
} else {
var name = ""
if let applicant = serviceCenterMainReqVM.informationFillStepModel {
......@@ -40,6 +41,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
}
}
headerTitleDesLable.text = "您好," + name
myDeslable.text = "此表由主申请人填写，我们将会根据您的个人信息制作资料清单，请按顺序填写，提交后1-2个工作日内联系您哦~"
}
}
}
......@@ -90,7 +92,16 @@ class YHInformationPerfectListVC: YHBaseViewController {
return view
}()
var myDeslable : UILabel!
//提交按钮
var submitBtn: UIButton!
//提交按钮2
var submitBtn2: UIButton!
//我的方案
var mySchemeBtn : UIButton!
//信息预览
var preInforBtn : UIButton!
override func viewDidLoad() {
super.viewDidLoad()
......@@ -194,34 +205,58 @@ extension YHInformationPerfectListVC {
func loadData() {
guard let orderId = orderId else { return}
self.serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) { success, error in
if success == true {
if success {
if self.serviceCenterMainReqVM.myInfoFillStep == 7 {
self.hasSubmitFlag = true
} else {
self.hasSubmitFlag = false
if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
self.submitBtn.layer.opacity = 1
self.submitBtn.isEnabled = true
let retValue = self.serviceCenterMainReqVM.informationFillStepModel?.policy_switch ?? false
if retValue {
self.hasSubmitFlag = true
self.submitBtn.isHidden = true
self.submitHoldView.isHidden = false
self.submitBtn2.isHidden = false
self.preInforBtn.isHidden = true
if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
//提交按钮可点击
self.submitBtn2.layer.opacity = 1
self.submitBtn2.isEnabled = true
} else {
//提交按钮不点击
self.submitBtn2.layer.opacity = 0.4
self.submitBtn2.isEnabled = false
}
} else {
self.submitBtn.layer.opacity = 0.4
self.submitBtn.isEnabled = false
self.hasSubmitFlag = false
self.submitBtn.isHidden = true
self.submitHoldView.isHidden = false
if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
self.submitBtn.layer.opacity = 1
self.submitBtn.isEnabled = true
} else {
self.submitBtn.layer.opacity = 0.4
self.submitBtn.isEnabled = false
}
}
}
// self.checkSubmitTips()
}
self.homeTableView.reloadData()
}
}
//我的评分 -> 我的方案
@objc func goScoreVC() {
// //我的评分
// let vc = YHScoreDetailViewController()
// vc.orderId = orderId
// vc.model = serviceCenterMainReqVM.allInfoScoreModel
// navigationController?.pushViewController(vc)
//我的方案
@objc func goMySchemeVC() {
YHMyNewSchemeViewController.shared.goToSchemePage()
}
......@@ -252,7 +287,7 @@ extension YHInformationPerfectListVC {
}
}
func submitAllInfo() {
@objc func submitAllInfo() {
guard let orderId = orderId else {
printLog("error: orderId 为空")
return
......@@ -271,7 +306,7 @@ extension YHInformationPerfectListVC {
//2、跳转其他界面
if agree == true {
self?.goScoreVC()
self?.goMySchemeVC()
}
}
//1、刷新当前界面
......@@ -335,8 +370,8 @@ extension YHInformationPerfectListVC {
make.height.equalTo(48)
}
//我的积分 -> 我的方案
let scoreButton = {
//我的方案
let mySchemeBtn = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xffffff)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
......@@ -346,16 +381,17 @@ extension YHInformationPerfectListVC {
button.layer.cornerRadius = kCornerRadius3
button.layer.borderWidth = 1
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.addTarget(self, action: #selector(goScoreVC), for: .touchUpInside)
button.addTarget(self, action: #selector(goMySchemeVC), for: .touchUpInside)
return button
}()
submitHoldView.addSubview(scoreButton)
scoreButton.snp.makeConstraints { make in
submitHoldView.addSubview(mySchemeBtn)
mySchemeBtn.snp.makeConstraints { make in
make.left.top.bottom.equalToSuperview()
make.right.equalTo(submitHoldView.snp.centerX).offset(-6)
}
self.mySchemeBtn = mySchemeBtn
let infoButton = {
let preInforBtn = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
......@@ -367,13 +403,40 @@ extension YHInformationPerfectListVC {
button.addTarget(self, action: #selector(goInfoListVC), for: .touchUpInside)
return button
}()
submitHoldView.addSubview(infoButton)
infoButton.snp.makeConstraints { make in
self.preInforBtn = preInforBtn
submitHoldView.addSubview(preInforBtn)
preInforBtn.snp.makeConstraints { make in
make.right.top.bottom.equalToSuperview()
make.left.equalTo(submitHoldView.snp.centerX).offset(6)
}
preInforBtn.layoutIfNeeded()
preInforBtn.addYinHeGradualLayer()
let submitBtn2 = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("提交信息", for: .normal)
button.setTitleColor(.white, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.addTarget(self, action: #selector(submitAllInfo), for: .touchUpInside)
button.isHidden = true
return button
}()
self.submitBtn2 = submitBtn2
submitHoldView.addSubview(submitBtn2)
submitBtn2.snp.makeConstraints { make in
make.right.top.bottom.equalToSuperview()
make.left.equalTo(submitHoldView.snp.centerX).offset(6)
}
infoButton.layoutIfNeeded()
infoButton.addYinHeGradualLayer()
submitBtn2.layoutIfNeeded()
submitBtn2.addYinHeGradualLayer()
homeTableView.delegate = self
homeTableView.dataSource = self
......@@ -397,6 +460,7 @@ extension YHInformationPerfectListVC {
desLable.numberOfLines = 0
desLable.textColor = UIColor.mainTextColor
desLable.lineBreakMode = .byWordWrapping
self.myDeslable = desLable
myHeadView.addSubview(desLable)
desLable.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift
View file @ 2b3d5862
......@@ -145,7 +145,7 @@ extension YHIncomeRecordWorkExperienceViewController {
}
private func setupUI() {
gk_navTitle = "工作经验信息填写"
gk_navTitle = "收入记录信息填写"
gk_navBarAlpha = 1.0
gk_navBackgroundColor = .white
......@@ -453,8 +453,8 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
case let .documentComfirm(title, question, docs):
if let cell = tableView.dequeueReusableCell(withIdentifier: YHIncomeDocumentationConfirmationCell.cellReuseIdentifier) as? YHIncomeDocumentationConfirmationCell {
hasAllFileIndexPath = indexPath
cell.setupCellInfo(title: title, question: question, documents: docs, needShowFailButton: !isHasAllFileOK)
cell.selectedSureButton = YHIncomeRecordHasAllFile(rawValue: companyModel.has_all_file) ?? .unknown
cell.setupCellInfo(title: title, question: question, documents: docs, needShowFailButton: !isHasAllFileOK)
cell.didSelectSureButton = { [weak self] flag in
guard let self = self else {
return
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/M/YHIncomeType.swift
View file @ 2b3d5862
......@@ -56,7 +56,8 @@ enum YHIncomeType: Int, CaseIterable {
"绝对实益拥有人声明书",
"企业所得税月（季）度预缴纳税申报表（A类）（前4个季度/前12个月）",
"企业所得税完税证明（表格式）",
"企业所得税年度纳税申报表（A类）（近一年度）"]
"企业所得税年度纳税申报表（A类）（近一年度）",
"工作证明"]
case .incomeOfHKCompanies:
return ["周年申报表",
"审计报告",
......@@ -109,7 +110,9 @@ enum YHIncomeType: Int, CaseIterable {
case .incomeOfOtherOverseasCompanies:
return ["财务报表",
"合法纳税及完税证明",
"公司所有权官方证明文件"]
"公司所有权官方证明文件",
"工作签证",
"工作证明"]
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeDocumentationConfirmationCell.swift
View file @ 2b3d5862
......@@ -6,6 +6,7 @@
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import AttributedString
import UIKit
class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
......@@ -82,6 +83,8 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
label.font = .PFSC_R(ofSize: 12)
label.textColor = .failColor
label.text = "请选择"
label.numberOfLines = 0
label.lineBreakMode = .byCharWrapping
return label
}()
......@@ -135,8 +138,9 @@ class YHIncomeDocumentationConfirmationCell: YHResignDocumentCell {
extension YHIncomeDocumentationConfirmationCell {
private func updateFailLabel(_ needShowFailButton: Bool) {
if needShowFailButton {
if needShowFailButton || selectedSureButton == .false {
infoFailLabel.isHidden = false
infoFailLabel.attributed.text = selectedSureButton.selectedTips()
containerView.snp.remakeConstraints { make in
make.left.equalTo(infoTitleLabel.snp.left)
make.right.equalToSuperview().offset(-18)
......@@ -149,8 +153,10 @@ extension YHIncomeDocumentationConfirmationCell {
make.right.lessThanOrEqualToSuperview().offset(-18)
make.bottom.equalToSuperview().offset(-16)
}
} else {
infoFailLabel.isHidden = true
infoFailLabel.attributed.text = selectedSureButton.selectedTips()
containerView.snp.remakeConstraints { make in
make.left.equalTo(infoTitleLabel.snp.left)
make.right.equalToSuperview().offset(-18)
......@@ -336,3 +342,19 @@ class YHIncomeDocumentationView: UIView {
}
}
}
private extension YHIncomeRecordHasAllFile {
func selectedTips() -> ASAttributedString? {
switch self {
case .unknown:
return .init(string: "请选择", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.failColor))
case .true:
return nil
case .false:
let first: ASAttributedString = .init(string: "若不能提供以上证明材料，将导致您的该收入", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor(hexString: "#8993A2") ?? .gray))
let second: ASAttributedString = .init(string: "不被认可不予加分", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.failColor))
let third: ASAttributedString = .init(string: "，请尽可能准备以上材料并修改此选项。", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor(hexString: "#8993A2") ?? .gray))
return first + second + third
}
}
}
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