高才列表bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/C/YHGCMySignatureDetailViewController.swift

@@ -68,7 +68,11 @@ class YHGCMySignatureDetailViewController: YHBaseViewController {
                     self.bottomButton.isEnabled = true
                     self.bottomView.isHidden = false
                     self.bottomButton.alpha = 1
-                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
+                    if self.viewModel.mainModel?.docType == 1001 {
+                        self.bottomButton.setTitle("确定已签章，提交", for: .normal)
+                    } else {
+                        self.bottomButton.setTitle("确定已签署，提交", for: .normal)
+                    }
                 } else if state == 1004 || state == 1005 {
                     self.bottomButton.isEnabled = false
                     self.bottomView.isHidden = false
@@ -78,12 +82,10 @@ class YHGCMySignatureDetailViewController: YHBaseViewController {
                     self.bottomView.isHidden = true
                     self.bottomButton.isEnabled = true
                     self.bottomButton.alpha = 1
-                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
                 } else if state == 1006 {
+                    self.bottomView.isHidden = true
                     self.bottomButton.isEnabled = true
-                    self.bottomView.isHidden = false
                     self.bottomButton.alpha = 1
-                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
                 }
                 self.tableView.reloadData()
             } else {
@@ -332,7 +334,7 @@ extension YHGCMySignatureDetailViewController: UITableViewDelegate, UITableViewD
                                 }
                             }
                         } else {
-                            
+                            YHHUD.flash(message: "文书编写中，请稍候查看")
                         }
                     }
                 }
@@ -540,7 +542,7 @@ extension YHGCMySignatureDetailViewController: UITableViewDelegate, UITableViewD
             return 180
         } else {
             guard let count = self.viewModel.mainModel?.signedDocument.count else { return CGFloat(221) }
-            if self.viewModel.mainModel?.docStatus == 1007 {
+            if self.viewModel.mainModel?.docStatus == 1007 || self.viewModel.mainModel?.docStatus == 1006 {
                 return CGFloat(168 + count * 71)
             } else {
                 return CGFloat(221 + count * 71)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCSignatureToActionTableViewCell.swift

@@ -293,11 +293,12 @@ class YHGCSignatureToActionTableViewCell: UITableViewCell {
             flagLabel.textColor = UIColor.brandMainColor
             if dataSource.docType == 1001 {
                 flagLabel.text = "待签章"
+                editButton.setTitle("查看", for: .normal)
             } else {
                 flagLabel.text = "待签署"
+                editButton.setTitle("签署", for: .normal)
             }
             flagLabel.backgroundColor = UIColor(hex: 0xebf0f9)
-            editButton.setTitle("查看", for: .normal)
         } else if dataSource.docStatus == 1004 || dataSource.docStatus == 1006 || dataSource.docStatus == 1005 {
             bottomLeftLineView.isHidden = true
             editButton.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MySignature(我的签字)/V/YHGCSignatureUploadTableViewCell.swift

@@ -187,8 +187,12 @@ class YHGCSignatureUploadTableViewCell: UITableViewCell {
         
         if dataSource.docType == 1001 {
             downLoadButton.setTitle("下载待签章文件", for: .normal)
+            bottomView.addBtn.setTitle("上传已签章件".local, for: .normal)
+            titleLabel.text = "上传已签章件"
         } else {
             downLoadButton.setTitle("下载待签署文件", for: .normal)
+            bottomView.addBtn.setTitle("上传已签署件".local, for: .normal)
+            titleLabel.text = "上传已签署件"
         }
         
         var y = 0
@@ -234,7 +238,7 @@ class YHGCSignatureUploadTableViewCell: UITableViewCell {
             self.bottomView.addBtn.isEnabled = false
         }
         
-        if dataSource.docStatus == 1007 {
+        if dataSource.docStatus == 1007 || dataSource.docStatus == 1006 {
             self.bottomView.isHidden = true
             mainItemView.snp.remakeConstraints { make in
                 make.left.right.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/VM/YHGCWorkItemListViewModel.swift

@@ -56,17 +56,22 @@ class YHGCWorkItemListViewModel: YHBaseViewModel {
             mainModel.consent_work_id = item?.id ?? 0
         }
         let item2 = YHWorkExperienceModel(id: .id4, isNeed: true, title: "可提供的在职公司", isUserKeyBoard: false, prompts: "请选择", message: company, type: .myCompany, isShowPrompts: isShowPrompt, alertMessage:"请选择")
-        if has_company_consent == 2 {
-            let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item])
-            return section
-        } else if has_company_consent == 1 {
-            let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item, item2])
-            return section
-        } else if has_company_consent == 0 {
-            let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item, item1])
-            return section
+        if mainModel.has_work_experience == 1 {
+            if has_company_consent == 2 {
+                let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item])
+                return section
+            } else if has_company_consent == 1 {
+                let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item, item2])
+                return section
+            } else if has_company_consent == 0 {
+                let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item, item1])
+                return section
+            } else {
+                let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item])
+                return section
+            }
         } else {
-            let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item])
+            let section = YHSectionWorkExperienceModel(title: "赴港同意书提供", models: [item1])
             return section
         }
     }