Skip to content

G
galaxy-iOS
Commit 1a9a6777 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit 'bccd9c3b' into xiezhaolin

parents 0831de19 bccd9c3b
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 33 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ 1a9a6777
......@@ -317,10 +317,11 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
self.navigationController?.pushViewController(vc)
} else if detailItem.type == .educationStyle { // 授课形式
YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
[weak self] selectType in
YHSheetPickerView.show(type:.educationStyle, selectTitle:detailInfo.teachingFormat) {
[weak self] item in
guard let self = self else { return }
detailInfo.teachingFormat = selectType.title
detailInfo.teachingFormat = item.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
......@@ -346,10 +347,10 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .educationDegree { // 学位
YHFormPickerView.show(type: .degree, selectType: .degree(.bachelor)) {
[weak self] selectType in
YHSheetPickerView.show(type:.educationDegree, selectTitle:detailInfo.degree) {
[weak self] item in
guard let self = self else { return }
detailInfo.degree = selectType.title
detailInfo.degree = item.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift
View file @ 1a9a6777
......@@ -161,6 +161,18 @@ class YHSheetPickerView: UIView {
YHSheetPickerViewItem(title:"博士学位".local, index:3)
],
// 学位2
.educationDegree:
[YHSheetPickerViewItem(title:"无学位(专科)".local, index:0),
YHSheetPickerViewItem(title:"无学位(本科)".local, index:1),
YHSheetPickerViewItem(title:"无学位(硕士)".local, index:2),
YHSheetPickerViewItem(title:"无学位(博士)".local, index:3),
YHSheetPickerViewItem(title:"学士学位".local, index:4),
YHSheetPickerViewItem(title:"硕士学位".local, index:5),
YHSheetPickerViewItem(title:"博士学位".local, index:6)
],
// 婚姻
.marriage:
[YHSheetPickerViewItem(title:"未婚".local, index:0),
......@@ -171,7 +183,7 @@ class YHSheetPickerView: UIView {
],
// 教育
.edution:
.educationStyle:
[YHSheetPickerViewItem(title:"全日制".local, index:0),
YHSheetPickerViewItem(title:"兼职制".local, index:1),
YHSheetPickerViewItem(title:"遥距课程".local, index:2),
......@@ -210,12 +222,12 @@ class YHSheetPickerView: UIView {
// 证件
.certificate:
[YHSheetPickerViewItem(title:"护照".local, index:3),
YHSheetPickerViewItem(title:"旅游通行证".local, index:4),
YHSheetPickerViewItem(title:"外交护照".local, index:5),
YHSheetPickerViewItem(title:"外交护照".local, index:4),
YHSheetPickerViewItem(title:"公务护照".local, index:5),
YHSheetPickerViewItem(title:"中国发无国籍旅游证件".local, index:6),
YHSheetPickerViewItem(title:"其他无国籍旅行证件".local, index:7),
YHSheetPickerViewItem(title:"旅游通行证".local, index:7),
YHSheetPickerViewItem(title:"联合国通行证".local, index:8),
YHSheetPickerViewItem(title:"公务护照".local, index:9),
YHSheetPickerViewItem(title:"其他无国籍旅行证件".local, index:9),
YHSheetPickerViewItem(title:"其他".local, index:10),
],
......@@ -236,8 +248,8 @@ class YHSheetPickerView: UIView {
// 学位颁发地区
.degreeLocation:
[YHSheetPickerViewItem(title:"国内 (颁发)".local, index:1),
YHSheetPickerViewItem(title:"国外 (颁发)".local, index:2),
[YHSheetPickerViewItem(title:"国内 (颁发)".local, index:0),
YHSheetPickerViewItem(title:"国外 (颁发)".local, index:1),
],
// 专业证书
......@@ -269,8 +281,9 @@ class YHSheetPickerView: UIView {
YHSheetPickerViewItem(title:"法律".local, index:6),
YHSheetPickerViewItem(title:"生命科学及医学".local, index:7),
YHSheetPickerViewItem(title:"管理学".local, index:8),
YHSheetPickerViewItem(title:"社会科学".local, index:9),
YHSheetPickerViewItem(title:"其他".local, index:10),
YHSheetPickerViewItem(title:"理学".local, index:9),
YHSheetPickerViewItem(title:"社会科学".local, index:10),
YHSheetPickerViewItem(title:"其他".local, index:11),
],
]
......@@ -342,9 +355,11 @@ extension YHSheetPickerView {
return ""
case .degree:
return "选择学位"
case .educationDegree:
return "选择学位"
case .marriage:
return "选择婚姻状况"
case .edution:
case .educationStyle:
return "选择学位"
case .occupation:
return "选择职业"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerViewType.swift
View file @ 1a9a6777
......@@ -14,12 +14,14 @@ enum YHSheetPickerViewType: Int {
case none = 0
// 学位
case degree
// 学位2 (包含无学位类型)
case educationDegree
// 学位有无
case ownDegree
// 婚姻
case marriage
// 授课形式
case edution
case educationStyle
// 职业
case occupation
// 职业2
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift
View file @ 1a9a6777
......@@ -22,8 +22,6 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
let lable0 = UILabel(text: "--")
lable0.textColor = UIColor.labelTextColor2
lable0.font = UIFont.PFSC_R(ofSize: 14)
// lable0.numberOfLines = 1
// lable0.lineBreakMode = .byCharWrapping
return lable0
}()
......@@ -65,6 +63,17 @@ extension YHPreviewInfoNameAndSubNameItemView {
func update(title : String,subtitle : String) {
nameLable.text = title
subtitleLable.text = subtitle
//处理特长的字符
if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：") {
nameLable.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(18)
make.left.equalToSuperview()
make.width.lessThanOrEqualTo(200)
make.height.equalTo(20)
}
nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 1a9a6777
......@@ -226,7 +226,7 @@ private extension YHPreviewViewModel {
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "用人单位：", answer: model.company_name)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "用人单位性质：", answer: model.industry)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "用人单位介绍：", answer: model.company_introduce)
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website)
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website.defaultStringIfEmpty())
var title = "-"
if let item = model.location {
title = item.country + "-" + item.details
......@@ -244,7 +244,7 @@ private extension YHPreviewViewModel {
let tempppp = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .structure)
let tmp13 = YHPreviewQuestionAndAnswerModel(question: "行政架构层级：", answer:tempppp)
let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover))
let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover).defaultStringIfEmpty())
let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .level)
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
......@@ -256,7 +256,7 @@ private extension YHPreviewViewModel {
var arr2 : [YHPreviewQuestionAndAnswerModel] = []
do {
//2.
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "公司业务性质/范畴/所属行业：", answer:model.business_nature)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "公司业务性质/范畴/所属行业：", answer:model.business_nature.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "工作职责：", answer:model.wduty)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "工作亮点：", answer:model.highlights)
......@@ -409,15 +409,15 @@ private extension YHPreviewViewModel {
do {
//基本信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "主申请人：", answer: model.username)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.used_name.isEmpty ? "--" : model.used_name)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.used_name.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: model.birth_place)
var msg = YHConstantArrayData.getShowNameBy(indexStr: model.sex, type: .sex)
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: msg)
msg = YHConstantArrayData.getShowNameBy(indexStr: model.married, type: .marry)
msg = model.married//后台 王辉维护这个字段 前端直接展示
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: msg)
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号：", answer: model.mobile)
......@@ -430,7 +430,7 @@ private extension YHPreviewViewModel {
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: model.is_live_oversea_year == 1 ? "是" : "否")
arr.append(tmp10)
} else {
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: model.live_address_detail)
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: model.live_address_detail.defaultStringIfEmpty())
arr.append(tmp10)
}
......@@ -946,7 +946,7 @@ private extension YHPreviewViewModel {
do {
//配偶信息-否
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
var city = ""
......@@ -994,7 +994,7 @@ private extension YHPreviewViewModel {
do {
//配偶信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
var city = ""
......@@ -1061,7 +1061,7 @@ private extension YHPreviewViewModel {
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: title)
arr.append(tmp12)
}
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address)
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
arr.append(tmp133)
let tmp13 = YHPreviewQuestionAndAnswerModel(question: "目前是否在港：", answer: model.hkIdentity.isEmpty == false ? "是" : "否")
......@@ -1248,8 +1248,8 @@ private extension YHPreviewViewModel {
do {
//配偶信息-否
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.isEmpty ? "--" : model.usedName)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.isEmpty ? "--" : model.surname)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
let tmp22 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: sexStr)
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "出生日期：", answer: model.birthday)
......@@ -1305,7 +1305,7 @@ private extension YHPreviewViewModel {
do {
//子女信息
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname)
let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
......@@ -1383,7 +1383,7 @@ private extension YHPreviewViewModel {
}
if model.nows == 0 {
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address)
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
arr.append(tmp133)
}
......
galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift
View file @ 1a9a6777
......@@ -40,6 +40,14 @@ extension String {
}
return nil
}
//判断字符串并返回默认值
func defaultStringIfEmpty(detaultValue : String = "--") -> String {
if self.isEmpty {
return detaultValue
}
return self
}
}
extension String {
......
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