// 续签

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialUploadVC.swift

@@ -322,7 +322,7 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
             titlelabel.textColor = UIColor.mainTextColor
             titlelabel.textAlignment = .left
             titlelabel.font = UIFont.PFSC_M(ofSize:17)
-            titlelabel.text = "\(self.materialModel.name)示例模版"
+            titlelabel.text = "\(self.materialModel.getName())示例模版"
             titlelabel.numberOfLines = 0
             view.addSubview(titlelabel)
             
@@ -356,7 +356,7 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
         titlelabel.textColor = UIColor.mainTextColor
         titlelabel.textAlignment = .left
         titlelabel.font = UIFont.PFSC_M(ofSize:17)
-        titlelabel.text = self.materialModel.name
+        titlelabel.text = self.materialModel.getName()
         titlelabel.numberOfLines = 0
         view.addSubview(titlelabel)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/M/YHMaterialListModel.swift

@@ -64,6 +64,13 @@ class YHMaterialModel: SmartCodable {
     var updated_at: String = ""
     var deleted_at: String = ""
     
+    func getName() -> String {
+        var nameStr = name.trimmingCharacters(in: .whitespaces)
+        nameStr = nameStr.replacingOccurrences(of: "\n", with: "")
+        nameStr = nameStr.replacingOccurrences(of: "\r", with: "")
+        return nameStr
+    }
+
     required init() {
         
     }
@@ -90,6 +97,13 @@ class YHResignTemplateDetail: SmartCodable {
     var remark: String = ""
     var file_url: [YHResignTemplateItemModel] = []
     
+    func getName() -> String {
+        var nameStr = name.trimmingCharacters(in: .whitespaces)
+        nameStr = nameStr.replacingOccurrences(of: "\n", with: "")
+        nameStr = nameStr.replacingOccurrences(of: "\r", with: "")
+        return nameStr
+    }
+        
     required init() {
         
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/V/YHResignMaterialCell.swift

@@ -103,9 +103,7 @@ class YHResignMaterialCell: UITableViewCell {
             
         var result:ASAttributedString = .init(string:"", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
         let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 16)),.foreground(UIColor.failColor))
-        var name = model.name.trimmingCharacters(in: .whitespaces)
-        name = name.replacingOccurrences(of: "\n", with: "")
-        name = name.replacingOccurrences(of: "\r", with: "")
+        var name = model.getName()
         let cerName: ASAttributedString = .init(string:name , .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
         let template: ASAttributedString = " \(.view(templateButton, .original(.center)))"
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/V/YHResignTemplateSheetView.swift

@@ -126,8 +126,8 @@ class YHResignTemplateSheetView: UIView {
     func updateModel(_ model: YHResignTemplateDetail) {
         
         templateInfo = model
-        if !model.name.isEmpty {
-            titleLabel.text = "\(model.name)示例模版"
+        if !model.getName().isEmpty {
+            titleLabel.text = "\(model.getName())示例模版"
         }
         
         templateArr.removeAll()