Commit 90fea73e authored by pete谢兆麟's avatar pete谢兆麟

相关bug修复

parent 4f947b0f
...@@ -123,6 +123,10 @@ class YHResignUploadDocDetailViewController: YHBaseViewController { ...@@ -123,6 +123,10 @@ class YHResignUploadDocDetailViewController: YHBaseViewController {
} }
} }
} else { } else {
if self.items.count == 0 {
YHHUD.flash(message: "请上传必填文件")
return
}
self.viewModel.postUploadDocUpload(id: id, file: self.items) { [weak self] success, err in self.viewModel.postUploadDocUpload(id: id, file: self.items) { [weak self] success, err in
guard let self = self else { return } guard let self = self else { return }
if success { if success {
......
...@@ -132,7 +132,7 @@ private extension YHResignUploadDocListViewController { ...@@ -132,7 +132,7 @@ private extension YHResignUploadDocListViewController {
let label = UILabel() let label = UILabel()
label.numberOfLines = 0 label.numberOfLines = 0
let a = ASAttributedString.init("您申请的【优才入境计划】续签,", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor50)) let a = ASAttributedString.init("您申请的【优才入境计划】续签,", .font(UIFont.PFSC_M(ofSize:17)), .foreground(UIColor.mainTextColor50))
let b = ASAttributedString.init("港澳通行证逗留(D)签注延期-办理指引", .font(UIFont.PFSC_M(ofSize:17)),.foreground(UIColor.yhOrangeColor)) let b = ASAttributedString.init("已获得港府补件通知!", .font(UIFont.PFSC_M(ofSize:17)),.foreground(UIColor.yhOrangeColor))
label.attributed.text = a+b label.attributed.text = a+b
return label return label
}() }()
...@@ -198,9 +198,19 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD ...@@ -198,9 +198,19 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
if indexPath.section == 0 { if indexPath.section == 0 {
approveCell.title = "资料上传" approveCell.title = "资料上传"
approveCell.dataSource = self.viewModel.mainModel.upload_list approveCell.dataSource = self.viewModel.mainModel.upload_list
if self.viewModel.mainModel.upload_list.count == 0 {
approveCell.isHidden = true
} else {
approveCell.isHidden = false
}
} else { } else {
approveCell.title = "文书确认" approveCell.title = "文书确认"
approveCell.dataSource = self.viewModel.mainModel.doc_list approveCell.dataSource = self.viewModel.mainModel.doc_list
if self.viewModel.mainModel.doc_list.count == 0 {
approveCell.isHidden = true
} else {
approveCell.isHidden = false
}
} }
approveCell.clickBlock = { [weak self] model, section in approveCell.clickBlock = { [weak self] model, section in
guard let self = self else { return } guard let self = self else { return }
...@@ -211,8 +221,12 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD ...@@ -211,8 +221,12 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else { } else {
// 跳转列表 // 跳转列表
let vc = YHResignDocumentManagementVC(orderId: orderId, id: batchId) if model.status == 0 {
self.navigationController?.pushViewController(vc) YHHUD.flash(message: "文书正在努力撰写中,请等待")
} else {
let vc = YHResignDocumentManagementVC(orderId: orderId, id: batchId)
self.navigationController?.pushViewController(vc)
}
} }
} }
return approveCell return approveCell
......
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