Commit 8ee34cbc authored by pete谢兆麟's avatar pete谢兆麟

我的签字

parent e5ad4984
......@@ -18,6 +18,12 @@
0411CEF32D153FB700644D35 /* YHGCWorkExperienceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEF22D153FB700644D35 /* YHGCWorkExperienceViewModel.swift */; };
0411CEF52D1548AF00644D35 /* YHGCWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEF42D1548AF00644D35 /* YHGCWorkModel.swift */; };
0411CEF72D15525400644D35 /* YHGCWorkExperienceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEF62D15525400644D35 /* YHGCWorkExperienceModel.swift */; };
0411CEFE2D1A7FFD00644D35 /* YHGCMySignatureListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEFD2D1A7FFD00644D35 /* YHGCMySignatureListViewController.swift */; };
0411CF002D1A805A00644D35 /* YHGCMySignatureListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEFF2D1A805A00644D35 /* YHGCMySignatureListViewModel.swift */; };
0411CF022D1A80F500644D35 /* YHGCMySignatureDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF012D1A80F500644D35 /* YHGCMySignatureDetailViewController.swift */; };
0411CF042D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF032D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift */; };
0411CF062D1A88EA00644D35 /* YHGCDocListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF052D1A88EA00644D35 /* YHGCDocListCell.swift */; };
0411CF082D1A896800644D35 /* YHGCMySignatureListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF072D1A896800644D35 /* YHGCMySignatureListModel.swift */; };
04307B662D1942F500ED8E8D /* YHDynamicSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */; };
045C0F7F2D12CA5F00BD2DC0 /* submit_page_scroll.gif in Resources */ = {isa = PBXBuildFile; fileRef = 045C0F4F2D12CA5E00BD2DC0 /* submit_page_scroll.gif */; };
045C0F802D12CA5F00BD2DC0 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 045C0F762D12CA5E00BD2DC0 /* Localizable.xcstrings */; };
......@@ -1187,6 +1193,12 @@
0411CEF22D153FB700644D35 /* YHGCWorkExperienceViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceViewModel.swift; sourceTree = "<group>"; };
0411CEF42D1548AF00644D35 /* YHGCWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkModel.swift; sourceTree = "<group>"; };
0411CEF62D15525400644D35 /* YHGCWorkExperienceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceModel.swift; sourceTree = "<group>"; };
0411CEFD2D1A7FFD00644D35 /* YHGCMySignatureListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySignatureListViewController.swift; sourceTree = "<group>"; };
0411CEFF2D1A805A00644D35 /* YHGCMySignatureListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySignatureListViewModel.swift; sourceTree = "<group>"; };
0411CF012D1A80F500644D35 /* YHGCMySignatureDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySignatureDetailViewController.swift; sourceTree = "<group>"; };
0411CF032D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySignatureDetailViewModel.swift; sourceTree = "<group>"; };
0411CF052D1A88EA00644D35 /* YHGCDocListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCDocListCell.swift; sourceTree = "<group>"; };
0411CF072D1A896800644D35 /* YHGCMySignatureListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySignatureListModel.swift; sourceTree = "<group>"; };
04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDynamicSheetPickerView.swift; sourceTree = "<group>"; };
045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineSchemeViewController.swift; sourceTree = "<group>"; };
045C0A142D12CA5E00BD2DC0 /* YHBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
......@@ -2439,6 +2451,51 @@
path = M;
sourceTree = "<group>";
};
0411CEF82D1A7F9D00644D35 /* MySignature(我的签字) */ = {
isa = PBXGroup;
children = (
0411CEFC2D1A7FDD00644D35 /* V */,
0411CEFB2D1A7FD500644D35 /* M */,
0411CEFA2D1A7FCE00644D35 /* C */,
0411CEF92D1A7FC100644D35 /* VM */,
);
path = "MySignature(我的签字)";
sourceTree = "<group>";
};
0411CEF92D1A7FC100644D35 /* VM */ = {
isa = PBXGroup;
children = (
0411CEFF2D1A805A00644D35 /* YHGCMySignatureListViewModel.swift */,
0411CF032D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
0411CEFA2D1A7FCE00644D35 /* C */ = {
isa = PBXGroup;
children = (
0411CEFD2D1A7FFD00644D35 /* YHGCMySignatureListViewController.swift */,
0411CF012D1A80F500644D35 /* YHGCMySignatureDetailViewController.swift */,
);
path = C;
sourceTree = "<group>";
};
0411CEFB2D1A7FD500644D35 /* M */ = {
isa = PBXGroup;
children = (
0411CF072D1A896800644D35 /* YHGCMySignatureListModel.swift */,
);
path = M;
sourceTree = "<group>";
};
0411CEFC2D1A7FDD00644D35 /* V */ = {
isa = PBXGroup;
children = (
0411CF052D1A88EA00644D35 /* YHGCDocListCell.swift */,
);
path = V;
sourceTree = "<group>";
};
045C0A182D12CA5E00BD2DC0 /* C */ = {
isa = PBXGroup;
children = (
......@@ -6080,6 +6137,7 @@
04AE200E2D12CFAF00891D24 /* TTPS(高才) */ = {
isa = PBXGroup;
children = (
0411CEF82D1A7F9D00644D35 /* MySignature(我的签字) */,
04AE20572D19448800891D24 /* FileList(文件清单) */,
04AE20442D1940C700891D24 /* MyCertificates(我的证书) */,
04AE1FFC2D12CFAF00891D24 /* MyScheme(我的方案) */,
......@@ -6668,9 +6726,11 @@
045C101B2D12CA5F00BD2DC0 /* YHLoginOneLeadView.swift in Sources */,
0411CEE22D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift in Sources */,
045C101C2D12CA5F00BD2DC0 /* YHCollectionViewLeftAlignedFlowLayout.swift in Sources */,
0411CF082D1A896800644D35 /* YHGCMySignatureListModel.swift in Sources */,
045C101D2D12CA5F00BD2DC0 /* YHHUDProgressView.swift in Sources */,
045C101E2D12CA5F00BD2DC0 /* YHFailPromptView.swift in Sources */,
045C101F2D12CA5F00BD2DC0 /* YHBasePlayerViewController.swift in Sources */,
0411CEFE2D1A7FFD00644D35 /* YHGCMySignatureListViewController.swift in Sources */,
045C10202D12CA5F00BD2DC0 /* YHSelectLookHeadView.swift in Sources */,
045C10212D12CA5F00BD2DC0 /* YHHomeWebViewController.swift in Sources */,
045C10222D12CA5F00BD2DC0 /* YHMyFileListViewController.swift in Sources */,
......@@ -6781,6 +6841,7 @@
04AE20172D12CFAF00891D24 /* YHGCSchemeTableHeadView.swift in Sources */,
04AE20182D12CFAF00891D24 /* YHGCApplicationModel.swift in Sources */,
04AE20192D12CFAF00891D24 /* YHGCApplicationTypeResponseModel.swift in Sources */,
0411CF022D1A80F500644D35 /* YHGCMySignatureDetailViewController.swift in Sources */,
045C10822D12CA5F00BD2DC0 /* YHHKPlanCell.swift in Sources */,
045C10832D12CA5F00BD2DC0 /* YHAdopterIncomeViewModel.swift in Sources */,
045C10842D12CA5F00BD2DC0 /* YHResignAppointMember.swift in Sources */,
......@@ -6794,6 +6855,7 @@
045C108C2D12CA5F00BD2DC0 /* YHActivityDetailCell0.swift in Sources */,
0411CEF12D153F6300644D35 /* YHGCWorkExperienceViewController.swift in Sources */,
045C108D2D12CA5F00BD2DC0 /* YHSelectApplicantCell.swift in Sources */,
0411CF042D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift in Sources */,
045C108E2D12CA5F00BD2DC0 /* YHNameCardViewController.swift in Sources */,
045C108F2D12CA5F00BD2DC0 /* YHFamilyMemberInfoListVC.swift in Sources */,
045C10902D12CA5F00BD2DC0 /* YHHKEventWebViewController.swift in Sources */,
......@@ -7317,6 +7379,7 @@
045C12872D12CA5F00BD2DC0 /* YHStatusAdvantageVC.swift in Sources */,
045C12882D12CA5F00BD2DC0 /* YHHKPlanDoctumentVC.swift in Sources */,
045C12892D12CA5F00BD2DC0 /* YHHomeHeadView.swift in Sources */,
0411CF062D1A88EA00644D35 /* YHGCDocListCell.swift in Sources */,
045C128A2D12CA5F00BD2DC0 /* YHAITextInputView.swift in Sources */,
045C128B2D12CA5F00BD2DC0 /* YHWorkExpDataModel.swift in Sources */,
045C128C2D12CA5F00BD2DC0 /* YHSearchInfoBar.swift in Sources */,
......@@ -7529,6 +7592,7 @@
045C13562D12CA5F00BD2DC0 /* YHOtherPickerView.swift in Sources */,
045C13572D12CA5F00BD2DC0 /* YHLivePlayerViewController.swift in Sources */,
045C13582D12CA5F00BD2DC0 /* YHAIChatInputShadowView.swift in Sources */,
0411CF002D1A805A00644D35 /* YHGCMySignatureListViewModel.swift in Sources */,
045C13592D12CA5F00BD2DC0 /* YHMyFileListNoneCell.swift in Sources */,
045C135A2D12CA5F00BD2DC0 /* YHCardButton.swift in Sources */,
045C135B2D12CA5F00BD2DC0 /* YHAdopterIncomeTitleTableViewCell.swift in Sources */,
......
......@@ -292,6 +292,9 @@ class YHServiceOrderListViewController: YHBaseViewController {
} else if type == 204 {
//高才我的签字
let vc = YHGCMySignatureListViewController()
vc.orderId = orderId
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
}
......@@ -526,9 +529,9 @@ extension YHServiceOrderListViewController : UITableViewDelegate,UITableViewData
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = self.arrDataForSeviceCenterProgress[indexPath.row]
if model.status == 1 || model.status == 4 {
return
} else {
// if model.status == 1 || model.status == 4 {
// return
// } else {
YHServiceOrderListViewController.jumpToMessageController(type: model.type, orderId: orderID, stepID,productType: productInfoMode.product_type)
if model.type == 3 {
//我的评分
......@@ -537,7 +540,7 @@ extension YHServiceOrderListViewController : UITableViewDelegate,UITableViewData
//我的方案
handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
}
}
// }
}
func handleRedPointFor(key: String, model: YHServiceCenterProgressModel) {
......
......@@ -56,7 +56,7 @@ class YHMyDocListHeaderView: UIView {
fatalError("init(coder:) has not been implemented")
}
private lazy var titleLable : UILabel = {
lazy var titleLable : UILabel = {
let lable0 = UILabel(text: "您好,尊敬的客户")
lable0.textColor = UIColor.mainTextColor
lable0.font = UIFont.PFSC_M(ofSize: 21)
......
//
// YHGCDocListCell.swift
// galaxy
//
// Created by EDY on 2024/12/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHGCMySignatureListModel: SmartCodable {
var renewal_manage_docs: [YHGCMySignatureModel] = []
var top_title: String = ""
required init() {
}
}
class YHGCMySignatureModel: SmartCodable {
var id: Int = 0
var doc_name: String = ""
var doc_type: Int = 0
var doc_type_name: String = ""
var is_upload: Int = 0
var doc_status: Int = 0
var doc_send: String = ""
var contract_lock: Bool = false
var is_second_page: Bool = false
var contract_id: String = ""
var doc_type_label: String = ""
var isEditFlag : Bool = false //是否为编辑状态
var isSelectedFlag : Bool = true //是否被选择 默认全部全部选择
required init() {
}
}
//
// YHGCDocListCell.swift
// galaxy
//
// Created by EDY on 2024/12/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHGCDocListCell: UITableViewCell {
var centerView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius6
return view
}()
var titleLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 16)
label.textColor = UIColor.mainTextColor
label.lineBreakMode = .byWordWrapping
label.numberOfLines = 0
return label
}()
var statusLabel: UILabel!
lazy var statusHoldView : UIView = {
let view = UIView()
return view
}()
lazy var checkButton : UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 15)
button.contentHorizontalAlignment = .center
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setImage(UIImage(named: "my_doc_check_btn_0"), for: .normal)
button.setImage(UIImage(named: "my_doc_check_btn_1"), for: .selected)
button.isUserInteractionEnabled = false
return button
}()
var dataSourceForSign: YHGCMySignatureModel? {
didSet {
updateAllViewsForSign()
}
}
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
selectionStyle = .none
setupUI()
}
func setupUI() {
backgroundColor = .clear
contentView.addSubview(centerView)
centerView.snp.makeConstraints { make in
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.top.equalTo(14)
make.bottom.equalToSuperview()
}
centerView.addSubview(statusHoldView)
statusHoldView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalTo(-kMargin)
make.height.equalTo(20)
make.width.equalTo(62)
}
let imageV : UIImageView = UIImageView()
imageV.image = UIImage(named: "my_doc_right_arrow")
statusHoldView.addSubview(imageV)
imageV.snp.makeConstraints { make in
make.right.equalToSuperview()
make.centerY.equalToSuperview()
make.width.height.equalTo(kMargin)
}
statusLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = UIColor.brandMainColor
label.textAlignment = .right
label.text = "待审核"
return label
}()
statusHoldView.addSubview(statusLabel)
statusLabel.snp.makeConstraints { make in
make.right.equalTo(imageV.snp.left).offset(-4)
make.centerY.equalToSuperview()
make.width.equalTo(42)
make.height.equalTo(20)
}
centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(22)
make.left.equalTo(21)
make.right.equalTo(-90)
make.bottom.equalTo(-22)
}
centerView.addSubview(checkButton)
checkButton.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-kMargin)
make.centerY.equalToSuperview()
make.width.height.equalTo(kMargin)
}
checkButton.isHidden = true
}
//签字状态
func updateAllViewsForSign() {
guard let dataSource = dataSourceForSign else { return }
titleLabel.text = dataSource.doc_type_name
if dataSource.isEditFlag {
checkButton.isHidden = false
statusHoldView.isHidden = true
checkButton.isSelected = dataSource.isSelectedFlag
} else {
checkButton.isHidden = true
statusHoldView.isHidden = false
/*
statusOpt: {
3: '待签章',
4: '已签章',
5: '已完成',
6: '已驳回'
},
*/
var statusTxt = ""
var color : UIColor = .brandMainColor
let status = dataSource.doc_status
if status == 1003 && dataSource.doc_type == 1001{
statusTxt = "待签章"
color = UIColor.brandMainColor
} else if status == 1003 {
statusTxt = "待签署"
color = UIColor.successColor
} else if status == 1000 || status == 1001 || status == 1002 {
statusTxt = "待补充"
color = UIColor.successColor
} else if status == 1007 {
statusTxt = "已完成"
color = UIColor.labelTextColor2
} else if status == 1005 || status == 1006 {
statusTxt = "审核中"
color = UIColor.failColor
} else {
statusTxt = "--"
color = UIColor.failColor
}
statusLabel.text = statusTxt
statusLabel.textColor = color
}
}
}
//
// YHGCMySignatureListViewModel.swift
// galaxy
//
// Created by EDY on 2024/12/24.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHGCMySignatureListViewModel: YHBaseViewModel {
var mainModel: YHGCMySignatureListModel?
override init() {
super.init()
}
func requestSignatureList(_ orderId: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.gclist
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
guard let dic = json.data?.peel as? [String : Any],let result = YHGCMySignatureListModel.deserialize(from: dic) else {
callBackBlock(false,nil)
return
}
self.mainModel = result
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
}
......@@ -37,7 +37,7 @@ class YHGCWorkExperienceViewController: YHBaseViewController {
}
func getData() {
viewModel.requestWorkPositionDetail(workID) {[weak self] success, error in
viewModel.requestWorkPositionDetail(workID, orderID) {[weak self] success, error in
guard let self = self else { return }
if success ?? false {
updateDataSource()
......
......@@ -32,7 +32,13 @@ class YHGCWorkExperienceViewModel: YHBaseViewModel {
let item3 = YHWorkExperienceModel(id: .id5, isNeed: true, title: "职责", isUserKeyBoard: true, prompts: "请输入", message: position.position, isShowPrompts: isShowPrompt, alertMessage:"请输入")
let item4 = YHWorkExperienceModel(id: .id23, isNeed: true, title: "开始就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.entry_time, type: .time)
let item5 = YHWorkExperienceModel(id: .id24, isNeed: true, title: "结束就职年月", isUserKeyBoard: false, prompts: "请选择", message: position.departure_time, type: .time)
let item6 = YHWorkExperienceModel(id: .id6, isNeed: true, title: "工作证明是否可以提供", isUserKeyBoard: false, prompts: "", message: "\(position.has_work_certificate)", leftButtonString: "是", rightButtonString: "否")
var has_work_certificate = 2
if position.has_work_certificate == 1 {
has_work_certificate = 1
} else if position.has_work_certificate == 2 {
has_work_certificate = 0
}
let item6 = YHWorkExperienceModel(id: .id6, isNeed: true, title: "工作证明是否可以提供", isUserKeyBoard: false, prompts: "", message: "\(has_work_certificate)", leftButtonString: "是", rightButtonString: "否")
let item7 = YHWorkExperienceModel(id: .id7, isNeed: true, title: "职业界别", isUserKeyBoard: false, prompts: "请选择", message: position.company_type, type: .position, isShowPrompts: isShowPrompt, alertMessage:"请选择")
let item77 = YHWorkExperienceModel(id: .id8, isNeed: true, title: "具体经验领域", isUserKeyBoard: true, prompts: "请输入", message: position.company_type_other, isShowPrompts: isShowPrompt, alertMessage:"请输入")
......@@ -111,7 +117,12 @@ class YHGCWorkExperienceViewModel: YHBaseViewModel {
case .id5:
position.position = item.message ?? ""
case .id6:
position.has_work_certificate = Int(item.value?.first ?? "0") ?? 0
let value = item.value?.first?.int ?? 0
if value == 0 {
position.has_work_certificate = 2
} else if value == 1 {
position.has_work_certificate = 1
}
case .id7:
position.company_type = item.message ?? ""
case .id8:
......@@ -148,8 +159,8 @@ class YHGCWorkExperienceViewModel: YHBaseViewModel {
return true
}
func requestWorkPositionDetail(_ workId: Int, callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
let param: [String: Any] = ["id": workId]
func requestWorkPositionDetail(_ workId: Int,_ orderID: Int ,callBackBlock:@escaping (_ success: Bool?, _ error:YHErrorModel?)->()) {
let param: [String: Any] = ["id": workId, "order_id": orderID]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.gcworkDetail
let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
//1. json字符串 转 对象
......
......@@ -363,6 +363,7 @@ class YHAllApiName {
static let signCallBack = "infoflow/sign/sign-callback"
static let personal = "infoflow/sign/check-personal-status"
static let signUrl = "infoflow/get-sign-url"
static let gclist = "super-app/gc/signature/doc/list"
}
//我的文书
......
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