我的文书和我的签字修改

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

@@ -146,6 +146,7 @@ extension YHHKPlanDoctumentVC {
                               "plan_detail":viewModel.arrHKPlanData[3].content,
                               "qualifications_and_awards":viewModel.arrHKPlanData[4].content,
                               "other":viewModel.arrHKPlanData[5].content,
+                              "remark":viewModel.arrHKPlanData[6].content,
                               "content_save":1]
                 cancelTimer()
                 startTimer()

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

@@ -702,17 +702,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                     }
                     
                     if type == .delete {
-                        YHHUD.flash(message: "产品确定 后续完善")
-//                        self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index]
-//                        self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
-//                            guard let self = self else { return }
-//                            if success {
-//                                YHHUD.flash(message: "删除成功")
-//                            } else {
-//                                YHHUD.flash(message: error?.errorMsg ?? "")
-//                            }
-//                            self.getData()
-//                        }
+//                        YHHUD.flash(message: "产品确定 后续完善")
+                        self.oldUrl = self.viewModel.mainModel?.writing_document.doc_sign.doc_return_manual[index]
+                        self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
+                            guard let self = self else { return }
+                            if success {
+                                YHHUD.flash(message: "删除成功")
+                            } else {
+                                YHHUD.flash(message: error?.errorMsg ?? "")
+                            }
+                            self.getData()
+                        }
                     }
                 }
                 return cell

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

@@ -16,6 +16,7 @@ enum HKPlanDocQuestionType {
     case planDocQuestion4 //4、未来发展计划
     case planDocQuestion5 //5、专业资格及奖项
     case planDocQuestion6 //6、其他材料
+    case planOther        //7、备注
 }
 
 class YHHKPlanDocModel {

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

@@ -30,6 +30,7 @@ class YHMyDocumentProspectusModel: YHBaseModel {
     var tag: String = ""
     var tencent_file_id: String = ""
     var tencent_docs_url: String = ""
+    var remark: String = ""
 
     //赴港计划书状态
     var status : Int = 0

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

@@ -164,6 +164,8 @@ private extension YHHKPlanItemView {
             YHWholeScreenTipsView.show(type: .hkPlanQ6, targetView: iconImageV)
         case .unknow:
             printLog("")
+        case .planOther:
+            YHWholeScreenTipsView.show(type: .hkPlanQ7, targetView: iconImageV)
         }
     }
     
@@ -182,8 +184,12 @@ private extension YHHKPlanItemView {
             
             myTextView.wrapToContent()
         }
-        numberLabel.text = myTextView.text.count.string + "/100"
-        if myTextView.text.count > 100 {
+        var number = 100
+        if model.type == .planOther {
+            number = 500
+        }
+        numberLabel.text = myTextView.text.count.string + "/\(number)"
+        if myTextView.text.count > number {
             numberLabel.textColor = .failColor
         } else {
             numberLabel.textColor = UIColor.placeHolderColor
@@ -204,6 +210,9 @@ extension YHHKPlanItemView : UITextViewDelegate {
             return true
         }
         let newLength = (textView.text as NSString).length + text.count - range.length
+        if dataMode?.type == .planOther {
+            return newLength <= 500
+        }
         return newLength <= 100
     }
     
@@ -211,8 +220,12 @@ extension YHHKPlanItemView : UITextViewDelegate {
         guard let model = dataMode else { return }
         guard let text = textView.text else { return }
         model.content = text
-        numberLabel.text = myTextView.text.count.string + "/100"
-        if myTextView.text.count > 100 {
+        var number = 100
+        if model.type == .planOther {
+            number = 500
+        }
+        numberLabel.text = myTextView.text.count.string + "/\(number)"
+        if myTextView.text.count > number {
             numberLabel.textColor = .failColor
         } else {
             numberLabel.textColor = UIColor.placeHolderColor

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

@@ -386,6 +386,15 @@ private extension YHMyDocumentsDetailViewModel {
             tModel.title = "6、其他材料"
             tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
             tModel.type = .planDocQuestion6
+            
+            arrHKPlanData.append(tModel)
+        }
+        //6、备注
+        do {
+            let tModel = YHHKPlanDocModel()
+            tModel.title = "7、备注"
+            tModel.content = model.remark.defaultStringIfEmpty(detaultValue: "")
+            tModel.type = .planOther
             tModel.isLastData = true
             
             arrHKPlanData.append(tModel)

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

@@ -595,17 +595,16 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                 }
                 
                 if type == .delete {
-                    YHHUD.flash(message: "产品确定 后续完善")
-//                    self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
-//                    self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
-//                        guard let self = self else { return }
-//                        if success {
-//                            YHHUD.flash(message: "删除成功")
-//                        } else {
-//                            YHHUD.flash(message: error?.errorMsg ?? "")
-//                        }
-//                        self.getData()
-//                    }
+                    self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
+                    self.viewModel.requestFileAction("\(self.id)", 3, [], self.oldUrl ?? "") {[weak self] success, error in
+                        guard let self = self else { return }
+                        if success {
+                            YHHUD.flash(message: "删除成功")
+                        } else {
+                            YHHUD.flash(message: error?.errorMsg ?? "")
+                        }
+                        self.getData()
+                    }
                 }
             }
             return cell

galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift

@@ -21,6 +21,7 @@ enum YHWholeScreenTipsViewType : Int {
     case hkPlanQ4 //赴港计划书问题4
     case hkPlanQ5 //赴港计划书问题5
     case hkPlanQ6 //赴港计划书问题6
+    case hkPlanQ7 //赴港计划书问题7
 }
 
 
@@ -85,6 +86,8 @@ class YHWholeScreenTipsView: UIView {
             return "请以不超过100字简介你所属的专业界别内曾获取由国家或国际认可/著名团体颁奖的专业资格，及曾取得的奖项（如有）"
         case .hkPlanQ6:
             return "请以不超过100字简介你认为对评核你的申请非常重要的其他材料"
+        case .hkPlanQ7:
+            return "您可以在此输入因为字数限制无法输入的内容"
         default:
             return "--"
         }