Skip to content

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

收入记录工作经验提交校验

parent a438dd2d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 75 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeRecordFromCell.swift
View file @ 718bfad9
...@@ -81,37 +81,14 @@ class YHIncomeRecordFromCell: YHResignDocumentCell { ...@@ -81,37 +81,14 @@ class YHIncomeRecordFromCell: YHResignDocumentCell {
extension YHIncomeRecordFromCell { extension YHIncomeRecordFromCell {
private func updateFailLabel(_ needShowFailButton: Bool) { private func updateFailLabel(_ needShowFailButton: Bool) {
if needShowFailButton { if needShowFailButton {
let isRightArrowIconHidden = rightArrowIcon.isHidden
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(147)
if isRightArrowIconHidden {
make.right.lessThanOrEqualToSuperview().offset(-18)
} else {
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
}
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.top.equalTo(infoDetailLabel.snp.bottom).offset(6) make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
make.left.equalTo(dotIcon) make.left.equalTo(dotIcon)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
make.bottom.equalToSuperview().offset(-16) make.bottom.equalToSuperview().offset(-16)
} }
infoFailLabel.isHidden = false infoFailLabel.isHidden = false
} else { } else {
let isRightArrowIconHidden = rightArrowIcon.isHidden
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16)
make.left.equalToSuperview().offset(147)
if isRightArrowIconHidden {
make.right.lessThanOrEqualToSuperview().offset(-18)
} else {
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
}
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.left.equalTo(dotIcon) make.left.equalTo(dotIcon)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
...@@ -153,8 +130,9 @@ extension YHIncomeRecordFromCell { ...@@ -153,8 +130,9 @@ extension YHIncomeRecordFromCell {
} }
infoDetailLabel.snp.makeConstraints { make in infoDetailLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18) make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeDateTillNowCell.swift
View file @ 718bfad9
...@@ -93,25 +93,16 @@ extension YHIncomeDateTillNowCell { ...@@ -93,25 +93,16 @@ extension YHIncomeDateTillNowCell {
private func updateFailLabel(_ needShowFailButton: Bool) { private func updateFailLabel(_ needShowFailButton: Bool) {
if needShowFailButton { if needShowFailButton {
infoFailLabel.isHidden = false infoFailLabel.isHidden = false
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.top.equalTo(infoDetailLabel.snp.bottom).offset(6) make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
make.bottom.equalToSuperview().offset(-16) make.bottom.equalToSuperview().offset(-16)
} }
} else { } else {
infoFailLabel.isHidden = true infoFailLabel.isHidden = true
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
...@@ -137,8 +128,9 @@ extension YHIncomeDateTillNowCell { ...@@ -137,8 +128,9 @@ extension YHIncomeDateTillNowCell {
} }
infoDetailLabel.snp.remakeConstraints { make in infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
} }
...@@ -152,8 +144,9 @@ extension YHIncomeDateTillNowCell { ...@@ -152,8 +144,9 @@ extension YHIncomeDateTillNowCell {
make.height.equalTo(30) make.height.equalTo(30)
} }
infoDetailLabel.snp.remakeConstraints { make in infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18) make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18)
} }
...@@ -213,8 +206,9 @@ extension YHIncomeDateTillNowCell { ...@@ -213,8 +206,9 @@ extension YHIncomeDateTillNowCell {
} }
infoDetailLabel.snp.makeConstraints { make in infoDetailLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18) make.right.lessThanOrEqualTo(tillNowButton.snp.left).offset(-18)
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInfoEditCell.swift
View file @ 718bfad9
...@@ -24,7 +24,6 @@ class YHIncomeInfoEditCell: YHResignDocumentCell { ...@@ -24,7 +24,6 @@ class YHIncomeInfoEditCell: YHResignDocumentCell {
let label = UILabel() let label = UILabel()
label.font = .PFSC_R(ofSize: 14) label.font = .PFSC_R(ofSize: 14)
label.textColor = UIColor.mainTextColor label.textColor = UIColor.mainTextColor
label.text = "收入来源公司"
return label return label
}() }()
...@@ -61,7 +60,7 @@ class YHIncomeInfoEditCell: YHResignDocumentCell { ...@@ -61,7 +60,7 @@ class YHIncomeInfoEditCell: YHResignDocumentCell {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
func setupCellInfo(title: String, detail: String?, placeholder: String = "请输入", showBottomLine: Bool = true, needShowFailButton: Bool) { func setupCellInfo(title: String, detail: String?, placeholder: String = "请输入", showBottomLine: Bool = true, needShowFailButton: Bool, cellType: YHResignRoundCellType = .mid) {
infoTitleLabel.text = title infoTitleLabel.text = title
inputTextField.text = detail inputTextField.text = detail
inputTextField.attributedPlaceholder = NSAttributedString( inputTextField.attributedPlaceholder = NSAttributedString(
...@@ -73,6 +72,7 @@ class YHIncomeInfoEditCell: YHResignDocumentCell { ...@@ -73,6 +72,7 @@ class YHIncomeInfoEditCell: YHResignDocumentCell {
) )
bottomLineView.isHidden = !showBottomLine bottomLineView.isHidden = !showBottomLine
updateFailLabel(needShowFailButton) updateFailLabel(needShowFailButton)
updateCellCorner(cellType)
} }
} }
...@@ -80,25 +80,16 @@ extension YHIncomeInfoEditCell { ...@@ -80,25 +80,16 @@ extension YHIncomeInfoEditCell {
private func updateFailLabel(_ needShowFailButton: Bool) { private func updateFailLabel(_ needShowFailButton: Bool) {
if needShowFailButton { if needShowFailButton {
infoFailLabel.isHidden = false infoFailLabel.isHidden = false
inputTextField.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualToSuperview().offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.top.equalTo(inputTextField.snp.bottom).offset(6) make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
make.bottom.equalToSuperview().offset(-16) make.bottom.equalToSuperview().offset(-16)
} }
} else { } else {
infoFailLabel.isHidden = true infoFailLabel.isHidden = true
inputTextField.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualToSuperview().offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
...@@ -126,14 +117,17 @@ extension YHIncomeInfoEditCell { ...@@ -126,14 +117,17 @@ extension YHIncomeInfoEditCell {
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
make.left.equalTo(dotIcon.snp.right).offset(2) make.left.equalTo(dotIcon.snp.right).offset(2)
} }
inputTextField.snp.makeConstraints { make in inputTextField.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview()
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
make.centerY.equalToSuperview()
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/IncomeRecord(收入记录)/V/YHIncomeInfoSelectCell.swift
View file @ 718bfad9
...@@ -63,12 +63,13 @@ class YHIncomeInfoSelectCell: YHResignDocumentCell { ...@@ -63,12 +63,13 @@ class YHIncomeInfoSelectCell: YHResignDocumentCell {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
func setupCellInfo(title: String, detail: String?, placeholder: String = "请选择", showBottomLine: Bool = true, needShowFailButton: Bool) { func setupCellInfo(title: String, detail: String?, placeholder: String = "请选择", showBottomLine: Bool = true, needShowFailButton: Bool, cellType: YHResignRoundCellType = .mid) {
infoTitleLabel.text = title infoTitleLabel.text = title
updateContentState(detail: detail, placeholder: placeholder) updateContentState(detail: detail, placeholder: placeholder)
bottomLineView.isHidden = !showBottomLine bottomLineView.isHidden = !showBottomLine
infoFailLabel.text = placeholder infoFailLabel.text = placeholder
updateFailLabel(needShowFailButton) updateFailLabel(needShowFailButton)
updateCellCorner(cellType)
} }
} }
...@@ -76,25 +77,16 @@ extension YHIncomeInfoSelectCell { ...@@ -76,25 +77,16 @@ extension YHIncomeInfoSelectCell {
private func updateFailLabel(_ needShowFailButton: Bool) { private func updateFailLabel(_ needShowFailButton: Bool) {
if needShowFailButton { if needShowFailButton {
infoFailLabel.isHidden = false infoFailLabel.isHidden = false
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.top.equalTo(infoDetailLabel.snp.bottom).offset(6) make.top.equalTo(infoTitleLabel.snp.bottom).offset(6)
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
make.bottom.equalToSuperview().offset(-16) make.bottom.equalToSuperview().offset(-16)
} }
} else { } else {
infoFailLabel.isHidden = true infoFailLabel.isHidden = true
infoDetailLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16)
make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
}
infoFailLabel.snp.remakeConstraints { make in infoFailLabel.snp.remakeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.lessThanOrEqualToSuperview().offset(-18) make.right.lessThanOrEqualToSuperview().offset(-18)
...@@ -148,8 +140,9 @@ extension YHIncomeInfoSelectCell { ...@@ -148,8 +140,9 @@ extension YHIncomeInfoSelectCell {
} }
infoDetailLabel.snp.makeConstraints { make in infoDetailLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(16) make.top.greaterThanOrEqualToSuperview().offset(16)
make.bottom.equalToSuperview().offset(-16) make.bottom.lessThanOrEqualToSuperview().offset(-16)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(147) make.left.equalToSuperview().offset(147)
make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18) make.right.lessThanOrEqualTo(rightArrowIcon.snp.left).offset(-18)
} }
......
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