Skip to content

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

Merge branch 'qmas-1130' into AI-1212

parents 23e56c96 b0c35d56
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 30 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 1aaccab7
......@@ -6784,7 +6784,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -6926,7 +6926,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7131,7 +7131,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7178,7 +7178,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 9;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift
View file @ 1aaccab7
......@@ -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,10 +139,26 @@ 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,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/Model/YHHKPlanDocModel.swift
View file @ 1aaccab7
......@@ -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 @ 1aaccab7
......@@ -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 {
......@@ -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 @ 1aaccab7
......@@ -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(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 1aaccab7
......@@ -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 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift
View file @ 1aaccab7
......@@ -255,6 +255,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
self.isShowPrompt = true
tableView.reloadData()
YHHUD.flash(message: "至少需要新增一个职位")
bottom.nextButton.isEnabled = true
return
}
for item in self.viewModel.positionList {
......@@ -262,6 +263,7 @@ class YHWorkExperienceViewController: YHBaseViewController {
self.isShowPrompt = true
tableView.reloadData()
YHHUD.flash(message: "您的职位未全部填写完成，请先填写完成再提交")
bottom.nextButton.isEnabled = true
return
}
}
......
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