Commit 49786bc2 authored by pete谢兆麟's avatar pete谢兆麟

state 状态

parent 24e45d78
...@@ -62,6 +62,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -62,6 +62,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
func getData() { func getData() {
viewModel.requestDocumentsDetail("\(id)", callBackBlock: {[weak self] success, error in viewModel.requestDocumentsDetail("\(id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success {
if self.viewModel.mainModel?.prospectus.id != 0 { if self.viewModel.mainModel?.prospectus.id != 0 {
self.stepView.snp.remakeConstraints { make in self.stepView.snp.remakeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar) make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
...@@ -91,13 +92,16 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -91,13 +92,16 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
self.bottomButton.isEnabled = true self.bottomButton.isEnabled = true
} else { } else {
self.promptView.isHidden = false self.promptView.isHidden = false
self.promptView.setPrompt("失败") self.promptView.setPrompt(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
self.bottomButton.isEnabled = true self.bottomButton.isEnabled = true
self.bottomView.isHidden = false self.bottomView.isHidden = false
} }
self.stepView.currentIndex = 1 self.stepView.currentIndex = 1
} }
self.tableView.reloadData() self.tableView.reloadData()
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
}) })
viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in
......
...@@ -57,6 +57,7 @@ class YHMyDocumentWritingDocumentDocSignModel: YHBaseModel { ...@@ -57,6 +57,7 @@ class YHMyDocumentWritingDocumentDocSignModel: YHBaseModel {
var wx_electronically_signed: Int = 0 var wx_electronically_signed: Int = 0
var doc_return_manual: [String] = [] var doc_return_manual: [String] = []
var doc_type_name: String = "" var doc_type_name: String = ""
var audit_opinion: String = ""
} }
class YHMyDocumentWritingDocumentSupplementListModel: YHBaseModel { class YHMyDocumentWritingDocumentSupplementListModel: YHBaseModel {
......
...@@ -18,7 +18,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel { ...@@ -18,7 +18,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
super.init() super.init()
} }
func requestDocumentsDetail(_ supplementId: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) { func requestDocumentsDetail(_ supplementId: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["supplement_id": supplementId] let params: [String : Any] = ["supplement_id": supplementId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.detailApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.detailApi
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
......
...@@ -59,6 +59,7 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -59,6 +59,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
func getData() { func getData() {
viewModel.requestSignatureDetail("\(id)", callBackBlock: {[weak self] success, error in viewModel.requestSignatureDetail("\(id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success {
let state = self.viewModel.mainModel?.status ?? 0 let state = self.viewModel.mainModel?.status ?? 0
// 0-待上传,1-未发送, 2-发送中,3-已发送,4-已签收,5-审核通过,6-驳回 // 0-待上传,1-未发送, 2-发送中,3-已发送,4-已签收,5-审核通过,6-驳回
self.type = state self.type = state
...@@ -76,11 +77,14 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -76,11 +77,14 @@ class YHMySignatureDetailViewController: YHBaseViewController {
self.bottomButton.isEnabled = true self.bottomButton.isEnabled = true
} else { } else {
self.promptView.isHidden = false self.promptView.isHidden = false
self.promptView.setPrompt("失败") self.promptView.setPrompt(self.viewModel.mainModel?.audit_opinion ?? "")
self.bottomButton.isEnabled = true self.bottomButton.isEnabled = true
self.bottomView.isHidden = false self.bottomView.isHidden = false
} }
self.tableView.reloadData() self.tableView.reloadData()
} else {
YHHUD.flash(message: error?.errorMsg ?? "")
}
}) })
viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
......
...@@ -19,6 +19,7 @@ class YHMySignatureDetailModel: YHBaseModel { ...@@ -19,6 +19,7 @@ class YHMySignatureDetailModel: YHBaseModel {
var is_upload: Int = 0 var is_upload: Int = 0
var is_show_button: Bool = false var is_show_button: Bool = false
var status: Int = 0 var status: Int = 0
var audit_opinion: String = ""
} }
class YHMySignatureURLModel: YHBaseModel { class YHMySignatureURLModel: YHBaseModel {
......
...@@ -17,7 +17,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel { ...@@ -17,7 +17,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
super.init() super.init()
} }
func requestSignatureDetail(_ id: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) { func requestSignatureDetail(_ id: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId] // let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["id": id] let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.detail let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.detail
......
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