Commit fe19a0fc authored by Steven杜宇's avatar Steven杜宇

// 原则批

parent 5f72409f
...@@ -433,7 +433,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell { ...@@ -433,7 +433,7 @@ class YHPrincipleUploadStatusCell: UITableViewCell {
if let remark = self.itemModel?.remark, !remark.isEmpty { if let remark = self.itemModel?.remark, !remark.isEmpty {
text = "\n"+remark text = "\n"+remark
} }
return "新公司在职证明(在申请期间更换了工作时必传)"+text return "1、新公司在职证明(在申请期间更换了工作时必传)\n2、海外学历认证证书:如您曾申报过由非中国内地学院颁发的学位,则必传(比如:留服认证)\n"+text
} }
return "" return ""
} }
......
...@@ -49,6 +49,7 @@ class YHEducationInfoListVC: YHBaseViewController { ...@@ -49,6 +49,7 @@ class YHEducationInfoListVC: YHBaseViewController {
var bottomView: YHSaveAndSubmitView = { var bottomView: YHSaveAndSubmitView = {
let view = YHSaveAndSubmitView.createView() let view = YHSaveAndSubmitView.createView()
view.isHiddenSave = true
return view return view
}() }()
...@@ -198,14 +199,15 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource { ...@@ -198,14 +199,15 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
let isNeedWrap = (formItem.type == .mainApplicantProfessionalQualification) let isNeedWrap = (formItem.type == .mainApplicantProfessionalQualification)
cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle(), isNeedWrap:isNeedWrap)
// 决定右边按钮显示样式 // 决定右边按钮显示样式
cell.showEditType(type: .none) cell.showEditType(type: .none)
if formItem.type == .mainApplicantEducation { // 学历 if formItem.type == .mainApplicantEducation { // 学历
cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle(), isNeedWrap:isNeedWrap)
cell.showEditType(type: isDegreeEditMode) cell.showEditType(type: isDegreeEditMode)
} else if formItem.type == .mainApplicantProfessionalQualification { // 专业 } else if formItem.type == .mainApplicantProfessionalQualification { // 专业
cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle(), subTitleColor: .failColor, isNeedWrap:isNeedWrap)
cell.showEditType(type: isQualificationEditMode) cell.showEditType(type: isQualificationEditMode)
} }
......
...@@ -19,7 +19,7 @@ class YHFormItemTitleCell: UITableViewCell { ...@@ -19,7 +19,7 @@ class YHFormItemTitleCell: UITableViewCell {
var rightClickBlock:((YHFormTitleItemEditType)->Void)? var rightClickBlock:((YHFormTitleItemEditType)->Void)?
// isNeedWrap 副标题是否需要换行 // isNeedWrap 副标题是否需要换行
func setTitleAndSubTitle(title: String? = "", subTitle: String? = "", isNeedWrap:Bool = false) { func setTitleAndSubTitle(title: String? = "", subTitle: String? = "", subTitleColor: UIColor = .labelTextColor2, isNeedWrap:Bool = false) {
let titleAttributes: [NSAttributedString.Key: Any] = [ let titleAttributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_M(ofSize: 17), .font: UIFont.PFSC_M(ofSize: 17),
...@@ -27,7 +27,7 @@ class YHFormItemTitleCell: UITableViewCell { ...@@ -27,7 +27,7 @@ class YHFormItemTitleCell: UITableViewCell {
] ]
let subTitleAttributes: [NSAttributedString.Key: Any] = [ let subTitleAttributes: [NSAttributedString.Key: Any] = [
.font: UIFont.PFSC_R(ofSize: 12), .font: UIFont.PFSC_R(ofSize: 12),
.foregroundColor: UIColor.labelTextColor2 .foregroundColor: subTitleColor
] ]
let attrStr = NSMutableAttributedString(string:"", attributes: titleAttributes) let attrStr = NSMutableAttributedString(string:"", attributes: titleAttributes)
......
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