Merge commit '30d0256c' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1191,8 +1191,8 @@
 		045EEE222B9F171A0022A143 /* C */ = {
 			isa = PBXGroup;
 			children = (
-				045EEE232B9F171A0022A143 /* YHMySignatureDetailViewController.swift */,
 				045EEE242B9F171A0022A143 /* YHMySignatureListViewController.swift */,
+				045EEE232B9F171A0022A143 /* YHMySignatureDetailViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";

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

@@ -14,7 +14,7 @@ import IQKeyboardManagerSwift
 
 class YHMyDocumentsListViewController: YHBaseViewController {
     var tableView: UITableView!
-    var dataSource: [YHMyDocumentsListModel]?
+//    var dataSource: [YHMyDocumentsListModel]?
     var viewModel: YHMyDocumentsListViewModel?
     var orderId: Int = 0
     var mobile: String = ""
@@ -42,9 +42,6 @@ class YHMyDocumentsListViewController: YHBaseViewController {
         return imagV
     }()
     
-    
-    
-    
     lazy var emailInputView: YHEmailInputAlertView = {
         let view = YHEmailInputAlertView.emailInputView(defalutText: "请输入邮箱")
         return view

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

@@ -101,7 +101,7 @@ class YHDocListCell: UITableViewCell {
         
         statusLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_R(ofSize: 14)
+            label.font = UIFont.PFSC_M(ofSize: 14)
             label.textColor = UIColor.brandMainColor
             label.textAlignment = .right
             label.text = "待审核"
@@ -133,6 +133,7 @@ class YHDocListCell: UITableViewCell {
         checkButton.isHidden = true
     }
     
+    //文书状态
     func updateAllViewsForDocs() {
         guard let dataSource = dataSourceForDocs else { return }
         titleLabel.text = dataSource.doc_type_name
@@ -144,18 +145,20 @@ class YHDocListCell: UITableViewCell {
             checkButton.isHidden = true
             statusHoldView.isHidden = false
             /*
-             *  1: '待确认',
-             *  2: '待签章',
-             *  3: '已驳回',
-             *  4: '待核对',
-             *  5: '已签章',
-             *  6: '已定稿',
-             *  7: '已完成'
+             docOpt: {
+                         1: '待确认',
+                         2: '待签章',
+                         3: '已驳回',
+                         4: '待核对',
+                         5: '已签章',
+                         6: '已定稿',
+                         7: '已完成'
+                     },
              */
             var statusTxt = ""
             var color : UIColor = .brandMainColor
             
-            let status = dataSource.document_check_status
+            let status = dataSource.status
             if status == 1 {
                 statusTxt = "待确认"
                 color = UIColor.brandMainColor
@@ -166,7 +169,7 @@ class YHDocListCell: UITableViewCell {
                 statusTxt = "已驳回"
                 color = UIColor.failColor
             } else if status == 4 {
-                statusTxt = "待审核"
+                statusTxt = "核对中"
                 color = UIColor.warnColor
             } else if status == 5 {
                 statusTxt = "已签章"
@@ -179,16 +182,57 @@ class YHDocListCell: UITableViewCell {
                 color = UIColor.labelTextColor2
             } else {
                 statusTxt = "--"
-                color = UIColor.brandMainColor
+                color = UIColor.failColor
             }
             statusLabel.text = statusTxt
             statusLabel.textColor = color
         }
     }
     
-    
+    //签字状态
     func updateAllViewsForSign() {
         guard let dataSource = dataSourceForSign else { return }
+        titleLabel.text = dataSource.doc_type_name
+        if dataSource.isEditFlag {
+            checkButton.isHidden = false
+            statusHoldView.isHidden = true
+            checkButton.isSelected = dataSource.isSelectedFlag
+        } else {
+            checkButton.isHidden = true
+            statusHoldView.isHidden = false
+            /*
+             statusOpt: {
+                         3: '待签章',
+                         4: '已签章',
+                         5: '已完成',
+                         6: '已驳回'
+                     },
+             */
+            var statusTxt = ""
+            var color : UIColor = .brandMainColor
+            
+            let status = dataSource.status
+            if status == 3 {
+                statusTxt = "待签章"
+                color = UIColor.brandMainColor
+            } else if status == 4 {
+                statusTxt = "已签章"
+                color = UIColor.successColor
+            } else if status == 5 {
+                statusTxt = "已完成"
+                color = UIColor.labelTextColor2
+            } else if status == 6 {
+                statusTxt = "已驳回"
+                color = UIColor.failColor
+            } else {
+                statusTxt = "--"
+                color = UIColor.failColor
+            }
+            statusLabel.text = statusTxt
+            statusLabel.textColor = color
+            
+        }
+        
     }
 }
 

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

@@ -225,7 +225,7 @@ class YHDocumentMessageTableViewCell: UITableViewCell {
                 lookButton.isHidden = true
             }
             if dataSource.writing_document.status == 3 {
-                title = " 待核对 "
+                title = "核对中"
                 color = UIColor.warnColor
                 editButton.isHidden = true
                 submitButton.isHidden = true

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

@@ -25,6 +25,10 @@ class YHMySignatureModel: YHBaseModel {
     var is_second_page: Bool = false
     var contract_id: String = ""
     var doc_type_label: String = ""
+    
+    
+    var  isEditFlag : Bool = false //是否为编辑状态
+    var  isSelectedFlag : Bool = true //是否被选择  默认全部全部选择
 }
 
 class YHMySignatureUserInfoModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift

@@ -92,7 +92,7 @@ extension YHPhoneMessageView: UITextFieldDelegate {
     }
     
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
-        var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+        let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
         if newText.count > 11 {
             return false
         }