Skip to content

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

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

parents 24fe5a3a 9f585c97
Hide whitespace changes
Inline Side-by-side
Showing with 203 additions and 94 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 58f312dc
......@@ -6908,7 +6908,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7050,7 +7050,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7255,7 +7255,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7302,7 +7302,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/AppDelegate.swift
View file @ 58f312dc
......@@ -70,7 +70,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
AGCAppLinking.instance().handle { (link, error) in
let deepLink = link?.deepLink
//TODO: 增加deeplink地址跳转
print(deepLink as Any)
}
// QiYu SDK初始化
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 58f312dc
......@@ -237,8 +237,8 @@ extension YHInformationPerfectListVC {
} else {
self.hasSubmitFlag = false
self.submitBtn.isHidden = true
self.submitHoldView.isHidden = false
self.submitBtn.isHidden = false
self.submitHoldView.isHidden = true
if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
self.submitBtn.layer.opacity = 1
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift
View file @ 58f312dc
......@@ -125,6 +125,12 @@ extension YHHKPlanDoctumentVC {
//点击提交按钮
@objc func clickSubmitBtn() {
if !checkDataOK() {
YHHUD.flash(message: "需完成所有项的填写")
return
}
YHCommonAlertView.show("", "是否已完成对文本框的内容修改，并确认提交？", "取消", "确认") {
self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
guard let self = self else { return }
......@@ -133,20 +139,36 @@ extension YHHKPlanDoctumentVC {
}
}
private func checkDataOK() -> Bool {
if viewModel.arrHKPlanData.count > 6 {
let ret0 = viewModel.arrHKPlanData[0].contentCount > 0 ? true : false
let ret1 = viewModel.arrHKPlanData[1].contentCount > 0 ? true : false
let ret2 = viewModel.arrHKPlanData[2].contentCount > 0 ? true : false
let ret3 = viewModel.arrHKPlanData[3].contentCount > 0 ? true : false
let ret4 = viewModel.arrHKPlanData[4].contentCount > 0 ? true : false
let ret5 = viewModel.arrHKPlanData[5].contentCount > 0 ? true : false
let ret6 = viewModel.arrHKPlanData[6].contentCount > 0 ? true : false
return ret0 && ret1 && ret2 && ret3 && ret4 && ret5 && ret6
}
return false
}
//提交数据
private func submitOp() {
if viewModel.arrHKPlanData.count > 5 {
if viewModel.arrHKPlanData.count > 6 {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let params = ["order_id":orderID,
"supplement_id":supplement_id,
"career_achievement":viewModel.arrHKPlanData[0].content,
"professional_skills":viewModel.arrHKPlanData[1].content,
"academic_achievement":viewModel.arrHKPlanData[2].content,
"plan_detail":viewModel.arrHKPlanData[3].content,
"qualifications_and_awards":viewModel.arrHKPlanData[4].content,
"other":viewModel.arrHKPlanData[5].content,
"remark":viewModel.arrHKPlanData[6].content,
"academic_achievement":viewModel.arrHKPlanData[1].content,
"qualifications_and_awards":viewModel.arrHKPlanData[2].content,
"professional_skills":viewModel.arrHKPlanData[3].content,
"visa_contribution":viewModel.arrHKPlanData[4].content,
"plan_detail":viewModel.arrHKPlanData[5].content,
"other":viewModel.arrHKPlanData[6].content,
"content_save":1]
cancelTimer()
startTimer()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/Model/YHHKPlanDocModel.swift
View file @ 58f312dc
......@@ -22,10 +22,14 @@ enum HKPlanDocQuestionType {
class YHHKPlanDocModel {
var title : String = ""
var content : String = ""
var contentCount : Int = 0 // content的长度
var type : HKPlanDocQuestionType = .unknow
var other : String = ""
//本地使用
var canEditFlag : Bool = true
var isFirstData : Bool = false
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift
View file @ 58f312dc
......@@ -105,7 +105,7 @@ class YHHKPlanItemView: UIView {
let holdView : UIView = UIView()
//提示文字
var tipsTxt : String = "请输入,300字内"
var tipsTxt : String = "请输入,100字内"
// var maxNumbler : Int = 100
var maxNumbler : Int = 100 {
didSet {
......@@ -127,7 +127,7 @@ private extension YHHKPlanItemView {
backgroundColor = .clear
//应香港入境处最新要求，
//赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
//赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过100字(不含标点)
//。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
addSubview(line)
......@@ -270,12 +270,7 @@ private extension YHHKPlanItemView {
myTextView.wrapToContent()
}
if model.type == .planOther {
maxNumbler = 100
tipsTxt = "在此补充其他信息，非必填"
} else {
maxNumbler = 100
}
maxNumbler = 100
tipsLable.text = tipsTxt
......@@ -287,6 +282,9 @@ private extension YHHKPlanItemView {
let textNum = calcTextLength(string: myTextView.text)
numberLabel.text = textNum.string + "/\(maxNumbler)"
model.contentCount = textNum //方便后面判断
if textNum > maxNumbler {
numberLabel.textColor = .failColor
} else {
......@@ -326,7 +324,7 @@ private extension YHHKPlanItemView {
} else {
subHoldView2.isHidden = false
skillLabel.text = model.other
skillLabel.text = "所属专业名称（如有）：" + model.other
subHoldView.snp.removeConstraints()
subHoldView2.snp.removeConstraints()
......@@ -502,23 +500,12 @@ extension YHHKPlanItemView : UITextViewDelegate {
guard let model = dataMode else { return }
guard let text = textView.text else { return }
var txtNum : Int = 0
txtNum = calcTextLength(string: text)
var txtNum : Int = calcTextLength(string: text)
numberLabel.text = txtNum.string + "/\(maxNumbler)"
printLog(text.count)
// if text.count <= maxNumbler{
// model.content = text
// } else {
// var ttt = text
// let subString = ttt.slice(from: 0, length: maxNumbler)
//
// model.content = subString
// }
model.content = text
model.contentCount = txtNum
if txtNum > maxNumbler {
numberLabel.textColor = .failColor
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanTipsCell.swift
View file @ 58f312dc
......@@ -41,7 +41,7 @@ private extension YHHKPlanTipsCell {
contentView.backgroundColor = .clear
//应香港入境处最新要求，
//赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过100字(不含标点)
//赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过100字(不含标点)
//。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。
let holdView : UIView = UIView()
......@@ -84,7 +84,7 @@ private extension YHHKPlanTipsCell {
let a: ASAttributedString = .init("应香港入境处最新要求，", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
let b: ASAttributedString = .init("赴港计划书格式、内容作出调整，共分为六部分，每部分不得超过对应字数", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
let b: ASAttributedString = .init("赴港计划书格式、内容作出调整，共分为七部分，每部分不得超过100字(含标点)", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.brandMainColor))
let c: ASAttributedString = .init("。其中“赴港具体计划”仅代表个人预期规划，无须严格执行。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift
View file @ 58f312dc
......@@ -173,6 +173,8 @@ class YHImproveSchemeViewController: YHBaseViewController {
}
view.bringSubviewToFront(gk_navigationBar)
tableView.reloadData()
tableView.isHidden = true
bottomView.isHidden = true
requestData()
}
......@@ -189,13 +191,16 @@ class YHImproveSchemeViewController: YHBaseViewController {
}
func requestData() {
YHHUD.show(.progress(message: "加载中..."))
viewModel.getImproveDetail(orderId: orderId) {
[weak self] success, error in
YHHUD.hide()
guard let self = self else { return }
items.removeAll()
items.append(contentsOf: viewModel.improveDetailModel.improvePlanItem)
tableView.reloadData()
tableView.isHidden = false
bottomView.isHidden = false
var name = viewModel.improveDetailModel.username
if name.count > 5 {
name = String(name.prefix(5)) + "..."
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift
View file @ 58f312dc
......@@ -65,13 +65,14 @@ class YHMyNewSchemeViewController: YHBaseViewController {
tableView.bounces = false
tableView.tableFooterView = bottomLogoView
tableView.isHidden = true
return tableView
}()
lazy var bgView: UIView = {
let view = UIView()
view.backgroundColor = .red
view.isHidden = true
let bgImgView = UIImageView(image: UIImage(named: "my_scheme_head_img"))
view.addSubview(bgImgView)
......@@ -248,8 +249,10 @@ class YHMyNewSchemeViewController: YHBaseViewController {
orderId = orderID
}
YHHUD.show(.progress(message: "加载中..."))
viewModel.getMySchemeData(orderId: orderId) {
[weak self] success, error in
YHHUD.hide()
guard let self = self else { return }
titleLabel.text = "尊敬的\(viewModel.schemeModel.username)\(viewModel.schemeModel.sex)"
passArr = self.viewModel.schemeModel.comprehensive_evaluation.filter {
......@@ -323,6 +326,9 @@ class YHMyNewSchemeViewController: YHBaseViewController {
items.append(arr2)
}
self.tableView.reloadData()
self.tableView.isHidden = false
self.bgView.isHidden = false
}
}
......@@ -436,6 +442,10 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
[weak self] in
guard let self = self else { return }
if !self.viewModel.schemeModel.certificate_skip_status {
YHHUD.flash(message: "您的资料清单正在准备中，请耐心等待")
return
}
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let vc = YHMineCertificateEntryViewController()
vc.orderId = orderID as? Int ?? 0
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/M/YHSchemeModel.swift
View file @ 58f312dc
......@@ -33,6 +33,7 @@ class YHMySchemeDetailModel: SmartCodable {
var industry_positioning_other: String = ""
var plan_skip_status: Bool = false
var supplement_skip_status: Bool = false
var certificate_skip_status: Bool = false
var username: String = ""
var sex: String = ""
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveHKView.swift
View file @ 58f312dc
......@@ -112,6 +112,11 @@ class YHImproveHKView: UIView {
return btn
}()
lazy var templateListView:YHImproveSchemeTemplateListView = {
let view = YHImproveSchemeTemplateListView.listView()
return view
}()
override init(frame: CGRect) {
super.init(frame: .zero)
setupUI()
......@@ -122,9 +127,8 @@ class YHImproveHKView: UIView {
}
@objc func didRightBtnClicked() {
let view = YHImproveSchemeTemplateListView.listView()
view.items = item.templates
view.show()
self.templateListView.items = item.templates
self.templateListView.show()
}
func setupUI() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListCell.swift
View file @ 58f312dc
......@@ -13,11 +13,8 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
static let cellReuseIdentifier = "YHImproveSchemeTemplateListCell"
var model = YHSchemeTemplatesModel()
var clickBlock: ((YHSchemeTemplatesModel)->())?
lazy var previewFileTool:YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: UIViewController.current)
return tool
}()
lazy var lineView:UIView = {
let view = UIView()
......@@ -45,12 +42,7 @@ class YHImproveSchemeTemplateListCell: UITableViewCell {
}()
@objc func didBtnClicked() {
if !model.url.isEmpty {
let viewModel = YHBaseViewModel()
viewModel.getRealUsefulUrl(model.url) { success in
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"预览")
}
}
clickBlock?(model)
}
required init?(coder: NSCoder) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeTemplateListView.swift
View file @ 58f312dc
......@@ -14,6 +14,11 @@ class YHImproveSchemeTemplateListView: UIView {
let v = YHImproveSchemeTemplateListView(frame: UIScreen.main.bounds)
return v
}
lazy var previewFileTool:YHFilePreviewTool = {
let tool = YHFilePreviewTool(targetVC: UIViewController.current)
return tool
}()
let bottomFixHeight = 102.0
......@@ -155,6 +160,24 @@ extension YHImproveSchemeTemplateListView : UITableViewDelegate, UITableViewData
let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveSchemeTemplateListCell.cellReuseIdentifier, for: indexPath) as! YHImproveSchemeTemplateListCell
cell.titleLabel.text = "\(indexPath.row+1)、\(item.name)"
cell.model = item
cell.clickBlock = {
[weak self] model in
guard let self = self else { return }
if !model.url.isEmpty {
let viewModel = YHBaseViewModel()
if model.url.contains("pub.galaxy-immi.com") { // 资源文件
viewModel.getRealUsefulUrl(model.url) { success in
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"预览")
}
} else { // web
let vc = YHH5WebViewVC()
vc.url = model.url
vc.isFullScreenFlag = false
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
self.dismiss()
}
return cell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveTargetListCell.swift
View file @ 58f312dc
......@@ -58,7 +58,7 @@ class YHImproveTargetListCell: UITableViewCell {
lazy var subtitleLabel: UILabel = {
let label = UILabel()
label.text = "接下来请您依据如下指引进行提升准备"
label.text = "以下指引供您按需参考"
label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = .init(hex: 0x8993A2)
return label
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift
View file @ 58f312dc
......@@ -199,7 +199,7 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
make.height.equalTo(52)
}
}
if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.sign_valid_date) {
if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
failString = ""
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/V/YHCollegeSearchBar.swift
View file @ 58f312dc
......@@ -33,7 +33,7 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
let textField = UITextField()
textField.backgroundColor = .clear
textField.attributedPlaceholder = NSAttributedString(string: "请输入学校全称", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
textField.font = UIFont.PFSC_M(ofSize: 12)
textField.font = UIFont.PFSC_M(ofSize: 14)
textField.tintColor = UIColor.brandMainColor
textField.textColor = UIColor.mainTextColor
textField.delegate = self
......@@ -43,7 +43,7 @@ class YHCollegeSearchBar: UIView, UITextFieldDelegate {
lazy var confirmBtn: UIButton = {
let btn = UIButton()
btn.setTitle("确认".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor.brandMainColor
btn.addTarget(self, action: #selector(confirmBtnClicked), for: .touchUpInside)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemTitleCell.swift
View file @ 58f312dc
......@@ -61,7 +61,7 @@ class YHFormItemTitleCell: UITableViewCell {
lazy var cancelButton: UIButton = {
let btn = UIButton()
btn.setTitle("取消操作".local, for: .normal)
btn.setTitle("取消编辑".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.brandMainColor, for: .normal)
btn.tag = cancelTag
......@@ -72,7 +72,9 @@ class YHFormItemTitleCell: UITableViewCell {
lazy var editButton: UIButton = {
let btn = UIButton()
btn.setImage(UIImage(named: "form_edit"), for: .normal)
btn.setTitle("编辑", for: .normal)
btn.setTitleColor(.brandMainColor, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.tag = editTag
btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
btn.isHidden = true
......@@ -105,9 +107,9 @@ class YHFormItemTitleCell: UITableViewCell {
}
editButton.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(24, 24))
make.size.equalTo(CGSizeMake(64, 24))
make.top.equalTo(titleLabel).offset(0)
make.right.equalToSuperview().offset(-18)
make.right.equalToSuperview().offset(0)
}
cancelButton.snp.makeConstraints { make in
......@@ -127,7 +129,7 @@ class YHFormItemTitleCell: UITableViewCell {
case .canEdit:
cancelButton.isHidden = true
editButton.isHidden = false
titleMaxRight = -(horizonalGap+24.0+5.0)
titleMaxRight = -(horizonalGap+46.0+5.0)
case .canCancel:
cancelButton.isHidden = false
editButton.isHidden = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/C/YHIncomeRecordWorkExperienceViewController.swift
View file @ 58f312dc
......@@ -461,7 +461,7 @@ extension YHIncomeRecordWorkExperienceViewController: UITableViewDelegate, UITab
}
self.companyModel.has_all_file = flag.rawValue
self.isHasAllFileOK = flag != .unknown
self.tableView.reloadRows(at: [indexPath], with: .none)
self.tableView.reloadRows(at: [indexPath], with: .automatic)
}
return cell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInputMoneyCell.swift
View file @ 58f312dc
......@@ -9,6 +9,7 @@
import UIKit
class YHIncomeInputMoneyCell: YHResignDocumentCell {
private let maxCount = 12
static let cellReuseIdentifier = "YHIncomeInputMoneyCell"
......@@ -208,6 +209,11 @@ extension YHIncomeInputMoneyCell: UITextFieldDelegate {
if (string as NSString).rangeOfCharacter(from: number.inverted).location != NSNotFound {
return false
}
let count = (textField.text?.utf16.count ?? 0) - range.length + string.utf16.count
if count > maxCount {
return false
}
return true
}
return true
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHSelectCountryViewController.swift
View file @ 58f312dc
......@@ -35,6 +35,7 @@ class YHSelectCountryViewController: YHBaseViewController {
view.backgroundColor = .white
searchView = {
let searchBar = UITextField()
searchBar.font = .PFSC_R(ofSize: 14)
searchBar.placeholder = "搜索国家/地区"
searchBar.backgroundColor = UIColor.contentBkgColor
searchBar.keyboardType = .default
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherSingleChoiceItemView.swift
View file @ 58f312dc
......@@ -7,6 +7,7 @@
//
import UIKit
import AttributedString
class YHOtherSingleChoiceItemView: UIView {
override init(frame: CGRect) {
......@@ -101,6 +102,32 @@ extension YHOtherSingleChoiceItemView {
isSelected = model.select
setViewSelected()
if !model.subname.isEmpty,!model.highlight.isEmpty {
if #available(iOS 16.0, *) {
let arr = model.subname.split(separator: model.highlight)
if arr.count == 2 {
let aa: ASAttributedString = .init(NSAttributedString(string: String(arr[0])), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
let bb: ASAttributedString = .init(NSAttributedString(string: model.highlight), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
let cc: ASAttributedString = .init(NSAttributedString(string: String(arr[1])), .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
descLabel.attributed.text = aa + bb + cc
} else {
descLabel.attributed.text = nil
descLabel.text = model.subname
}
} else {
descLabel.attributed.text = nil
descLabel.text = model.subname
}
} else {
}
}
func setViewSelected() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 58f312dc
......@@ -88,7 +88,7 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
"highlight" : ""],
["id" : 4,
"name" : "其他证件",
"name" : "其他证明",
"select" : 0,
"subname" : "(仅可尝试加分，此类文件加分以港府审批为准)",
"highlight" : ""],
......@@ -187,15 +187,15 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
"highlight" : ""],
["id" : 4,
"name" : "其他证件",
"name" : "该语言相关专业学位证 、 毕业证、 学位认证报告",
"select" : 0,
"subname" : "该语言相关专业学位证 、 毕业证、 学位认证报告",
"subname" : "",
"highlight" : ""],
["id" : 5,
"name" : "其他证件",
"name" : "官方语言成绩单",
"select" : 0,
"subname" : "官方语言成绩单",
"subname" : "",
"highlight" : ""],
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 58f312dc
......@@ -256,10 +256,10 @@ private extension YHPreviewViewModel {
do {
//1.基本信息
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "用人单位：", answer: model.company_name)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "公司是否上市：", answer: model.is_ipo_company ? "是" : "否")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "公司是否为上市公司：", answer: model.is_ipo_company ? "是" : "否")
arr1.append(contentsOf: [tmp1,tmp2])
if model.is_ipo_company {
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您是否拥有此公司所有权(10%以上股权)：", answer: model.has_ipo_company_equity ? "是" : "否")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "您目前是否拥有此公司10%以上股权：", answer: model.has_ipo_company_equity ? "是" : "否")
arr1.append(tmp2)
if model.has_ipo_company_equity {
......@@ -648,7 +648,7 @@ private extension YHPreviewViewModel {
//港澳通行证
str = model2.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model2.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -970,13 +970,17 @@ private extension YHPreviewViewModel {
var findFirstFlag : Bool = false
for(i,t) in arrCompare.enumerated() {
for(_,t) in arrCompare.enumerated() {
if t.id == firstID {
firstName = t.name + (t.other_instructions.isEmpty ? "" : ("=" + t.other_instructions))
findFirstFlag = true
if t.id == 3 {
firstName = firstName + "-" + item.other_instructions
}
var findSecondFlag : Bool = false
for(ii,tt) in t.options.enumerated() {
for(_,tt) in t.options.enumerated() {
if tt.id == secondID {
secondName = tt.name
findSecondFlag = true
......@@ -1370,7 +1374,7 @@ private extension YHPreviewViewModel {
if isNeedShowHK {
var str = model.certificates.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model.certificates.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -1412,7 +1416,7 @@ private extension YHPreviewViewModel {
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp9,tmp10,tmp11,tmp12])
let model2 = YHPersonInfoCellModel1(cellTitle: "护照", cellData: [tmp9,tmp10,tmp11,tmp12])
cerInfoArr.append(model2)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: cerInfoArr)
......@@ -1682,7 +1686,7 @@ private extension YHPreviewViewModel {
if isNeedShowHK {
var str = model.certificates.hkMacaoPass.number
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行社证件号码：", answer: str.defaultStringIfEmpty())
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "旅行证件号码：", answer: str.defaultStringIfEmpty())
str = model.certificates.hkMacaoPass.issueAt
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "签发地：", answer: str.defaultStringIfEmpty())
......@@ -1724,7 +1728,7 @@ private extension YHPreviewViewModel {
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
let model2 = YHPersonInfoCellModel1(cellTitle: "护照及其他旅行证件", cellData: [tmp9,tmp10,tmp11,tmp12])
let model2 = YHPersonInfoCellModel1(cellTitle: "护照", cellData: [tmp9,tmp10,tmp11,tmp12])
cerInfoArr.append(model2)
}
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "证件信息", cellData1: cerInfoArr)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ 58f312dc
......@@ -74,6 +74,10 @@ class YHWorkExperienceListViewController: YHBaseViewController {
bottom.nextblock = { [weak self] in
guard let self = self else { return }
guard let dataSource = dataSource else { return }
if dataSource.count == 0 {
YHHUD.flash(message: "至少需要有一条工作经验")
return
}
for item in dataSource {
if item.vacant_num ?? 0 > 0 {
showPrompt = true
......@@ -211,7 +215,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
if let data = dataSource {
for item in data {
if item.company_name == "" {
height = height + 52
height = height + 76
} else {
let text = item.company_name // 要显示的文本内容
let font = UIFont.PFSC_B(ofSize: 14) // 字体大小
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperiencePositionViewViewController.swift
View file @ 58f312dc
......@@ -24,7 +24,7 @@ class YHWorkExperiencePositionViewViewController: YHBaseViewController {
var isShowPrompt: Bool = false
var isShowMessageSelect: Bool = true
var isKeyboardShow: Bool = false
var selectReasonIndex: Int = 0
var selectReasonIndex: Int = 5
var selectEditItem = YHWorkExperienceFileModel()
override func viewDidLoad() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ 58f312dc
......@@ -60,7 +60,6 @@ class YHWorkExperienceViewController: YHBaseViewController {
guard let self = self else { return }
if var text = text, let dataSorce = fileDataSource {
// 重命名
self.renameInputView.isHidden = true
text = text + "." + getFileSuffixName(selectEditItem.fileUrl)
for item in dataSorce {
if item.fileUrl == selectEditItem.fileUrl {
......@@ -251,11 +250,19 @@ class YHWorkExperienceViewController: YHBaseViewController {
guard let self = self else { return }
if self.viewModel.isCanNext(self.stepView.currentIndex) {
if self.stepView.currentIndex == 0 {
if self.viewModel.positionList.count == 0 {
self.isShowPrompt = true
tableView.reloadData()
YHHUD.flash(message: "至少需要新增一个职位")
bottom.nextButton.isEnabled = true
return
}
for item in self.viewModel.positionList {
if item.missing_item_num > 0 {
self.isShowPrompt = true
tableView.reloadData()
YHHUD.flash(message: "您的职位未全部填写完成，请先填写完成再提交")
bottom.nextButton.isEnabled = true
return
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceCompanySelectView.swift
View file @ 58f312dc
......@@ -1008,6 +1008,7 @@ class YHCompanyReasonFileCell: UITableViewCell {
rightButton.isSelected = false
leftButton.layer.borderWidth = 0
rightButton.layer.borderWidth = 0
alertLabel.isHidden = true
}
if model?.has_provide_certificate == 1 {
leftButton.isSelected = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift
View file @ 58f312dc
......@@ -561,7 +561,11 @@ extension YHWorkExperienceItemView: UITextFieldDelegate {
}
let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
if (dataSource?.id == .id1 || dataSource?.id == .id7 || dataSource?.id == .id14 || dataSource?.id == .id16 || dataSource?.id == .id18) && newText.count > 10 {
if (dataSource?.id == .id7 || dataSource?.id == .id14 || dataSource?.id == .id16 || dataSource?.id == .id18) && newText.count > 10 {
return false
}
if dataSource?.id == .id1 && newText.count > 50 {
return false
}
......@@ -586,7 +590,7 @@ extension YHWorkExperienceItemView: UITextFieldDelegate {
return false
}
if (dataSource?.id == .id12 || dataSource?.id == .id8) && newText.count > 50 {
if (dataSource?.id == .id12 || dataSource?.id == .id8 ) && newText.count > 50 {
return false
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListTableViewCell.swift
View file @ 58f312dc
......@@ -99,8 +99,8 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
cannalButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal)
button.contentHorizontalAlignment = .right
button.setTitle("取消编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(cannal), for: .touchUpInside)
button.isHidden = true
......@@ -116,7 +116,10 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
moreButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "work_more"), for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.setTitle("编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(more), for: .touchUpInside)
return button
}()
......@@ -124,8 +127,8 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
moreButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(24)
make.height.equalTo(24)
make.width.equalTo(24)
make.height.equalTo(20)
make.width.equalTo(60)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperiencePositionTableViewCell.swift
View file @ 58f312dc
......@@ -100,7 +100,7 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消操作", for: .normal)
button.setTitle("取消编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(cannal), for: .touchUpInside)
button.isHidden = true
......@@ -116,7 +116,10 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
moreButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "work_more"), for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.setTitle("编辑", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(more), for: .touchUpInside)
return button
}()
......@@ -124,8 +127,8 @@ class YHWorkExperiencePositionTableViewCell: UITableViewCell {
moreButton.snp.makeConstraints { make in
make.right.equalTo(-18)
make.top.equalTo(24)
make.height.equalTo(24)
make.width.equalTo(24)
make.height.equalTo(20)
make.width.equalTo(60)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkItemListViewModel.swift
View file @ 58f312dc
......@@ -60,8 +60,8 @@ class YHWorkItemListViewModel: YHBaseViewModel {
func requestWorkTimeRemarkWorkExperience(_ orderId: String, _ isSaveAll: Int = 0, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId,
"work_time_empty_remark": self.mainModel.work_time_overlap_remark,
"work_time_overlap_remark": self.mainModel.work_time_empty_remark,
"work_time_empty_remark": self.mainModel.work_time_empty_remark,
"work_time_overlap_remark": self.mainModel.work_time_overlap_remark,
"is_save_all": isSaveAll]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.saveWorkTimeRemark
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
......
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