数据回写

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -96,7 +96,7 @@ extension YHOtherInfoFillViewController {
     private func saveData() {
         
         let model = otherInfoVM.otherInfoFillData
-        printLog(model)
+        printLog(model?.toDictionary())
         //保存
 //        let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
 //        

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift

@@ -287,6 +287,9 @@ extension YHOtherInfoFillCell {
             //1、您是否有行业内的专业资格证书？
             let fzView1 = YHOtherYesOrNoItemView(frame: .zero)
             fzView1.updateUI(title: "1、您是否有行业内的专业资格证书？", answer: dataModel.question?.professional_qualification ?? -1)
+            fzView1.block = { answer in
+                dataModel.question?.professional_qualification = answer
+            }
             holdView4.addSubview(fzView1)
             fzView1.snp.makeConstraints { make in
                 make.top.equalTo(sessionView.snp.bottom)
@@ -298,6 +301,9 @@ extension YHOtherInfoFillCell {
             // 2、您是否在期刊或杂志上发表过论文、文章、书籍等（与工作、资质有关的）？
             let fzView2 = YHOtherYesOrNoItemView(frame: .zero)
             fzView2.updateUI(title: "2、您是否在期刊或杂志上发表过论文、文章、书籍等（与工作、资质有关的）？", answer: dataModel.question?.paper ?? -1)
+            fzView2.block = { answer in
+                dataModel.question?.paper = answer
+            }
             holdView4.addSubview(fzView2)
             fzView2.snp.makeConstraints { make in
                 make.top.equalTo(fzView1.snp.bottom)
@@ -308,6 +314,9 @@ extension YHOtherInfoFillCell {
             // 3、您是否有大学奖学金证明、专利证书、获奖证书（工作单位颁发的可以）？
             let fzView3 = YHOtherYesOrNoItemView(frame: .zero)
             fzView3.updateUI(title: "3、您是否有大学奖学金证明、专利证书、获奖证书（工作单位颁发的可以）？", answer: dataModel.question?.scholarship ?? -1)
+            fzView3.block = { answer in
+                dataModel.question?.scholarship = answer
+            }
             holdView4.addSubview(fzView3)
             fzView3.snp.makeConstraints { make in
                 make.top.equalTo(fzView2.snp.bottom)
@@ -318,6 +327,9 @@ extension YHOtherInfoFillCell {
             // 4、您是否被媒体采访过，专访您的文章被发表在杂志上或网络上？
             let fzView4 = YHOtherYesOrNoItemView(frame: .zero)
             fzView4.updateUI(title: "4、您是否被媒体采访过，专访您的文章被发表在杂志上或网络上？", answer: dataModel.question?.media_interview ?? -1)
+            fzView4.block = { answer in
+                dataModel.question?.media_interview = answer
+            }
             holdView4.addSubview(fzView4)
             fzView4.snp.makeConstraints { make in
                 make.top.equalTo(fzView3.snp.bottom)
@@ -327,8 +339,12 @@ extension YHOtherInfoFillCell {
             
             //5、专业奖项
             let fzView5 = YHOtherTextViewItemView(frame: .zero)
-            fzView5.updateUI(title: "5、专业奖项", value: dataModel.question?.professional_awards ?? "")
-              holdView4.addSubview(fzView5)
+            fzView5.updateUI(title: "5、专业奖项", value: dataModel.question?.professional_awards ?? "",type: .professionAwards)
+            fzView5.block = { txt in
+                dataModel.question?.professional_awards = txt
+                
+            }
+            holdView4.addSubview(fzView5)
             fzView5.snp.makeConstraints { make in
                 make.top.equalTo(fzView4.snp.bottom)
                 make.left.equalToSuperview().offset(18)
@@ -338,7 +354,11 @@ extension YHOtherInfoFillCell {
             
             //6、学业奖项
             let fzView6 = YHOtherTextViewItemView(frame: .zero)
-            fzView6.updateUI(title: "6、学业奖项", value: dataModel.question?.academic_awards ?? "")
+            fzView6.updateUI(title: "6、学业奖项", value: dataModel.question?.academic_awards ?? "",type: .academicAwards)
+            fzView6.block = { txt in
+                dataModel.question?.academic_awards = txt
+                
+            }
             holdView4.addSubview(fzView6)
             fzView6.snp.makeConstraints { make in
                 make.top.equalTo(fzView5.snp.bottom)
@@ -349,7 +369,10 @@ extension YHOtherInfoFillCell {
             
             //7、其他奖励
             let fzView7 = YHOtherTextViewItemView(frame: .zero)
-            fzView7.updateUI(title: "7、其他奖励", value: dataModel.question?.other_information ?? "")
+            fzView7.updateUI(title: "7、其他奖励", value: dataModel.question?.other_information ?? "",type: .otherAwards)
+            fzView7.block = { txt in
+                dataModel.question?.other_information = txt
+            }
             holdView4.addSubview(fzView7)
             fzView7.snp.makeConstraints { make in
                 make.top.equalTo(fzView6.snp.bottom)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherTextViewItemView.swift

@@ -8,6 +8,15 @@
 
 import UIKit
 
+
+enum YHOtherTextViewItemType: Int {
+    case unknowAwards = 0
+    case professionAwards = 5 //专业奖项
+    case academicAwards = 6 //学业奖项
+    case otherAwards = 7 //其他
+}
+
+
 class YHOtherTextViewItemView: UIView, UITextViewDelegate {
     
     static let viewH : CGFloat = 172.0
@@ -22,9 +31,29 @@ class YHOtherTextViewItemView: UIView, UITextViewDelegate {
     }
     
     
-    typealias Block = () -> ()
+    typealias Block = (String) -> ()
     var block: Block?
     
+    var itemType : YHOtherTextViewItemType = .unknowAwards {
+        didSet {
+            switch itemType {
+            case .unknowAwards:
+                kTipsString = "请输入"
+                break
+            case .professionAwards:
+                kTipsString = "请填写您在所属的专业界别内曾获取由国家或国际认可/著名的团体颁授的专业资格、曾取得的奖项等"
+                break
+            case .academicAwards:
+                kTipsString = "请填写您的学业成绩、曾取得的奖项等"
+                break
+            case .otherAwards:
+                kTipsString = "请填写其他能对申请带来帮助的重要资料（如：拥有有利于申请的社会任职、相关国际人脉/业务或随行人员所具备的优势点等）"
+                break
+            }
+            tipsLabel.text = kTipsString
+        }
+    }
+    
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = .mainTextColor
@@ -64,7 +93,7 @@ class YHOtherTextViewItemView: UIView, UITextViewDelegate {
     }()
     
     private var myTextView : UITextView!
-    private let kTipsString : String = "如选择“是”，请详细说明"
+    private var kTipsString : String = "如选择“是”，请详细说明"
 }
 
 
@@ -119,8 +148,6 @@ private extension YHOtherTextViewItemView {
     }
 }
 
-
-
 extension YHOtherTextViewItemView : UITextFieldDelegate {
     internal func textViewDidChange(_ textView: UITextView) {
         if textView.text == "" {
@@ -128,13 +155,16 @@ extension YHOtherTextViewItemView : UITextFieldDelegate {
         } else {
             tipsLabel.isHidden = true
         }
+        self.block?(textView.text)
     }
 }
 
 extension YHOtherTextViewItemView {
-    func updateUI(title : String,value : String) {
+    func updateUI(title : String,value : String, type : YHOtherTextViewItemType = .unknowAwards) {
         titleLabel.text = title
         myTextView.text = value
+        self.itemType = type
+        
         if title.count > 0 {
             tipsLabel.isHidden = true
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherYesOrNoItemView.swift

@@ -20,7 +20,7 @@ class YHOtherYesOrNoItemView: UIView, UITextViewDelegate {
     }
     
     
-    typealias Block = () -> ()
+    typealias Block = (Int) -> ()
     var block: Block?
     
     
@@ -156,8 +156,7 @@ private extension YHOtherYesOrNoItemView {
             answer1Btn.isSelected = false
             updateAnswerButton(answer1Btn, false)
         }
-        
-//        block?()
+        self.block?(answer2Btn.isSelected == true ? 2 : 1)
     }
     
     // 更新答案按钮选中状态