Skip to content

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

其他信息 界面的校验

parent 229c39ea
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 17 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ 980f2189
......@@ -159,6 +159,8 @@ extension YHOtherInfoFillCell {
let item = dataModel.residences[0]
item.needCheckFlag = dataModel.needCheckFlag
residenceView.dataModel = item
} else {
printLog("error: 数据源有问题")
}
holdView1.addSubview(residenceView)
......@@ -191,18 +193,6 @@ extension YHOtherInfoFillCell {
}
holdView1.layoutIfNeeded()
//2.语言水平
let holdView2 = createHoldView()
contentView.addSubview(holdView2)
......@@ -225,6 +215,7 @@ extension YHOtherInfoFillCell {
let view = languageView
view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "")
view.needCheckFlag = dataModel.needCheckFlag
view.type = 2
holdView2.addSubview(view)
view.snp.makeConstraints { make in
......@@ -232,7 +223,6 @@ extension YHOtherInfoFillCell {
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview()
}
......@@ -240,6 +230,7 @@ extension YHOtherInfoFillCell {
view.addGestureRecognizer(tap)
}
holdView2.layoutIfNeeded()
//3.专业技能行业
......@@ -264,14 +255,13 @@ extension YHOtherInfoFillCell {
let view = skillView
view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "")
view.needCheckFlag = dataModel.needCheckFlag
view.type = 2
holdView3.addSubview(view)
view.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview()
}
......@@ -280,6 +270,7 @@ extension YHOtherInfoFillCell {
skillView.addGestureRecognizer(tap)
}
holdView3.layoutIfNeeded()
//4.辅助资料
......@@ -306,6 +297,7 @@ extension YHOtherInfoFillCell {
//1、您是否有行业内的专业资格证书？
let fzView1 = YHOtherYesOrNoItemView(frame: .zero)
fzView1.updateUI(title: "1、您是否有行业内的专业资格证书？", answer: dataModel.question?.professional_qualification ?? -1)
fzView1.needCheckFlag = dataModel.needCheckFlag
fzView1.block = { answer in
dataModel.question?.professional_qualification = answer
}
......@@ -320,6 +312,7 @@ extension YHOtherInfoFillCell {
// 2、您是否在期刊或杂志上发表过论文、文章、书籍等（与工作、资质有关的）？
let fzView2 = YHOtherYesOrNoItemView(frame: .zero)
fzView2.updateUI(title: "2、您是否在期刊或杂志上发表过论文、文章、书籍等（与工作、资质有关的）？", answer: dataModel.question?.paper ?? -1)
fzView2.needCheckFlag = dataModel.needCheckFlag
fzView2.block = { answer in
dataModel.question?.paper = answer
}
......@@ -333,6 +326,7 @@ extension YHOtherInfoFillCell {
// 3、您是否有大学奖学金证明、专利证书、获奖证书（工作单位颁发的可以）？
let fzView3 = YHOtherYesOrNoItemView(frame: .zero)
fzView3.updateUI(title: "3、您是否有大学奖学金证明、专利证书、获奖证书（工作单位颁发的可以）？", answer: dataModel.question?.scholarship ?? -1)
fzView3.needCheckFlag = dataModel.needCheckFlag
fzView3.block = { answer in
dataModel.question?.scholarship = answer
}
......@@ -346,6 +340,7 @@ extension YHOtherInfoFillCell {
// 4、您是否被媒体采访过，专访您的文章被发表在杂志上或网络上？
let fzView4 = YHOtherYesOrNoItemView(frame: .zero)
fzView4.updateUI(title: "4、您是否被媒体采访过，专访您的文章被发表在杂志上或网络上？", answer: dataModel.question?.media_interview ?? -1)
fzView4.needCheckFlag = dataModel.needCheckFlag
fzView4.block = { answer in
dataModel.question?.media_interview = answer
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift
View file @ 980f2189
......@@ -62,7 +62,6 @@ extension YHOtherResidenceFillView {
addSubview(view)
view.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
// make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 1))
}
let tap1 = UITapGestureRecognizer(target: self, action: #selector(tapCountry))
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ 980f2189
......@@ -138,7 +138,13 @@ extension YHOtherSelecteItemView {
extension YHOtherSelecteItemView {
func updateKeyName(name : String, keyValue : String) {
noTextTipsLable.text = "请选择" + name
if type == 1 {
noTextTipsLable.text = "请选择" + name
} else {
noTextTipsLable.text = "请选择"
}
title = name
textField.text = keyValue
layoutMyUI()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherYesOrNoItemView.swift
View file @ 980f2189
......@@ -99,6 +99,26 @@ class YHOtherYesOrNoItemView: UIView, UITextViewDelegate {
}
}
private var lastSelectedBtn : UIButton?
var needCheckFlag : Bool = false {
didSet {
layoutMyUI()
}
}
//提示lable
private lazy var noTextTipsLable: UILabel = {
let label = UILabel()
label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "请选择"
label.isHidden = true
return label
}()
}
......@@ -109,6 +129,7 @@ private extension YHOtherYesOrNoItemView {
addSubview(titleLabel)
addSubview(answer2Btn)
addSubview(answer1Btn)
addSubview(noTextTipsLable)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(kMargin)
......@@ -134,6 +155,9 @@ private extension YHOtherYesOrNoItemView {
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
layoutMyUI()
}
@objc func didClickResponseBtn(btn: UIButton) {
......@@ -157,6 +181,8 @@ private extension YHOtherYesOrNoItemView {
updateAnswerButton(answer1Btn, false)
}
self.block?(answer2Btn.isSelected == true ? 2 : 1)
layoutMyUI()
}
// 更新答案按钮选中状态
......@@ -176,5 +202,40 @@ extension YHOtherYesOrNoItemView {
} else if answer == 1 {
didClickResponseBtn(btn: answer1Btn)
}
layoutMyUI()
}
private func layoutMyUI() {
bottomLine.snp.removeConstraints()
if needCheckFlag == true {
if answer1Btn.isSelected == false && answer2Btn.isSelected == false {
noTextTipsLable.isHidden = false
noTextTipsLable.snp.removeConstraints()
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(answer1Btn.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(20)
}
bottomLine.snp.makeConstraints { make in
make.top.equalTo(noTextTipsLable.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
return
}
}
noTextTipsLable.isHidden = true
bottomLine.snp.makeConstraints { make in
make.top.equalTo(answer1Btn.snp.bottom).offset(12)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 980f2189
......@@ -321,6 +321,10 @@ extension YHOtherInfoFillViewModel {
return
}
if resultModel.residences.isEmpty {
resultModel.residences.append(Residence())
}
self.otherInfoFillData = resultModel
handleData()
......
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