// 学历

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -160,12 +160,9 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
         let item:YHFormItemProtocol = arr[indexPath.row]
 
         if item is YHFormTitleItem { // 是标题
-            
             let formItem = item as! YHFormTitleItem
-            
-            // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle())
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDegreeInfoCell.swift

@@ -40,7 +40,7 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
                 titleLabel.attributedText = questionAttrStr
                 
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }
@@ -167,7 +167,7 @@ class HKDegreeInfoItemView: UIView {
                 titleLabel.attributedText = questionAttrStr
                 
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemDoubleChoiceCell.swift

@@ -54,7 +54,7 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
                 
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemEnterDetailCell.swift

@@ -48,7 +48,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -30,7 +30,6 @@ class YHFormItemExpireDateCell: UITableViewCell {
 
     var title:String? {
         didSet {
-            
             if let title = title, !title.isEmpty {
                 let str = (isMust ? ("*"+title) : title)
                 let attributes: [NSAttributedString.Key: Any] = [
@@ -43,7 +42,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }
@@ -56,7 +55,6 @@ class YHFormItemExpireDateCell: UITableViewCell {
     
     var detail:String? {
         didSet {
-
             if let detail = detail, !detail.isEmpty {
                 detailLabel.text =  detail
                 detailLabel.textColor = detailColor

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemInputTextCell.swift

@@ -39,7 +39,7 @@ class YHFormItemInputTextCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemQuestionsCell.swift

@@ -40,7 +40,7 @@ class YHFormItemQuestionsCell: UITableViewCell {
                 
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemTitleCell.swift

@@ -104,7 +104,7 @@ class YHFormItemTitleCell: UITableViewCell {
 
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(cancelButton.snp.left).offset(-3)
+            make.right.equalToSuperview().offset(-horizonalGap)
             make.top.equalToSuperview().offset(16)
             make.bottom.equalToSuperview().offset(-16)
         }
@@ -130,6 +130,8 @@ class YHFormItemTitleCell: UITableViewCell {
     }
     
     func showEditType(type: YHFormTitleItemEditType) {
+        
+        var titleMaxRight = -(horizonalGap)
         switch type {
             case .none:
                 cancelButton.isHidden = true
@@ -137,10 +139,17 @@ class YHFormItemTitleCell: UITableViewCell {
             case .canEdit:
                 cancelButton.isHidden = true
                 editButton.isHidden = false
+                titleMaxRight = -(horizonalGap+24.0+5.0)
             case .canCancel:
                 cancelButton.isHidden = false
                 editButton.isHidden = true
+                titleMaxRight = -(horizonalGap+92.0+5.0)
+         }
+        titleLabel.snp.updateConstraints { make in
+            make.right.equalToSuperview().offset(-horizonalGap)
         }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
     }
     
     @objc func didClickOperatorBtn(btn:UIButton) {