修改几处 bug

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

@@ -125,6 +125,12 @@ extension YHHKPlanDoctumentVC {
     
     //点击提交按钮
     @objc func clickSubmitBtn() {
+        
+        if !checkDataOK() {
+            YHHUD.flash(message: "需完成所有项的填写")
+            return
+        }
+        
         YHCommonAlertView.show("", "是否已完成对文本框的内容修改，并确认提交？", "取消", "确认") {
             self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
                 guard let self = self else { return }
@@ -133,10 +139,26 @@ extension YHHKPlanDoctumentVC {
         }
     }
     
+    private func checkDataOK() -> Bool {
+        if viewModel.arrHKPlanData.count > 6 {
+            
+            let ret0 = viewModel.arrHKPlanData[0].contentCount > 0 ? true : false
+            let ret1 = viewModel.arrHKPlanData[1].contentCount > 0 ? true : false
+            let ret2 = viewModel.arrHKPlanData[2].contentCount > 0 ? true : false
+            let ret3 = viewModel.arrHKPlanData[3].contentCount > 0 ? true : false
+            let ret4 = viewModel.arrHKPlanData[4].contentCount > 0 ? true : false
+            let ret5 = viewModel.arrHKPlanData[5].contentCount > 0 ? true : false
+            let ret6 = viewModel.arrHKPlanData[6].contentCount > 0 ? true : false
+            
+            return ret0 && ret1 && ret2 && ret3 && ret4 && ret5 && ret6
+        }
+        return false
+    }
+    
     //提交数据
     private func submitOp() {
         
-        if viewModel.arrHKPlanData.count > 5 {
+        if viewModel.arrHKPlanData.count > 6 {
             if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
                 let params = ["order_id":orderID,
                               "supplement_id":supplement_id,

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

@@ -105,7 +105,7 @@ class YHHKPlanItemView: UIView {
     let holdView : UIView = UIView()
     
     //提示文字
-    var tipsTxt : String = "请输入,300字内"
+    var tipsTxt : String = "请输入,100字内"
 //    var maxNumbler : Int = 100
     var maxNumbler : Int = 100 {
         didSet {
@@ -270,12 +270,7 @@ private extension YHHKPlanItemView {
             myTextView.wrapToContent()
         }
         
-        if model.type == .planOther {
-            maxNumbler = 100
-            tipsTxt = "在此补充其他信息，非必填"
-        } else {
-            maxNumbler = 100
-        }
+        maxNumbler = 100
         
         tipsLable.text = tipsTxt
         
@@ -287,6 +282,9 @@ private extension YHHKPlanItemView {
         
         let textNum = calcTextLength(string: myTextView.text)
         numberLabel.text = textNum.string + "/\(maxNumbler)"
+        
+        model.contentCount = textNum //方便后面判断
+        
         if textNum > maxNumbler {
             numberLabel.textColor = .failColor
         } else {
@@ -502,22 +500,9 @@ extension YHHKPlanItemView : UITextViewDelegate {
         guard let model = dataMode else { return }
         guard let text = textView.text else { return }
         
-        var txtNum : Int = 0
-        
-        txtNum = calcTextLength(string: text)
+        var txtNum : Int =  calcTextLength(string: text)
         numberLabel.text =  txtNum.string + "/\(maxNumbler)"
         
-        
-        printLog(text.count)
-//        if text.count <= maxNumbler{
-//            model.content = text
-//        } else {
-//            var ttt = text
-//            let subString = ttt.slice(from: 0, length: maxNumbler)
-//            
-//            model.content = subString
-//        }
-        
         model.content = text
         model.contentCount = txtNum