state 状态

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -62,42 +62,46 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
     func getData() {
         viewModel.requestDocumentsDetail("\(id)", callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
-            if self.viewModel.mainModel?.prospectus.id != 0 {
-                self.stepView.snp.remakeConstraints { make in
-                    make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-                    make.left.right.equalTo(self.view)
-                    make.height.equalTo(0)
+            if success {
+                if self.viewModel.mainModel?.prospectus.id != 0 {
+                    self.stepView.snp.remakeConstraints { make in
+                        make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+                        make.left.right.equalTo(self.view)
+                        make.height.equalTo(0)
+                    }
+                    self.bottomView.isHidden = true
                 }
-                self.bottomView.isHidden = true
-            }
-            if self.viewModel.mainModel?.writing_document.doc_sign.supplement_id == 0 {
-                self.stepView.currentIndex = 0
-                self.bottomView.isHidden = true
-            } else {
-                let state = self.viewModel.mainModel?.writing_document.doc_sign.status ?? 0
-                // 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
-                self.type = state
-                if state == 0 || state == 1 || state == 2 || state == 3  {
-                    self.promptView.isHidden = true
-                    self.bottomButton.isEnabled = true
-                    self.bottomView.isHidden = false
-                } else if state == 4 {
-                    self.promptView.isHidden = true
-                    self.bottomButton.isEnabled = false
-                    self.bottomView.isHidden = false
-                } else if state == 5 {
-                    self.promptView.isHidden = true
+                if self.viewModel.mainModel?.writing_document.doc_sign.supplement_id == 0 {
+                    self.stepView.currentIndex = 0
                     self.bottomView.isHidden = true
-                    self.bottomButton.isEnabled = true
                 } else {
-                    self.promptView.isHidden = false
-                    self.promptView.setPrompt("失败")
-                    self.bottomButton.isEnabled = true
-                    self.bottomView.isHidden = false
+                    let state = self.viewModel.mainModel?.writing_document.doc_sign.status ?? 0
+                    // 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
+                    self.type = state
+                    if state == 0 || state == 1 || state == 2 || state == 3  {
+                        self.promptView.isHidden = true
+                        self.bottomButton.isEnabled = true
+                        self.bottomView.isHidden = false
+                    } else if state == 4 {
+                        self.promptView.isHidden = true
+                        self.bottomButton.isEnabled = false
+                        self.bottomView.isHidden = false
+                    } else if state == 5 {
+                        self.promptView.isHidden = true
+                        self.bottomView.isHidden = true
+                        self.bottomButton.isEnabled = true
+                    } else {
+                        self.promptView.isHidden = false
+                        self.promptView.setPrompt(self.viewModel.mainModel?.writing_document.doc_sign.audit_opinion ?? "")
+                        self.bottomButton.isEnabled = true
+                        self.bottomView.isHidden = false
+                    }
+                    self.stepView.currentIndex = 1
                 }
-                self.stepView.currentIndex = 1
+                self.tableView.reloadData()
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "")
             }
-            self.tableView.reloadData()
         })
         
         viewModel?.requestSignCallBack("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", callBackBlock: {[weak self] success, error in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentDetailModel.swift

@@ -57,6 +57,7 @@ class YHMyDocumentWritingDocumentDocSignModel: YHBaseModel {
     var wx_electronically_signed: Int = 0
     var doc_return_manual: [String] = []
     var doc_type_name: String = ""
+    var audit_opinion: String = ""
 }
 
 class YHMyDocumentWritingDocumentSupplementListModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -18,7 +18,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
         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 strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.detailApi
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -59,28 +59,32 @@ class YHMySignatureDetailViewController: YHBaseViewController {
     func getData() {
         viewModel.requestSignatureDetail("\(id)", callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
-            let state = self.viewModel.mainModel?.status ?? 0
-            // 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
-            self.type = state
-            if state == 0 || state == 1 || state == 2 || state == 3  {
-                self.promptView.isHidden = true
-                self.bottomButton.isEnabled = true
-                self.bottomView.isHidden = false
-            } else if state == 4 {
-                self.promptView.isHidden = true
-                self.bottomButton.isEnabled = false
-                self.bottomView.isHidden = false
-            } else if state == 5 {
-                self.promptView.isHidden = true
-                self.bottomView.isHidden = true
-                self.bottomButton.isEnabled = true
+            if success {
+                let state = self.viewModel.mainModel?.status ?? 0
+                // 0-待上传，1-未发送, 2-发送中，3-已发送，4-已签收，5-审核通过，6-驳回
+                self.type = state
+                if state == 0 || state == 1 || state == 2 || state == 3  {
+                    self.promptView.isHidden = true
+                    self.bottomButton.isEnabled = true
+                    self.bottomView.isHidden = false
+                } else if state == 4 {
+                    self.promptView.isHidden = true
+                    self.bottomButton.isEnabled = false
+                    self.bottomView.isHidden = false
+                } else if state == 5 {
+                    self.promptView.isHidden = true
+                    self.bottomView.isHidden = true
+                    self.bottomButton.isEnabled = true
+                } else {
+                    self.promptView.isHidden = false
+                    self.promptView.setPrompt(self.viewModel.mainModel?.audit_opinion ?? "")
+                    self.bottomButton.isEnabled = true
+                    self.bottomView.isHidden = false
+                }
+                self.tableView.reloadData()
             } else {
-                self.promptView.isHidden = false
-                self.promptView.setPrompt("失败")
-                self.bottomButton.isEnabled = true
-                self.bottomView.isHidden = false
+                YHHUD.flash(message: error?.errorMsg ?? "")
             }
-            self.tableView.reloadData()
         })
         
         viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/Model/YHMySignatureDetailModel.swift

@@ -19,6 +19,7 @@ class YHMySignatureDetailModel: YHBaseModel {
     var is_upload: Int = 0
     var is_show_button: Bool = false
     var status: Int = 0
+    var audit_opinion: String = ""
 }
 
 class YHMySignatureURLModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

@@ -17,7 +17,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
         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] = ["id": id]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.detail