Commit 4e34d695 authored by David黄金龙's avatar David黄金龙

处理 文书的几处bug

parent efd13397
......@@ -186,12 +186,11 @@ extension YHHKPlanDoctumentVC {
guard let self = self else { return }
self.status = viewModel.mainModel?.prospectus.status ?? 0
self.updateUI()
for item in viewModel.arrHKPlanData {
item.canEditFlag = self.canEditFlag
}
self.updateUI()
self.tableView.isHidden = false
self.tableView.reloadData()
})
......
......@@ -29,7 +29,7 @@ class YHHKPlanItemView: UIView {
private lazy var numberLabel : UILabel = {
let view = UILabel()
view.text = "--/100"
view.text = "--/300"
view.font = UIFont.PFSC_R(ofSize: 12)
view.textColor = UIColor.placeHolderColor
view.textAlignment = .right
......@@ -381,6 +381,7 @@ private extension YHHKPlanItemView {
}
}
isPreDone = true
returStrn = returStrn + String(scalar)
}
if index == stringLength - 1 {
......
......@@ -335,9 +335,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "1、主要事业成就"
tModel.content = model.career_achievement.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion1
tModel.isFirstData = true
arrHKPlanData.append(tModel)
......@@ -348,9 +348,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "2、专业技能成就"
tModel.content = model.professional_skills.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion2
arrHKPlanData.append(tModel)
......@@ -361,9 +361,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "3、学业成就"
tModel.content = model.academic_achievement.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion3
arrHKPlanData.append(tModel)
......@@ -374,9 +374,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "4、未来发展计划"
tModel.content = model.plan_detail.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion4
arrHKPlanData.append(tModel)
......@@ -387,9 +387,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "5、专业资格及奖项"
tModel.content = model.qualifications_and_awards.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion5
arrHKPlanData.append(tModel)
......@@ -400,9 +400,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "6、其他材料"
tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
// if tModel.content.count > 100 {
// tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
// }
tModel.type = .planDocQuestion6
arrHKPlanData.append(tModel)
......@@ -412,9 +412,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "7、备注"
tModel.content = model.remark.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 500 {
tModel.content = tModel.content.slicing(from: 0, length: 500) ?? ""
}
// if tModel.content.count > 500 {
// tModel.content = tModel.content.slicing(from: 0, length: 500) ?? ""
// }
tModel.type = .planOther
tModel.isLastData = true
......
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