Commit ad87f970 authored by pete谢兆麟's avatar pete谢兆麟

部分接口调试

parent dcee402c
...@@ -16,8 +16,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController { ...@@ -16,8 +16,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController {
// 订单id // 订单id
var id: Int = 0 var id: Int = 0
var materialModel: YHResignUploadDetailModel = YHResignUploadDetailModel() var materialModel: YHResignUploadDocExplainModel = YHResignUploadDocExplainModel()
var templateArr: [YHResignUploadDetailTemplateListModel] = []
var viewModel: YHResignUploadDocExplainViewModel = YHResignUploadDocExplainViewModel() var viewModel: YHResignUploadDocExplainViewModel = YHResignUploadDocExplainViewModel()
var fileDataSource:[YHWorkExperienceFileModel] = [] var fileDataSource:[YHWorkExperienceFileModel] = []
var selectEditItem: YHWorkExperienceFileModel? var selectEditItem: YHWorkExperienceFileModel?
...@@ -75,7 +74,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController { ...@@ -75,7 +74,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
self.gk_navTitle = "解释说明" // self.gk_navTitle = "解释说明"
addKeyBoardNotify() addKeyBoardNotify()
createUI() createUI()
...@@ -222,7 +221,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController { ...@@ -222,7 +221,7 @@ class YHResignUploadDocExplainViewController: YHBaseViewController {
extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableViewDataSource { extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
return 2 return self.materialModel.survey_content.questions.count
} }
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
...@@ -230,10 +229,15 @@ extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableVi ...@@ -230,10 +229,15 @@ extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableVi
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 { let model = self.materialModel.survey_content.questions[indexPath.section]
if model.type == 1 || model.type == 2 || model.type == 3{
let cell = tableView.dequeueReusableCell(withIdentifier: YHResignUploadDocSelectViewCell.cellReuseIdentifier, for: indexPath) as! YHResignUploadDocSelectViewCell let cell = tableView.dequeueReusableCell(withIdentifier: YHResignUploadDocSelectViewCell.cellReuseIdentifier, for: indexPath) as! YHResignUploadDocSelectViewCell
cell.selectItem = self.selectItems cell.selectItem = self.selectItems
cell.dataSource = ["小白条丢失,不知道逗留截止日期","自己生病","家人生病","工作繁忙,出差在外地","旅行证件到期,更新需要时间","受养人在内地读书,学业繁忙","其他"] var dataSource: [String] = []
for item in model.options {
dataSource.append(item.title)
}
cell.dataSource = dataSource
cell.selectBlock = {[weak self] items, value, otherValue in cell.selectBlock = {[weak self] items, value, otherValue in
guard let self = self else { return } guard let self = self else { return }
self.selectItems = items self.selectItems = items
...@@ -241,7 +245,7 @@ extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableVi ...@@ -241,7 +245,7 @@ extension YHResignUploadDocExplainViewController: UITableViewDelegate, UITableVi
} }
return cell return cell
} }
if indexPath.section == 1 { if model.type == 4 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHResignUploadDocExplainViewCell.cellReuseIdentifier, for: indexPath) as! YHResignUploadDocExplainViewCell let cell = tableView.dequeueReusableCell(withIdentifier: YHResignUploadDocExplainViewCell.cellReuseIdentifier, for: indexPath) as! YHResignUploadDocExplainViewCell
cell.dataSource = fileDataSource cell.dataSource = fileDataSource
cell.addIntroductionBlock = { [weak self] in cell.addIntroductionBlock = { [weak self] in
...@@ -436,8 +440,13 @@ extension YHResignUploadDocExplainViewController { ...@@ -436,8 +440,13 @@ extension YHResignUploadDocExplainViewController {
extension YHResignUploadDocExplainViewController { extension YHResignUploadDocExplainViewController {
func requestMaterialDetail() { func requestMaterialDetail() {
viewModel.getUploadDocSurveyContent(id: id) { [weak self] success, err in
guard let self = self else { return }
self.gk_navTitle = self.viewModel.mainModel.survey_content.title
self.materialModel = self.viewModel.mainModel
self.tableView.reloadData()
}
// viewModel.getUploadDocDetail(id: id) {[weak self] success, err in // viewModel.getUploadDocDetail(id: id) {[weak self] success, err in
// guard let self = self else { return }
// self.materialModel = self.viewModel.mainModel // self.materialModel = self.viewModel.mainModel
// if self.materialModel.status == 0 || self.materialModel.status == 1 { // if self.materialModel.status == 0 || self.materialModel.status == 1 {
// self.uploadBtn.isHidden = true // self.uploadBtn.isHidden = true
......
...@@ -87,7 +87,10 @@ class YHResignUploadDocListViewController: YHBaseViewController { ...@@ -87,7 +87,10 @@ class YHResignUploadDocListViewController: YHBaseViewController {
private extension YHResignUploadDocListViewController { private extension YHResignUploadDocListViewController {
func loadData() { func loadData() {
viewModel.getUploadDocList(orderID: orderId, stepID: batchId) {[weak self] success, err in
viewModel.getUploadDocList(orderID: 135128, stepID: 368) {[weak self] success, err in
// viewModel.getUploadDocList(orderID: orderId, stepID: batchId) {[weak self] success, err in
guard let self = self else { return } guard let self = self else { return }
if self.viewModel.mainModel.supplement_voucher_url.count == 0 { if self.viewModel.mainModel.supplement_voucher_url.count == 0 {
self.bottomView.isHidden = true self.bottomView.isHidden = true
...@@ -235,6 +238,7 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD ...@@ -235,6 +238,7 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else { } else {
let vc = YHResignUploadDocExplainViewController() let vc = YHResignUploadDocExplainViewController()
vc.id = model.supplement_id
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
// 跳转列表 // 跳转列表
......
...@@ -36,7 +36,7 @@ class YHResignUploadDocExplainContentQuestionsModel: SmartCodable { ...@@ -36,7 +36,7 @@ class YHResignUploadDocExplainContentQuestionsModel: SmartCodable {
var type: Int = 0 // 问题类型:1:单选 2:多选 3:文本输入 4:文件上传 var type: Int = 0 // 问题类型:1:单选 2:多选 3:文本输入 4:文件上传
var is_required: Int = 0 //是否必须回答 0:否 1:是 var is_required: Int = 0 //是否必须回答 0:否 1:是
var max_file_count: Int = 0 // var max_file_count: Int = 0 //
var options : YHResignUploadDocExplainContentQuestionsOptionsModel = YHResignUploadDocExplainContentQuestionsOptionsModel() var options : [YHResignUploadDocExplainContentQuestionsOptionsModel] = []
required init() { required init() {
......
...@@ -23,7 +23,8 @@ class YHResignUploadDocModel: SmartCodable { ...@@ -23,7 +23,8 @@ class YHResignUploadDocModel: SmartCodable {
var name : String = "" var name : String = ""
var status : Int = 0 var status : Int = 0
var id : Int = 0 var id : Int = 0
var supplement_id : Int = 0
required init() { required init() {
} }
......
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